Skip to content

Commit 31f2564

Browse files
authored
Add and update ext/odbc preprocessor macros help texts (#15223)
1 parent 8bfcbdc commit 31f2564

File tree

2 files changed

+41
-28
lines changed

2 files changed

+41
-28
lines changed

ext/odbc/config.m4

Lines changed: 39 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,26 @@ AC_DEFUN([PHP_ODBC_FIND_SOLID_LIBS],[
1414
HP-UX) ac_solid_os=h9x;; # h1x for hpux11, h0x for hpux10
1515
Linux)
1616
if ldd -v /bin/sh | grep GLIBC > /dev/null; then
17-
AC_DEFINE(SS_LINUX,1,[Needed in sqlunix.h ])
1817
ac_solid_os=l2x
1918
else
20-
AC_DEFINE(SS_LINUX,1,[Needed in sqlunix.h ])
2119
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+
;;
2325
SunOS)
2426
ac_solid_os=ssx;; # should we deal with SunOS 4?
2527
FreeBSD)
2628
if test `expr $ac_solid_uname_r : '\(.\)'` -gt "2"; then
27-
AC_DEFINE(SS_FBX,1,[Needed in sqlunix.h for wchar defs ])
2829
ac_solid_os=fex
2930
else
30-
AC_DEFINE(SS_FBX,1,[Needed in sqlunix.h for wchar defs ])
3131
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+
;;
3337
esac
3438
3539
if test -f $1/soc${ac_solid_os}35.a; then
@@ -119,7 +123,8 @@ PHP_ARG_WITH([adabas],,
119123
ODBC_TYPE=adabas
120124
ODBC_INCDIR=$PHP_ADABAS/incl
121125
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.])
123128
AC_MSG_RESULT([$ext_output])
124129
else
125130
AC_MSG_RESULT([no])
@@ -140,7 +145,8 @@ PHP_ARG_WITH([sapdb],,
140145
PHP_ADD_LIBPATH([$PHP_SAPDB/$PHP_LIBDIR])
141146
PHP_ADD_LIBRARY([sqlod])
142147
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.])
144150
AC_MSG_RESULT([$ext_output])
145151
else
146152
AC_MSG_RESULT([no])
@@ -162,11 +168,12 @@ PHP_ARG_WITH([solid],,
162168
ODBC_CFLAGS=-I$ODBC_INCDIR
163169
ODBC_TYPE=solid
164170
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.])
166172
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.])
168174
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.])
170177
fi
171178
AC_MSG_RESULT([$ext_output])
172179
PHP_ODBC_FIND_SOLID_LIBS($ODBC_LIBDIR)
@@ -198,7 +205,8 @@ PHP_ARG_WITH([ibm-db2],,
198205
ODBC_LIBS=-ldb2
199206

200207
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.])
202210
AC_MSG_RESULT([$ext_output])
203211
], [
204212
AC_MSG_RESULT([no])
@@ -232,7 +240,8 @@ PHP_ARG_WITH([empress],,
232240
ODBC_CFLAGS=-I$ODBC_INCDIR
233241
ODBC_LFLAGS=-L$ODBC_LIBDIR
234242
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.])
236245
AC_MSG_RESULT([$ext_output])
237246
PHP_ODBC_FIND_EMPRESS_LIBS($ODBC_LIBDIR)
238247
else
@@ -274,7 +283,8 @@ PHP_ARG_WITH([empress-bcs],,
274283
done
275284
ODBC_LIBS="-lempphpbcs -lms -lmscfg -lbasic -lbasic_os -lnlscstab -lnlsmsgtab -lm -ldl -lcrypt"
276285
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.])
278288
AC_MSG_RESULT([$ext_output])
279289
PHP_ODBC_FIND_EMPRESS_BCS_LIBS($ODBC_LIBDIR)
280290
else
@@ -303,7 +313,8 @@ PHP_ARG_WITH([custom-odbc],,
303313
ODBC_CFLAGS=-I$ODBC_INCDIR
304314
ODBC_LIBS=$CUSTOM_ODBC_LIBS
305315
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.])
307318
AC_MSG_RESULT([$ext_output])
308319
else
309320
AC_MSG_RESULT([no])
@@ -321,7 +332,8 @@ PHP_ARG_WITH([iodbc],,
321332
PKG_CHECK_MODULES([ODBC], [libiodbc])
322333
PHP_EVAL_INCLINE([$ODBC_CFLAGS])
323334
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.])
325337
else
326338
AC_MSG_RESULT([no])
327339
fi
@@ -343,7 +355,8 @@ PHP_ARG_WITH([esoob],,
343355
ODBC_CFLAGS=-I$ODBC_INCDIR
344356
ODBC_LIBS=-lesoobclient
345357
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.])
347360
AC_MSG_RESULT([$ext_output])
348361
else
349362
AC_MSG_RESULT([no])
@@ -372,7 +385,8 @@ PHP_ARG_WITH([unixODBC],,
372385
AC_MSG_RESULT([yes in $PHP_UNIXODBC])
373386
fi
374387
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.])
376390
else
377391
AC_MSG_RESULT([no])
378392
fi
@@ -413,7 +427,8 @@ PHP_ARG_WITH([dbmaker],,
413427
ODBC_LIBS="-ldmapic -lc"
414428
ODBC_TYPE=dbmaker
415429

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.])
417432

418433
if test "$ext_shared" = "yes"; then
419434
AC_MSG_RESULT([yes (shared)])
@@ -430,13 +445,11 @@ PHP_ARG_WITH([dbmaker],,
430445
fi
431446
fi
432447

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])])])
440453

441454
dnl Extension setup
442455
if test -n "$ODBC_TYPE"; then

ext/odbc/config.w32

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ if (PHP_ODBC == "yes") {
1111
AC_DEFINE("HAVE_UODBC", 1, "Define to 1 if the PHP extension 'odbc' is available.");
1212
AC_DEFINE("HAVE_SQLDATASOURCES", 1, "Define to 1 if ODBC library has 'SQLDataSources', as a function or macro.");
1313
if ("no" == PHP_ODBCVER) {
14-
AC_DEFINE("ODBCVER", "0x0350", "The highest supported ODBC version", false);
14+
AC_DEFINE("ODBCVER", "0x0350", "The highest supported ODBC version.", false);
1515
} else if ("0" != PHP_ODBCVER) {
16-
AC_DEFINE("ODBCVER", PHP_ODBCVER, "The highest supported ODBC version", false);
16+
AC_DEFINE("ODBCVER", PHP_ODBCVER, "The highest supported ODBC version.", false);
1717
}
1818
} else {
1919
WARNING("odbc support can't be enabled, libraries or header are missing (SDK)")

0 commit comments

Comments
 (0)