odbc compiles and runs on UNIX again (tested with Solid 2.3)

Makefile.in

@@ -86,7 +86,8 @@ LIBS = $(PHPLIBS) $(EXTRA_LIBS) @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@
 
 all: $(BINNAME)
 
-all-recursive clean-recursive distclean-recursive:
+all-recursive clean-recursive distclean-recursive \
+maintainer-clean-depend-recursive:
 	@set fnord $(MAKEFLAGS); amf=$$2; \
 	for subdir in $(SUBDIRS); do \
 		target=`echo $@ | sed s/-recursive//`; \
@@ -140,6 +141,8 @@ distclean: clean distclean-recursive
 	-rm -f do-conf test/test.log extra/gd/bdf2gdfont
 	-rm -f doc/Makefile regex/Makefile
 
+maintainer-clean-depend: maintainer-clean-depend-recursive
+
 bench: $(BINNAME)
 	./$(BINNAME) -c. tests/bench.phtml
 

acconfig.h.in

@@ -1,4 +1,9 @@
-/* This is the default configuration file to read */
+/* This is the default configuration file to read -*- C -*- */
+
+/* these are defined by automake */
+#undef PACKAGE
+#undef VERSION
+
 #define CONFIGURATION_FILE_PATH "php3.ini"
 #define USE_CONFIG_FILE 1
 
@@ -29,15 +34,9 @@
 /* Define if you have the resolv library (-lresolv). */
 #define HAVE_LIBRESOLV 0
 
-/* Define if you have the gd library (-lgd). */
-#define HAVE_LIBGD 0
-
 /* Define if you have the zlib library */
 #define HAVE_ZLIB 0
 
-/* Define if you have the gd version 1.3 library (-lgd). */
-#define HAVE_LIBGD13 0
-
 /* Define if you want safe mode enabled by default. */
 #define PHP_SAFE_MODE 0
 
@@ -55,21 +54,7 @@
 /* in GET/POST/Cookie data */
 #define MAGIC_QUOTES 1
 
-/* Define if you want the logging to go to ndbm/gdbm/flatfile */
-#define LOG_DBM 0
-#define LOG_DBM_DIR "."
-
-/* Define if you want the logging to go to a mysql database */
-#define LOG_MYSQL 0
-
-/* Define if you want the logging to go to a mysql database */
-#define LOG_MSQL 0
-
-/* Define these if you are using an SQL database for logging */
-#define LOG_SQL_HOST ""
-#define LOG_SQL_DB ""
-
-/* Define if you an ndbm compatible library (-ldbm).  */
+/* Define if you have an ndbm compatible library (-ldbm).  */
 #define NDBM 0
 
 /* Define if you have the gdbm library (-lgdbm).  */
@@ -79,12 +64,6 @@
 #define REGEX 0
 #define HSREGEX 0
 
-/* Define if you want Solid database support */
-#define HAVE_SOLID 0
-
-/* Define if you want to use the supplied dbase library */
-#define DBASE 0
-
 /* Define if you want Hyperwave support */
 #define HYPERWAVE 0
 
@@ -97,15 +76,6 @@
 /* Define if you have the Oracle version 8 database client libraries */
 #define HAVE_OCI8 0
 
-/* Define if you want to use the iODBC database driver */
-#define HAVE_IODBC 0
-
-/* Define if you want to use the OpenLink ODBC database driver */
-#define HAVE_OPENLINK 0
-
-/* Define if you have the AdabasD client libraries */
-#define HAVE_ADABAS 0
-
 /* Define if you want the LDAP directory interface */
 #define HAVE_LDAP 0
 
@@ -115,12 +85,6 @@
 /* Define if you want the IMAP directory interface */
 #define HAVE_IMAP 0
 
-/* Define if you want to use a custom ODBC database driver */
-#define HAVE_CODBC 0
-
-/* Define to use the unified ODBC interface */
-#define HAVE_UODBC 0
-
 /* Define if you have libdl (used for dynamic linking) */
 #define HAVE_LIBDL 0
 
@@ -157,10 +121,6 @@
 /* Define if your Apache has src/include/ap_compat.h */
 #define HAVE_AP_COMPAT_H 0
 
-#ifndef HAVE_EMPRESS
-#define HAVE_EMPRESS 0
-#endif
-
 #define HAVE_SYBASE 0
 #define HAVE_SYBASE_CT 0
 
@@ -176,10 +136,6 @@
 #define HAVE_PGSQL 0
 #endif
 
