configure.in had the new search paths added, but configure was not
updated.
Here is the patch to accomplish that:
--
Ryan Butler <[EMAIL PROTECTED]>
ADI Internet Solutions
diff -ur dbmail/configure dbmail.working/configure
--- dbmail/configure Fri Feb 7 13:54:10 2003
+++ dbmail.working/configure Thu Feb 20 10:23:21 2003
@@ -842,19 +842,24 @@
mysqllibpaths="/usr/lib /usr/local/lib /lib /usr/freeware/lib \
- /usr/freeware/lib32 $HOME/lib $HOME/tcl/lib $HOME"
+ /usr/freeware/lib32 $HOME/lib $HOME/mysql/lib \
+ /usr/lib/mysql /usr/local/lib/mysql $HOME/lib/mysql $HOME"
+
mysqlheaderpaths="/usr/include/mysql /usr/include /usr/local/include/mysql \
/usr/local/include /usr/freeware/include/mysql \
/usr/freeware/include $HOME/include $HOME/mysql/include \
$HOME"
pgsqllibpaths="/usr/lib /usr/local/lib /lib /usr/freeware/lib \
- /usr/freeware/lib32 $HOME/lib $HOME/tcl/lib $HOME"
+ /usr/freeware/lib32 $HOME/lib $HOME/pgsql/lib \
+ /usr/lib/pgsql /usr/local/lib/pgsql /usr/lib/postgresql \
+ /usr/local/lib/postgresql $HOME/lib/pgsql $HOME/lib/postgresql \
+ $HOME/postgresql/lib $HOME"
pgsqlheaderpaths="/usr/include/pgsql /usr/include /usr/local/include/pgsql \
/usr/local/include /usr/freeware/include/pgsql \
/usr/freeware/include $HOME/include $HOME/pgsql/include \
- /usr/local/pgsql/include $HOME"
+ /usr/local/pgsql/include /usr/include/postgresql $HOME"
# Check whether --with-mysql or --without-mysql was given.
if test "${with_mysql+set}" = set; then
@@ -917,7 +922,7 @@
if test "$withval" != "yes"
then
echo $ac_n "checking for mysql.h (user supplied)""... $ac_c" 1>&6
-echo "configure:921: checking for mysql.h (user supplied)" >&5
+echo "configure:926: checking for mysql.h (user supplied)" >&5
if test -r "$mysqlheadername/mysql.h"
then
# found
@@ -935,7 +940,7 @@
else
# Lets look in our standard paths
echo $ac_n "checking for mysql.h""... $ac_c" 1>&6
-echo "configure:939: checking for mysql.h" >&5
+echo "configure:944: checking for mysql.h" >&5
for mysqlpaths in $mysqlheaderpaths
do
if test -r "$mysqlpaths/mysql.h"
@@ -962,7 +967,7 @@
if test "$withval" != "yes"
then
echo $ac_n "checking for libpq-fe.h (user supplied)""... $ac_c" 1>&6
-echo "configure:966: checking for libpq-fe.h (user supplied)" >&5
+echo "configure:971: checking for libpq-fe.h (user supplied)" >&5
if test -r "$pgsqlheadername/libpq-fe.h"
then
# found
@@ -980,7 +985,7 @@
else
# Lets look in our standard paths
echo $ac_n "checking for libpq-fe.h""... $ac_c" 1>&6
-echo "configure:984: checking for libpq-fe.h" >&5
+echo "configure:989: checking for libpq-fe.h" >&5
for pgsqlpaths in $pgsqlheaderpaths
do
if test -r "$pgsqlpaths/libpq-fe.h"
@@ -1004,7 +1009,7 @@
if test ! "${mysqlheadername-x}" = "x"
then
echo $ac_n "checking for mysql_real_connect in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:1008: checking for mysql_real_connect in -lmysqlclient" >&5
+echo "configure:1013: checking for mysql_real_connect in -lmysqlclient" >&5
ac_lib_var=`echo mysqlclient'_'mysql_real_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
@@ -1012,7 +1017,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lmysqlclient $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1016 "configure"
+#line 1021 "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
@@ -1023,7 +1028,7 @@
mysql_real_connect()
; return 0; }
EOF
-if { (eval echo configure:1027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1032: \"$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
@@ -1055,7 +1060,7 @@
if test ! "${pgsqlheadername-x}" = "x"
then
echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6
-echo "configure:1059: checking for PQconnectdb in -lpq" >&5
+echo "configure:1064: checking for PQconnectdb in -lpq" >&5
ac_lib_var=`echo pq'_'PQconnectdb | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1063,7 +1068,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1067 "configure"
+#line 1072 "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
@@ -1074,7 +1079,7 @@
PQconnectdb()
; return 0; }
EOF
-if { (eval echo configure:1078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1083: \"$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
@@ -1109,7 +1114,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:1113: checking for $ac_word" >&5
+echo "configure:1118: 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
@@ -1139,7 +1144,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:1143: checking for $ac_word" >&5
+echo "configure:1148: 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
@@ -1190,7 +1195,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:1194: checking for $ac_word" >&5
+echo "configure:1199: 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
@@ -1222,7 +1227,7 @@
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1226: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1231: 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.
@@ -1233,12 +1238,12 @@
cat > conftest.$ac_ext << EOF
-#line 1237 "configure"
+#line 1242 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:1242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1247: \"$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
@@ -1264,12 +1269,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:1268: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1273: 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:1273: checking whether we are using GNU C" >&5
+echo "configure:1278: 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
@@ -1278,7 +1283,7 @@
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1282: \"$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:1287: \"$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
@@ -1297,7 +1302,7 @@
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1301: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1306: 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
@@ -1329,12 +1334,12 @@
fi
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1333: checking for working const" >&5
+echo "configure:1338: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1338 "configure"
+#line 1343 "configure"
#include "confdefs.h"
int main() {
@@ -1383,7 +1388,7 @@
; return 0; }
EOF
-if { (eval echo configure:1387: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1392: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -1404,21 +1409,21 @@
fi
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:1408: checking for inline" >&5
+echo "configure:1413: checking for inline" >&5
if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat > conftest.$ac_ext <<EOF
-#line 1415 "configure"
+#line 1420 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:1422: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1427: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
diff -ur dbmail/mysql/Makefile.in dbmail.working/mysql/Makefile.in
--- dbmail/mysql/Makefile.in Fri Jul 26 16:22:43 2002
+++ dbmail.working/mysql/Makefile.in Thu Feb 20 10:23:22 2003
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -68,11 +68,12 @@
SQLLIB = @SQLLIB@
VERSION = @VERSION@
[EMAIL PROTECTED]@AM_CFLAGS = -I @MYSQLINC@
[EMAIL PROTECTED]@AM_CFLAGS = @[EMAIL PROTECTED] @MYSQLINC@
[EMAIL PROTECTED]@lib_LIBRARIES = libmysqldbmail.a
[EMAIL PROTECTED]@lib_LIBRARIES = @[EMAIL PROTECTED]
[EMAIL PROTECTED]@libmysqldbmail_a_SOURCES = dbauthmysql.c dbmysql.c dbmsgbufmysql.c dbsearchmysql.c
[EMAIL PROTECTED]@libmysqldbmail_a_SOURCES = @[EMAIL PROTECTED] dbmysql.c dbmsgbufmysql.c \
[EMAIL PROTECTED]@ dbsearchmysql.c
mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
CONFIG_CLEAN_FILES =
LIBRARIES = $(lib_LIBRARIES)
@@ -95,7 +96,7 @@
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-TAR = tar
+TAR = gtar
GZIP_ENV = --best
DEP_FILES = .deps/dbauthmysql.P .deps/dbmsgbufmysql.P .deps/dbmysql.P \
.deps/dbsearchmysql.P
diff -ur dbmail/pgsql/Makefile.in dbmail.working/pgsql/Makefile.in
--- dbmail/pgsql/Makefile.in Fri Jul 26 16:22:43 2002
+++ dbmail.working/pgsql/Makefile.in Thu Feb 20 10:23:23 2003
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -68,9 +68,9 @@
SQLLIB = @SQLLIB@
VERSION = @VERSION@
[EMAIL PROTECTED]@AM_CFLAGS = -I @PGSQLINC@
[EMAIL PROTECTED]@lib_LIBRARIES = libpgsqldbmail.a
[EMAIL PROTECTED]@libpgsqldbmail_a_SOURCES = dbauthpgsql.c dbpgsql.c dbmsgbufpgsql.c dbsearchpgsql.c
[EMAIL PROTECTED]@AM_CFLAGS = @[EMAIL PROTECTED] @PGSQLINC@
[EMAIL PROTECTED]@lib_LIBRARIES = @[EMAIL PROTECTED]
[EMAIL PROTECTED]@libpgsqldbmail_a_SOURCES = @[EMAIL PROTECTED] dbpgsql.c dbmsgbufpgsql.c dbsearchpgsql.c
mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs
CONFIG_CLEAN_FILES =
LIBRARIES = $(lib_LIBRARIES)
@@ -93,7 +93,7 @@
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-TAR = tar
+TAR = gtar
GZIP_ENV = --best
DEP_FILES = .deps/dbauthpgsql.P .deps/dbmsgbufpgsql.P .deps/dbpgsql.P \
.deps/dbsearchpgsql.P
