Changeset 1364

Timestamp:

06/01/05 13:50:00 (3 years ago)

Author:

madcat

Message:

Fixes --with-boost / --with-builtin_boost configure options.

Files:

• hydranode/configure.ac (modified) (2 diffs)
• hydranode/m4/boost.m4 (modified) (1 diff)

hydranode/configure.ac

@@ -66 +66 @@
-            [builtin_boost=$withval], [builtin_boost=false]
-)
+dnl This is here and not in boost.m4 'cos otherwise it breaks when both
+dnl builtin_boost and with-boost args are specified.
+AC_ARG_WITH(boost,
+    AC_HELP_STRING(
+        [--with-boost=PATH],
+        [Absolute path name where the Boost C++ libraries reside]),
+        [BOOST_ROOT=$withval], [BOOST_ROOT="/usr"]
+)
+
-AC_ARG_WITH(builtin,
-        [  --with-builtin=MODULES  Modules that shall be built-in            ],
@@ -122 +131 @@
-        RS_BOOST_PROGRAM_OPTIONS([], [builtin_boost=yes])
-fi
-
+-z $BOOST_ROOT || test 
-        boost_path="$HOME/boost_1_32_0";
-else
-        boost_path=$BOOST_ROOT
+fi
+if test x$builtin_boost = xyes; then
+        BOOST_CPPFLAGS="-I$boost_path"
-fi
-

hydranode/m4/boost.m4

@@ -11 +11 @@
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-
-dnl Extract the path name from a --with-boost=PATH argument
-  AC_ARG_WITH(boost,
-    AC_HELP_STRING(
-        [--with-boost=PATH],
-        [Absolute path name where the Boost C++ libraries reside]),
-        [BOOST_ROOT=$withval], [BOOST_ROOT="/usr"]
-  )
-
-  boost_min_version=ifelse([$1], ,1.20.0,[$1])