-#ifndef HAVE_VELOCIS
-#define HAVE_VELOCIS 0
-#endif
-
 #ifndef HAVE_IFX
 #define HAVE_IFX 0
 #endif
@@ -200,8 +156,10 @@
 
 #define MSQL1 0
 #define HAVE_FILEPRO 0
-#define HAVE_SOLID 0
+
+#ifndef DEBUG /* should be set to ZEND_DEBUG */
 #define DEBUG 0
+#endif
 
 /* Define if your system has the gettimeofday() call */
 #define HAVE_GETTIMEOFDAY 0

acinclude.m4

@@ -33,53 +33,6 @@ AC_DEFUN(AC_MSQL_VERSION,[
   AC_MSG_RESULT($MSQL_VERSION)
 ])
 
-dnl
-dnl Figure out which library file to link with for the Solid support.
-dnl
-AC_DEFUN(AC_FIND_SOLID_LIBS,[
-  AC_MSG_CHECKING([Solid library file])
-  ac_solid_uname_s=`uname -s 2>/dev/null`
-  case $ac_solid_uname_s in
-    AIX) ac_solid_os=a3x;;
-    HP-UX) ac_solid_os=h9x;;
-    IRIX) ac_solid_os=irx;;
-    Linux) ac_solid_os=lux;;
-    SunOS) ac_solid_os=ssx;; # should we deal with SunOS 4?
-    FreeBSD) ac_solid_os=fbx;;
-    # "uname -s" on SCO makes no sense.
-  esac
-  SOLID_LIBS=`echo $1/scl${ac_solid_os}*.so | cut -d' ' -f1`
-  if test ! -f $SOLID_LIBS; then
-    SOLID_LIBS=`echo $1/scl${ac_solid_os}*.a | cut -d' ' -f1`
-  fi
-  if test ! -f $SOLID_LIBS; then
-    SOLID_LIBS=`echo $1/scl2x${ac_solid_os}*.a | cut -d' ' -f1`
-  fi
-  if test ! -f $SOLID_LIBS; then
-    SOLID_LIBS=`echo $1/scl2x${ac_solid_os}*.a | cut -d' ' -f1`
-  fi
-  if test ! -f $SOLID_LIBS; then
-    SOLID_LIBS=`echo $1/bcl${ac_solid_os}*.so | cut -d' ' -f1`
-  fi
-  if test ! -f $SOLID_LIBS; then
-    SOLID_LIBS=`echo $1/bcl${ac_solid_os}*.a | cut -d' ' -f1`
-  fi
-  AC_MSG_RESULT(`echo $SOLID_LIBS | sed -e 's!.*/!!'`)
-])
-
-dnl
-dnl Figure out which library file to link with for the Empress support.
-dnl
-AC_DEFUN(AC_FIND_EMPRESS_LIBS,[
-  AC_MSG_CHECKING([Empress library file])
-  EMPRESS_LIBS=`echo $1/empodbc.so | cut -d' ' -f1`
-  if test ! -f $EMPRESS_LIBS; then
-    EMPRESS_LIBS=`echo $1/empodbc.a | cut -d' ' -f1`
-  fi
-  AC_MSG_RESULT(`echo $EMPRESS_LIBS | sed -e 's!.*/!!'`)
-])
-
-
 dnl
 dnl See if we have broken header files like SunOS has.
 dnl

build-defs.h.in

@@ -83,3 +83,10 @@
 #define PHP_LDAP_LIBS		"@LDAP_LIBS@"
 #define PHP_VELOCIS_INCLUDE     "@VELOCIS_INCLUDE@"
 #define PHP_VELOCIS_LIBS        "@VELOCIS_LIBS@"
+
+#define ODBC_TYPE       "@ODBC_TYPE@"
+#define ODBC_INCDIR     "@ODBC_INCDIR@"
+#define ODBC_INCLUDE    "@ODBC_INCLUDE@"
+#define ODBC_LIBDIR     "@ODBC_LIBDIR@"
+#define ODBC_LFLAGS     "@ODBC_LFLAGS@"
+#define ODBC_LIBS       "@ODBC_LIBS@"

config.h.in

@@ -65,7 +65,10 @@
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef uid_t
 
-/* This is the default configuration file to read */
+/* these are defined by automake */
+#undef PACKAGE
+#undef VERSION
+
 #define CONFIGURATION_FILE_PATH "php3.ini"
 #define USE_CONFIG_FILE 1
 
