@@ -14,22 +14,26 @@ AC_DEFUN([PHP_ODBC_FIND_SOLID_LIBS],[
14
14
HP-UX) ac_solid_os=h9x;; # h1x for hpux11, h0x for hpux10
15
15
Linux)
16
16
if ldd -v /bin/sh | grep GLIBC > /dev/null; then
17
- AC_DEFINE ( SS_LINUX ,1 ,[ Needed in sqlunix.h ] )
18
17
ac_solid_os=l2x
19
18
else
20
- AC_DEFINE ( SS_LINUX ,1 ,[ Needed in sqlunix.h ] )
21
19
ac_solid_os=lux
22
- fi;;
20
+ fi
21
+ AC_DEFINE ( [ SS_LINUX] , [ 1] ,
22
+ [ Define to 1 to be able to use the obsolete <sqlunix.h> header file on
23
+ some Linux systems.] )
24
+ ;;
23
25
SunOS)
24
26
ac_solid_os=ssx;; # should we deal with SunOS 4?
25
27
FreeBSD)
26
28
if test `expr $ac_solid_uname_r : '\(.\)'` -gt "2"; then
27
- AC_DEFINE ( SS_FBX ,1 ,[ Needed in sqlunix.h for wchar defs ] )
28
29
ac_solid_os=fex
29
30
else
30
- AC_DEFINE ( SS_FBX ,1 ,[ Needed in sqlunix.h for wchar defs ] )
31
31
ac_solid_os=fbx
32
- fi;;
32
+ fi
33
+ AC_DEFINE ( [ SS_FBX] , [ 1] ,
34
+ [ Define to 1 to be able to use the wchar defs in the obsolete
35
+ <sqlunix.h> header file on some FreeBSD systems.] )
36
+ ;;
33
37
esac
34
38
35
39
if test -f $1 /soc${ac_solid_os}35.a; then
@@ -119,7 +123,8 @@ PHP_ARG_WITH([adabas],,
119
123
ODBC_TYPE=adabas
120
124
ODBC_INCDIR=$PHP_ADABAS/incl
121
125
PHP_ODBC_CHECK_HEADER(sqlext.h)
122
- AC_DEFINE ( HAVE_ADABAS ,1 ,[ ] )
126
+ AC_DEFINE ( [ HAVE_ADABAS] , [ 1] ,
127
+ [ Define to 1 if the odbc extension uses the Adabas D.] )
123
128
AC_MSG_RESULT ( [ $ext_output] )
124
129
else
125
130
AC_MSG_RESULT ( [ no] )
@@ -140,7 +145,8 @@ PHP_ARG_WITH([sapdb],,
140
145
PHP_ADD_LIBPATH([ $PHP_SAPDB/$PHP_LIBDIR] )
141
146
PHP_ADD_LIBRARY([ sqlod] )
142
147
ODBC_TYPE=sapdb
143
- AC_DEFINE ( HAVE_SAPDB ,1 ,[ ] )
148
+ AC_DEFINE ( [ HAVE_SAPDB] , [ 1] ,
149
+ [ Define to 1 if the odbc extension uses the SAP DB.] )
144
150
AC_MSG_RESULT ( [ $ext_output] )
145
151
else
146
152
AC_MSG_RESULT ( [ no] )
@@ -162,11 +168,12 @@ PHP_ARG_WITH([solid],,
162
168
ODBC_CFLAGS=-I$ODBC_INCDIR
163
169
ODBC_TYPE=solid
164
170
if test -f $ODBC_LIBDIR/soc*35.a; then
165
- AC_DEFINE ( HAVE_SOLID_35 , 1 , [ ] )
171
+ AC_DEFINE ( [ HAVE_SOLID_35] , [ 1 ] , [ Define to 1 if Solid DB 3.5 is used. ] )
166
172
elif test -f $ODBC_LIBDIR/scl*30.a; then
167
- AC_DEFINE ( HAVE_SOLID_30 , 1 , [ ] )
173
+ AC_DEFINE ( [ HAVE_SOLID_30] , [ 1 ] , [ Define to 1 if Solid DB 3.0 is used. ] )
168
174
elif test -f $ODBC_LIBDIR/scl*23.a; then
169
- AC_DEFINE ( HAVE_SOLID ,1 ,[ ] )
175
+ AC_DEFINE ( [ HAVE_SOLID] , [ 1] ,
176
+ [ Define to 1 if the odbc extension uses the Solid DB.] )
170
177
fi
171
178
AC_MSG_RESULT ( [ $ext_output] )
172
179
PHP_ODBC_FIND_SOLID_LIBS($ODBC_LIBDIR)
@@ -198,7 +205,8 @@ PHP_ARG_WITH([ibm-db2],,
198
205
ODBC_LIBS=-ldb2
199
206
200
207
PHP_TEST_BUILD([ SQLExecute] , [
201
- AC_DEFINE ( HAVE_IBMDB2 ,1 ,[ ] )
208
+ AC_DEFINE ( [ HAVE_IBMDB2] , [ 1] ,
209
+ [ Define to 1 if the odbc extension uses the IBM DB2.] )
202
210
AC_MSG_RESULT ( [ $ext_output] )
203
211
] , [
204
212
AC_MSG_RESULT ( [ no] )
@@ -232,7 +240,8 @@ PHP_ARG_WITH([empress],,
232
240
ODBC_CFLAGS=-I$ODBC_INCDIR
233
241
ODBC_LFLAGS=-L$ODBC_LIBDIR
234
242
ODBC_TYPE=empress
235
- AC_DEFINE ( HAVE_EMPRESS ,1 ,[ ] )
243
+ AC_DEFINE ( [ HAVE_EMPRESS] , [ 1] ,
244
+ [ Define to 1 if the odbc extension uses the Empress.] )
236
245
AC_MSG_RESULT ( [ $ext_output] )
237
246
PHP_ODBC_FIND_EMPRESS_LIBS($ODBC_LIBDIR)
238
247
else
@@ -274,7 +283,8 @@ PHP_ARG_WITH([empress-bcs],,
274
283
done
275
284
ODBC_LIBS="-lempphpbcs -lms -lmscfg -lbasic -lbasic_os -lnlscstab -lnlsmsgtab -lm -ldl -lcrypt"
276
285
ODBC_TYPE=empress-bcs
277
- AC_DEFINE ( HAVE_EMPRESS ,1 ,[ ] )
286
+ AC_DEFINE ( [ HAVE_EMPRESS] , [ 1] ,
287
+ [ Define to 1 if the odbc extension uses the Empress.] )
278
288
AC_MSG_RESULT ( [ $ext_output] )
279
289
PHP_ODBC_FIND_EMPRESS_BCS_LIBS($ODBC_LIBDIR)
280
290
else
@@ -303,7 +313,8 @@ PHP_ARG_WITH([custom-odbc],,
303
313
ODBC_CFLAGS=-I$ODBC_INCDIR
304
314
ODBC_LIBS=$CUSTOM_ODBC_LIBS
305
315
ODBC_TYPE=custom-odbc
306
- AC_DEFINE ( HAVE_CODBC ,1 ,[ ] )
316
+ AC_DEFINE ( [ HAVE_CODBC] , [ 1] ,
317
+ [ Define to 1 if the odbc extension uses custom ODBC installation.] )
307
318
AC_MSG_RESULT ( [ $ext_output] )
308
319
else
309
320
AC_MSG_RESULT ( [ no] )
@@ -321,7 +332,8 @@ PHP_ARG_WITH([iodbc],,
321
332
PKG_CHECK_MODULES([ ODBC] , [ libiodbc] )
322
333
PHP_EVAL_INCLINE([ $ODBC_CFLAGS] )
323
334
ODBC_TYPE=iodbc
324
- AC_DEFINE ( HAVE_IODBC ,1 ,[ ] )
335
+ AC_DEFINE ( [ HAVE_IODBC] , [ 1] ,
336
+ [ Define to 1 if the odbc extension uses the iODBC.] )
325
337
else
326
338
AC_MSG_RESULT ( [ no] )
327
339
fi
@@ -343,7 +355,8 @@ PHP_ARG_WITH([esoob],,
343
355
ODBC_CFLAGS=-I$ODBC_INCDIR
344
356
ODBC_LIBS=-lesoobclient
345
357
ODBC_TYPE=esoob
346
- AC_DEFINE ( HAVE_ESOOB ,1 ,[ ] )
358
+ AC_DEFINE ( [ HAVE_ESOOB] , [ 1] ,
359
+ [ Define to 1 if the odbc extension uses the Easysoft OOB.] )
347
360
AC_MSG_RESULT ( [ $ext_output] )
348
361
else
349
362
AC_MSG_RESULT ( [ no] )
@@ -372,7 +385,8 @@ PHP_ARG_WITH([unixODBC],,
372
385
AC_MSG_RESULT ( [ yes in $PHP_UNIXODBC] )
373
386
fi
374
387
ODBC_TYPE=unixODBC
375
- AC_DEFINE ( HAVE_UNIXODBC ,1 ,[ ] )
388
+ AC_DEFINE ( [ HAVE_UNIXODBC] , [ 1] ,
389
+ [ Define to 1 if the odbc extension uses the unixODBC.] )
376
390
else
377
391
AC_MSG_RESULT ( [ no] )
378
392
fi
@@ -413,7 +427,8 @@ PHP_ARG_WITH([dbmaker],,
413
427
ODBC_LIBS="-ldmapic -lc"
414
428
ODBC_TYPE=dbmaker
415
429
416
- AC_DEFINE ( HAVE_DBMAKER ,1 ,[ Whether you want DBMaker] )
430
+ AC_DEFINE ( [ HAVE_DBMAKER] , [ 1] ,
431
+ [ Define to 1 if the odbc extension uses the DBMaker.] )
417
432
418
433
if test "$ext_shared" = "yes"; then
419
434
AC_MSG_RESULT ( [ yes (shared)] )
@@ -430,13 +445,11 @@ PHP_ARG_WITH([dbmaker],,
430
445
fi
431
446
fi
432
447
433
- if test "no" != "$PHP_ODBCVER"; then
434
- if test "$PHP_ODBCVER" != "0"; then
435
- AC_DEFINE_UNQUOTED ( ODBCVER , $PHP_ODBCVER , [ The highest supported ODBC version ] )
436
- fi
437
- else
438
- AC_DEFINE ( ODBCVER , 0x0350 , [ The highest supported ODBC version ] )
439
- fi
448
+ AH_TEMPLATE ( [ ODBCVER] , [ The highest supported ODBC version.] )
449
+ AS_VAR_IF ( [ PHP_ODBCVER] , [ no] ,
450
+ [ AC_DEFINE ( [ ODBCVER] , [ 0x0350] ) ] ,
451
+ [ AS_VAR_IF ( [ PHP_ODBCVER] , [ 0] ,,
452
+ [ AC_DEFINE_UNQUOTED ( [ ODBCVER] , [ $PHP_ODBCVER] ) ] ) ] )
440
453
441
454
dnl Extension setup
442
455
if test -n "$ODBC_TYPE"; then
0 commit comments