2 files changed, 8 insertions, 3 deletions

diff --git a/configure.ac b/configure.ac
index 3caaf253a..0e5fbb75e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -598,10 +598,15 @@ AC_ARG_WITH(mysql,
    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])])
diff --git a/src/mysql/Makefile.am b/src/mysql/Makefile.am
index 1711e7572..c98c71b44 100644
--- a/src/mysql/Makefile.am
+++ b/src/mysql/Makefile.am
@@ -12,7 +12,7 @@ lib_LTLIBRARIES = libgnunetmysql.la
 
 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) \