summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.in1
-rw-r--r--aclocal.m4142
-rwxr-xr-xconfigure1704
-rw-r--r--configure.in32
-rw-r--r--include/services.h13
-rw-r--r--mysql.m43
-rw-r--r--src/Makefile2
-rw-r--r--version.log6
8 files changed, 926 insertions, 977 deletions
diff --git a/Makefile.in b/Makefile.in
index 4e0986c7d..eb90b8fa4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,6 +13,7 @@ TOUCH=@TOUCH@
MODULE_PATH=@MODULE_PATH@
MYSQL=@MYSQL@
RDB=@RDB@
+LDFLAGS=@LDFLAGS@
all: language headers build modules
diff --git a/aclocal.m4 b/aclocal.m4
index f94135dad..0e05d7a0b 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -227,3 +227,145 @@ fi
AC_LANG_RESTORE
])dnl ACX_PTHREAD
+dnl # Configure paths for mysql-client, GPLv2
+dnl #$Id: mysql.m4,v 1.1 2001/10/15 01:48:03 ken Exp $
+dnl #ken restivo modified 2001/08/04 to remove NULLs and use 0, in case NULL undefined.
+dnl # Markus Fischer <[EMAIL PROTECTED]>, 23.9.1999
+dnl # URL : http://josefine.ben.tuwien.ac.at/~mfischer/m4/mysql-client.m4
+dnl # Last Modified : Thu Sep 23 14:24:15 CEST 1999
+dnl #
+dnl # written from scratch
+
+dnl Test for libmysqlclient and
+dnl define MYSQLCLIENT_CFLAGS, MYSQLCLIENT_LDFLAGS and MYSQLCLIENT_LIBS
+dnl usage:
+dnl AM_PATH_MYSQLCLIENT(
+dnl [MINIMUM-VERSION,
+dnl [ACTION-IF-FOUND [,
+dnl ACTION-IF-NOT-FOUND ]]])
+dnl
+
+AC_DEFUN(AM_PATH_MYSQLCLIENT,
+[
+AC_ARG_WITH(mysqlclient-prefix,
+ [ --with-mysqlclient-prefix=PFX Prefix where mysqlclient is
+installed],
+ mysqlclient_prefix="$withval",
+ mysqlclient_prefix="")
+
+AC_ARG_WITH(mysqlclient-include, [ --with-mysqlclient-include=DIR Directory pointing
+ to mysqlclient include files],
+ mysqlclient_include="$withval",
+ mysqlclient_include="")
+
+AC_ARG_WITH(mysqlclient-lib,
+[ --with-mysqlclient-lib=LIB Directory pointing to mysqlclient library
+ (Note: -include and -lib do override
+ paths found with -prefix)
+],
+ mysqlclient_lib="$withval",
+ mysqlclient_lib="")
+
+ AC_MSG_CHECKING([for mysqlclient ifelse([$1], , ,[>= v$1])])
+ MYSQLCLIENT_LDFLAGS=""
+ MYSQLCLIENT_CFLAGS=""
+ MYSQLCLIENT_LIBS="-lmysqlclient"
+ mysqlclient_fail=""
+
+ dnl test --with-mysqlclient-prefix
+ for tryprefix in /usr /usr/local /usr/mysql /usr/local/mysql /usr/pkg $msqlclient_prefix; do
+ #testloop
+ for hloc in lib/mysql lib ; do
+ if test -e "$tryprefix/$hloc/libmysqlclient.so"; then
+ MYSQLCLIENT_LDFLAGS="-L$tryprefix/$hloc"
+ fi
+ done
+
+ for iloc in include/mysql include; do
+ if test -e "$tryprefix/$iloc/mysql.h"; then
+ MYSQLCLIENT_CFLAGS="-I$tryprefix/$iloc"
+ fi
+ done
+ # testloop
+ done
+
+ dnl test --with-mysqlclient-include
+ if test "x$mysqlclient_include" != "x" ; then
+ echo "checking for mysql includes... "
+ if test -d "$mysqlclient_include/mysql" ; then
+ MYSQLCLIENT_CFLAGS="-I$mysqlclient_include"
+ echo " found $MYSQLCLIENT_CFLAGS"
+ elif test -d "$mysqlclient_include/include/mysql" ; then
+ MYSQLCLIENT_CFLAGS="-I$mysqlclient_include/include"
+ echo " found $MYSQLCLIENT_CFLAGS"
+ elif test -d "$mysqlclient_include" ; then
+ MYSQLCLIENT_CFLAGS="-I$mysqlclient_include"
+ echo "found $MYSQLCLIENT_CFLAGS"
+ else
+ echo "not found! no include dir found in $mysqlclient_include"
+ fi
+ fi
+
+ dnl test --with-mysqlclient-lib
+ if test "x$mysqlclient_lib" != "x" ; then
+ echo "checking for mysql libx... "
+ if test -d "$mysqlclient_lib/lib/mysql" ; then
+ MYSQLCLIENT_LDFLAGS="-L$mysqlclient_lib/lib/mysql"
+ echo "found $MYSQLCLIENT_LDFLAGS"
+ elif test -d "$mysqlclient_lib/lin" ; then
+ MYSQLCLIENT_LDFLAGS="-L$mysqlclient_lib/lib"
+ echo "found $MYSQLCLIENT_LDFLAGS"
+ else
+ MYSQLCLIENT_LDFLAGS="-L$mysqlclient_lib"
+ echo "defaultd to $MYSQLCLIENT_LDFLAGS"
+ fi
+ fi
+
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LDFLAGS="$LDFLAGS"
+ ac_save_LIBS="$LIBS"
+ CFLAGS="-v $CFLAGS $MYSQLCLIENT_CFLAGS"
+ LDFLAGS="$LDFLAGS $MYSQLCLIENT_LDFLAGS"
+ LIBS="$LIBS $MYSQLCLIENT_LIBS"
+ dnl if no minimum version is given, just try to compile
+ dnl else try to compile AND run
+ AC_TRY_COMPILE([
+ #include <mysql.h>
+ #include <mysql_version.h>
+ ],[
+ mysql_connect( 0, 0, 0, 0);
+ ], [AC_MSG_RESULT(yes $MYSQLCLIENT_CFLAGS $MYSQLCLIENT_LDFLAGS)
+ CFLAGS="$ac_save_CFLAGS"
+ LDFLAGS="$ac_save_LDFLAGS"
+ LIBS="$ac_save_LIBS"
+ ifelse([$2], ,:,[$2])
+ ],[
+ echo "no"
+ echo "can't compile a simple app with mysql_connnect in it.
+bad."
+ mysqlclient_fail="yes"
+ ])
+
+ if test "x$mysqlclient_fail" != "x" ; then
+ dnl AC_MSG_RESULT(no)
+ echo
+ echo "***"
+ echo "*** mysqlclient test source had problems, check your config.log ."
+ echo "*** Also try one of the following switches :"
+ echo "*** --with-mysqlclient-prefix=PFX"
+ echo "*** --with-mysqlclient-include=DIR"
+ echo "*** --with-mysqlclient-lib=DIR"
+ echo "***"
+ CFLAGS="$ac_save_CFLAGS"
+ LDFLAGS="$ac_save_LDFLAGS"
+ LIBS="$ac_save_LIBS"
+ ifelse([$3], ,:,[$3])
+ fi
+
+ CFLAGS="$ac_save_CFLAGS"
+ LDFLAGS="$ac_save_LDFLAGS"
+ LIBS="$ac_save_LIBS"
+ AC_SUBST(MYSQLCLIENT_LDFLAGS)
+ AC_SUBST(MYSQLCLIENT_CFLAGS)
+ AC_SUBST(MYSQLCLIENT_LIBS)
+])
diff --git a/configure b/configure
index d54dd2ad5..a4964e709 100755
--- a/configure
+++ b/configure
@@ -309,7 +309,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RM CP TOUCH INSTALL MYSQL RDB CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS ANOPELIBS BINDEST DATDEST MODULE_PATH LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RM CP TOUCH INSTALL MYSQL RDB MYSQLCLIENT_LDFLAGS MYSQLCLIENT_CFLAGS MYSQLCLIENT_LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS ANOPELIBS CPP EGREP BINDEST DATDEST MODULE_PATH LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -844,6 +844,14 @@ if test -n "$ac_init_help"; then
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --with-mysqlclient-prefix=PFX Prefix where mysqlclient is
+installed
+ --with-mysqlclient-include=DIR Directory pointing
+ to mysqlclient include files
+ --with-mysqlclient-lib=LIB Directory pointing to mysqlclient library
+ (Note: -include and -lib do override
+ paths found with -prefix)
+
--with-rungroup=group Specify the rungroup for anope
--with-permissions=permissions Specify the default permissions for anope
--with-bindir=bindir Specify the default binary dir for anope
@@ -2731,276 +2739,109 @@ if test $ac_cv_lib_bsd_revoke = yes; then
ANOPELIBS="$ANOPELIBS-lbsd "
fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-fi
-if test -z "$CPP"; then
- if test "${ac_cv_prog_CPP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- # Double quotes because CPP needs to be expanded
- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
- do
- ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
- Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether non-existent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- # Broken: success on invalid input.
-continue
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- break
-fi
- done
- ac_cv_prog_CPP=$CPP
-fi
- CPP=$ac_cv_prog_CPP
-else
- ac_cv_prog_CPP=$CPP
-fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
- Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- :
+# Check whether --with-mysqlclient-prefix or --without-mysqlclient-prefix was given.
+if test "${with_mysqlclient_prefix+set}" = set; then
+ withval="$with_mysqlclient_prefix"
+ mysqlclient_prefix="$withval"
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ mysqlclient_prefix=""
+fi;
- # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
- # OK, works on sane cases. Now check whether non-existent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- # Broken: success on invalid input.
-continue
+# Check whether --with-mysqlclient-include or --without-mysqlclient-include was given.
+if test "${with_mysqlclient_include+set}" = set; then
+ withval="$with_mysqlclient_include"
+ mysqlclient_include="$withval"
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ mysqlclient_include=""
+fi;
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- :
+# Check whether --with-mysqlclient-lib or --without-mysqlclient-lib was given.
+if test "${with_mysqlclient_lib+set}" = set; then
+ withval="$with_mysqlclient_lib"
+ mysqlclient_lib="$withval"
else
- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
+ mysqlclient_lib=""
+fi;
-echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-if test "${ac_cv_prog_egrep+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if echo a | (grep -E '(a|b)') >/dev/null 2>&1
- then ac_cv_prog_egrep='grep -E'
- else ac_cv_prog_egrep='egrep'
+ echo "$as_me:$LINENO: checking for mysqlclient " >&5
+echo $ECHO_N "checking for mysqlclient ... $ECHO_C" >&6
+ MYSQLCLIENT_LDFLAGS=""
+ MYSQLCLIENT_CFLAGS=""
+ MYSQLCLIENT_LIBS="-lmysqlclient"
+ mysqlclient_fail=""
+
+ for tryprefix in /usr /usr/local /usr/mysql /usr/local/mysql /usr/pkg $msqlclient_prefix; do
+ #testloop
+ for hloc in lib/mysql lib ; do
+ if test -e "$tryprefix/$hloc/libmysqlclient.so"; then
+ MYSQLCLIENT_LDFLAGS="-L$tryprefix/$hloc"
+ fi
+ done
+
+ for iloc in include/mysql include; do
+ if test -e "$tryprefix/$iloc/mysql.h"; then
+ MYSQLCLIENT_CFLAGS="-I$tryprefix/$iloc"
+ fi
+ done
+ # testloop
+ done
+
+ if test "x$mysqlclient_include" != "x" ; then
+ echo "checking for mysql includes... "
+ if test -d "$mysqlclient_include/mysql" ; then
+ MYSQLCLIENT_CFLAGS="-I$mysqlclient_include"
+ echo " found $MYSQLCLIENT_CFLAGS"
+ elif test -d "$mysqlclient_include/include/mysql" ; then
+ MYSQLCLIENT_CFLAGS="-I$mysqlclient_include/include"
+ echo " found $MYSQLCLIENT_CFLAGS"
+ elif test -d "$mysqlclient_include" ; then
+ MYSQLCLIENT_CFLAGS="-I$mysqlclient_include"
+ echo "found $MYSQLCLIENT_CFLAGS"
+ else
+ echo "not found! no include dir found in $mysqlclient_include"
+ fi
fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- EGREP=$ac_cv_prog_egrep
+ if test "x$mysqlclient_lib" != "x" ; then
+ echo "checking for mysql libx... "
+ if test -d "$mysqlclient_lib/lib/mysql" ; then
+ MYSQLCLIENT_LDFLAGS="-L$mysqlclient_lib/lib/mysql"
+ echo "found $MYSQLCLIENT_LDFLAGS"
+ elif test -d "$mysqlclient_lib/lin" ; then
+ MYSQLCLIENT_LDFLAGS="-L$mysqlclient_lib/lib"
+ echo "found $MYSQLCLIENT_LDFLAGS"
+ else
+ MYSQLCLIENT_LDFLAGS="-L$mysqlclient_lib"
+ echo "defaultd to $MYSQLCLIENT_LDFLAGS"
+ fi
+ fi
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-if test "${ac_cv_header_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LDFLAGS="$LDFLAGS"
+ ac_save_LIBS="$LIBS"
+ CFLAGS="-v $CFLAGS $MYSQLCLIENT_CFLAGS"
+ LDFLAGS="$LDFLAGS $MYSQLCLIENT_LDFLAGS"
+ LIBS="$LIBS $MYSQLCLIENT_LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
+
+ #include <mysql.h>
+ #include <mysql_version.h>
int
main ()
{
+ mysql_connect( 0, 0, 0, 0);
+
;
return 0;
}
@@ -3027,265 +2868,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_header_stdc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_stdc=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then
- :
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then
- :
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then
- :
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <ctype.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
- (('a' <= (c) && (c) <= 'i') \
- || ('j' <= (c) && (c) <= 'r') \
- || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
- int i;
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
- exit(2);
- exit (0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
- inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- eval "$as_ac_Header=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Header=no"
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-echo "$as_me:$LINENO: checking for mysql_real_connect in -lmysqlclient" >&5
-echo $ECHO_N "checking for mysql_real_connect in -lmysqlclient... $ECHO_C" >&6
-if test "${ac_cv_lib_mysqlclient_mysql_real_connect+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmysqlclient $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char mysql_real_connect ();
-int
-main ()
-{
-mysql_real_connect ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_mysqlclient_mysql_real_connect=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_mysqlclient_mysql_real_connect=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlclient_mysql_real_connect" >&5
-echo "${ECHO_T}$ac_cv_lib_mysqlclient_mysql_real_connect" >&6
-if test $ac_cv_lib_mysqlclient_mysql_real_connect = yes; then
+ echo "$as_me:$LINENO: result: yes $MYSQLCLIENT_CFLAGS $MYSQLCLIENT_LDFLAGS" >&5
+echo "${ECHO_T}yes $MYSQLCLIENT_CFLAGS $MYSQLCLIENT_LDFLAGS" >&6
+ CFLAGS="$ac_save_CFLAGS"
+ LDFLAGS="$ac_save_LDFLAGS"
+ LIBS="$ac_save_LIBS"
- ANOPELIBS="$ANOPELIBS-lmysqlclient "
cat >>confdefs.h <<_ACEOF
#define USE_MYSQL 1
@@ -3296,461 +2884,51 @@ cat >>confdefs.h <<_ACEOF
#define USE_RDB 1
_ACEOF
- MYSQL=" mysql.c "
- RDB=" rdb.c "
-
-
- 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
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_mysql_h" >&5
-echo "${ECHO_T}$ac_cv_header_mysql_h" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking mysql.h usability" >&5
-echo $ECHO_N "checking mysql.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <mysql.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking mysql.h presence" >&5
-echo $ECHO_N "checking mysql.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <mysql.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: mysql.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: mysql.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: mysql.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: mysql.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: mysql.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: mysql.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: mysql.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: mysql.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: mysql.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: mysql.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: mysql.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: mysql.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: mysql.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: mysql.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: mysql.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: mysql.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-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
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_mysql_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_mysql_h" >&5
-echo "${ECHO_T}$ac_cv_header_mysql_h" >&6
-
-fi
-if test $ac_cv_header_mysql_h = yes; then
-
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MYSQL_MYSQL_H "1"
-_ACEOF
-
+ MYSQL=" mysql.c "
+ RDB=" rdb.c "
-fi
- if test "${ac_cv_header_mysql_mysql_h+set}" = set; then
- echo "$as_me:$LINENO: checking for mysql/mysql.h" >&5
-echo $ECHO_N "checking for mysql/mysql.h... $ECHO_C" >&6
-if test "${ac_cv_header_mysql_mysql_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_mysql_mysql_h" >&5
-echo "${ECHO_T}$ac_cv_header_mysql_mysql_h" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking mysql/mysql.h usability" >&5
-echo $ECHO_N "checking mysql/mysql.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <mysql/mysql.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=yes
-else
- echo "$as_me