32 lines
1016 B
Diff
32 lines
1016 B
Diff
|
--- Makefile.am
|
||
|
|
+++ Makefile.am
|
||
|
|
@@ -25,7 +25,12 @@
|
||
|
|
# the GNU Lesser General Public License.
|
||
|
|
|
||
|
|
# Where to find the headers
|
||
|
|
+
|
||
|
|
+if BOOST_NOT_STD
|
||
|
|
AM_CPPFLAGS = -I$(srcdir)/src -I@BOOSTDIR@
|
||
|
|
+else
|
||
|
|
+AM_CPPFLAGS = -I$(srcdir)/src
|
||
|
|
+endif
|
||
|
|
|
||
|
|
# we assume a compliant compiler, but maybe it's a good idea to get this
|
||
|
|
# refined in configure.in (contributions welcome)
|
||
|
|
--- configure.in
|
||
|
|
+++ configure.in
|
||
|
|
@@ -54,9 +54,11 @@
|
||
|
|
AC_ARG_WITH(boost,
|
||
|
|
AC_HELP_STRING([--with-boost=BOOST_PREFIX],
|
||
|
|
[place where boost headers reside]),
|
||
|
|
- [ BOOSTDIR="$withval"; echo $withval; ],
|
||
|
|
- AC_MSG_ERROR([please rerun using flag --with-boost=BOOST_PREFIX ]) )
|
||
|
|
+ [BOOSTDIR="$withval"; echo $withval; ],
|
||
|
|
+ [AC_CHECK_HEADER([boost/config.hpp],,
|
||
|
|
+ [AC_MSG_WARN([please rerun using flag --with-boost=BOOST_PREFIX])] )])
|
||
|
|
|
||
|
|
+AM_CONDITIONAL([BOOST_NOT_STD], [test ! -z x$BOOSTDIR])
|
||
|
|
|
||
|
|
################################################################################
|
||
|
|
# transfer the obtained information to automake
|