Upstream-status: https://sourceforge.net/p/freesolid/patches/1/

Resolve Autoconf warnings.

diff --git a/Makefile.am b/Makefile.am
index 4914f44..77b157a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = libmoto libbroad libsolid sample doc
 
 EXTRA_DIST = include
-bin_SCRIPTS = freesolid-config
\ No newline at end of file
+bin_SCRIPTS = freesolid-config
diff --git a/configure.in b/configure.in
index 7d61ba5..41a761c 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(sample/sample.cpp)
+AC_CONFIG_MACRO_DIR([m4])
 
 AC_CANONICAL_SYSTEM
 PACKAGE=FreeSOLID
@@ -22,17 +23,14 @@ AC_PROG_CXX
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
-AC_PROG_RANLIB
 AC_PROG_LIBTOOL
 
 CPPFLAGS="$CPPFLAGS -I../include -I./include -I. -I../libbroad -I../libmoto"
 AC_SUBST(CPPFLAGS)
 
 dnl Checks for libraries.
-dnl Replace `main' with a function in -lm:
-AC_CHECK_LIB(m, main)
-dnl Replace `main' with a function in -lqhull:
-AC_CHECK_LIB(qhull, main, s_have_qhull=yes)
+AC_CHECK_LIB(m, ceil)
+AC_CHECK_LIB(qhull, qh_initbuild, s_have_qhull=yes)
 
 if test "X${s_have_qhull}" = Xyes; then
   QHULL_LIBS="-lqhull"
diff --git a/libsolid/Makefile.am b/libsolid/Makefile.am
index cc295c7..f722be3 100644
--- a/libsolid/Makefile.am
+++ b/libsolid/Makefile.am
@@ -23,7 +23,7 @@ libFreeSOLID_la_SOURCES = \
 
 libFreeSOLID_la_LDFLAGS = -no-undefined -version-info @FREESOLID_CURRENT@:@FREESOLID_REVISION@:@FREESOLID_AGE@ -release @VERSION@
 
-CPPFLAGS = @CPPFLAGS@
+AM_CPPFLAGS = @CPPFLAGS@
 LIBS = @QHULL_LIBS@ -lm
 
 pkginclude_HEADERS = \
diff --git a/sample/Makefile.am b/sample/Makefile.am
index 5559fb0..eaa705f 100644
--- a/sample/Makefile.am
+++ b/sample/Makefile.am
@@ -4,7 +4,7 @@ sample_SOURCES = sample.cpp
 x_wing_SOURCES = x_wing.cpp
 teapot_SOURCES = teapot.cpp
 
-CPPFLAGS = @CPPFLAGS@
+AM_CPPFLAGS = @CPPFLAGS@
 
 LDADD = ../libsolid/libFreeSOLID.la
 
itter</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=9679123ce083c69cdfd1505d95a4066d41280394'>root</a>/<a href='/guix/log/gnu?id=9679123ce083c69cdfd1505d95a4066d41280394'>gnu</a>/<a href='/guix/log/gnu/system?id=9679123ce083c69cdfd1505d95a4066d41280394'>system</a>/<a href='/guix/log/gnu/system/examples?id=9679123ce083c69cdfd1505d95a4066d41280394'>examples</a>/<a href='/guix/log/gnu/system/examples/lightweight-desktop.tmpl?id=9679123ce083c69cdfd1505d95a4066d41280394'>lightweight-desktop.tmpl</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/system/examples/lightweight-desktop.tmpl?id=9679123ce083c69cdfd1505d95a4066d41280394&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-08-29 01:05:26 -0400'>2021-08-29</span></td><td><a href='/guix/commit/gnu/system/examples/lightweight-desktop.tmpl?id=da4e40948326387d5bcda58783914d5f9ce8b095'>Migrate to the new 'targets' field of bootloader-configuration.</a><span class='msg-avail'>...<span class='msg-tooltip'>The old 'target' field is deprecated; adjust the sources to use the new
'targets' one instead.

* doc/guix-cookbook.texi&lt;target&gt;: Replace by 'targets'.
* gnu/bootloader/grub.scm: Likewise.
* gnu/installer/parted.scm: Likewise.
* gnu/machine/digital-ocean.scm: Likewise.
* gnu/system/examples/asus-c201.tmpl: Likewise
* gnu/system/examples/bare-bones.tmpl: Likewise
* gnu/system/examples/bare-hurd.tmpl: Likewise
* gnu/system/examples/beaglebone-black.tmpl: Likewise
* gnu/system/examples/desktop.tmpl: Likewise
* gnu/system/examples/docker-image.tmpl: Likewise
* gnu/system/examples/lightweight-desktop.tmpl: Likewise
* gnu/system/examples/vm-image.tmpl: Likewise
* gnu/system/examples/yggdrasil.tmpl: Likewise
* gnu/system/hurd.scm: Likewise
* gnu/system/images/hurd.scm: Likewise
* gnu/system/images/novena.scm: Likewise
* gnu/system/images/pine64.scm: Likewise
* gnu/system/images/pinebook-pro.scm: Likewise
* gnu/system/images/rock64.scm: Likewise
* gnu/system/install.scm: Likewise
* gnu/system/vm.scm: Likewise
* gnu/tests.scm: Likewise
* gnu/tests/ganeti.scm: Likewise
* gnu/tests/install.scm: Likewise
* gnu/tests/nfs.scm: Likewise
* gnu/tests/telephony.scm: Likewise
* tests/boot-parameters.scm: Likewise
* tests/system.scm: Likewise
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2020-10-13 21:17:40 +0200'>2020-10-13</span></td><td><a href='/guix/commit/gnu/system/examples/lightweight-desktop.tmpl?id=1197b8b20f4fca4ce03bbc5fa75e18d54e3717c0'>installer: Add Emacs EXWM desktop environment.</a><span class='msg-avail'>...<span class='msg-tooltip'>Suggested by zenny via IRC.

* gnu/installer/services.scm (%system-services): Add emacs, emacs-exwm,
emacs-desktop-environment.
* etc/release-manifest.scm (%system-packages): Likewise.
* gnu/system/examples/lightweight-desktop.tmpl: Likewise.
* gnu/tests/install.scm (installation-target-desktop-os-for-gui-tests)
[packages]: Likewise
* gnu/installer/newt/services.scm (run-desktop-environments-cbt-page): Make
one entry taller.
</span></span></td><td>Jan (janneke) Nieuwenhuizen</td></tr>
<tr><td><span title='2020-08-28 23:27:53 +0200'>2020-08-28</span></td><td><a href='/guix/commit/gnu/system/examples/lightweight-desktop.tmpl?id=be1c00ae3c3dc7086ada05f34c36e85adb839038'>system: Remove extra line from 'lightweight-desktop.tmpl'.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to c7af96871737ffa0e2be879e200573bc60603c8c.

* gnu/system/examples/lightweight-desktop.tmpl: Remove extra
'use-package-modules' line.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-04-02 11:48:25 +0200'>2020-04-02</span></td><td><a href='/guix/commit/gnu/system/examples/lightweight-desktop.tmpl?id=c7af96871737ffa0e2be879e200573bc60603c8c'>system: Add xterm to lightweight-desktop example.</a><span class='msg-avail'>...<span class='msg-tooltip'>That makes ratpoison more usable, for instance.

* gnu/system/examples/lightweight-desktop.tmpl (packages): Add XTERM.
</span></span></td><td>Ludovic Courtès</td></tr>