diff options
| author | Maximilian Szengel <gnunet@maxsz.de> | 2012-10-24 21:32:21 +0000 |
|---|---|---|
| committer | Maximilian Szengel <gnunet@maxsz.de> | 2012-10-24 21:32:21 +0000 |
| commit | a50d02eb13b2e9885aa8451fe11eeab9ac2126a6 (patch) | |
| tree | dcd410bd5a0fe4fe9e04f42c0f6d7e3db0111ec1 | |
| parent | e58e6a7ff78981fb4d592587a30e0a94b873a912 (diff) | |
libmysqlclient linking for /usr/lib64 (fedora 17)
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | src/mysql/Makefile.am | 2 |
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) \ |