--- sql/mysql/Attic/configure.in 2001/10/28 11:28:15 1.3 +++ sql/mysql/Attic/configure.in 2003/01/13 14:16:34 1.18 @@ -1,21 +1,44 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(parser3mysql.C) -AM_INIT_AUTOMAKE(parser3mysqlclient, 3.0g, nodefine) +AC_PREREQ(2.57) + +AM_INIT_AUTOMAKE(parser3mysql, 3.0.HEAD, nodefine) AM_CONFIG_HEADER(config_auto.h) + +AC_DEFUN(MYSQL_INC_CHK,[ + if test -r "$1/mysql.h"; then + MYSQL_INC=$1 + fi +]) + + dnl Arguments -AC_ARG_WITH(mysql-inc,[ --with-mysql-inc[=DIR] DIR is the MySQL includes directory],, - withval="/usr/include/mysql" +AC_ARG_WITH(mysql-inc,[ --with-mysql-inc=DIR DIR is the MySQL includes directory], + MYSQL_INC_CHK($withval) + + if test -z "$MYSQL_INC"; then + AC_MSG_ERROR($MYSQL_INC does not seem to be valid MySQL includes directory) + fi +, + AC_MSG_CHECKING(for MYSQL_INC directory) + for d in \ + /usr/local/include/mysql \ + /usr/include/mysql ; do + MYSQL_INC_CHK($d) + done + + if test -z "$MYSQL_INC"; then + AC_MSG_ERROR(use --with-mysql-inc=DIR to specify MySQL includes directory) + fi + + AC_MSG_RESULT($MYSQL_INC) ) -MYSQL_INC=$withval AC_SUBST(MYSQL_INC) -if test \! -f "$MYSQL_INC/mysql.h"; then - AC_MSG_ERROR($MYSQL_INC does not seem to be valid MySQL includes directory) -fi dnl Checks for programs. @@ -26,24 +49,6 @@ AC_PROG_AWK AC_LANG_CPLUSPLUS AC_PROG_CXX -AC_DEFUN(GCC_OPTION, -[ - AC_MSG_CHECKING(whether gcc accepts $1) - save_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$save_CXXFLAGS $1" - AC_TRY_COMPILE(,, - AC_MSG_RESULT(yes) - dnl leave CXXFLAGS - , - AC_MSG_RESULT(no) - CXXFLAGS=$save_CXXFLAGS - ) -]) - -if test "z$GXX" = "zyes"; then - GCC_OPTION(-fno-rtti) -fi - dnl Enable building of the convenience library dnl and set LIBLTDL accordingly AC_LIBLTDL_CONVENIENCE @@ -54,7 +59,10 @@ AC_SUBST(LIBADD_DL) dnl Check for dlopen support AC_LIBTOOL_DLOPEN dnl Configure libtool -AM_PROG_LIBTOOL +AC_DISABLE_STATIC +AC_LIBTOOL_WIN32_DLL +AC_PROG_LIBTOOL +AC_SUBST(LIBTOOL_DEPS) dnl Configure libltdl AC_CONFIG_SUBDIRS(libltdl) @@ -65,7 +73,8 @@ dnl Checks for header files. AC_CHECK_HEADERS( stdio.h \ stdlib.h \ -string.h +string.h \ +setjmp.h ) dnl Checks for typedefs, structures, and compiler characteristics. @@ -76,4 +85,4 @@ dnl Checks for library functions. dnl Output makefiles -AC_OUTPUT(libltdl/Makefile Makefile) +AC_OUTPUT(Makefile)