Skip to content

Commit 54468d2

Browse files
stigsbstigsb
committed
odbc compiles and runs on UNIX again (tested with Solid 2.3)
1 parent b7c30c1 commit 54468d2

11 files changed

+541
-1178
lines changed

‎Makefile.in

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ LIBS = $(PHPLIBS) $(EXTRA_LIBS) @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@
8686

8787
all: $(BINNAME)
8888

89-
all-recursive clean-recursive distclean-recursive:
89+
all-recursive clean-recursive distclean-recursive \
90+
maintainer-clean-depend-recursive:
9091
@set fnord $(MAKEFLAGS); amf=$$2; \
9192
for subdir in $(SUBDIRS); do \
9293
target=`echo $@ | sed s/-recursive//`; \
@@ -140,6 +141,8 @@ distclean: clean distclean-recursive
140141
-rm -f do-conf test/test.log extra/gd/bdf2gdfont
141142
-rm -f doc/Makefile regex/Makefile
142143

144+
maintainer-clean-depend: maintainer-clean-depend-recursive
145+
143146
bench: $(BINNAME)
144147
./$(BINNAME) -c. tests/bench.phtml
145148

‎acconfig.h.in

Lines changed: 10 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
/* This is the default configuration file to read */
1+
/* This is the default configuration file to read -*- C -*- */
2+
3+
/* these are defined by automake */
4+
#undef PACKAGE
5+
#undef VERSION
6+
27
#define CONFIGURATION_FILE_PATH "php3.ini"
38
#define USE_CONFIG_FILE 1
49

@@ -29,15 +34,9 @@
2934
/* Define if you have the resolv library (-lresolv). */
3035
#define HAVE_LIBRESOLV 0
3136

32-
/* Define if you have the gd library (-lgd). */
33-
#define HAVE_LIBGD 0
34-
3537
/* Define if you have the zlib library */
3638
#define HAVE_ZLIB 0
3739

38-
/* Define if you have the gd version 1.3 library (-lgd). */
39-
#define HAVE_LIBGD13 0
40-
4140
/* Define if you want safe mode enabled by default. */
4241
#define PHP_SAFE_MODE 0
4342

@@ -55,21 +54,7 @@
5554
/* in GET/POST/Cookie data */
5655
#define MAGIC_QUOTES 1
5756

58-
/* Define if you want the logging to go to ndbm/gdbm/flatfile */
59-
#define LOG_DBM 0
60-
#define LOG_DBM_DIR "."
61-
62-
/* Define if you want the logging to go to a mysql database */
63-
#define LOG_MYSQL 0
64-
65-
/* Define if you want the logging to go to a mysql database */
66-
#define LOG_MSQL 0
67-
68-
/* Define these if you are using an SQL database for logging */
69-
#define LOG_SQL_HOST ""
70-
#define LOG_SQL_DB ""
71-
72-
/* Define if you an ndbm compatible library (-ldbm). */
57+
/* Define if you have an ndbm compatible library (-ldbm). */
7358
#define NDBM 0
7459

7560
/* Define if you have the gdbm library (-lgdbm). */
@@ -79,12 +64,6 @@
7964
#define REGEX 0
8065
#define HSREGEX 0
8166

82-
/* Define if you want Solid database support */
83-
#define HAVE_SOLID 0
84-
85-
/* Define if you want to use the supplied dbase library */
86-
#define DBASE 0
87-
8867
/* Define if you want Hyperwave support */
8968
#define HYPERWAVE 0
9069

@@ -97,15 +76,6 @@
9776
/* Define if you have the Oracle version 8 database client libraries */
9877
#define HAVE_OCI8 0
9978

100-
/* Define if you want to use the iODBC database driver */
101-
#define HAVE_IODBC 0
102-
103-
/* Define if you want to use the OpenLink ODBC database driver */
104-
#define HAVE_OPENLINK 0
105-
106-
/* Define if you have the AdabasD client libraries */
107-
#define HAVE_ADABAS 0
108-
10979
/* Define if you want the LDAP directory interface */
11080
#define HAVE_LDAP 0
11181

@@ -115,12 +85,6 @@
11585
/* Define if you want the IMAP directory interface */
11686
#define HAVE_IMAP 0
11787

118-
/* Define if you want to use a custom ODBC database driver */
119-
#define HAVE_CODBC 0
120-
121-
/* Define to use the unified ODBC interface */
122-
#define HAVE_UODBC 0
123-
12488
/* Define if you have libdl (used for dynamic linking) */
12589
#define HAVE_LIBDL 0
12690

@@ -157,10 +121,6 @@
157121
/* Define if your Apache has src/include/ap_compat.h */
158122
#define HAVE_AP_COMPAT_H 0
159123

160-
#ifndef HAVE_EMPRESS
161-
#define HAVE_EMPRESS 0
162-
#endif
163-
164124
#define HAVE_SYBASE 0
165125
#define HAVE_SYBASE_CT 0
166126

@@ -176,10 +136,6 @@
176136
#define HAVE_PGSQL 0
177137
#endif
178138

179-
#ifndef HAVE_VELOCIS
180-
#define HAVE_VELOCIS 0
181-
#endif
182-
183139
#ifndef HAVE_IFX
184140
#define HAVE_IFX 0
185141
#endif
@@ -200,8 +156,10 @@
200156

201157
#define MSQL1 0
202158
#define HAVE_FILEPRO 0
203-
#define HAVE_SOLID 0
159+
160+
#ifndef DEBUG /* should be set to ZEND_DEBUG */
204161
#define DEBUG 0
162+
#endif
205163

206164
/* Define if your system has the gettimeofday() call */
207165
#define HAVE_GETTIMEOFDAY 0

‎acinclude.m4

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -33,53 +33,6 @@ AC_DEFUN(AC_MSQL_VERSION,[
3333
AC_MSG_RESULT($MSQL_VERSION)
3434
])
3535

36-
dnl
37-
dnl Figure out which library file to link with for the Solid support.
38-
dnl
39-
AC_DEFUN(AC_FIND_SOLID_LIBS,[
40-
AC_MSG_CHECKING([Solid library file])
41-
ac_solid_uname_s=`uname -s 2>/dev/null`
42-
case $ac_solid_uname_s in
43-
AIX) ac_solid_os=a3x;;
44-
HP-UX) ac_solid_os=h9x;;
45-
IRIX) ac_solid_os=irx;;
46-
Linux) ac_solid_os=lux;;
47-
SunOS) ac_solid_os=ssx;; # should we deal with SunOS 4?
48-
FreeBSD) ac_solid_os=fbx;;
49-
# "uname -s" on SCO makes no sense.
50-
esac
51-
SOLID_LIBS=`echo $1/scl${ac_solid_os}*.so | cut -d' ' -f1`
52-
if test ! -f $SOLID_LIBS; then
53-
SOLID_LIBS=`echo $1/scl${ac_solid_os}*.a | cut -d' ' -f1`
54-
fi
55-
if test ! -f $SOLID_LIBS; then
56-
SOLID_LIBS=`echo $1/scl2x${ac_solid_os}*.a | cut -d' ' -f1`
57-
fi
58-
if test ! -f $SOLID_LIBS; then
59-
SOLID_LIBS=`echo $1/scl2x${ac_solid_os}*.a | cut -d' ' -f1`
60-
fi
61-
if test ! -f $SOLID_LIBS; then
62-
SOLID_LIBS=`echo $1/bcl${ac_solid_os}*.so | cut -d' ' -f1`
63-
fi
64-
if test ! -f $SOLID_LIBS; then
65-
SOLID_LIBS=`echo $1/bcl${ac_solid_os}*.a | cut -d' ' -f1`
66-
fi
67-
AC_MSG_RESULT(`echo $SOLID_LIBS | sed -e 's!.*/!!'`)
68-
])
69-
70-
dnl
71-
dnl Figure out which library file to link with for the Empress support.
72-
dnl
73-
AC_DEFUN(AC_FIND_EMPRESS_LIBS,[
74-
AC_MSG_CHECKING([Empress library file])
75-
EMPRESS_LIBS=`echo $1/empodbc.so | cut -d' ' -f1`
76-
if test ! -f $EMPRESS_LIBS; then
77-
EMPRESS_LIBS=`echo $1/empodbc.a | cut -d' ' -f1`
78-
fi
79-
AC_MSG_RESULT(`echo $EMPRESS_LIBS | sed -e 's!.*/!!'`)
80-
])
81-
82-
8336
dnl
8437
dnl See if we have broken header files like SunOS has.
8538
dnl

‎build-defs.h.in

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,10 @@
8383
#define PHP_LDAP_LIBS "@LDAP_LIBS@"
8484
#define PHP_VELOCIS_INCLUDE "@VELOCIS_INCLUDE@"
8585
#define PHP_VELOCIS_LIBS "@VELOCIS_LIBS@"
86+
87+
#define ODBC_TYPE "@ODBC_TYPE@"
88+
#define ODBC_INCDIR "@ODBC_INCDIR@"
89+
#define ODBC_INCLUDE "@ODBC_INCLUDE@"
90+
#define ODBC_LIBDIR "@ODBC_LIBDIR@"
91+
#define ODBC_LFLAGS "@ODBC_LFLAGS@"
92+
#define ODBC_LIBS "@ODBC_LIBS@"

‎config.h.in

Lines changed: 40 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,10 @@
6565
/* Define to `int' if <sys/types.h> doesn't define. */
6666
#undef uid_t
6767

68-
/* This is the default configuration file to read */
68+
/* these are defined by automake */
69+
#undef PACKAGE
70+
#undef VERSION
71+
6972
#define CONFIGURATION_FILE_PATH "php3.ini"
7073
#define USE_CONFIG_FILE 1
7174

@@ -92,15 +95,9 @@
9295
/* Define if you have the resolv library (-lresolv). */
9396
#define HAVE_LIBRESOLV 0
9497

95-
/* Define if you have the gd library (-lgd). */
96-
#define HAVE_LIBGD 0
97-
9898
/* Define if you have the zlib library */
9999
#define HAVE_ZLIB 0
100100

101-
/* Define if you have the gd version 1.3 library (-lgd). */
102-
#define HAVE_LIBGD13 0
103-
104101
/* Define if you want safe mode enabled by default. */
105102
#define PHP_SAFE_MODE 0
106103

@@ -118,7 +115,7 @@
118115
/* in GET/POST/Cookie data */
119116
#define MAGIC_QUOTES 1
120117

121-
/* Define if you an ndbm compatible library (-ldbm). */
118+
/* Define if you have an ndbm compatible library (-ldbm). */
122119
#define NDBM 0
123120

124121
/* Define if you have the gdbm library (-lgdbm). */
@@ -128,12 +125,6 @@
128125
#define REGEX 0
129126
#define HSREGEX 0
130127

131-
/* Define if you want Solid database support */
132-
#define HAVE_SOLID 0
133-
134-
/* Define if you want to use the supplied dbase library */
135-
#define DBASE 0
136-
137128
/* Define if you want Hyperwave support */
138129
#define HYPERWAVE 0
139130

@@ -143,15 +134,6 @@
143134
/* Define if you have the Oracle version 8 database client libraries */
144135
#define HAVE_OCI8 0
145136

146-
/* Define if you want to use the iODBC database driver */
147-
#define HAVE_IODBC 0
148-
149-
/* Define if you want to use the OpenLink ODBC database driver */
150-
#define HAVE_OPENLINK 0
151-
152-
/* Define if you have the AdabasD client libraries */
153-
#define HAVE_ADABAS 0
154-
155137
/* Define if you want the LDAP directory interface */
156138
#define HAVE_LDAP 0
157139

@@ -161,12 +143,6 @@
161143
/* Define if you want the IMAP directory interface */
162144
#define HAVE_IMAP 0
163145

164-
/* Define if you want to use a custom ODBC database driver */
165-
#define HAVE_CODBC 0
166-
167-
/* Define to use the unified ODBC interface */
168-
#define HAVE_UODBC 0
169-
170146
/* Define if you have libdl (used for dynamic linking) */
171147
#define HAVE_LIBDL 0
172148

@@ -203,10 +179,6 @@
203179
/* Define if your Apache has src/include/ap_compat.h */
204180
#define HAVE_AP_COMPAT_H 0
205181

206-
#ifndef HAVE_EMPRESS
207-
#define HAVE_EMPRESS 0
208-
#endif
209-
210182
#define HAVE_SYBASE 0
211183
#define HAVE_SYBASE_CT 0
212184

@@ -222,10 +194,6 @@
222194
#define HAVE_PGSQL 0
223195
#endif
224196

225-
#ifndef HAVE_VELOCIS
226-
#define HAVE_VELOCIS 0
227-
#endif
228-
229197
#ifndef HAVE_IFX
230198
#define HAVE_IFX 0
231199
#endif
@@ -246,8 +214,10 @@
246214

247215
#define MSQL1 0
248216
#define HAVE_FILEPRO 0
249-
#define HAVE_SOLID 0
217+
218+
#ifndef DEBUG /* should be set to ZEND_DEBUG */
250219
#define DEBUG 0
220+
#endif
251221

252222
/* Define if you want to enable bc style precision math support */
253223
#define WITH_BCMATH 0
@@ -295,6 +265,38 @@
295265

296266
/* Define to compile with mod_dav support */
297267
#define HAVE_MOD_DAV 0
268+
/* Define if you want to use the supplied dbase library */
269+
#define DBASE 0
270+
/* Define if you have the gd library (-lgd). */
271+
#define HAVE_LIBGD 0
272+
273+
/* Define if you have the gd version 1.3 library (-lgd). */
274+
#define HAVE_LIBGD13 0
275+
/* Define if you want Solid database support */
276+
#define HAVE_SOLID 0
277+
278+
/* Define if you want to use the iODBC database driver */
279+
#define HAVE_IODBC 0
280+
281+
/* Define if you want to use the OpenLink ODBC database driver */
282+
#define HAVE_OPENLINK 0
283+
284+
/* Define if you have the AdabasD client libraries */
285+
#define HAVE_ADABAS 0
286+
287+
/* Define if you want to use a custom ODBC database driver */
288+
#define HAVE_CODBC 0
289+
290+
/* Define to use the unified ODBC interface */
291+
#define HAVE_UODBC 0
292+
293+
#ifndef HAVE_EMPRESS
294+
#define HAVE_EMPRESS 0
295+
#endif
296+
297+
#ifndef HAVE_VELOCIS
298+
#define HAVE_VELOCIS 0
299+
#endif
298300

299301
/* Define if you have the crypt function. */
300302
#undef HAVE_CRYPT

0 commit comments

Comments
 (0)