@@ -92,15 +95,9 @@
 /* Define if you have the resolv library (-lresolv). */
 #define HAVE_LIBRESOLV 0
 
-/* Define if you have the gd library (-lgd). */
-#define HAVE_LIBGD 0
-
 /* Define if you have the zlib library */
 #define HAVE_ZLIB 0
 
-/* Define if you have the gd version 1.3 library (-lgd). */
-#define HAVE_LIBGD13 0
-
 /* Define if you want safe mode enabled by default. */
 #define PHP_SAFE_MODE 0
 
@@ -118,7 +115,7 @@
 /* in GET/POST/Cookie data */
 #define MAGIC_QUOTES 1
 
-/* Define if you an ndbm compatible library (-ldbm).  */
+/* Define if you have an ndbm compatible library (-ldbm).  */
 #define NDBM 0
 
 /* Define if you have the gdbm library (-lgdbm).  */
@@ -128,12 +125,6 @@
 #define REGEX 0
 #define HSREGEX 0
 
-/* Define if you want Solid database support */
-#define HAVE_SOLID 0
-
-/* Define if you want to use the supplied dbase library */
-#define DBASE 0
-
 /* Define if you want Hyperwave support */
 #define HYPERWAVE 0
 
@@ -143,15 +134,6 @@
 /* Define if you have the Oracle version 8 database client libraries */
 #define HAVE_OCI8 0
 
-/* Define if you want to use the iODBC database driver */
-#define HAVE_IODBC 0
-
-/* Define if you want to use the OpenLink ODBC database driver */
-#define HAVE_OPENLINK 0
-
-/* Define if you have the AdabasD client libraries */
-#define HAVE_ADABAS 0
-
 /* Define if you want the LDAP directory interface */
 #define HAVE_LDAP 0
 
@@ -161,12 +143,6 @@
 /* Define if you want the IMAP directory interface */
 #define HAVE_IMAP 0
 
-/* Define if you want to use a custom ODBC database driver */
-#define HAVE_CODBC 0
-
-/* Define to use the unified ODBC interface */
-#define HAVE_UODBC 0
-
 /* Define if you have libdl (used for dynamic linking) */
 #define HAVE_LIBDL 0
 
@@ -203,10 +179,6 @@
 /* Define if your Apache has src/include/ap_compat.h */
 #define HAVE_AP_COMPAT_H 0
 
-#ifndef HAVE_EMPRESS
-#define HAVE_EMPRESS 0
-#endif
-
 #define HAVE_SYBASE 0
 #define HAVE_SYBASE_CT 0
 
@@ -222,10 +194,6 @@
 #define HAVE_PGSQL 0
 #endif
 
-#ifndef HAVE_VELOCIS
-#define HAVE_VELOCIS 0
-#endif
-
 #ifndef HAVE_IFX
 #define HAVE_IFX 0
 #endif
@@ -246,8 +214,10 @@
 
 #define MSQL1 0
 #define HAVE_FILEPRO 0
-#define HAVE_SOLID 0
+
+#ifndef DEBUG /* should be set to ZEND_DEBUG */
 #define DEBUG 0
+#endif
 
 /* Define if you want to enable bc style precision math support */
 #define WITH_BCMATH 0
@@ -295,6 +265,38 @@
 
 /* Define to compile with mod_dav support */
 #define HAVE_MOD_DAV 0
+/* Define if you want to use the supplied dbase library */
+#define DBASE 0
+/* Define if you have the gd library (-lgd). */
+#define HAVE_LIBGD 0
+
+/* Define if you have the gd version 1.3 library (-lgd). */
+#define HAVE_LIBGD13 0
+/* Define if you want Solid database support */
+#define HAVE_SOLID 0
+
+/* Define if you want to use the iODBC database driver */
+#define HAVE_IODBC 0
+
+/* Define if you want to use the OpenLink ODBC database driver */
+#define HAVE_OPENLINK 0
+
+/* Define if you have the AdabasD client libraries */
+#define HAVE_ADABAS 0
+
+/* Define if you want to use a custom ODBC database driver */
+#define HAVE_CODBC 0
+
+/* Define to use the unified ODBC interface */
+#define HAVE_UODBC 0
+
+#ifndef HAVE_EMPRESS
+#define HAVE_EMPRESS 0
+#endif
+
+#ifndef HAVE_VELOCIS
+#define HAVE_VELOCIS 0
+#endif
 
 /* Define if you have the crypt function.  */
 #undef HAVE_CRYPT