[PATCH] mysql configure rewrite
Alexander Malysh <[email protected]>
| Newsgroups | gmane.comp.mobile.kannel.devel |
|---|---|
| Organization | Centrium GmbH |
| Message-ID | <[email protected]> |
Hi List, attached is a patch that is mysql configure rewrite/simplification/bug-fixing. Patch does: 1) remove code duplication 2) bug-fix for CFLAGS/LIBS 3) adds using of reentrant counterpart of libmysqlclient Comments and votes please! -- Best regards / Mit besten Grüßen aus Düsseldorf Dipl.-Ing. Alexander Malysh ___________________________________________ Centrium GmbH Vogelsanger Weg 80 40470 Düsseldorf Fon: +49 (0211) 74 84 51 80 Fax: +49 (0211) 277 49 109 email: [email protected] web: www.centrium.de msn: [email protected] icq: 98063111 ___________________________________________ Please avoid sending me Word, Excel or PowerPoint attachments. See http://www.fsf.org/philosophy/no-word-attachments.html
mysql-configure-rewrite.patch
(text/x-diff, 86.8 KB)
Index: configure.in
===================================================================
RCS file: /home/cvs/gateway/configure.in,v
retrieving revision 1.137
diff -a -u -r1.137 configure.in
--- configure.in 10 Jan 2004 16:35:12 -0000 1.137
+++ configure.in 19 Jan 2004 14:21:06 -0000
@@ -723,33 +723,6 @@
AC_CONFIG_SECTION([Configuring DB support])
-dnl Implement the --with-mysql-dir option.
-
-AC_ARG_WITH(mysql-dir,
-[ --with-mysql-dir=DIR where to look for MySQL libs and header files
- DIR points to the installation [/usr/local/mysql]],
-[ if test -d "$withval"; then
- mysqlloc="$withval";
- dnl check for MySQL 4.x style mysql_config information
- PATH="$PATH:$mysqlloc/bin"
- AC_PATH_PROGS(MYSQL_CONFIG, mysql_config, no)
- if test "$MYSQL_CONFIG" != "no"; then
- dnl mysql-4.x style
- AC_MSG_CHECKING([mysql version])
- mysql_version=`$MYSQL_CONFIG --version`
- AC_MSG_RESULT([$mysql_version])
- AC_MSG_CHECKING([mysql libs])
- LIBS="$LIBS `$MYSQL_CONFIG --libs`"
- AC_MSG_RESULT([`$MYSQL_CONFIG --libs`])
- AC_MSG_CHECKING([mysql compiler flags])
- CFLAGS="$CFLAGS `$MYSQL_CONFIG --cflags`"
- AC_MSG_RESULT([`$MYSQL_CONFIG --cflags`])
- fi
- else
- AC_MSG_ERROR(Unable to find MySQL libs and/or directories at $withval)
- fi
-])
-
dnl Implement the --with-mysql option. This will set HAVE_MYSQL in gw-config.h
dnl accordingly and enable the usage of the libmysqlclient routines.
@@ -757,52 +730,69 @@
AC_MSG_CHECKING([whether to compile with MySQL support])
AC_ARG_WITH(mysql,
[ --with-mysql enable MySQL storage [disabled]], [
- if test "$withval" != yes ; then
+if test "$withval" != yes ; then
AC_MSG_RESULT(disabled)
else
- dnl test only if --with-mysql has not been used
- if test "x$mysqlloc" = "x" ; then
- AC_MSG_RESULT(searching)
- AC_PATH_PROGS(MYSQL_CONFIG, mysql_config, no)
- dnl check for MySQL 4.x style mysql_config information
- if test "$MYSQL_CONFIG" = "no"; then
- dnl mysql-3.x style
- found=""
- for loc in /usr /usr/local ; do
- if test "x$found" = "x" ; then
- AC_MSG_CHECKING([for MySQL client support in])
- AC_MSG_RESULT($loc)
- AC_CHECK_FILE("$loc/include/mysql/mysql.h",
- [CFLAGS="$CFLAGS -I$loc/include/mysql"; LIBS="$LIBS -L$loc/lib/mysql -lmysqlclient"]; found=1,
- [AC_CHECK_FILE("$loc/include/mysql.h",
- [CFLAGS="$CFLAGS -I$loc/include"; LIBS="$LIBS -L$loc/lib -lmysqlclient"]; found=1
- )]
- )
- fi
- done
- if test "x$found" != "x1" ; then
- AC_MSG_ERROR([Unable to find mysql.h, please provide a --with-mysql-dir=<dir> location])
+ dnl Implement the --with-mysql-dir option.
+ AC_ARG_WITH(mysql-dir,
+ [ --with-mysql-dir=DIR where to look for MySQL libs and header files
+ DIR points to the installation [/usr/local/mysql]
+ ],
+ [
+ mysqlloc=""
+ if test -d "$withval" ; then
+ mysqlloc="$withval"
+ fi
+ ])
+
+ AC_MSG_RESULT(searching)
+ AC_PATH_PROG(MYSQL_CONFIG, mysql_config, no, [$PATH:$mysqlloc/bin])
+ dnl check for MySQL 4.x style mysql_config information
+ if test "$MYSQL_CONFIG" = "no"; then
+ found=""
+ for loc in $mysqlloc /usr /usr/local ; do
+ if test "x$found" = "x" ; then
+ AC_MSG_CHECKING([for MySQL client support in])
+ AC_MSG_RESULT($loc)
+ AC_CHECK_FILE("$loc/include/mysql/mysql.h",
+ [CFLAGS="$CFLAGS -I$loc/include/mysql"; LIBS="$LIBS -L$loc/lib/mysql -lmysqlclient"]; found=1,
+ [AC_CHECK_FILE("$loc/include/mysql.h",
+ [CFLAGS="$CFLAGS -I$loc/include"; LIBS="$LIBS -L$loc/lib -lmysqlclient"]; found=1
+ )]
+ )
fi
- else
- dnl mysql-4.x style
- AC_MSG_CHECKING([mysql version])
- mysql_version=`$MYSQL_CONFIG --version`
- AC_MSG_RESULT([$mysql_version])
- LIBS="$LIBS `$MYSQL_CONFIG --libs`"
- CFLAGS="$CFLAGS `$MYSQL_CONFIG --cflags`"
+ done
+ if test "x$found" != "x1" ; then
+ AC_MSG_ERROR([Unable to find mysql.h, please provide a --with-mysql-dir=<dir> location])
fi
else
- AC_MSG_RESULT(searching in $mysqlloc)
- AC_CHECK_FILE("$mysqlloc/include/mysql/mysql.h",
- [CFLAGS="$CFLAGS -I$mysqlloc/include/mysql"; LIBS="$LIBS -L$mysqlloc/lib/mysql -lmysqlclient"],
- [AC_CHECK_FILE("$mysqlloc/include/mysql.h",
- [CFLAGS="$CFLAGS -I$mysqlloc/include"; LIBS="$LIBS -L$mysqlloc/lib -lmysqlclient"],
- [AC_MSG_ERROR([Unable to find mysql.h under location $mysqlloc])]
- )]
- )
+ dnl mysql_config found
+ AC_MSG_CHECKING([mysql version])
+ mysql_version=`$MYSQL_CONFIG --version`
+ AC_MSG_RESULT([$mysql_version])
+ AC_MSG_CHECKING([mysql libs])
+ dnl mysql-4.x style
+ if $MYSQL_CONFIG --libs_r &>/dev/null ; then
+ LIBS="$LIBS `$MYSQL_CONFIG --libs_r`"
+ AC_MSG_RESULT([`$MYSQL_CONFIG --libs_r`])
+ else
+ LIBS="$LIBS `$MYSQL_CONFIG --libs`"
+ AC_MSG_RESULT([`$MYSQL_CONFIG --libs`])
+ fi
+ AC_MSG_CHECKING([mysql includes])
+ dnl mysql-4.x style
+ if $MYSQL_CONFIG --include &>/dev/null ; then
+ CFLAGS="$CFLAGS `$MYSQL_CONFIG --include`"
+ AC_MSG_RESULT([`$MYSQL_CONFIG --include`])
+ else
+ CFLAGS="$CFLAGS `$MYSQL_CONFIG --cflags`"
+ AC_MSG_RESULT([`$MYSQL_CONFIG --cflags`])
+ fi
fi
+
AC_CHECK_HEADERS(mysql/mysql.h mysql/mysql_com.h mysql/mysql_version.h)
- AC_CHECK_LIB(mysqlclient, mysql_init)
+ dnl first check reentrant 'mysqlclient_r' and if not found 'mysqlclient'
+ AC_CHECK_LIB(mysqlclient_r, mysql_init, [], [AC_CHECK_LIB(mysqlclient, mysql_init)])
AC_DEFINE(HAVE_MYSQL)
AC_MSG_CHECKING([whether to compile with MySQL support])
AC_MSG_RESULT(yes)
Index: configure
===================================================================
RCS file: /home/cvs/gateway/configure,v
retrieving revision 1.134
diff -a -u -r1.134 configure
--- configure 10 Jan 2004 16:35:12 -0000 1.134
+++ configure 19 Jan 2004 14:21:07 -0000
@@ -61,11 +61,12 @@
--disable-ssl-thread-test disable the multithread test for the OpenSSL library
this will force to continue even if the test fails"
ac_help="$ac_help
- --with-mysql-dir=DIR where to look for MySQL libs and header files
- DIR points to the installation [/usr/local/mysql]"
-ac_help="$ac_help
--with-mysql enable MySQL storage [disabled]"
ac_help="$ac_help
+ --with-mysql-dir=DIR where to look for MySQL libs and header files
+ DIR points to the installation [/usr/local/mysql]
+ "
+ac_help="$ac_help
--with-sdb enable LibSDB storage [disabled]"
ac_help="$ac_help
--with-sqlite enable SQLite storage [disabled]"
@@ -628,7 +629,7 @@
VERSION=`head -n 1 VERSION`
if test "x$VERSION" = "xcvs"; then
echo $ac_n "checking cvs checkout date""... $ac_c" 1>&6
-echo "configure:632: checking cvs checkout date" >&5
+echo "configure:633: checking cvs checkout date" >&5
cvs_date=`grep ChangeLog CVS/Entries | cut -f4 -d/`
day=`grep ChangeLog CVS/Entries | cut -f4 -d/ | cut -c9-10 | tr " " "0"`
@@ -695,7 +696,7 @@
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:699: checking host system type" >&5
+echo "configure:700: checking host system type" >&5
host_alias=$host
case "$host_alias" in
@@ -753,7 +754,7 @@
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:757: checking for $ac_word" >&5
+echo "configure:758: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -783,7 +784,7 @@
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:787: checking for $ac_word" >&5
+echo "configure:788: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -834,7 +835,7 @@
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:838: checking for $ac_word" >&5
+echo "configure:839: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -866,7 +867,7 @@
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:870: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:871: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -877,12 +878,12 @@
cat > conftest.$ac_ext << EOF
-#line 881 "configure"
+#line 882 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -908,12 +909,12 @@
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:912: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:913: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:917: checking whether we are using GNU C" >&5
+echo "configure:918: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -922,7 +923,7 @@
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:926: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@@ -941,7 +942,7 @@
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:945: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:946: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -984,7 +985,7 @@
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:988: checking for a BSD compatible install" >&5
+echo "configure:989: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1039,7 +1040,7 @@
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1043: checking for $ac_word" >&5
+echo "configure:1044: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1071,7 +1072,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1075: checking for $ac_word" >&5
+echo "configure:1076: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1104,7 +1105,7 @@
# Extract the first word of "flex", so it can be a program name with args.
set dummy flex; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1108: checking for $ac_word" >&5
+echo "configure:1109: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1138,7 +1139,7 @@
*) ac_lib=l ;;
esac
echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:1142: checking for yywrap in -l$ac_lib" >&5
+echo "configure:1143: checking for yywrap in -l$ac_lib" >&5
ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1146,7 +1147,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l$ac_lib $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1150 "configure"
+#line 1151 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1157,7 +1158,7 @@
yywrap()
; return 0; }
EOF
-if { (eval echo configure:1161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1182,7 +1183,7 @@
# Extract the first word of "convert", so it can be a program name with args.
set dummy convert; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1186: checking for $ac_word" >&5
+echo "configure:1187: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_CONVERT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1217,7 +1218,7 @@
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1221: checking for $ac_word" >&5
+echo "configure:1222: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1252,7 +1253,7 @@
echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:1256: checking size of short" >&5
+echo "configure:1257: checking size of short" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1260,7 +1261,7 @@
ac_cv_sizeof_short=2
else
cat > conftest.$ac_ext <<EOF
-#line 1264 "configure"
+#line 1265 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1271,7 +1272,7 @@
exit(0);
}
EOF
-if { (eval echo configure:1275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_short=`cat conftestval`
else
@@ -1291,7 +1292,7 @@
echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:1295: checking size of int" >&5
+echo "configure:1296: checking size of int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1299,7 +1300,7 @@
ac_cv_sizeof_int=4
else
cat > conftest.$ac_ext <<EOF
-#line 1303 "configure"
+#line 1304 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1310,7 +1311,7 @@
exit(0);
}
EOF
-if { (eval echo configure:1314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_int=`cat conftestval`
else
@@ -1330,7 +1331,7 @@
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:1334: checking size of long" >&5
+echo "configure:1335: checking size of long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1338,7 +1339,7 @@
ac_cv_sizeof_long=4
else
cat > conftest.$ac_ext <<EOF
-#line 1342 "configure"
+#line 1343 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1349,7 +1350,7 @@
exit(0);
}
EOF
-if { (eval echo configure:1353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long=`cat conftestval`
else
@@ -1369,7 +1370,7 @@
echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:1373: checking size of long long" >&5
+echo "configure:1374: checking size of long long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1377,7 +1378,7 @@
ac_cv_sizeof_long_long=8
else
cat > conftest.$ac_ext <<EOF
-#line 1381 "configure"
+#line 1382 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1388,7 +1389,7 @@
exit(0);
}
EOF
-if { (eval echo configure:1392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long_long=`cat conftestval`
else
@@ -1418,7 +1419,7 @@
echo $ac_n "checking for log in -lm""... $ac_c" 1>&6
-echo "configure:1422: checking for log in -lm" >&5
+echo "configure:1423: checking for log in -lm" >&5
ac_lib_var=`echo m'_'log | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1426,7 +1427,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1430 "configure"
+#line 1431 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1437,7 +1438,7 @@
log()
; return 0; }
EOF
-if { (eval echo configure:1441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1465,7 +1466,7 @@
fi
echo $ac_n "checking for accept in -lsocket""... $ac_c" 1>&6
-echo "configure:1469: checking for accept in -lsocket" >&5
+echo "configure:1470: checking for accept in -lsocket" >&5
ac_lib_var=`echo socket'_'accept | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1473,7 +1474,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1477 "configure"
+#line 1478 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1484,7 +1485,7 @@
accept()
; return 0; }
EOF
-if { (eval echo configure:1488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1512,7 +1513,7 @@
fi
echo $ac_n "checking for inet_ntoa in -lnsl""... $ac_c" 1>&6
-echo "configure:1516: checking for inet_ntoa in -lnsl" >&5
+echo "configure:1517: checking for inet_ntoa in -lnsl" >&5
ac_lib_var=`echo nsl'_'inet_ntoa | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1520,7 +1521,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1524 "configure"
+#line 1525 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1531,7 +1532,7 @@
inet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:1535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1559,7 +1560,7 @@
fi
echo $ac_n "checking for inet_ntop in -lresolv""... $ac_c" 1>&6
-echo "configure:1563: checking for inet_ntop in -lresolv" >&5
+echo "configure:1564: checking for inet_ntop in -lresolv" >&5
ac_lib_var=`echo resolv'_'inet_ntop | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1567,7 +1568,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1571 "configure"
+#line 1572 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1578,7 +1579,7 @@
inet_ntop()
; return 0; }
EOF
-if { (eval echo configure:1582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1606,7 +1607,7 @@
fi
echo $ac_n "checking for inet_ntop in -lbind""... $ac_c" 1>&6
-echo "configure:1610: checking for inet_ntop in -lbind" >&5
+echo "configure:1611: checking for inet_ntop in -lbind" >&5
ac_lib_var=`echo bind'_'inet_ntop | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1614,7 +1615,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lbind $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1618 "configure"
+#line 1619 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1625,7 +1626,7 @@
inet_ntop()
; return 0; }
EOF
-if { (eval echo configure:1629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1653,7 +1654,7 @@
fi
echo $ac_n "checking for pthread_exit in -lpthread""... $ac_c" 1>&6
-echo "configure:1657: checking for pthread_exit in -lpthread" >&5
+echo "configure:1658: checking for pthread_exit in -lpthread" >&5
ac_lib_var=`echo pthread'_'pthread_exit | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1661,7 +1662,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpthread $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1665 "configure"
+#line 1666 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1672,7 +1673,7 @@
pthread_exit()
; return 0; }
EOF
-if { (eval echo configure:1676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1694,7 +1695,7 @@
if test -z "$pthread"; then
echo $ac_n "checking for pthread_exit in -lc_r""... $ac_c" 1>&6
-echo "configure:1698: checking for pthread_exit in -lc_r" >&5
+echo "configure:1699: checking for pthread_exit in -lc_r" >&5
ac_lib_var=`echo c_r'_'pthread_exit | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1702,7 +1703,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lc_r $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1706 "configure"
+#line 1707 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1713,7 +1714,7 @@
pthread_exit()
; return 0; }
EOF
-if { (eval echo configure:1717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1735,7 +1736,7 @@
fi
echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
-echo "configure:1739: checking for libiconv in -liconv" >&5
+echo "configure:1740: checking for libiconv in -liconv" >&5
ac_lib_var=`echo iconv'_'libiconv | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1743,7 +1744,7 @@
ac_save_LIBS="$LIBS"
LIBS="-liconv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1747 "configure"
+#line 1748 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1754,7 +1755,7 @@
libiconv()
; return 0; }
EOF
-if { (eval echo configure:1758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1777,7 +1778,7 @@
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1781: checking how to run the C preprocessor" >&5
+echo "configure:1782: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1792,13 +1793,13 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1796 "configure"
+#line 1797 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1802: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1803: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1809,13 +1810,13 @@
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1813 "configure"
+#line 1814 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1819: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1820: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1826,13 +1827,13 @@
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1830 "configure"
+#line 1831 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1836: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1857,12 +1858,12 @@
echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1861: checking for ANSI C header files" >&5
+echo "configure:1862: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1866 "configure"
+#line 1867 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -1870,7 +1871,7 @@
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1875: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1887,7 +1888,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1891 "configure"
+#line 1892 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -1905,7 +1906,7 @@
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 <<EOF
-#line 1909 "configure"
+#line 1910 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1926,7 +1927,7 @@
:
else
cat > conftest.$ac_ext <<EOF
-#line 1930 "configure"
+#line 1931 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1937,7 +1938,7 @@
exit (0); }
EOF
-if { (eval echo configure:1941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -1964,17 +1965,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1968: checking for $ac_hdr" >&5
+echo "configure:1969: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1973 "configure"
+#line 1974 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1978: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1979: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2004,17 +2005,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2008: checking for $ac_hdr" >&5
+echo "configure:2009: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2013 "configure"
+#line 2014 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2018: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2019: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2044,17 +2045,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2048: checking for $ac_hdr" >&5
+echo "configure:2049: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2053 "configure"
+#line 2054 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2058: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2059: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2083,14 +2084,14 @@
cat > conftest.$ac_ext <<EOF
-#line 2087 "configure"
+#line 2088 "configure"
#include "confdefs.h"
int main() {
char *func = __FUNCTION__;
; return 0; }
EOF
-if { (eval echo configure:2094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2095: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE___FUNCTION__ 1
@@ -2102,14 +2103,14 @@
fi
rm -f conftest*
cat > conftest.$ac_ext <<EOF
-#line 2106 "configure"
+#line 2107 "configure"
#include "confdefs.h"
int main() {
char *func = __func__;
; return 0; }
EOF
-if { (eval echo configure:2113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2114: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE___FUNC__ 1
@@ -2126,12 +2127,12 @@
for ac_func in gettimeofday select socket strdup getopt_long localtime_r gmtime_r backtrace srandom
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2130: checking for $ac_func" >&5
+echo "configure:2131: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2135 "configure"
+#line 2136 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2154,7 +2155,7 @@
; return 0; }
EOF
-if { (eval echo configure:2158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2179,12 +2180,12 @@
done
echo $ac_n "checking for getopt""... $ac_c" 1>&6
-echo "configure:2183: checking for getopt" >&5
+echo "configure:2184: checking for getopt" >&5
if eval "test \"`echo '$''{'ac_cv_func_getopt'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2188 "configure"
+#line 2189 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char getopt(); below. */
@@ -2207,7 +2208,7 @@
; return 0; }
EOF
-if { (eval echo configure:2211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_getopt=yes"
else
@@ -2230,12 +2231,12 @@
echo $ac_n "checking for gethostbyname_r""... $ac_c" 1>&6
-echo "configure:2234: checking for gethostbyname_r" >&5
+echo "configure:2235: checking for gethostbyname_r" >&5
if eval "test \"`echo '$''{'ac_cv_func_gethostbyname_r'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2239 "configure"
+#line 2240 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname_r(); below. */
@@ -2258,7 +2259,7 @@
; return 0; }
EOF
-if { (eval echo configure:2262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gethostbyname_r=yes"
else
@@ -2273,13 +2274,13 @@
if eval "test \"`echo '$ac_cv_func_'gethostbyname_r`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for which type of gethostbyname_r""... $ac_c" 1>&6
-echo "configure:2277: checking for which type of gethostbyname_r" >&5
+echo "configure:2278: checking for which type of gethostbyname_r" >&5
if eval "test \"`echo '$''{'ac_cv_func_which_gethostname_r'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2283 "configure"
+#line 2284 "configure"
#include "confdefs.h"
#include <netdb.h>
@@ -2293,7 +2294,7 @@
; return 0; }
EOF
-if { (eval echo configure:2297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2298: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_func_which_gethostname_r=3
else
@@ -2302,7 +2303,7 @@
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 2306 "configure"
+#line 2307 "configure"
#include "confdefs.h"
#include <netdb.h>
@@ -2318,7 +2319,7 @@
; return 0; }
EOF
-if { (eval echo configure:2322: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2323: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_func_which_gethostname_r=6
else
@@ -2327,7 +2328,7 @@
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 2331 "configure"
+#line 2332 "configure"
#include "confdefs.h"
#include <netdb.h>
@@ -2343,7 +2344,7 @@
; return 0; }
EOF
-if { (eval echo configure:2347: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_func_which_gethostname_r=5
else
@@ -2385,12 +2386,12 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:2389: checking for gethostbyname" >&5
+echo "configure:2390: checking for gethostbyname" >&5
if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2394 "configure"
+#line 2395 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
@@ -2413,7 +2414,7 @@
; return 0; }
EOF
-if { (eval echo configure:2417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gethostbyname=yes"
else
@@ -2445,12 +2446,12 @@
echo $ac_n "checking for socklen_t in <sys/socket.h>""... $ac_c" 1>&6
-echo "configure:2449: checking for socklen_t in <sys/socket.h>" >&5
+echo "configure:2450: checking for socklen_t in <sys/socket.h>" >&5
if eval "test \"`echo '$''{'gw_cv_type_HAVE_SOCKLEN_T'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2454 "configure"
+#line 2455 "configure"
#include "confdefs.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -2461,7 +2462,7 @@
socklen_t foo;
; return 0; }
EOF
-if { (eval echo configure:2465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2466: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
gw_cv_type_HAVE_SOCKLEN_T=yes
else
@@ -2484,19 +2485,19 @@
echo $ac_n "checking for getopt in <stdio.h>""... $ac_c" 1>&6
-echo "configure:2488: checking for getopt in <stdio.h>" >&5
+echo "configure:2489: checking for getopt in <stdio.h>" >&5
if eval "test \"`echo '$''{'gw_cv_func_HAVE_GETOPT_IN_STDIO_H'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2493 "configure"
+#line 2494 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
void *foo = getopt;
; return 0; }
EOF
-if { (eval echo configure:2500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2501: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
gw_cv_func_HAVE_GETOPT_IN_STDIO_H=yes
else
@@ -2518,19 +2519,19 @@
echo $ac_n "checking for getopt in <unistd.h>""... $ac_c" 1>&6
-echo "configure:2522: checking for getopt in <unistd.h>" >&5
+echo "configure:2523: checking for getopt in <unistd.h>" >&5
if eval "test \"`echo '$''{'gw_cv_func_HAVE_GETOPT_IN_UNISTD_H'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2527 "configure"
+#line 2528 "configure"
#include "confdefs.h"
#include <unistd.h>
int main() {
void *foo = getopt;
; return 0; }
EOF
-if { (eval echo configure:2534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2535: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
gw_cv_func_HAVE_GETOPT_IN_UNISTD_H=yes
else
@@ -2557,17 +2558,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2561: checking for $ac_hdr" >&5
+echo "configure:2562: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2566 "configure"
+#line 2567 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2572: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2589,12 +2590,12 @@
EOF
echo $ac_n "checking for regcomp""... $ac_c" 1>&6
-echo "configure:2593: checking for regcomp" >&5
+echo "configure:2594: checking for regcomp" >&5
if eval "test \"`echo '$''{'ac_cv_func_regcomp'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2598 "configure"
+#line 2599 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char regcomp(); below. */
@@ -2617,7 +2618,7 @@
; return 0; }
EOF
-if { (eval echo configure:2621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_regcomp=yes"
else
@@ -2657,12 +2658,12 @@
echo "${nl}${T_MD}Checking for POSIX threads support ...${T_ME}"
echo $ac_n "checking for working pthreads""... $ac_c" 1>&6
-echo "configure:2661: checking for working pthreads" >&5
+echo "configure:2662: checking for working pthreads" >&5
if test "$cross_compiling" = yes; then
echo Cross compiling - assuming they work
else
cat > conftest.$ac_ext <<EOF
-#line 2666 "configure"
+#line 2667 "configure"
#include "confdefs.h"
#include <pthread.h>
#include <unistd.h>
@@ -2688,7 +2689,7 @@
}
EOF
-if { (eval echo configure:2692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
echo yes
else
@@ -2702,9 +2703,9 @@
echo $ac_n "checking for pthread_spinlock support""... $ac_c" 1>&6
-echo "configure:2706: checking for pthread_spinlock support" >&5
+echo "configure:2707: checking for pthread_spinlock support" >&5
cat > conftest.$ac_ext <<EOF
-#line 2708 "configure"
+#line 2709 "configure"
#include "confdefs.h"
#include <pthread.h>
int main() {
@@ -2717,7 +2718,7 @@
; return 0; }
EOF
-if { (eval echo configure:2721: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
#define HAVE_PTHREAD_SPINLOCK_T 1
@@ -2744,7 +2745,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2748: checking for $ac_word" >&5
+echo "configure:2749: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_XML_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2784,7 +2785,7 @@
{ echo "configure: error: You MUST have the libxml2 (aka gnome-xml) library installed" 1>&2; exit 1; }
else
echo $ac_n "checking libxml version""... $ac_c" 1>&6
-echo "configure:2788: checking libxml version" >&5
+echo "configure:2789: checking libxml version" >&5
xml_version=`$XML_CONFIG --version`
echo "$ac_t""$xml_version" 1>&6
@@ -2828,7 +2829,7 @@
echo "${nl}${T_MD}Configuring for PCRE support ...${T_ME}"
echo $ac_n "checking whether to compile with PCRE support""... $ac_c" 1>&6
-echo "configure:2832: checking whether to compile with PCRE support" >&5
+echo "configure:2833: checking whether to compile with PCRE support" >&5
# Check whether --enable-pcre or --disable-pcre was given.
if test "${enable_pcre+set}" = set; then
enableval="$enable_pcre"
@@ -2842,7 +2843,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2846: checking for $ac_word" >&5
+echo "configure:2847: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PCRE_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2882,11 +2883,11 @@
{ echo "configure: error: Unable to find pcre-config in path for PCRE support" 1>&2; exit 1; }
else
echo $ac_n "checking PCRE version""... $ac_c" 1>&6
-echo "configure:2886: checking PCRE version" >&5
+echo "configure:2887: checking PCRE version" >&5
pcre_version=`$PCRE_CONFIG --version`
echo "$ac_t""$pcre_version" 1>&6
echo $ac_n "checking for POSIX regex provider""... $ac_c" 1>&6
-echo "configure:2890: checking for POSIX regex provider" >&5
+echo "configure:2891: checking for POSIX regex provider" >&5
if test "x$has_posix_regex" != "x" ; then
LIBS="$LIBS `$PCRE_CONFIG --libs`"
CFLAGS="$CFLAGS `$PCRE_CONFIG --cflags`"
@@ -2899,17 +2900,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2903: checking for $ac_hdr" >&5
+echo "configure:2904: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2908 "configure"
+#line 2909 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2914: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2936,7 +2937,7 @@
done
echo $ac_n "checking for regcomp in -lpcreposix""... $ac_c" 1>&6
-echo "configure:2940: checking for regcomp in -lpcreposix" >&5
+echo "configure:2941: checking for regcomp in -lpcreposix" >&5
ac_lib_var=`echo pcreposix'_'regcomp | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2944,7 +2945,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpcreposix $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2948 "configure"
+#line 2949 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2955,7 +2956,7 @@
regcomp()
; return 0; }
EOF
-if { (eval echo configure:2959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2987,17 +2988,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2991: checking for $ac_hdr" >&5
+echo "configure:2992: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2996 "configure"
+#line 2997 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3001: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3002: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3026,12 +3027,12 @@
for ac_func in pcre_compile
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3030: checking for $ac_func" >&5
+echo "configure:3031: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3035 "configure"
+#line 3036 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3054,7 +3055,7 @@
; return 0; }
EOF
-if { (eval echo configure:3058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3107,7 +3108,7 @@
# Extract the first word of "jade", so it can be a program name with args.
set dummy jade; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3111: checking for $ac_word" >&5
+echo "configure:3112: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_JADE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3137,7 +3138,7 @@
# Extract the first word of "jadetex", so it can be a program name with args.
set dummy jadetex; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3141: checking for $ac_word" >&5
+echo "configure:3142: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_JADETEX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3167,7 +3168,7 @@
# Extract the first word of "pdfjadetex", so it can be a program name with args.
set dummy pdfjadetex; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3171: checking for $ac_word" >&5
+echo "configure:3172: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_PDFJADETEX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3197,7 +3198,7 @@
# Extract the first word of "dvips", so it can be a program name with args.
set dummy dvips; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3201: checking for $ac_word" >&5
+echo "configure:3202: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_DVIPS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3227,7 +3228,7 @@
# Extract the first word of "fig2dev", so it can be a program name with args.
set dummy fig2dev; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3231: checking for $ac_word" >&5
+echo "configure:3232: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_FIG2DEV'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3257,7 +3258,7 @@
# Extract the first word of "convert", so it can be a program name with args.
set dummy convert; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3261: checking for $ac_word" >&5
+echo "configure:3262: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CONVERT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3298,7 +3299,7 @@
ac_safe=`echo "$file" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $file""... $ac_c" 1>&6
-echo "configure:3302: checking for $file" >&5
+echo "configure:3303: checking for $file" >&5
if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3338,7 +3339,7 @@
ac_safe=`echo "$file" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $file""... $ac_c" 1>&6
-echo "configure:3342: checking for $file" >&5
+echo "configure:3343: checking for $file" >&5
if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3482,7 +3483,7 @@
if test "x$SUFFIX" != "x" ; then
echo $ac_n "checking whether to append suffix to binary""... $ac_c" 1>&6
-echo "configure:3486: checking whether to append suffix to binary" >&5
+echo "configure:3487: checking whether to append suffix to binary" >&5
echo "$ac_t""$SUFFIX" 1>&6
fi
@@ -3521,7 +3522,7 @@
echo $ac_n "checking which malloc to use""... $ac_c" 1>&6
-echo "configure:3525: checking which malloc to use" >&5
+echo "configure:3526: checking which malloc to use" >&5
# Check whether --with-malloc or --without-malloc was given.
if test "${with_malloc+set}" = set; then
withval="$with_malloc"
@@ -3612,7 +3613,7 @@
if test "$enableval" = "yes"
then
echo $ac_n "checking for pam_end in -lpam""... $ac_c" 1>&6
-echo "configure:3616: checking for pam_end in -lpam" >&5
+echo "configure:3617: checking for pam_end in -lpam" >&5
ac_lib_var=`echo pam'_'pam_end | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3620,7 +3621,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpam $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3624 "configure"
+#line 3625 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3631,7 +3632,7 @@
pam_end()
; return 0; }
EOF
-if { (eval echo configure:3635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3659,7 +3660,7 @@
fi
echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6
-echo "configure:3663: checking for main in -ldl" >&5
+echo "configure:3664: checking for main in -ldl" >&5
ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3667,14 +3668,14 @@
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3671 "configure"
+#line 3672 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3705,17 +3706,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3709: checking for $ac_hdr" >&5
+echo "configure:3710: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3714 "configure"
+#line 3715 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3720: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3910,7 +3911,7 @@
echo $ac_n "checking whether to compile with SSL support""... $ac_c" 1>&6
-echo "configure:3914: checking whether to compile with SSL support" >&5
+echo "configure:3915: checking whether to compile with SSL support" >&5
# Check whether --enable-ssl or --disable-ssl was given.
if test "${enable_ssl+set}" = set; then
enableval="$enable_ssl"
@@ -3955,7 +3956,7 @@
# Extract the first word of "openssl", so it can be a program name with args.
set dummy openssl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3959: checking for $ac_word" >&5
+echo "configure:3960: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_OPENSSL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3990,12 +3991,12 @@
if test "$OPENSSL" = "yes"; then
echo $ac_n "checking openssl version""... $ac_c" 1>&6
-echo "configure:3994: checking openssl version" >&5
+echo "configure:3995: checking openssl version" >&5
openssl_version=`$OPENSSL version | awk '{print $2}'`
echo "$ac_t""$openssl_version" 1>&6
fi
echo $ac_n "checking for CRYPTO_lock in -lcrypto""... $ac_c" 1>&6
-echo "configure:3999: checking for CRYPTO_lock in -lcrypto" >&5
+echo "configure:4000: checking for CRYPTO_lock in -lcrypto" >&5
ac_lib_var=`echo crypto'_'CRYPTO_lock | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4003,7 +4004,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lcrypto $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4007 "configure"
+#line 4008 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4014,7 +4015,7 @@
CRYPTO_lock()
; return 0; }
EOF
-if { (eval echo configure:4018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4031,7 +4032,7 @@
echo "$ac_t""yes" 1>&6
LIBS="$LIBS -lcrypto"
echo $ac_n "checking for SSL_library_init in -lssl""... $ac_c" 1>&6
-echo "configure:4035: checking for SSL_library_init in -lssl" >&5
+echo "configure:4036: checking for SSL_library_init in -lssl" >&5
ac_lib_var=`echo ssl'_'SSL_library_init | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4039,7 +4040,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lssl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4043 "configure"
+#line 4044 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4050,7 +4051,7 @@
SSL_library_init()
; return 0; }
EOF
-if { (eval echo configure:4054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4066,7 +4067,7 @@
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for SSL_connect in -lssl""... $ac_c" 1>&6
-echo "configure:4070: checking for SSL_connect in -lssl" >&5
+echo "configure:4071: checking for SSL_connect in -lssl" >&5
ac_lib_var=`echo ssl'_'SSL_connect | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4074,7 +4075,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lssl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4078 "configure"
+#line 4079 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4085,7 +4086,7 @@
SSL_connect()
; return 0; }
EOF
-if { (eval echo configure:4089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4117,17 +4118,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4121: checking for $ac_hdr" >&5
+echo "configure:4122: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4126 "configure"
+#line 4127 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4131: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4132: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -4154,13 +4155,13 @@
done
echo $ac_n "checking whether the OpenSSL library is multithread-enabled""... $ac_c" 1>&6
-echo "configure:4158: checking whether the OpenSSL library is multithread-enabled" >&5
+echo "configure:4159: checking whether the OpenSSL library is multithread-enabled" >&5
if test "$cross_compiling" = yes; then
echo "Cross-compiling; make sure your SSL library is multithread-enabled"
else
cat > conftest.$ac_ext <<EOF
-#line 4164 "configure"
+#line 4165 "configure"
#include "confdefs.h"
#define OPENSSL_THREAD_DEFINES
@@ -4176,7 +4177,7 @@
}
EOF
-if { (eval echo configure:4180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
echo "$ac_t""yes" 1>&6
@@ -4186,7 +4187,7 @@
LIBS="$LIBS -lssl"
echo $ac_n "checking whether to compile with SSL support""... $ac_c" 1>&6
-echo "configure:4190: checking whether to compile with SSL support" >&5
+echo "configure:4191: checking whether to compile with SSL support" >&5
echo "$ac_t""yes" 1>&6
else
@@ -4233,93 +4234,33 @@
-# Check whether --with-mysql-dir or --without-mysql-dir was given.
-if test "${with_mysql_dir+set}" = set; then
- withval="$with_mysql_dir"
- if test -d "$withval"; then
- mysqlloc="$withval";
- PATH="$PATH:$mysqlloc/bin"
- for ac_prog in mysql_config
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4248: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_MYSQL_CONFIG'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- case "$MYSQL_CONFIG" in
- /*)
- ac_cv_path_MYSQL_CONFIG="$MYSQL_CONFIG" # Let the user override the test with a path.
- ;;
- ?:/*)
- ac_cv_path_MYSQL_CONFIG="$MYSQL_CONFIG" # Let the user override the test with a dos path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_MYSQL_CONFIG="$ac_dir/$ac_word"
- break
- fi
- done
- IFS="$ac_save_ifs"
- ;;
-esac
-fi
-MYSQL_CONFIG="$ac_cv_path_MYSQL_CONFIG"
-if test -n "$MYSQL_CONFIG"; then
- echo "$ac_t""$MYSQL_CONFIG" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
-
-test -n "$MYSQL_CONFIG" && break
-done
-test -n "$MYSQL_CONFIG" || MYSQL_CONFIG="no"
-
- if test "$MYSQL_CONFIG" != "no"; then
- echo $ac_n "checking mysql version""... $ac_c" 1>&6
-echo "configure:4286: checking mysql version" >&5
- mysql_version=`$MYSQL_CONFIG --version`
- echo "$ac_t""$mysql_version" 1>&6
- echo $ac_n "checking mysql libs""... $ac_c" 1>&6
-echo "configure:4290: checking mysql libs" >&5
- LIBS="$LIBS `$MYSQL_CONFIG --libs`"
- echo "$ac_t""`$MYSQL_CONFIG --libs`" 1>&6
- echo $ac_n "checking mysql compiler flags""... $ac_c" 1>&6
-echo "configure:4294: checking mysql compiler flags" >&5
- CFLAGS="$CFLAGS `$MYSQL_CONFIG --cflags`"
- echo "$ac_t""`$MYSQL_CONFIG --cflags`" 1>&6
- fi
- else
- { echo "configure: error: Unable to find MySQL libs and/or directories at $withval" 1>&2; exit 1; }
- fi
-
-fi
-
-
-
echo $ac_n "checking whether to compile with MySQL support""... $ac_c" 1>&6
-echo "configure:4308: checking whether to compile with MySQL support" >&5
+echo "configure:4240: checking whether to compile with MySQL support" >&5
# Check whether --with-mysql or --without-mysql was given.
if test "${with_mysql+set}" = set; then
withval="$with_mysql"
- if test "$withval" != yes ; then
+if test "$withval" != yes ; then
echo "$ac_t""disabled" 1>&6
else
- if test "x$mysqlloc" = "x" ; then
- echo "$ac_t""searching" 1>&6
- for ac_prog in mysql_config
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
+ # Check whether --with-mysql-dir or --without-mysql-dir was given.
+if test "${with_mysql_dir+set}" = set; then
+ withval="$with_mysql_dir"
+
+ mysqlloc=""
+ if test -d "$withval" ; then
+ mysqlloc="$withval"
+ fi
+
+fi
+
+
+ echo "$ac_t""searching" 1>&6
+ # Extract the first word of "mysql_config", so it can be a program name with args.
+set dummy mysql_config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4323: checking for $ac_word" >&5
+echo "configure:4264: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MYSQL_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4332,7 +4273,7 @@
;;
*)
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
+ ac_dummy="$PATH:$mysqlloc/bin"
for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
@@ -4341,6 +4282,7 @@
fi
done
IFS="$ac_save_ifs"
+ test -z "$ac_cv_path_MYSQL_CONFIG" && ac_cv_path_MYSQL_CONFIG="no"
;;
esac
fi
@@ -4351,21 +4293,17 @@
echo "$ac_t""no" 1>&6
fi
-test -n "$MYSQL_CONFIG" && break
-done
-test -n "$MYSQL_CONFIG" || MYSQL_CONFIG="no"
-
- if test "$MYSQL_CONFIG" = "no"; then
- found=""
- for loc in /usr /usr/local ; do
- if test "x$found" = "x" ; then
- echo $ac_n "checking for MySQL client support in""... $ac_c" 1>&6
-echo "configure:4364: checking for MySQL client support in" >&5
- echo "$ac_t""$loc" 1>&6
-
+ if test "$MYSQL_CONFIG" = "no"; then
+ found=""
+ for loc in $mysqlloc /usr /usr/local ; do
+ if test "x$found" = "x" ; then
+ echo $ac_n "checking for MySQL client support in""... $ac_c" 1>&6
+echo "configure:4302: checking for MySQL client support in" >&5
+ echo "$ac_t""$loc" 1>&6
+
ac_safe=`echo ""$loc/include/mysql/mysql.h"" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for "$loc/include/mysql/mysql.h"""... $ac_c" 1>&6
-echo "configure:4369: checking for "$loc/include/mysql/mysql.h"" >&5
+echo "configure:4307: checking for "$loc/include/mysql/mysql.h"" >&5
if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4387,7 +4325,7 @@
ac_safe=`echo ""$loc/include/mysql.h"" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for "$loc/include/mysql.h"""... $ac_c" 1>&6
-echo "configure:4391: checking for "$loc/include/mysql.h"" >&5
+echo "configure:4329: checking for "$loc/include/mysql.h"" >&5
if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4404,97 +4342,60 @@
if eval "test \"`echo '$ac_cv_file_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
CFLAGS="$CFLAGS -I$loc/include"; LIBS="$LIBS -L$loc/lib -lmysqlclient"; found=1
-
+
else
echo "$ac_t""no" 1>&6
fi
-
+
fi
- fi
- done
- if test "x$found" != "x1" ; then
- { echo "configure: error: Unable to find mysql.h, please provide a --with-mysql-dir=<dir> location" 1>&2; exit 1; }
fi
- else
- echo $ac_n "checking mysql version""... $ac_c" 1>&6
-echo "configure:4424: checking mysql version" >&5
- mysql_version=`$MYSQL_CONFIG --version`
- echo "$ac_t""$mysql_version" 1>&6
- LIBS="$LIBS `$MYSQL_CONFIG --libs`"
- CFLAGS="$CFLAGS `$MYSQL_CONFIG --cflags`"
+ done
+ if test "x$found" != "x1" ; then
+ { echo "configure: error: Unable to find mysql.h, please provide a --with-mysql-dir=<dir> location" 1>&2; exit 1; }
fi
else
- echo "$ac_t""searching in $mysqlloc" 1>&6
-
-ac_safe=`echo ""$mysqlloc/include/mysql/mysql.h"" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for "$mysqlloc/include/mysql/mysql.h"""... $ac_c" 1>&6
-echo "configure:4435: checking for "$mysqlloc/include/mysql/mysql.h"" >&5
-if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- if test "$cross_compiling" = yes; then
- { echo "configure: error: Cannot check for file existence when cross compiling" 1>&2; exit 1; }
-else
- if test -r "$mysqlloc/include/mysql/mysql.h"; then
- eval "ac_cv_file_$ac_safe=yes"
- else
- eval "ac_cv_file_$ac_safe=no"
- fi
-fi
-fi
-if eval "test \"`echo '$ac_cv_file_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- CFLAGS="$CFLAGS -I$mysqlloc/include/mysql"; LIBS="$LIBS -L$mysqlloc/lib/mysql -lmysqlclient"
-else
- echo "$ac_t""no" 1>&6
-
-ac_safe=`echo ""$mysqlloc/include/mysql.h"" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for "$mysqlloc/include/mysql.h"""... $ac_c" 1>&6
-echo "configure:4457: checking for "$mysqlloc/include/mysql.h"" >&5
-if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- if test "$cross_compiling" = yes; then
- { echo "configure: error: Cannot check for file existence when cross compiling" 1>&2; exit 1; }
-else
- if test -r "$mysqlloc/include/mysql.h"; then
- eval "ac_cv_file_$ac_safe=yes"
- else
- eval "ac_cv_file_$ac_safe=no"
+ echo $ac_n "checking mysql version""... $ac_c" 1>&6
+echo "configure:4362: checking mysql version" >&5
+ mysql_version=`$MYSQL_CONFIG --version`
+ echo "$ac_t""$mysql_version" 1>&6
+ echo $ac_n "checking mysql libs""... $ac_c" 1>&6
+echo "configure:4366: checking mysql libs" >&5
+ if $MYSQL_CONFIG --libs_r &>/dev/null ; then
+ LIBS="$LIBS `$MYSQL_CONFIG --libs_r`"
+ echo "$ac_t""`$MYSQL_CONFIG --libs_r`" 1>&6
+ else
+ LIBS="$LIBS `$MYSQL_CONFIG --libs`"
+ echo "$ac_t""`$MYSQL_CONFIG --libs`" 1>&6
+ fi
+ echo $ac_n "checking mysql includes""... $ac_c" 1>&6
+echo "configure:4375: checking mysql includes" >&5
+ if $MYSQL_CONFIG --include &>/dev/null ; then
+ CFLAGS="$CFLAGS `$MYSQL_CONFIG --include`"
+ echo "$ac_t""`$MYSQL_CONFIG --include`" 1>&6
+ else
+ CFLAGS="$CFLAGS `$MYSQL_CONFIG --cflags`"
+ echo "$ac_t""`$MYSQL_CONFIG --cflags`" 1>&6
+ fi
fi
-fi
-fi
-if eval "test \"`echo '$ac_cv_file_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- CFLAGS="$CFLAGS -I$mysqlloc/include"; LIBS="$LIBS -L$mysqlloc/lib -lmysqlclient"
-else
- echo "$ac_t""no" 1>&6
-{ echo "configure: error: Unable to find mysql.h under location $mysqlloc" 1>&2; exit 1; }
-
-fi
-
-fi
-
- fi
for ac_hdr in mysql/mysql.h mysql/mysql_com.h mysql/mysql_version.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4488: checking for $ac_hdr" >&5
+echo "configure:4389: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4493 "configure"
+#line 4394 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4498: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4399: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -4520,8 +4421,53 @@
fi
done
- echo $ac_n "checking for mysql_init in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:4525: checking for mysql_init in -lmysqlclient" >&5
+ echo $ac_n "checking for mysql_init in -lmysqlclient_r""... $ac_c" 1>&6
+echo "configure:4426: checking for mysql_init in -lmysqlclient_r" >&5
+ac_lib_var=`echo mysqlclient_r'_'mysql_init | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lmysqlclient_r $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 4434 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char mysql_init();
+
+int main() {
+mysql_init()
+; return 0; }
+EOF
+if { (eval echo configure:4445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_lib=HAVE_LIB`echo mysqlclient_r | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+ LIBS="-lmysqlclient_r $LIBS"
+
+else
+ echo "$ac_t""no" 1>&6
+echo $ac_n "checking for mysql_init in -lmysqlclient""... $ac_c" 1>&6
+echo "configure:4471: checking for mysql_init in -lmysqlclient" >&5
ac_lib_var=`echo mysqlclient'_'mysql_init | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4529,7 +4475,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lmysqlclient $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4533 "configure"
+#line 4479 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4540,7 +4486,7 @@
mysql_init()
; return 0; }
EOF
-if { (eval echo configure:4544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4567,12 +4513,14 @@
echo "$ac_t""no" 1>&6
fi
+fi
+
cat >> confdefs.h <<\EOF
#define HAVE_MYSQL 1
EOF
echo $ac_n "checking whether to compile with MySQL support""... $ac_c" 1>&6
-echo "configure:4576: checking whether to compile with MySQL support" >&5
+echo "configure:4524: checking whether to compile with MySQL support" >&5
echo "$ac_t""yes" 1>&6
MYSQL="yes"
fi
@@ -4587,7 +4535,7 @@
echo $ac_n "checking whether to compile with LibSDB support""... $ac_c" 1>&6
-echo "configure:4591: checking whether to compile with LibSDB support" >&5
+echo "configure:4539: checking whether to compile with LibSDB support" >&5
# Check whether --with-sdb or --without-sdb was given.
if test "${with_sdb+set}" = set; then
withval="$with_sdb"
@@ -4601,7 +4549,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4605: checking for $ac_word" >&5
+echo "configure:4553: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SDB_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4641,7 +4589,7 @@
{ echo "configure: error: Unable to find sdb-config in path for SDB support" 1>&2; exit 1; }
else
echo $ac_n "checking sdb version""... $ac_c" 1>&6
-echo "configure:4645: checking sdb version" >&5
+echo "configure:4593: checking sdb version" >&5
sdb_version=`$SDB_CONFIG --version`
echo "$ac_t""$sdb_version" 1>&6
LIBS="$LIBS `$SDB_CONFIG --libs`"
@@ -4650,17 +4598,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4654: checking for $ac_hdr" >&5
+echo "configure:4602: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4659 "configure"
+#line 4607 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4664: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4612: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -4689,12 +4637,12 @@
for ac_func in sdb_init
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4693: checking for $ac_func" >&5
+echo "configure:4641: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4698 "configure"
+#line 4646 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4717,7 +4665,7 @@
; return 0; }
EOF
-if { (eval echo configure:4721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -4763,7 +4711,7 @@
echo $ac_n "checking whether to compile with SQLite support""... $ac_c" 1>&6
-echo "configure:4767: checking whether to compile with SQLite support" >&5
+echo "configure:4715: checking whether to compile with SQLite support" >&5
# Check whether --with-sqlite or --without-sqlite was given.
if test "${with_sqlite+set}" = set; then
withval="$with_sqlite"
@@ -4776,17 +4724,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4780: checking for $ac_hdr" >&5
+echo "configure:4728: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4785 "configure"
+#line 4733 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4738: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -4814,7 +4762,7 @@
LIBS="$LIBS -L/usr/local/lib"
echo $ac_n "checking for sqlite_open in -lsqlite""... $ac_c" 1>&6
-echo "configure:4818: checking for sqlite_open in -lsqlite" >&5
+echo "configure:4766: checking for sqlite_open in -lsqlite" >&5
ac_lib_var=`echo sqlite'_'sqlite_open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4822,7 +4770,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsqlite $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4826 "configure"
+#line 4774 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4833,7 +4781,7 @@
sqlite_open()
; return 0; }
EOF
-if { (eval echo configure:4837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4858,7 +4806,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4862: checking for $ac_word" >&5
+echo "configure:4810: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SQLITE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4895,7 +4843,7 @@
test -n "$SQLITE" || SQLITE="no"
echo $ac_n "checking sqlite version""... $ac_c" 1>&6
-echo "configure:4899: checking sqlite version" >&5
+echo "configure:4847: checking sqlite version" >&5
sqlite_version=`$SQLITE -version`
echo "$ac_t""$sqlite_version" 1>&6
cat >> confdefs.h <<\EOF
@@ -4915,7 +4863,7 @@
echo $ac_n "checking whether to compile with Oracle support""... $ac_c" 1>&6
-echo "configure:4919: checking whether to compile with Oracle support" >&5
+echo "configure:4867: checking whether to compile with Oracle support" >&5
# Check whether --with-oracle or --without-oracle was given.
if test "${with_oracle+set}" = set; then
withval="$with_oracle"
@@ -4935,14 +4883,14 @@
CPPFLAGS="$CPPFLAGS -I$a"
done
echo $ac_n "checking for oci.h ""... $ac_c" 1>&6
-echo "configure:4939: checking for oci.h " >&5
+echo "configure:4887: checking for oci.h " >&5
cat > conftest.$ac_ext <<EOF
-#line 4941 "configure"
+#line 4889 "configure"
#include "confdefs.h"
#include <oci.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4946: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4894: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -4971,7 +4919,7 @@
LIBS="$LIBS -L$a"
done
echo $ac_n "checking for OCIEnvCreate in -lclntsh""... $ac_c" 1>&6
-echo "configure:4975: checking for OCIEnvCreate in -lclntsh" >&5
+echo "configure:4923: checking for OCIEnvCreate in -lclntsh" >&5
ac_lib_var=`echo clntsh'_'OCIEnvCreate | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4979,7 +4927,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lclntsh $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4983 "configure"
+#line 4931 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4990,7 +4938,7 @@
OCIEnvCreate()
; return 0; }
EOF
-if { (eval echo configure:4994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5014,7 +4962,7 @@
if test -f "$ORACLE_HOME/lib/libwtc8.so"
then
echo $ac_n "checking for wtcstu in -lwtc8""... $ac_c" 1>&6
-echo "configure:5018: checking for wtcstu in -lwtc8" >&5
+echo "configure:4966: checking for wtcstu in -lwtc8" >&5
ac_lib_var=`echo wtc8'_'wtcstu | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5022,7 +4970,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lwtc8 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5026 "configure"
+#line 4974 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5033,7 +4981,7 @@
wtcstu()
; return 0; }
EOF
-if { (eval echo configure:5037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5056,7 +5004,7 @@
else
echo $ac_n "checking for wtcstu in -lwtc9""... $ac_c" 1>&6
-echo "configure:5060: checking for wtcstu in -lwtc9" >&5
+echo "configure:5008: checking for wtcstu in -lwtc9" >&5
ac_lib_var=`echo wtc9'_'wtcstu | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5064,7 +5012,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lwtc9 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5068 "configure"
+#line 5016 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5075,7 +5023,7 @@
wtcstu()
; return 0; }
EOF
-if { (eval echo configure:5079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5103,7 +5051,7 @@
EOF
echo $ac_n "checking whether to compile with Oracle support""... $ac_c" 1>&6
-echo "configure:5107: checking whether to compile with Oracle support" >&5
+echo "configure:5055: checking whether to compile with Oracle support" >&5
echo "$ac_t""yes" 1>&6
else
@@ -5122,14 +5070,14 @@
echo "${nl}${T_MD}Configuring WTLS support ...${T_ME}"
echo $ac_n "checking for WTLS library""... $ac_c" 1>&6
-echo "configure:5126: checking for WTLS library" >&5
+echo "configure:5074: checking for WTLS library" >&5
echo "$ac_t""$withval" 1>&6
case "$withval" in
openssl)
OLDLIBS="$LIBS"
LIBS="$LIBS -L/usr/local/ssl/lib -lcrypto"
echo $ac_n "checking for RSA_new in -lcrypto""... $ac_c" 1>&6
-echo "configure:5133: checking for RSA_new in -lcrypto" >&5
+echo "configure:5081: checking for RSA_new in -lcrypto" >&5
ac_lib_var=`echo crypto'_'RSA_new | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5137,7 +5085,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lcrypto $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5141 "configure"
+#line 5089 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5148,7 +5096,7 @@
RSA_new()
; return 0; }
EOF
-if { (eval echo configure:5152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5167,17 +5115,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5171: checking for $ac_hdr" >&5
+echo "configure:5119: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5176 "configure"
+#line 5124 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5181: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5129: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*