[Gnash-commit] gnash configure.ac macros/boost.m4

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/10 23:43:15

Modified files:
        .              : configure.ac 
        macros         : boost.m4 

Log message:
        Fix for setting BOOST_CFLAGS.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.144&r2=1.145
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -b -r1.144 -r1.145
--- configure.ac        10 Oct 2006 21:00:53 -0000      1.144
+++ configure.ac        10 Oct 2006 23:43:15 -0000      1.145
@@ -33,7 +33,7 @@
 dnl also makes it possible to release a modified version which carries
 dnl forward this exception.
 
-dnl $Id: configure.ac,v 1.144 2006/10/10 21:00:53 nihilus Exp $
+dnl $Id: configure.ac,v 1.145 2006/10/10 23:43:15 nihilus Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, 0.7.1-cvs)
@@ -1104,7 +1104,7 @@
   fi
 fi
 
-if test x"$BOOST_CFLAGS" != x -o x"$BOOST_LIBS" != x; then
+if test x"$BOOST_CFLAGS" != x; then
     echo "        BOOST flags are: $BOOST_CFLAGS"
     echo "        BOOST libs are: $BOOST_LIBS"
 else

Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- macros/boost.m4     10 Oct 2006 20:39:03 -0000      1.9
+++ macros/boost.m4     10 Oct 2006 23:43:15 -0000      1.10
@@ -35,7 +35,7 @@
 dnl  
 dnl 
 
-dnl $Id: boost.m4,v 1.9 2006/10/10 20:39:03 nihilus Exp $
+dnl $Id: boost.m4,v 1.10 2006/10/10 23:43:15 nihilus Exp $
 
 dnl Boost modules are:
 dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -70,14 +70,9 @@
   fi
 
   if test x"${ac_cv_path_boost_incl}" != x ; then
-    if test x"${ac_cv_path_boost_incl}" != x"/usr/include"; then
       BOOST_CFLAGS="-I${ac_cv_path_boost_incl}"
       AC_MSG_RESULT(${ac_cv_path_boost_incl})
     else
-      BOOST_CFLAGS=""
-      AC_MSG_RESULT([yes])
-    fi
-  else
     AC_MSG_RESULT(no)
     BOOST_CFLAGS=""
     AC_MSG_WARN([Boost header files not found!])