[PATCH] get rid of DLR_MYSQL & co
Alexander Malysh <[email protected]>
| Newsgroups | gmane.comp.mobile.kannel.devel |
|---|---|
| Organization | Centrium GmbH |
| Message-ID | <[email protected]> |
Hi list, attached you can find patch that removes unneeded DLR_[MYSQL|SDB] defines and --with-dlr= configure option. These confuse all users and just make no sense because if we compile with --enable-mysql as example we anyhow have a mysql dependencies. With this patch applied , user can simple compile with: --enable-mysql --enable-oracle --enable-sdb and has dlr for this storage build-in. Comments or vetos 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
kill-with-dlr-mysql-sdb.patch
(text/x-diff, 79.2 KB)
Index: gw-config.h.in
===================================================================
RCS file: /home/cvs/gateway/gw-config.h.in,v
retrieving revision 1.6
diff -a -u -r1.6 gw-config.h.in
--- gw-config.h.in 5 Jan 2004 16:19:27 -0000 1.6
+++ gw-config.h.in 9 Jan 2004 11:12:11 -0000
@@ -220,15 +220,6 @@
/* Define if you have and want to use the SQLite database library (-lsqlite) */
#undef HAVE_SQLITE
-/* Define if you want to use the MySQL support for DLR (delivery reports) */
-#undef DLR_MYSQL
-
-/* Define if you want to use the simple database library (libSDB) support for DLR */
-#undef DLR_SDB
-
-/* Define if you want to use SQLite (libsqlite) support for DLR */
-#undef DLR_SQLITE
-
/* Define version of used libSDB */
#undef LIBSDB_VERSION
Index: configure.in
===================================================================
RCS file: /home/cvs/gateway/configure.in,v
retrieving revision 1.136
diff -a -u -r1.136 configure.in
--- configure.in 6 Jan 2004 10:17:24 -0000 1.136
+++ configure.in 9 Jan 2004 11:12:11 -0000
@@ -917,50 +917,6 @@
[AC_MSG_RESULT(disabled)])
-dnl Implement the --with-dlr option.
-dnl Checks which external DLR storage should be used.
-
-AC_ARG_WITH(dlr,
-[ --with-dlr[=TYPE TYPE] select DLR storage to use: internal/mysql/sdb [internal]],
-[ AC_CONFIG_SECTION([Configuring DLR support])
- for myval in $withval; do
- AC_MSG_CHECKING([for DLR storage type $myval])
- case "$myval" in
- internal)
- ;;
- mysql)
- if test "$MYSQL" != "yes"; then
- AC_MSG_ERROR(Option --with-dlr=mysql requires MySQL client support)
- else
- AC_MSG_RESULT(enabled)
- AC_DEFINE(DLR_MYSQL)
- fi
- ;;
- sdb)
- if test "$SDB" != "yes"; then
- AC_MSG_ERROR(Option --with-dlr=sdb requires SDB support)
- else
- AC_DEFINE(DLR_SDB)
- AC_MSG_RESULT(enabled)
- fi
- ;;
- sqlite)
- if test "$SQLITE" != "yes"; then
- AC_MSG_ERROR(Option --with-dlr=sqlte requires SQLite support)
- else
- AC_DEFINE(DLR_SQLITE)
- AC_MSG_RESULT(enabled)
- fi
- ;;
- *)
- AC_MSG_ERROR(Unknown DLR storage support!)
- exit 1
- ;;
- esac
- done
-])
-
-
dnl Implement the --with-wtls option.
dnl Check to see if we should include WTLS support, and which library to use.
Index: configure
===================================================================
RCS file: /home/cvs/gateway/configure,v
retrieving revision 1.133
diff -a -u -r1.133 configure
--- configure 6 Jan 2004 10:17:24 -0000 1.133
+++ configure 9 Jan 2004 11:12:11 -0000
@@ -76,8 +76,6 @@
ac_help="$ac_help
--with-oracle-libs=DIR adds oracle library path"
ac_help="$ac_help
- --with-dlr[=TYPE TYPE] select DLR storage to use: internal/mysql/sdb [internal]"
-ac_help="$ac_help
--with-wtls[=TYPE] select WTLS version to use: openssl/baltimore"
# Initialize some variables set by options.
@@ -630,7 +628,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:634: checking cvs checkout date" >&5
+echo "configure:632: 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"`
@@ -697,7 +695,7 @@
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:701: checking host system type" >&5
+echo "configure:699: checking host system type" >&5
host_alias=$host
case "$host_alias" in
@@ -755,7 +753,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:759: checking for $ac_word" >&5
+echo "configure:757: 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
@@ -785,7 +783,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:789: checking for $ac_word" >&5
+echo "configure:787: 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
@@ -836,7 +834,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:840: checking for $ac_word" >&5
+echo "configure:838: 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
@@ -868,7 +866,7 @@
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:872: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:870: 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.
@@ -879,12 +877,12 @@
cat > conftest.$ac_ext << EOF
-#line 883 "configure"
+#line 881 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:886: \"$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
@@ -910,12 +908,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:914: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:912: 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:919: checking whether we are using GNU C" >&5
+echo "configure:917: 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
@@ -924,7 +922,7 @@
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:928: \"$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:926: \"$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
@@ -943,7 +941,7 @@
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:947: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:945: 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
@@ -986,7 +984,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:990: checking for a BSD compatible install" >&5
+echo "configure:988: 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
@@ -1041,7 +1039,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:1045: checking for $ac_word" >&5
+echo "configure:1043: 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
@@ -1073,7 +1071,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:1077: checking for $ac_word" >&5
+echo "configure:1075: 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
@@ -1106,7 +1104,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:1110: checking for $ac_word" >&5
+echo "configure:1108: 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
@@ -1140,7 +1138,7 @@
*) ac_lib=l ;;
esac
echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:1144: checking for yywrap in -l$ac_lib" >&5
+echo "configure:1142: 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
@@ -1148,7 +1146,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l$ac_lib $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1152 "configure"
+#line 1150 "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
@@ -1159,7 +1157,7 @@
yywrap()
; return 0; }
EOF
-if { (eval echo configure:1163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1161: \"$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
@@ -1184,7 +1182,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:1188: checking for $ac_word" >&5
+echo "configure:1186: 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
@@ -1219,7 +1217,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:1223: checking for $ac_word" >&5
+echo "configure:1221: 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
@@ -1254,7 +1252,7 @@
echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:1258: checking size of short" >&5
+echo "configure:1256: 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
@@ -1262,7 +1260,7 @@
ac_cv_sizeof_short=2
else
cat > conftest.$ac_ext <<EOF
-#line 1266 "configure"
+#line 1264 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1273,7 +1271,7 @@
exit(0);
}
EOF
-if { (eval echo configure:1277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1275: \"$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
@@ -1293,7 +1291,7 @@
echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:1297: checking size of int" >&5
+echo "configure:1295: 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
@@ -1301,7 +1299,7 @@
ac_cv_sizeof_int=4
else
cat > conftest.$ac_ext <<EOF
-#line 1305 "configure"
+#line 1303 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1312,7 +1310,7 @@
exit(0);
}
EOF
-if { (eval echo configure:1316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1314: \"$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
@@ -1332,7 +1330,7 @@
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:1336: checking size of long" >&5
+echo "configure:1334: 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
@@ -1340,7 +1338,7 @@
ac_cv_sizeof_long=4
else
cat > conftest.$ac_ext <<EOF
-#line 1344 "configure"
+#line 1342 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1351,7 +1349,7 @@
exit(0);
}
EOF
-if { (eval echo configure:1355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1353: \"$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
@@ -1371,7 +1369,7 @@
echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:1375: checking size of long long" >&5
+echo "configure:1373: 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
@@ -1379,7 +1377,7 @@
ac_cv_sizeof_long_long=8
else
cat > conftest.$ac_ext <<EOF
-#line 1383 "configure"
+#line 1381 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1390,7 +1388,7 @@
exit(0);
}
EOF
-if { (eval echo configure:1394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1392: \"$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
@@ -1420,7 +1418,7 @@
echo $ac_n "checking for log in -lm""... $ac_c" 1>&6
-echo "configure:1424: checking for log in -lm" >&5
+echo "configure:1422: 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
@@ -1428,7 +1426,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1432 "configure"
+#line 1430 "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
@@ -1439,7 +1437,7 @@
log()
; return 0; }
EOF
-if { (eval echo configure:1443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1441: \"$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
@@ -1467,7 +1465,7 @@
fi
echo $ac_n "checking for accept in -lsocket""... $ac_c" 1>&6
-echo "configure:1471: checking for accept in -lsocket" >&5
+echo "configure:1469: 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
@@ -1475,7 +1473,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1479 "configure"
+#line 1477 "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
@@ -1486,7 +1484,7 @@
accept()
; return 0; }
EOF
-if { (eval echo configure:1490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1488: \"$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
@@ -1514,7 +1512,7 @@
fi
echo $ac_n "checking for inet_ntoa in -lnsl""... $ac_c" 1>&6
-echo "configure:1518: checking for inet_ntoa in -lnsl" >&5
+echo "configure:1516: 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
@@ -1522,7 +1520,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1526 "configure"
+#line 1524 "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
@@ -1533,7 +1531,7 @@
inet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:1537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1535: \"$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
@@ -1561,7 +1559,7 @@
fi
echo $ac_n "checking for inet_ntop in -lresolv""... $ac_c" 1>&6
-echo "configure:1565: checking for inet_ntop in -lresolv" >&5
+echo "configure:1563: 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
@@ -1569,7 +1567,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1573 "configure"
+#line 1571 "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
@@ -1580,7 +1578,7 @@
inet_ntop()
; return 0; }
EOF
-if { (eval echo configure:1584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1582: \"$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
@@ -1608,7 +1606,7 @@
fi
echo $ac_n "checking for inet_ntop in -lbind""... $ac_c" 1>&6
-echo "configure:1612: checking for inet_ntop in -lbind" >&5
+echo "configure:1610: 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
@@ -1616,7 +1614,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lbind $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1620 "configure"
+#line 1618 "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
@@ -1627,7 +1625,7 @@
inet_ntop()
; return 0; }
EOF
-if { (eval echo configure:1631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1629: \"$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
@@ -1655,7 +1653,7 @@
fi
echo $ac_n "checking for pthread_exit in -lpthread""... $ac_c" 1>&6
-echo "configure:1659: checking for pthread_exit in -lpthread" >&5
+echo "configure:1657: 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
@@ -1663,7 +1661,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpthread $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1667 "configure"
+#line 1665 "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
@@ -1674,7 +1672,7 @@
pthread_exit()
; return 0; }
EOF
-if { (eval echo configure:1678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1676: \"$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
@@ -1696,7 +1694,7 @@
if test -z "$pthread"; then
echo $ac_n "checking for pthread_exit in -lc_r""... $ac_c" 1>&6
-echo "configure:1700: checking for pthread_exit in -lc_r" >&5
+echo "configure:1698: 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
@@ -1704,7 +1702,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lc_r $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1708 "configure"
+#line 1706 "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
@@ -1715,7 +1713,7 @@
pthread_exit()
; return 0; }
EOF
-if { (eval echo configure:1719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1717: \"$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
@@ -1737,7 +1735,7 @@
fi
echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
-echo "configure:1741: checking for libiconv in -liconv" >&5
+echo "configure:1739: 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
@@ -1745,7 +1743,7 @@
ac_save_LIBS="$LIBS"
LIBS="-liconv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1749 "configure"
+#line 1747 "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
@@ -1756,7 +1754,7 @@
libiconv()
; return 0; }
EOF
-if { (eval echo configure:1760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1758: \"$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
@@ -1779,7 +1777,7 @@
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1783: checking how to run the C preprocessor" >&5
+echo "configure:1781: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1794,13 +1792,13 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1798 "configure"
+#line 1796 "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:1804: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1802: \"$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
:
@@ -1811,13 +1809,13 @@
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1815 "configure"
+#line 1813 "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:1821: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1819: \"$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
:
@@ -1828,13 +1826,13 @@
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1832 "configure"
+#line 1830 "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:1838: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1836: \"$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
:
@@ -1859,12 +1857,12 @@
echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1863: checking for ANSI C header files" >&5
+echo "configure:1861: 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 1868 "configure"
+#line 1866 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -1872,7 +1870,7 @@
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1874: \"$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*
@@ -1889,7 +1887,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 1893 "configure"
+#line 1891 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -1907,7 +1905,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 1911 "configure"
+#line 1909 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1928,7 +1926,7 @@
:
else
cat > conftest.$ac_ext <<EOF
-#line 1932 "configure"
+#line 1930 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1939,7 +1937,7 @@
exit (0); }
EOF
-if { (eval echo configure:1943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -1966,17 +1964,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1970: checking for $ac_hdr" >&5
+echo "configure:1968: 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 1975 "configure"
+#line 1973 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1980: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1978: \"$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*
@@ -2006,17 +2004,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2010: checking for $ac_hdr" >&5
+echo "configure:2008: 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 2015 "configure"
+#line 2013 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2018: \"$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*
@@ -2046,17 +2044,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2050: checking for $ac_hdr" >&5
+echo "configure:2048: 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 2055 "configure"
+#line 2053 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2058: \"$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*
@@ -2085,14 +2083,14 @@
cat > conftest.$ac_ext <<EOF
-#line 2089 "configure"
+#line 2087 "configure"
#include "confdefs.h"
int main() {
char *func = __FUNCTION__;
; return 0; }
EOF
-if { (eval echo configure:2096: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE___FUNCTION__ 1
@@ -2104,14 +2102,14 @@
fi
rm -f conftest*
cat > conftest.$ac_ext <<EOF
-#line 2108 "configure"
+#line 2106 "configure"
#include "confdefs.h"
int main() {
char *func = __func__;
; return 0; }
EOF
-if { (eval echo configure:2115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE___FUNC__ 1
@@ -2128,12 +2126,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:2132: checking for $ac_func" >&5
+echo "configure:2130: 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 2137 "configure"
+#line 2135 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2156,7 +2154,7 @@
; return 0; }
EOF
-if { (eval echo configure:2160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2158: \"$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
@@ -2181,12 +2179,12 @@
done
echo $ac_n "checking for getopt""... $ac_c" 1>&6
-echo "configure:2185: checking for getopt" >&5
+echo "configure:2183: 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 2190 "configure"
+#line 2188 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char getopt(); below. */
@@ -2209,7 +2207,7 @@
; return 0; }
EOF
-if { (eval echo configure:2213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2211: \"$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
@@ -2232,12 +2230,12 @@
echo $ac_n "checking for gethostbyname_r""... $ac_c" 1>&6
-echo "configure:2236: checking for gethostbyname_r" >&5
+echo "configure:2234: 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 2241 "configure"
+#line 2239 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname_r(); below. */
@@ -2260,7 +2258,7 @@
; return 0; }
EOF
-if { (eval echo configure:2264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2262: \"$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
@@ -2275,13 +2273,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:2279: checking for which type of gethostbyname_r" >&5
+echo "configure:2277: 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 2285 "configure"
+#line 2283 "configure"
#include "confdefs.h"
#include <netdb.h>
@@ -2295,7 +2293,7 @@
; return 0; }
EOF
-if { (eval echo configure:2299: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_func_which_gethostname_r=3
else
@@ -2304,7 +2302,7 @@
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 2308 "configure"
+#line 2306 "configure"
#include "confdefs.h"
#include <netdb.h>
@@ -2320,7 +2318,7 @@
; return 0; }
EOF
-if { (eval echo configure:2324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2322: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_func_which_gethostname_r=6
else
@@ -2329,7 +2327,7 @@
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 2333 "configure"
+#line 2331 "configure"
#include "confdefs.h"
#include <netdb.h>
@@ -2345,7 +2343,7 @@
; return 0; }
EOF
-if { (eval echo configure:2349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2347: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_func_which_gethostname_r=5
else
@@ -2387,12 +2385,12 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:2391: checking for gethostbyname" >&5
+echo "configure:2389: 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 2396 "configure"
+#line 2394 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
@@ -2415,7 +2413,7 @@
; return 0; }
EOF
-if { (eval echo configure:2419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2417: \"$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
@@ -2447,12 +2445,12 @@
echo $ac_n "checking for socklen_t in <sys/socket.h>""... $ac_c" 1>&6
-echo "configure:2451: checking for socklen_t in <sys/socket.h>" >&5
+echo "configure:2449: 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 2456 "configure"
+#line 2454 "configure"
#include "confdefs.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -2463,7 +2461,7 @@
socklen_t foo;
; return 0; }
EOF
-if { (eval echo configure:2467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
gw_cv_type_HAVE_SOCKLEN_T=yes
else
@@ -2486,19 +2484,19 @@
echo $ac_n "checking for getopt in <stdio.h>""... $ac_c" 1>&6
-echo "configure:2490: checking for getopt in <stdio.h>" >&5
+echo "configure:2488: 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 2495 "configure"
+#line 2493 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
void *foo = getopt;
; return 0; }
EOF
-if { (eval echo configure:2502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
gw_cv_func_HAVE_GETOPT_IN_STDIO_H=yes
else
@@ -2520,19 +2518,19 @@
echo $ac_n "checking for getopt in <unistd.h>""... $ac_c" 1>&6
-echo "configure:2524: checking for getopt in <unistd.h>" >&5
+echo "configure:2522: 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 2529 "configure"
+#line 2527 "configure"
#include "confdefs.h"
#include <unistd.h>
int main() {
void *foo = getopt;
; return 0; }
EOF
-if { (eval echo configure:2536: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
gw_cv_func_HAVE_GETOPT_IN_UNISTD_H=yes
else
@@ -2559,17 +2557,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2563: checking for $ac_hdr" >&5
+echo "configure:2561: 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 2568 "configure"
+#line 2566 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2573: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2571: \"$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*
@@ -2591,12 +2589,12 @@
EOF
echo $ac_n "checking for regcomp""... $ac_c" 1>&6
-echo "configure:2595: checking for regcomp" >&5
+echo "configure:2593: 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 2600 "configure"
+#line 2598 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char regcomp(); below. */
@@ -2619,7 +2617,7 @@
; return 0; }
EOF
-if { (eval echo configure:2623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2621: \"$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
@@ -2659,12 +2657,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:2663: checking for working pthreads" >&5
+echo "configure:2661: checking for working pthreads" >&5
if test "$cross_compiling" = yes; then
echo Cross compiling - assuming they work
else
cat > conftest.$ac_ext <<EOF
-#line 2668 "configure"
+#line 2666 "configure"
#include "confdefs.h"
#include <pthread.h>
#include <unistd.h>
@@ -2690,7 +2688,7 @@
}
EOF
-if { (eval echo configure:2694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
echo yes
else
@@ -2704,9 +2702,9 @@
echo $ac_n "checking for pthread_spinlock support""... $ac_c" 1>&6
-echo "configure:2708: checking for pthread_spinlock support" >&5
+echo "configure:2706: checking for pthread_spinlock support" >&5
cat > conftest.$ac_ext <<EOF
-#line 2710 "configure"
+#line 2708 "configure"
#include "confdefs.h"
#include <pthread.h>
int main() {
@@ -2719,7 +2717,7 @@
; return 0; }
EOF
-if { (eval echo configure:2723: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2721: \"$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
@@ -2746,7 +2744,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:2750: checking for $ac_word" >&5
+echo "configure:2748: 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
@@ -2786,7 +2784,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:2790: checking libxml version" >&5
+echo "configure:2788: checking libxml version" >&5
xml_version=`$XML_CONFIG --version`
echo "$ac_t""$xml_version" 1>&6
@@ -2830,7 +2828,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:2834: checking whether to compile with PCRE support" >&5
+echo "configure:2832: 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"
@@ -2844,7 +2842,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:2848: checking for $ac_word" >&5
+echo "configure:2846: 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
@@ -2884,11 +2882,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:2888: checking PCRE version" >&5
+echo "configure:2886: 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:2892: checking for POSIX regex provider" >&5
+echo "configure:2890: checking for POSIX regex provider" >&5
if test "x$has_posix_regex" != "x" ; then
LIBS="$LIBS `$PCRE_CONFIG --libs`"
CFLAGS="$CFLAGS `$PCRE_CONFIG --cflags`"
@@ -2901,17 +2899,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2905: checking for $ac_hdr" >&5
+echo "configure:2903: 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 2910 "configure"
+#line 2908 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2915: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2913: \"$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*
@@ -2938,7 +2936,7 @@
done
echo $ac_n "checking for regcomp in -lpcreposix""... $ac_c" 1>&6
-echo "configure:2942: checking for regcomp in -lpcreposix" >&5
+echo "configure:2940: 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
@@ -2946,7 +2944,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpcreposix $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2950 "configure"
+#line 2948 "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
@@ -2957,7 +2955,7 @@
regcomp()
; return 0; }
EOF
-if { (eval echo configure:2961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2959: \"$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
@@ -2989,17 +2987,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2993: checking for $ac_hdr" >&5
+echo "configure:2991: 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 2998 "configure"
+#line 2996 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3003: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3001: \"$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*
@@ -3028,12 +3026,12 @@
for ac_func in pcre_compile
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3032: checking for $ac_func" >&5
+echo "configure:3030: 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 3037 "configure"
+#line 3035 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3056,7 +3054,7 @@
; return 0; }
EOF
-if { (eval echo configure:3060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3058: \"$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
@@ -3109,7 +3107,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:3113: checking for $ac_word" >&5
+echo "configure:3111: 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
@@ -3139,7 +3137,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:3143: checking for $ac_word" >&5
+echo "configure:3141: 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
@@ -3169,7 +3167,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:3173: checking for $ac_word" >&5
+echo "configure:3171: 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
@@ -3199,7 +3197,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:3203: checking for $ac_word" >&5
+echo "configure:3201: 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
@@ -3229,7 +3227,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:3233: checking for $ac_word" >&5
+echo "configure:3231: 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
@@ -3259,7 +3257,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:3263: checking for $ac_word" >&5
+echo "configure:3261: 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
@@ -3300,7 +3298,7 @@
ac_safe=`echo "$file" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $file""... $ac_c" 1>&6
-echo "configure:3304: checking for $file" >&5
+echo "configure:3302: 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
@@ -3340,7 +3338,7 @@
ac_safe=`echo "$file" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $file""... $ac_c" 1>&6
-echo "configure:3344: checking for $file" >&5
+echo "configure:3342: 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
@@ -3484,7 +3482,7 @@
if test "x$SUFFIX" != "x" ; then
echo $ac_n "checking whether to append suffix to binary""... $ac_c" 1>&6
-echo "configure:3488: checking whether to append suffix to binary" >&5
+echo "configure:3486: checking whether to append suffix to binary" >&5
echo "$ac_t""$SUFFIX" 1>&6
fi
@@ -3523,7 +3521,7 @@
echo $ac_n "checking which malloc to use""... $ac_c" 1>&6
-echo "configure:3527: checking which malloc to use" >&5
+echo "configure:3525: 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"
@@ -3614,7 +3612,7 @@
if test "$enableval" = "yes"
then
echo $ac_n "checking for pam_end in -lpam""... $ac_c" 1>&6
-echo "configure:3618: checking for pam_end in -lpam" >&5
+echo "configure:3616: 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
@@ -3622,7 +3620,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpam $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3626 "configure"
+#line 3624 "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
@@ -3633,7 +3631,7 @@
pam_end()
; return 0; }
EOF
-if { (eval echo configure:3637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3635: \"$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
@@ -3661,7 +3659,7 @@
fi
echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6
-echo "configure:3665: checking for main in -ldl" >&5
+echo "configure:3663: 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
@@ -3669,14 +3667,14 @@
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3673 "configure"
+#line 3671 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3678: \"$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
@@ -3707,17 +3705,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3711: checking for $ac_hdr" >&5
+echo "configure:3709: 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 3716 "configure"
+#line 3714 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3721: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3719: \"$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*
@@ -3912,7 +3910,7 @@
echo $ac_n "checking whether to compile with SSL support""... $ac_c" 1>&6
-echo "configure:3916: checking whether to compile with SSL support" >&5
+echo "configure:3914: 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"
@@ -3957,7 +3955,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:3961: checking for $ac_word" >&5
+echo "configure:3959: 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
@@ -3992,12 +3990,12 @@
if test "$OPENSSL" = "yes"; then
echo $ac_n "checking openssl version""... $ac_c" 1>&6
-echo "configure:3996: checking openssl version" >&5
+echo "configure:3994: 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:4001: checking for CRYPTO_lock in -lcrypto" >&5
+echo "configure:3999: 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
@@ -4005,7 +4003,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lcrypto $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4009 "configure"
+#line 4007 "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
@@ -4016,7 +4014,7 @@
CRYPTO_lock()
; return 0; }
EOF
-if { (eval echo configure:4020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4018: \"$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
@@ -4033,7 +4031,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:4037: checking for SSL_library_init in -lssl" >&5
+echo "configure:4035: 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
@@ -4041,7 +4039,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lssl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4045 "configure"
+#line 4043 "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
@@ -4052,7 +4050,7 @@
SSL_library_init()
; return 0; }
EOF
-if { (eval echo configure:4056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4054: \"$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
@@ -4068,7 +4066,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:4072: checking for SSL_connect in -lssl" >&5
+echo "configure:4070: 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
@@ -4076,7 +4074,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lssl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4080 "configure"
+#line 4078 "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
@@ -4087,7 +4085,7 @@
SSL_connect()
; return 0; }
EOF
-if { (eval echo configure:4091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4089: \"$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
@@ -4119,17 +4117,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4123: checking for $ac_hdr" >&5
+echo "configure:4121: 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 4128 "configure"
+#line 4126 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4133: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4131: \"$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*
@@ -4156,13 +4154,13 @@
done
echo $ac_n "checking whether the OpenSSL library is multithread-enabled""... $ac_c" 1>&6
-echo "configure:4160: checking whether the OpenSSL library is multithread-enabled" >&5
+echo "configure:4158: 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 4166 "configure"
+#line 4164 "configure"
#include "confdefs.h"
#define OPENSSL_THREAD_DEFINES
@@ -4178,7 +4176,7 @@
}
EOF
-if { (eval echo configure:4182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4180: \"$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
@@ -4188,7 +4186,7 @@
LIBS="$LIBS -lssl"
echo $ac_n "checking whether to compile with SSL support""... $ac_c" 1>&6
-echo "configure:4192: checking whether to compile with SSL support" >&5
+echo "configure:4190: checking whether to compile with SSL support" >&5
echo "$ac_t""yes" 1>&6
else
@@ -4246,7 +4244,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:4250: checking for $ac_word" >&5
+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
@@ -4284,15 +4282,15 @@
if test "$MYSQL_CONFIG" != "no"; then
echo $ac_n "checking mysql version""... $ac_c" 1>&6
-echo "configure:4288: checking mysql version" >&5
+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:4292: checking mysql libs" >&5
+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:4296: checking mysql compiler flags" >&5
+echo "configure:4294: checking mysql compiler flags" >&5
CFLAGS="$CFLAGS `$MYSQL_CONFIG --cflags`"
echo "$ac_t""`$MYSQL_CONFIG --cflags`" 1>&6
fi
@@ -4306,7 +4304,7 @@
echo $ac_n "checking whether to compile with MySQL support""... $ac_c" 1>&6
-echo "configure:4310: checking whether to compile with MySQL support" >&5
+echo "configure:4308: checking whether to compile with MySQL support" >&5
# Check whether --enable-mysql or --disable-mysql was given.
if test "${enable_mysql+set}" = set; then
enableval="$enable_mysql"
@@ -4321,7 +4319,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:4325: checking for $ac_word" >&5
+echo "configure:4323: 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
@@ -4362,12 +4360,12 @@
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:4366: checking for MySQL client support in" >&5
+echo "configure:4364: 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:4371: checking for "$loc/include/mysql/mysql.h"" >&5
+echo "configure:4369: 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
@@ -4389,7 +4387,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:4393: checking for "$loc/include/mysql.h"" >&5
+echo "configure:4391: 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
@@ -4422,7 +4420,7 @@
fi
else
echo $ac_n "checking mysql version""... $ac_c" 1>&6
-echo "configure:4426: checking mysql version" >&5
+echo "configure:4424: checking mysql version" >&5
mysql_version=`$MYSQL_CONFIG --version`
echo "$ac_t""$mysql_version" 1>&6
LIBS="$LIBS `$MYSQL_CONFIG --libs`"
@@ -4433,7 +4431,7 @@
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:4437: checking for "$mysqlloc/include/mysql/mysql.h"" >&5
+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
@@ -4455,7 +4453,7 @@
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:4459: checking for "$mysqlloc/include/mysql.h"" >&5
+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
@@ -4486,17 +4484,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4490: checking for $ac_hdr" >&5
+echo "configure:4488: 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 4495 "configure"
+#line 4493 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4500: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4498: \"$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*
@@ -4523,7 +4521,7 @@
done
echo $ac_n "checking for mysql_init in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:4527: checking for mysql_init in -lmysqlclient" >&5
+echo "configure:4525: 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
@@ -4531,7 +4529,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lmysqlclient $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4535 "configure"
+#line 4533 "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
@@ -4542,7 +4540,7 @@
mysql_init()
; return 0; }
EOF
-if { (eval echo configure:4546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4544: \"$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
@@ -4574,7 +4572,7 @@
EOF
echo $ac_n "checking whether to compile with MySQL support""... $ac_c" 1>&6
-echo "configure:4578: checking whether to compile with MySQL support" >&5
+echo "configure:4576: checking whether to compile with MySQL support" >&5
echo "$ac_t""yes" 1>&6
MYSQL="yes"
fi
@@ -4589,7 +4587,7 @@
echo $ac_n "checking whether to compile with LibSDB support""... $ac_c" 1>&6
-echo "configure:4593: checking whether to compile with LibSDB support" >&5
+echo "configure:4591: checking whether to compile with LibSDB support" >&5
# Check whether --enable-sdb or --disable-sdb was given.
if test "${enable_sdb+set}" = set; then
enableval="$enable_sdb"
@@ -4603,7 +4601,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:4607: checking for $ac_word" >&5
+echo "configure:4605: 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
@@ -4643,7 +4641,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:4647: checking sdb version" >&5
+echo "configure:4645: checking sdb version" >&5
sdb_version=`$SDB_CONFIG --version`
echo "$ac_t""$sdb_version" 1>&6
LIBS="$LIBS `$SDB_CONFIG --libs`"
@@ -4652,17 +4650,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4656: checking for $ac_hdr" >&5
+echo "configure:4654: 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 4661 "configure"
+#line 4659 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4666: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4664: \"$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*
@@ -4691,12 +4689,12 @@
for ac_func in sdb_init
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4695: checking for $ac_func" >&5
+echo "configure:4693: 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 4700 "configure"
+#line 4698 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4719,7 +4717,7 @@
; return 0; }
EOF
-if { (eval echo configure:4723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4721: \"$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
@@ -4765,7 +4763,7 @@
echo $ac_n "checking whether to compile with SQLite support""... $ac_c" 1>&6
-echo "configure:4769: checking whether to compile with SQLite support" >&5
+echo "configure:4767: checking whether to compile with SQLite support" >&5
# Check whether --enable-sqlite or --disable-sqlite was given.
if test "${enable_sqlite+set}" = set; then
enableval="$enable_sqlite"
@@ -4778,17 +4776,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4782: checking for $ac_hdr" >&5
+echo "configure:4780: 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 4787 "configure"
+#line 4785 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4792: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4790: \"$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*
@@ -4816,7 +4814,7 @@
LIBS="$LIBS -L/usr/local/lib"
echo $ac_n "checking for sqlite_open in -lsqlite""... $ac_c" 1>&6
-echo "configure:4820: checking for sqlite_open in -lsqlite" >&5
+echo "configure:4818: 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
@@ -4824,7 +4822,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsqlite $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4828 "configure"
+#line 4826 "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
@@ -4835,7 +4833,7 @@
sqlite_open()
; return 0; }
EOF
-if { (eval echo configure:4839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4837: \"$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
@@ -4860,7 +4858,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:4864: checking for $ac_word" >&5
+echo "configure:4862: 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
@@ -4897,7 +4895,7 @@
test -n "$SQLITE" || SQLITE="no"
echo $ac_n "checking sqlite version""... $ac_c" 1>&6
-echo "configure:4901: checking sqlite version" >&5
+echo "configure:4899: checking sqlite version" >&5
sqlite_version=`$SQLITE -version`
echo "$ac_t""$sqlite_version" 1>&6
cat >> confdefs.h <<\EOF
@@ -4917,7 +4915,7 @@
echo $ac_n "checking whether to compile with Oracle support""... $ac_c" 1>&6
-echo "configure:4921: checking whether to compile with Oracle support" >&5
+echo "configure:4919: checking whether to compile with Oracle support" >&5
# Check whether --enable-oracle or --disable-oracle was given.
if test "${enable_oracle+set}" = set; then
enableval="$enable_oracle"
@@ -4937,14 +4935,14 @@
CPPFLAGS="$CPPFLAGS -I$a"
done
echo $ac_n "checking for oci.h ""... $ac_c" 1>&6
-echo "configure:4941: checking for oci.h " >&5
+echo "configure:4939: checking for oci.h " >&5
cat > conftest.$ac_ext <<EOF
-#line 4943 "configure"
+#line 4941 "configure"
#include "confdefs.h"
#include <oci.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4948: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4946: \"$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*
@@ -4973,7 +4971,7 @@
LIBS="$LIBS -L$a"
done
echo $ac_n "checking for OCIEnvCreate in -lclntsh""... $ac_c" 1>&6
-echo "configure:4977: checking for OCIEnvCreate in -lclntsh" >&5
+echo "configure:4975: 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
@@ -4981,7 +4979,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lclntsh $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4985 "configure"
+#line 4983 "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
@@ -4992,7 +4990,7 @@
OCIEnvCreate()
; return 0; }
EOF
-if { (eval echo configure:4996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4994: \"$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
@@ -5016,7 +5014,7 @@
if test -f "$ORACLE_HOME/lib/libwtc8.so"
then
echo $ac_n "checking for wtcstu in -lwtc8""... $ac_c" 1>&6
-echo "configure:5020: checking for wtcstu in -lwtc8" >&5
+echo "configure:5018: 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
@@ -5024,7 +5022,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lwtc8 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5028 "configure"
+#line 5026 "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
@@ -5035,7 +5033,7 @@
wtcstu()
; return 0; }
EOF
-if { (eval echo configure:5039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5037: \"$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
@@ -5058,7 +5056,7 @@
else
echo $ac_n "checking for wtcstu in -lwtc9""... $ac_c" 1>&6
-echo "configure:5062: checking for wtcstu in -lwtc9" >&5
+echo "configure:5060: 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
@@ -5066,7 +5064,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lwtc9 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5070 "configure"
+#line 5068 "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
@@ -5077,7 +5075,7 @@
wtcstu()
; return 0; }
EOF
-if { (eval echo configure:5081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5079: \"$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
@@ -5105,7 +5103,7 @@
EOF
echo $ac_n "checking whether to compile with Oracle support""... $ac_c" 1>&6
-echo "configure:5109: checking whether to compile with Oracle support" >&5
+echo "configure:5107: checking whether to compile with Oracle support" >&5
echo "$ac_t""yes" 1>&6
else
@@ -5115,65 +5113,6 @@
-# Check whether --with-dlr or --without-dlr was given.
-if test "${with_dlr+set}" = set; then
- withval="$with_dlr"
-
- nl='
-'
- echo "${nl}${T_MD}Configuring DLR support ...${T_ME}"
-
- for myval in $withval; do
- echo $ac_n "checking for DLR storage type $myval""... $ac_c" 1>&6
-echo "configure:5129: checking for DLR storage type $myval" >&5
- case "$myval" in
- internal)
- ;;
- mysql)
- if test "$MYSQL" != "yes"; then
- { echo "configure: error: Option --with-dlr=mysql requires MySQL client support" 1>&2; exit 1; }
- else
- echo "$ac_t""enabled" 1>&6
- cat >> confdefs.h <<\EOF
-#define DLR_MYSQL 1
-EOF
-
- fi
- ;;
- sdb)
- if test "$SDB" != "yes"; then
- { echo "configure: error: Option --with-dlr=sdb requires SDB support" 1>&2; exit 1; }
- else
- cat >> confdefs.h <<\EOF
-#define DLR_SDB 1
-EOF
-
- echo "$ac_t""enabled" 1>&6
- fi
- ;;
- sqlite)
- if test "$SQLITE" != "yes"; then
- { echo "configure: error: Option --with-dlr=sqlte requires SQLite support" 1>&2; exit 1; }
- else
- cat >> confdefs.h <<\EOF
-#define DLR_SQLITE 1
-EOF
-
- echo "$ac_t""enabled" 1>&6
- fi
- ;;
- *)
- { echo "configure: error: Unknown DLR storage support!" 1>&2; exit 1; }
- exit 1
- ;;
- esac
- done
-
-fi
-
-
-
-
# Check whether --with-wtls or --without-wtls was given.
if test "${with_wtls+set}" = set; then
withval="$with_wtls"
@@ -5183,14 +5122,14 @@
echo "${nl}${T_MD}Configuring WTLS support ...${T_ME}"
echo $ac_n "checking for WTLS library""... $ac_c" 1>&6
-echo "configure:5187: checking for WTLS library" >&5
+echo "configure:5126: 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:5194: checking for RSA_new in -lcrypto" >&5
+echo "configure:5133: 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
@@ -5198,7 +5137,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lcrypto $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5202 "configure"
+#line 5141 "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
@@ -5209,7 +5148,7 @@
RSA_new()
; return 0; }
EOF
-if { (eval echo configure:5213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5152: \"$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
@@ -5228,17 +5167,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5232: checking for $ac_hdr" >&5
+echo "configure:5171: 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 5237 "configure"
+#line 5176 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5181: \"$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*
Index: gw/dlr_mysql.c
===================================================================
RCS file: /home/cvs/gateway/gw/dlr_mysql.c,v
retrieving revision 1.5
diff -a -u -r1.5 dlr_mysql.c
--- gw/dlr_mysql.c 15 Nov 2003 13:14:23 -0000 1.5
+++ gw/dlr_mysql.c 9 Jan 2004 11:12:11 -0000
@@ -70,7 +70,7 @@
#include "dlr_p.h"
-#ifdef DLR_MYSQL
+#ifdef HAVE_MYSQL
#include <mysql/mysql.h>
/*
@@ -392,5 +392,5 @@
{
return NULL;
}
-#endif /* DLR_MYSQL */
+#endif /* HAVE_MYSQL */
Index: gw/dlr_sdb.c
===================================================================
RCS file: /home/cvs/gateway/gw/dlr_sdb.c,v
retrieving revision 1.5
diff -a -u -r1.5 dlr_sdb.c
--- gw/dlr_sdb.c 15 Nov 2003 13:14:23 -0000 1.5
+++ gw/dlr_sdb.c 9 Jan 2004 11:12:11 -0000
@@ -68,7 +68,7 @@
#include "gwlib/gwlib.h"
#include "dlr_p.h"
-#ifdef DLR_SDB
+#ifdef HAVE_SDB
#include <sdb.h>
static char *connection;
@@ -413,4 +413,4 @@
{
return NULL;
}
-#endif /* DLR_SDB */
+#endif /* HAVE_SDB */