| 1 | Upstream-status: https://sourceforge.net/p/freesolid/patches/1/
|
| 2 |
|
| 3 | Resolve Autoconf warnings.
|
| 4 |
|
| 5 | diff --git a/Makefile.am b/Makefile.am
|
| 6 | index 4914f44..77b157a 100644
|
| 7 | |
| 8 | |
| 9 | @@ -1,4 +1,5 @@
|
| 10 | +ACLOCAL_AMFLAGS = -I m4
|
| 11 | SUBDIRS = libmoto libbroad libsolid sample doc
|
| 12 |
|
| 13 | EXTRA_DIST = include
|
| 14 | -bin_SCRIPTS = freesolid-config
|
| 15 | \ No newline at end of file
|
| 16 | +bin_SCRIPTS = freesolid-config
|
| 17 | diff --git a/configure.in b/configure.in
|
| 18 | index 7d61ba5..41a761c 100644
|
| 19 | |
| 20 | |
| 21 | @@ -1,5 +1,6 @@
|
| 22 | dnl Process this file with autoconf to produce a configure script.
|
| 23 | AC_INIT(sample/sample.cpp)
|
| 24 | +AC_CONFIG_MACRO_DIR([m4])
|
| 25 |
|
| 26 | AC_CANONICAL_SYSTEM
|
| 27 | PACKAGE=FreeSOLID
|
| 28 | @@ -22,17 +23,14 @@ AC_PROG_CXX
|
| 29 | AC_PROG_CC
|
| 30 | AC_PROG_CPP
|
| 31 | AC_PROG_INSTALL
|
| 32 | -AC_PROG_RANLIB
|
| 33 | AC_PROG_LIBTOOL
|
| 34 |
|
| 35 | CPPFLAGS="$CPPFLAGS -I../include -I./include -I. -I../libbroad -I../libmoto"
|
| 36 | AC_SUBST(CPPFLAGS)
|
| 37 |
|
| 38 | dnl Checks for libraries.
|
| 39 | -dnl Replace `main' with a function in -lm:
|
| 40 | -AC_CHECK_LIB(m, main)
|
| 41 | -dnl Replace `main' with a function in -lqhull:
|
| 42 | -AC_CHECK_LIB(qhull, main, s_have_qhull=yes)
|
| 43 | +AC_CHECK_LIB(m, ceil)
|
| 44 | +AC_CHECK_LIB(qhull, qh_initbuild, s_have_qhull=yes)
|
| 45 |
|
| 46 | if test "X${s_have_qhull}" = Xyes; then
|
| 47 | QHULL_LIBS="-lqhull"
|
| 48 | diff --git a/libsolid/Makefile.am b/libsolid/Makefile.am
|
| 49 | index cc295c7..f722be3 100644
|
| 50 | |
| 51 | |
| 52 | @@ -23,7 +23,7 @@ libFreeSOLID_la_SOURCES = \
|
| 53 |
|
| 54 | libFreeSOLID_la_LDFLAGS = -no-undefined -version-info @FREESOLID_CURRENT@:@FREESOLID_REVISION@:@FREESOLID_AGE@ -release @VERSION@
|
| 55 |
|
| 56 | -CPPFLAGS = @CPPFLAGS@
|
| 57 | +AM_CPPFLAGS = @CPPFLAGS@
|
| 58 | LIBS = @QHULL_LIBS@ -lm
|
| 59 |
|
| 60 | pkginclude_HEADERS = \
|
| 61 | diff --git a/sample/Makefile.am b/sample/Makefile.am
|
| 62 | index 5559fb0..eaa705f 100644
|
| 63 | |
| 64 | |
| 65 | @@ -4,7 +4,7 @@ sample_SOURCES = sample.cpp
|
| 66 | x_wing_SOURCES = x_wing.cpp
|
| 67 | teapot_SOURCES = teapot.cpp
|
| 68 |
|
| 69 | -CPPFLAGS = @CPPFLAGS@
|
| 70 | +AM_CPPFLAGS = @CPPFLAGS@
|
| 71 |
|
| 72 | LDADD = ../libsolid/libFreeSOLID.la
|
| 73 |
|