Created
April 26, 2013 11:42
-
-
Save Habbie/5466741 to your computer and use it in GitHub Desktop.
Candidate for locating mysql_config and using it instead
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: configure.ac | |
=================================================================== | |
--- configure.ac (revision 3017) | |
+++ configure.ac (working copy) | |
@@ -450,20 +450,19 @@ | |
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 @@ | |
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 | |
Index: pdns/Makefile.am | |
=================================================================== | |
--- pdns/Makefile.am (revision 3017) | |
+++ pdns/Makefile.am (working copy) | |
@@ -69,7 +69,7 @@ | |
# | |
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_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 | |
Index: modules/gmysqlbackend/Makefile.am | |
=================================================================== | |
--- modules/gmysqlbackend/Makefile.am (revision 3017) | |
+++ modules/gmysqlbackend/Makefile.am (working copy) | |
@@ -9,7 +9,7 @@ | |
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 | |
Index: modules/mydnsbackend/Makefile.am | |
=================================================================== | |
--- modules/mydnsbackend/Makefile.am (revision 3017) | |
+++ modules/mydnsbackend/Makefile.am (working copy) | |
@@ -3,5 +3,5 @@ | |
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@ | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment