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

1 files changed, 10 insertions, 52 deletions

diff --git a/acconfig.h.in b/acconfig.h.in
index 663f5b9e22..c5d3f9e1e4 100644
--- a/acconfig.h.in
+++ b/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