[Liblas-commits] r1299 - in trunk: . m4

[liblas-commits at liblas.org]

Author: hobu
Date: Thu Jun 18 22:47:16 2009
New Revision: 1299
URL: http://liblas.org/changeset/1299

Log:
make boost optional and fix the logic so it works correctly

Modified:
   trunk/configure.ac
   trunk/m4/ax_boost_base.m4

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Jun 18 22:47:16 2009
@@ -278,7 +278,8 @@
 AX_BOOST_BASE()
 AM_CONDITIONAL([BOOST_IS_CONFIG], [test ! x$HAVE_BOOST = xno])
 
-if test "${HAVE_BOOST}" == "" ; then
+echo ${HAVE_BOOST}
+if test "${HAVE_BOOST}" == "yes" ; then
     HAVE_BOOST="yes"
     LIBS="$BOOST_LDFLAGS -lboost_iostreams $LIBS"
 fi

Modified: trunk/m4/ax_boost_base.m4
==============================================================================
--- trunk/m4/ax_boost_base.m4	(original)
+++ trunk/m4/ax_boost_base.m4	Thu Jun 18 22:47:16 2009
@@ -21,7 +21,7 @@
 #
 #   And sets:
 #
-#     HAVE_BOOST
+#     HAVE_BOOST_API
 #
 # LICENSE
 #
@@ -34,7 +34,7 @@
 AC_DEFUN([AX_BOOST_BASE],
 [
 AC_ARG_WITH([boost],
-	AS_HELP_STRING([--with-boost@<:@=DIR@:>@], [use boost (default is yes) - it is possible to specify the root directory for boost (optional)]),
+	AS_HELP_STRING([--with-boost@<:@=DIR@:>@], [use boost (default is no) - it is possible to specify the root directory for boost (optional)]),
 	[
     if test "$withval" = "no"; then
 		want_boost="no"
@@ -43,10 +43,10 @@
         ac_boost_path=""
     else
 	    want_boost="yes"
-        ac_boost_path="$withval"
+	    ac_boost_path="$withval"
 	fi
     ],
-    [want_boost="yes"])
+    [want_boost="no"])
 
 
 AC_ARG_WITH([boost-libdir],
@@ -209,7 +209,9 @@
 	else
 		AC_SUBST(BOOST_CPPFLAGS)
 		AC_SUBST(BOOST_LDFLAGS)
-		AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available])
+		HAVE_BOOST="yes"
+		AC_SUBST(HAVE_BOOST)
+		AC_DEFINE(HAVE_BOOST_API,,[define if the Boost library is available])
 	fi
 
         CPPFLAGS="$CPPFLAGS_SAVED"