[GNUnet-SVN] r24523 - in gnunet: . src/mysql

[gnunet]

Author: szengel
Date: 2012-10-24 23:32:21 +0200 (Wed, 24 Oct 2012)
New Revision: 24523

Modified:
   gnunet/configure.ac
   gnunet/src/mysql/Makefile.am
Log:
libmysqlclient linking for /usr/lib64 (fedora 17)

Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2012-10-24 20:34:03 UTC (rev 24522)
+++ gnunet/configure.ac 2012-10-24 21:32:21 UTC (rev 24523)
@@ -598,10 +598,15 @@
    fi
   ],
   [AC_MSG_RESULT([--with-mysql not specified])
-   LDFLAGS="-L/usr/lib/mysql $LDFLAGS $ZLIBS"
+   if test -d "/usr/lib64/mysql"; then
+    MYSQL_LIBDIR="/usr/lib64/mysql"
+   elif test -d "/usr/lib/mysql"; then
+    MYSQL_LIBDIR="/usr/lib/mysql"
+   fi
+   LDFLAGS="-L$MYSQL_LIBDIR $LDFLAGS $ZLIBS"
    AC_CHECK_LIB(mysqlclient, mysql_init,
     [AC_CHECK_HEADERS(mysql/mysql.h,
-      MYSQL_LDFLAGS="-L/usr/lib/mysql"
+      MYSQL_LDFLAGS="-L$MYSQL_LIBDIR"
       mysql=true
 
      , [], [$CYGWIN_MYSQL_MAGIC])])

Modified: gnunet/src/mysql/Makefile.am
===================================================================
--- gnunet/src/mysql/Makefile.am        2012-10-24 20:34:03 UTC (rev 24522)
+++ gnunet/src/mysql/Makefile.am        2012-10-24 21:32:21 UTC (rev 24523)
@@ -12,7 +12,7 @@
 
 libgnunetmysql_la_SOURCES = \
   mysql.c
-libgnunetmysql_la_LIBADD = -lmysqlclient \
+libgnunetmysql_la_LIBADD = $(MYSQL_LDFLAGS) -lmysqlclient \
  $(top_builddir)/src/util/libgnunetutil.la  
 libgnunetmysql_la_LDFLAGS = \
  $(GN_LIB_LDFLAGS) \