[GNUnet-SVN] r434 - GNUnet

[durner]

Author: durner
Date: 2005-03-13 13:54:55 -0800 (Sun, 13 Mar 2005)
New Revision: 434

Modified:
   GNUnet/configure.ac
Log:
Use CPPFLAGS & LDFLAGS for MySQL version check

Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2005-03-13 21:42:18 UTC (rev 433)
+++ GNUnet/configure.ac 2005-03-13 21:54:55 UTC (rev 434)
@@ -257,14 +257,14 @@
 # test for mysql
 mysql=false
 mysqlfail=false
+SAVE_LDFLAGS=$LDFLAGS
+SAVE_CPPFLGAS=$CPPFLAGS
 AC_MSG_CHECKING(for mysql)
 AC_ARG_WITH(mysql,
   [  --with-mysql=PFX   Base of mysql installation],
   [AC_MSG_RESULT("$with_mysql")
    if test "$with_mysql" != "no"
    then
-    SAVE_LDFLAGS=$LDFLAGS
-    SAVE_CPPFLGAS=$CPPFLAGS
     LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql $LDFLAGS $ZLIBS"
     CPPFLAGS="-I$with_mysql/include $CPPFLAGS"
     AC_CHECK_HEADERS(mysql/mysql.h,
@@ -273,12 +273,9 @@
       MYSQL_CPPFLAGS="-I$with_mysql/include"
 
       mysql=true), [], [$CYGWIN_MYSQL_MAGIC])
-    LDFLAGS=$SAVE_LDFLAGS
-    CPPFLAGS=$SAVE_CPPFLAGS
    fi
   ],
   [AC_MSG_RESULT([--with-mysql not specified])
-   SAFE_LDFLAGS=$LDFLAGS
    LDFLAGS="-L/usr/lib/mysql $LDFLAGS $ZLIBS"
    AC_CHECK_LIB(mysqlclient, mysql_init,
     [AC_CHECK_HEADERS(mysql/mysql.h,
@@ -286,7 +283,6 @@
       mysql=true
       
      , [], [$CYGWIN_MYSQL_MAGIC])])
-   LDFLAGS=$SAVE_LDFLAGS
   ])
 
 AC_SUBST(MYSQL_LDFLAGS)
@@ -315,6 +311,8 @@
 fi
 AM_CONDITIONAL(HAVE_MYSQL, test x$mysql = xtrue)
 
+LDFLAGS=$SAVE_LDFLAGS
+CPPFLAGS=$SAVE_CPPFLAGS
 
 # GNUnet Setup
 curses=1