diff options
| -rw-r--r-- | Changelog-Trunk.txt | 3 | ||||
| -rwxr-xr-x | configure | 71 | ||||
| -rw-r--r-- | configure.in | 65 |
3 files changed, 114 insertions, 25 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 68690ceb3..3e7ba8b78 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,9 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. +2008/04/14 + * Changes to the configure script: [FlavioJS] + - added options --with-MYSQL_CFLAGS and --with-MYSQL_LIBS to allow manual setting of those variables 2008/04/13 * More major updates to the quest log system. [Kevin] * Followup to r12579 (all other players appeared as female on sql branch). [FlavioJS] @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 12578 . +# From configure.in Revision: 12586 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61. # @@ -1267,6 +1267,10 @@ Optional Packages: --with-mysql[=ARG] use MySQL client library, optionally specify the path to the mysql_config executable (by default mysql is used if found) + --with-MYSQL_CFLAGS=ARG specify MYSQL_CFLAGS manually (instead of using + "mysql_config --include") + --with-MYSQL_LIBS=ARG specify MYSQL_LIBS manually (instead of using + "mysql_config --libs") --with-pcre[=ARG] use PCRE library, optionally specify the full path of pcre installation directory (by default pcre is used if found) @@ -1833,6 +1837,40 @@ fi # +# Manual MYSQL_CFLAGS (optional) +# + +# Check whether --with-MYSQL_CFLAGS was given. +if test "${with_MYSQL_CFLAGS+set}" = set; then + withval=$with_MYSQL_CFLAGS; + manual_MYSQL_CFLAGS="yes" + MYSQL_CFLAGS="$withval" + +else + manual_MYSQL_CFLAGS="no" + +fi + + + +# +# Manual MYSQL_LIBS (optional) +# + +# Check whether --with-MYSQL_LIBS was given. +if test "${with_MYSQL_LIBS+set}" = set; then + withval=$with_MYSQL_LIBS; + manual_MYSQL_LIBS="yes" + MYSQL_LIBS="$withval" + +else + manual_MYSQL_LIBS="no" + +fi + + + +# # Enable/disable PCRE and optionally specify the path (optional library) # @@ -4778,11 +4816,11 @@ fi # # MySQL library (optional) # -MYSQL_VERSION="" -MYSQL_CFLAGS="" -MYSQL_LIBS="" if test "$want_mysql" = "no" ; then + MYSQL_VERSION="" + MYSQL_CFLAGS="" + MYSQL_LIBS="" { echo "$as_me:$LINENO: ignoring MySQL (optional)" >&5 echo "$as_me: ignoring MySQL (optional)" >&6;} else @@ -4832,12 +4870,19 @@ fi if test "$MYSQL_CONFIG_HOME" != "no" ; then MYSQL_VERSION="`$MYSQL_CONFIG_HOME --version`" - MYSQL_CFLAGS="`$MYSQL_CONFIG_HOME --include`" - MYSQL_LIBS="`$MYSQL_CONFIG_HOME --libs`" + if test "$manual_MYSQL_CFLAGS" = "no" ; then + MYSQL_CFLAGS="`$MYSQL_CONFIG_HOME --include`" + fi + if test "$manual_MYSQL_LIBS" = "no" ; then + MYSQL_LIBS="`$MYSQL_CONFIG_HOME --libs`" + fi + else + MYSQL_VERSION="unknown" + fi - MYSQL_OLD_LDFLAGS="$LDFLAGS" ; LDFLAGS="$LDFLAGS $MYSQL_LIBS" - MYSQL_OLD_CPPFLAGS="$CPPFLAGS" ; CPPFLAGS="$CPPFLAGS $MYSQL_CFLAGS" - { echo "$as_me:$LINENO: checking for mysql_init in -lmysqlclient" >&5 + MYSQL_OLD_LDFLAGS="$LDFLAGS" ; LDFLAGS="$LDFLAGS $MYSQL_LIBS" + MYSQL_OLD_CPPFLAGS="$CPPFLAGS" ; CPPFLAGS="$CPPFLAGS $MYSQL_CFLAGS" + { echo "$as_me:$LINENO: checking for mysql_init in -lmysqlclient" >&5 echo $ECHO_N "checking for mysql_init in -lmysqlclient... $ECHO_C" >&6; } if test "${ac_cv_lib_mysqlclient_mysql_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4902,7 +4947,7 @@ if test $ac_cv_lib_mysqlclient_mysql_init = yes; then HAVE_MYSQL="yes" fi - if test "${ac_cv_header_mysql_h+set}" = set; then + if test "${ac_cv_header_mysql_h+set}" = set; then { echo "$as_me:$LINENO: checking for mysql.h" >&5 echo $ECHO_N "checking for mysql.h... $ECHO_C" >&6; } if test "${ac_cv_header_mysql_h+set}" = set; then @@ -5034,9 +5079,9 @@ else fi - CPPFLAGS="$MYSQL_OLD_CPPFLAGS" - LDFLAGS="$MYSQL_OLD_LDFLAGS" - fi + CPPFLAGS="$MYSQL_OLD_CPPFLAGS" + LDFLAGS="$MYSQL_OLD_LDFLAGS" + { echo "$as_me:$LINENO: checking MySQL library (optional)" >&5 echo $ECHO_N "checking MySQL library (optional)... $ECHO_C" >&6; } if test "$HAVE_MYSQL" = "yes" ; then diff --git a/configure.in b/configure.in index ac0e7b436..6bc3d3918 100644 --- a/configure.in +++ b/configure.in @@ -120,6 +120,40 @@ AC_ARG_WITH( # +# Manual MYSQL_CFLAGS (optional) +# +AC_ARG_WITH( + [MYSQL_CFLAGS], + AC_HELP_STRING( + [--with-MYSQL_CFLAGS=ARG], + [specify MYSQL_CFLAGS manually (instead of using "mysql_config --include")] + ), + [ + manual_MYSQL_CFLAGS="yes" + MYSQL_CFLAGS="$withval" + ], + [manual_MYSQL_CFLAGS="no"] +) + + +# +# Manual MYSQL_LIBS (optional) +# +AC_ARG_WITH( + [MYSQL_LIBS], + AC_HELP_STRING( + [--with-MYSQL_LIBS=ARG], + [specify MYSQL_LIBS manually (instead of using "mysql_config --libs")] + ), + [ + manual_MYSQL_LIBS="yes" + MYSQL_LIBS="$withval" + ], + [manual_MYSQL_LIBS="no"] +) + + +# # Enable/disable PCRE and optionally specify the path (optional library) # AC_ARG_WITH( @@ -337,11 +371,11 @@ AC_CHECK_LIB([rt], [clock_gettime]) # # MySQL library (optional) # -MYSQL_VERSION="" -MYSQL_CFLAGS="" -MYSQL_LIBS="" if test "$want_mysql" = "no" ; then + MYSQL_VERSION="" + MYSQL_CFLAGS="" + MYSQL_LIBS="" AC_MSG_NOTICE([ignoring MySQL (optional)]) else if test -z "$MYSQL_CONFIG_HOME"; then @@ -350,16 +384,23 @@ else if test "$MYSQL_CONFIG_HOME" != "no" ; then MYSQL_VERSION="`$MYSQL_CONFIG_HOME --version`" - MYSQL_CFLAGS="`$MYSQL_CONFIG_HOME --include`" - MYSQL_LIBS="`$MYSQL_CONFIG_HOME --libs`" - - MYSQL_OLD_LDFLAGS="$LDFLAGS" ; LDFLAGS="$LDFLAGS $MYSQL_LIBS" - MYSQL_OLD_CPPFLAGS="$CPPFLAGS" ; CPPFLAGS="$CPPFLAGS $MYSQL_CFLAGS" - AC_CHECK_LIB([mysqlclient], [mysql_init], [HAVE_MYSQL="yes"], []) - AC_CHECK_HEADER([mysql.h], [], [HAVE_MYSQL=""]) - CPPFLAGS="$MYSQL_OLD_CPPFLAGS" - LDFLAGS="$MYSQL_OLD_LDFLAGS" + if test "$manual_MYSQL_CFLAGS" = "no" ; then + MYSQL_CFLAGS="`$MYSQL_CONFIG_HOME --include`" + fi + if test "$manual_MYSQL_LIBS" = "no" ; then + MYSQL_LIBS="`$MYSQL_CONFIG_HOME --libs`" + fi + else + MYSQL_VERSION="unknown" fi + + MYSQL_OLD_LDFLAGS="$LDFLAGS" ; LDFLAGS="$LDFLAGS $MYSQL_LIBS" + MYSQL_OLD_CPPFLAGS="$CPPFLAGS" ; CPPFLAGS="$CPPFLAGS $MYSQL_CFLAGS" + AC_CHECK_LIB([mysqlclient], [mysql_init], [HAVE_MYSQL="yes"], []) + AC_CHECK_HEADER([mysql.h], [], [HAVE_MYSQL=""]) + CPPFLAGS="$MYSQL_OLD_CPPFLAGS" + LDFLAGS="$MYSQL_OLD_LDFLAGS" + AC_MSG_CHECKING([MySQL library (optional)]) if test "$HAVE_MYSQL" = "yes" ; then AC_MSG_RESULT([yes ($MYSQL_VERSION)]) |