improve mysql lib detection, thanks Aki Tuomi and Kees Monshouwer, again closes #458

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@3019 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/configure.ac b/configure.ac
index 6cff60a2f11c18b780dd9a61de1807981b03e546..3fd969faacea19a8e8769c5180fd137abe219826 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -450,20 +450,19 @@ then
                AC_MSG_ERROR([Did not find the mysql library dir in '$MYSQL_lib_check'])
        fi
        case "$MYSQL_libdir" in
-                 /usr/lib ) MYSQL_lib="" ;;
-         /* ) MYSQL_lib=-L$MYSQL_libdir; LDFLAGS="$MYSQL_lib $LDFLAGS";;
-         * )  AC_MSG_ERROR([The MySQL library directory ($MYSQL_libdir) must be an absolute path.]) ;;
+         /*) MYSQL_lib="-L$MYSQL_libdir -lmysqlclient" 
+          ;;
+         *)  AC_MSG_ERROR([The MySQL library directory ($MYSQL_libdir) must be an absolute path.]) 
+          ;;
        esac
-       
-       AC_SUBST(MYSQL_lib)
-       
        AC_MSG_RESULT([$MYSQL_libdir])
-               AC_MSG_CHECKING([for MySQL include directory])
+        AC_SUBST(MYSQL_lib)
+       AC_MSG_CHECKING([for MySQL include directory])
        MYSQL_inc=
        for m in $MYSQL_inc_check; do
                if test -d "$m" && test -f "$m/mysql.h"
                then
-                       MYSQL_inc=-I$m
+                        MYSQL_inc="$m"
                        break
                fi
        done
@@ -472,14 +471,15 @@ then
        fi
        
        case "$MYSQL_inc" in
-         /* ) ;;
-         * )  AC_MSG_ERROR([The MySQL include directory ($MYSQL_inc) must be an absolute path.]) ;;
+         /*) AC_MSG_RESULT($MYSQL_inc) 
+          ;;
+         *)  AC_MSG_ERROR([The MySQL include directory ($MYSQL_inc) must be an absolute path.]) 
+          ;;
        esac
-        AC_MSG_RESULT([$MYSQL_inc])
+        MYSQL_inc="-I$MYSQL_inc"
      fi
        AC_SUBST(MYSQL_lib)
        AC_SUBST(MYSQL_inc)
-#      LIBS="$LIBS -lmysqlclient"
 fi
 
 

diff --git a/modules/gmysqlbackend/Makefile.am b/modules/gmysqlbackend/Makefile.am
index 918ad650e72b94648a13a707f2f02dfc56fe7e70..fadbc01b07e5586780906ef858a265ebb79f245b 100644 (file)
--- a/modules/gmysqlbackend/Makefile.am
+++ b/modules/gmysqlbackend/Makefile.am
@@ -9,7 +9,7 @@ libgmysqlbackend_la_SOURCES=gmysqlbackend.cc gmysqlbackend.hh \
                smysql.hh smysql.cc
 
 
-libgmysqlbackend_la_LDFLAGS=-module -avoid-version -lmysqlclient
+libgmysqlbackend_la_LDFLAGS=-module -avoid-version $(MYSQL_lib)
 
 #      -Wl,-Bstatic -lpq++ -lpq -Wl,-Bdynamic -lssl -lcrypt -lcrypto
 

diff --git a/modules/mydnsbackend/Makefile.am b/modules/mydnsbackend/Makefile.am
index 427d60d9926c1da1d75ed38a95c5c8c239fa7172..62f098ac3d155bbd6bbf8e6bf5796a91a0ebc9cc 100644 (file)
--- a/modules/mydnsbackend/Makefile.am
+++ b/modules/mydnsbackend/Makefile.am
@@ -3,5 +3,5 @@ INCLUDES=@MYSQL_inc@
 lib_LTLIBRARIES = libmydnsbackend.la 
 EXTRA_DIST=OBJECTFILES OBJECTLIBS
 libmydnsbackend_la_SOURCES=mydnsbackend.cc mydnsbackend.hh 
-libmydnsbackend_la_LDFLAGS=-module -avoid-version @MYSQL_lib@ -lmysqlclient
+libmydnsbackend_la_LDFLAGS=-module -avoid-version @MYSQL_lib@
 

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 65efb189a28d9721efb98d7ebb21aec7ae562951..f616b412d6c1164a8cfb222790b1b106d91fb358 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -69,7 +69,7 @@ ednssubnet.cc ednssubnet.hh cachecleaner.hh json.cc json.hh
 
 #
 pdns_server_LDFLAGS=@moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@  $(BOOST_SERIALIZATION_LDFLAGS) -rdynamic 
-pdns_server_LDADD= ext/polarssl-1.1.2/library/libpolarssl.a $(BOOST_SERIALIZATION_LIBS) $(LUA_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS)
+pdns_server_LDADD= ext/polarssl-1.1.2/library/libpolarssl.a $(BOOST_SERIALIZATION_LIBS) $(LUA_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(MYSQL_lib)
 
 if BOTAN110
 pdns_server_SOURCES += botan110signers.cc botansigners.cc
@@ -106,7 +106,7 @@ pdnssec_SOURCES=pdnssec.cc dbdnsseckeeper.cc sstuff.hh dnsparser.cc dnsparser.hh
 
 
 pdnssec_LDFLAGS=@moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@  $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
-pdnssec_LDADD= ext/polarssl-1.1.2/library/libpolarssl.a $(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_SERIALIZATION_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS)
+pdnssec_LDADD= ext/polarssl-1.1.2/library/libpolarssl.a $(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_SERIALIZATION_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(MYSQL_lib)
 
 if BOTAN110
 pdnssec_SOURCES += botan110signers.cc botansigners.cc