Skip to content

Commit 7dee737

Browse files
stigsbstigsb
committed
moved odbc into ext/
1 parent aac5a43 commit 7dee737

File tree

11 files changed

+4097
-346
lines changed

11 files changed

+4097
-346
lines changed

‎Makefile.in

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,22 +68,21 @@ OBJS = main.o internal_functions.o snprintf.o php3_sprintf.o \
6868
safe_mode.o fopen-wrappers.o php3_realpath.o alloca.o output.o \
6969
php_ini.o
7070

71-
FUNCTIONS_SOURCE = functions/adabasd.c functions/apache.c functions/fhttpd.c \
71+
FUNCTIONS_SOURCE = functions/apache.c functions/fhttpd.c \
7272
functions/crypt.c functions/db.c functions/dl.c functions/filepro.c \
7373
functions/head.c functions/imap.c functions/mime.c \
7474
functions/msql.c functions/mysql.c \
7575
functions/oracle.c functions/oci8.c functions/pgsql.c \
76-
functions/post.c functions/solid.c functions/sybase.c \
76+
functions/post.c functions/sybase.c \
7777
functions/sybase-ct.c @BCMATH_SRC@ functions/xml.c \
78-
functions/unified_odbc.c functions/ldap.c functions/velocis.c \
79-
functions/zlib.c functions/COM.c functions/ifx.c \
78+
functions/ldap.c functions/zlib.c functions/COM.c functions/ifx.c \
8079
functions/pdf.c functions/hw.c functions/hg_comm.c functions/dlist.c \
8180
functions/fdf.c functions/snmp.c functions/interbase.c \
8281
functions/sysvsem.c functions/sysvshm.c functions/dav.c
8382

8483
FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o)
8584
PHPLIBS = -L@top_srcdir@/libzend -lzend -Lext -lphpext
86-
LIBS = $(PHPLIBS) $(EXTRA_LIBS) @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @REGEX_LIB@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @LIBS@
85+
LIBS = $(PHPLIBS) $(EXTRA_LIBS) @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @REGEX_LIB@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @IMAP_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @LIBS@
8786

8887
all: $(BINNAME)
8988

‎configure.in.in

Lines changed: 0 additions & 278 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,99 +1023,6 @@ AC_SUBST(ORACLE_HOME)
10231023
AC_SUBST(ORACLE_VERSION)
10241024
10251025
1026-
AC_MSG_CHECKING(for iODBC support)
1027-
AC_ARG_WITH(iodbc,
1028-
[ --with-iodbc[=DIR] Include iODBC support. DIR is the iODBC base
1029-
install directory, defaults to /usr/local.],
1030-
[
1031-
if test "$withval" = "yes"; then
1032-
withval=/usr/local
1033-
fi
1034-
if test "$withval" != "no"; then
1035-
1036-
IODBC_INCDIR=$withval/include
1037-
IODBC_LIBDIR=$withval/lib
1038-
IODBC_LFLAGS=-L$IODBC_LIBDIR
1039-
IODBC_INCLUDE=-I$IODBC_INCDIR
1040-
IODBC_LIBS=-liodbc
1041-
UODBC_DEFAULT=yes
1042-
1043-
AC_DEFINE(HAVE_IODBC)
1044-
1045-
AC_MSG_RESULT(yes)
1046-
1047-
fi
1048-
],[
1049-
AC_MSG_RESULT(no)
1050-
])
1051-
AC_SUBST(IODBC_LIBS)
1052-
AC_SUBST(IODBC_LFLAGS)
1053-
dnl## AC_SUBST(IODBC_INCLUDE)
1054-
INCLUDES="$INCLUDES $IODBC_INCLUDE"
1055-
1056-
1057-
AC_MSG_CHECKING(for OpenLink ODBC support)
1058-
AC_ARG_WITH(openlink,
1059-
[ --with-openlink[=DIR] Include OpenLink ODBC support. DIR is the
1060-
OpenLink base install directory, defaults to
1061-
/usr/local/openlink.],
1062-
[
1063-
if test "$withval" = "yes"; then
1064-
withval=/usr/local/openlink
1065-
fi
1066-
if test "$withval" != "no"; then
1067-
1068-
OPENLINK_INCDIR=$withval/odbcsdk/include
1069-
OPENLINK_LIBDIR=$withval/odbcsdk/lib
1070-
OPENLINK_LFLAGS=-L$OPENLINK_LIBDIR
1071-
OPENLINK_INCLUDE=-I$OPENLINK_INCDIR
1072-
OPENLINK_LIBS=-liodbc
1073-
UODBC_DEFAULT=yes
1074-
1075-
AC_DEFINE(HAVE_OPENLINK)
1076-
1077-
AC_MSG_RESULT(yes)
1078-
1079-
fi
1080-
],[
1081-
AC_MSG_RESULT(no)
1082-
])
1083-
AC_SUBST(OPENLINK_LIBS)
1084-
AC_SUBST(OPENLINK_LFLAGS)
1085-
dnl## AC_SUBST(OPENLINK_INCLUDE)
1086-
INCLUDES="$INCLUDES $OPENLINK_INCLUDE"
1087-
1088-
1089-
AC_MSG_CHECKING(for Adabas support)
1090-
AC_ARG_WITH(adabas,
1091-
[ --with-adabas[=DIR] Include Adabas D support. DIR is the Adabas base
1092-
install directory, defaults to /usr/local.],
1093-
[
1094-
if test "$withval" = "yes"; then
1095-
withval=/usr/local
1096-
fi
1097-
if test "$withval" != "no"; then
1098-
ADA_INCDIR=$withval/incl
1099-
ADA_LIBDIR=$withval/lib
1100-
ADA_LFLAGS=-L$ADA_LIBDIR
1101-
ADA_INCLUDE=-I$ADA_INCDIR
1102-
ADA_LIBS="${ADA_LIBDIR}/odbclib.a -lsqlrte -lsqlptc"
1103-
UODBC_DEFAULT=yes
1104-
1105-
AC_DEFINE(HAVE_ADABAS)
1106-
AC_MSG_RESULT(yes)
1107-
else
1108-
AC_MSG_RESULT(no)
1109-
fi
1110-
],[
1111-
AC_MSG_RESULT(no)
1112-
])
1113-
AC_SUBST(ADA_LIBS)
1114-
AC_SUBST(ADA_LFLAGS)
1115-
dnl## AC_SUBST(ADA_INCLUDE)
1116-
INCLUDES="$INCLUDES $ADA_INCLUDE"
1117-
1118-
11191026
AC_MSG_CHECKING(for Sybase support)
11201027
AC_ARG_WITH(sybase,
11211028
[ --with-sybase[=DIR] Include Sybase-DB support. DIR is the Sybase home
@@ -1309,72 +1216,6 @@ dnl## AC_SUBST(PGSQL_INCLUDE)
13091216
INCLUDES="$INCLUDES $PGSQL_INCLUDE"
13101217
13111218
1312-
AC_MSG_CHECKING(for Solid support)
1313-
AC_ARG_WITH(solid,
1314-
[ --with-solid[=DIR] Include Solid support. DIR is the Solid base
1315-
install directory, defaults to /usr/local/solid],
1316-
[
1317-
if test "$withval" != "no"; then
1318-
if test "$withval" = "yes"; then
1319-
SOLID_INCDIR=/usr/local/solid/include
1320-
SOLID_LIBDIR=/usr/local/solid/lib
1321-
else
1322-
SOLID_INCDIR=$withval/include
1323-
SOLID_LIBDIR=$withval/lib
1324-
fi
1325-
SOLID_INCLUDE=-I$SOLID_INCDIR
1326-
UODBC_DEFAULT=yes
1327-
1328-
AC_DEFINE(HAVE_SOLID)
1329-
1330-
AC_MSG_RESULT(yes)
1331-
else
1332-
AC_MSG_RESULT(no)
1333-
fi
1334-
],[
1335-
AC_MSG_RESULT(no)
1336-
])
1337-
if test "$SOLID_LIBDIR" != ""; then
1338-
AC_FIND_SOLID_LIBS($SOLID_LIBDIR)
1339-
fi
1340-
dnl## AC_SUBST(SOLID_INCLUDE)
1341-
AC_SUBST(SOLID_LIBS)
1342-
INCLUDES="$INCLUDES $SOLID_INCLUDE"
1343-
1344-
1345-
AC_MSG_CHECKING(for Empress support)
1346-
AC_ARG_WITH(empress,
1347-
[ --with-empress[=DIR] Include Empress support. DIR is the Empress base
1348-
install directory, defaults to \$EMPRESSPATH],
1349-
[
1350-
if test "$withval" != "no"; then
1351-
if test "$withval" = "yes"; then
1352-
EMPRESS_INCDIR=$EMPRESSPATH/odbccl/include
1353-
EMPRESS_LIBDIR=$EMPRESSPATH/odbccl/lib
1354-
else
1355-
EMPRESS_INCDIR=$withval/include
1356-
EMPRESS_LIBDIR=$withval/lib
1357-
fi
1358-
EMPRESS_INCLUDE=-I$EMPRESS_INCDIR
1359-
UODBC_DEFAULT=yes
1360-
1361-
AC_DEFINE(HAVE_EMPRESS)
1362-
1363-
AC_MSG_RESULT(yes)
1364-
else
1365-
AC_MSG_RESULT(no)
1366-
fi
1367-
],[
1368-
AC_MSG_RESULT(no)
1369-
])
1370-
if test "$EMPRESS_LIBDIR" != ""; then
1371-
AC_FIND_EMPRESS_LIBS($EMPRESS_LIBDIR)
1372-
fi
1373-
AC_SUBST(EMPRESS_LIBS)
1374-
dnl## AC_SUBST(EMPRESS_INCLUDE)
1375-
INCLUDES="$INCLUDES $EMPRESS_INCLUDE"
1376-
1377-
13781219
AC_MSG_CHECKING(for LDAP support)
13791220
AC_ARG_WITH(ldap,
13801221
[ --with-ldap[=DIR] Include LDAP support. DIR is the LDAP base
@@ -1441,48 +1282,6 @@ dnl## AC_SUBST(SNMP_INCLUDE)
14411282
INCLUDES="$INCLUDES $SNMP_INCLUDE"
14421283
14431284
1444-
AC_MSG_CHECKING(for Velocis support)
1445-
AC_ARG_WITH(velocis,
1446-
[ --with-velocis[=DIR] Include Velocis support. DIR is the Velocis
1447-
base install directory, defaults to /usr/local/velocis.],
1448-
[
1449-
if test "$withval" != "no"; then
1450-
VELOCIS_OS=`uname`
1451-
if test "$withval" = "yes"; then
1452-
VELOCIS_INCDIR=/usr/local/velocis/include
1453-
VELOCIS_LIBDIR=/usr/local/velocis
1454-
else
1455-
VELOCIS_INCDIR=$withval/include
1456-
VELOCIS_LIBDIR=$withval
1457-
fi
1458-
VELOCIS_INCLUDE=-I$VELOCIS_INCDIR
1459-
VELOCIS_LIBDIR="$VELOCIS_LIBDIR/bin"
1460-
VELOCIS_LIBS="-l_rdbc -l_sql"
1461-
if test $VELOCIS_OS = "FreeBSD"; then
1462-
VELOCIS_LIBS="$VELOCIS_LIBDIR/../lib/rdscli.a -lcompat"
1463-
fi
1464-
if test $VELOCIS_OS = "BSD/OS"; then
1465-
VELOCIS_LIBS="$VELOCIS_LIBDIR/../lib/rdscli.a -lcompat"
1466-
fi
1467-
old_CFLAGS=$CFLAGS; old_LDFLAGS=$LDFLAGS
1468-
CFLAGS="$CFLAGS $VELOCIS_INCLUDE"
1469-
LDFLAGS="$LDFLAGS $VELOCIS_LIBS"
1470-
UODBC_DEFAULT=yes
1471-
1472-
AC_DEFINE(HAVE_VELOCIS)
1473-
AC_MSG_RESULT(yes)
1474-
else
1475-
AC_MSG_RESULT(no)
1476-
fi
1477-
],[
1478-
AC_MSG_RESULT(no)
1479-
])
1480-
AC_SUBST(VELOCIS_LIBS)
1481-
AC_SUBST(VELOCIS_LFLAGS)
1482-
dnl## AC_SUBST(VELOCIS_INCLUDE)
1483-
INCLUDES="$INCLUDES $VELOCIS_INCLUDE"
1484-
1485-
14861285
AC_MSG_CHECKING(for Informix support)
14871286
AC_ARG_WITH(informix,
14881287
[ --with-informix[=DIR] Include Informix support. DIR is the Informix base
@@ -1587,46 +1386,6 @@ dnl## AC_SUBST(IBASE_INCLUDE)
15871386
INCLUDES="$INCLUDES $IBASE_INCLUDE"
15881387
15891388
1590-
AC_MSG_CHECKING(for a custom ODBC support)
1591-
AC_ARG_WITH(custom-odbc,
1592-
[ --with-custom-odbc[=DIR] Include a user defined ODBC support.
1593-
The DIR is ODBC install base directory,
1594-
which defaults to /usr/local.
1595-
Make sure to define CUSTOM_ODBC_LIBS and
1596-
have some odbc.h in your include dirs.
1597-
E.g., you should define following for
1598-
Sybase SQL Anywhere 5.5.00 on QNX, prior to
1599-
run configure script:
1600-
CFLAGS=\"-DODBC_QNX -DSQLANY_BUG\"
1601-
LDFLAGS=-lunix
1602-
CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\".],
1603-
[
1604-
if test "$withval" = "yes"; then
1605-
withval=/usr/local
1606-
fi
1607-
if test "$withval" != "no"; then
1608-
1609-
CODBC_INCDIR=$withval/include
1610-
CODBC_LIBDIR=$withval/lib
1611-
CODBC_LFLAGS=-L$CODBC_LIBDIR
1612-
CODBC_INCLUDE=-I$CODBC_INCDIR
1613-
CODBC_LIBS=$CUSTOM_ODBC_LIBS
1614-
UODBC_DEFAULT=yes
1615-
1616-
AC_DEFINE(HAVE_CODBC)
1617-
1618-
AC_MSG_RESULT(yes)
1619-
1620-
fi
1621-
],[
1622-
AC_MSG_RESULT(no)
1623-
])
1624-
AC_SUBST(CODBC_LIBS)
1625-
AC_SUBST(CODBC_LFLAGS)
1626-
dnl## AC_SUBST(CODBC_INCLUDE)
1627-
INCLUDES="$INCLUDES $CODBC_INCLUDE"
1628-
1629-
16301389
AC_MSG_CHECKING(for Hyperwave support)
16311390
AC_ARG_WITH(hyperwave,
16321391
[ --with-hyperwave Include Hyperwave support],
@@ -1805,43 +1564,6 @@ AC_ARG_WITH(mod-dav,
18051564
AC_SUBST(MOD_DAV_CFLAGS)
18061565
18071566
1808-
AC_MSG_CHECKING(whether to enable unified ODBC support)
1809-
AC_ARG_ENABLE(unified-odbc,
1810-
[ --disable-unified-odbc Disable unified ODBC support. Only applicable if
1811-
iODBC, Adabas, Solid, Velocis or a custom ODBC
1812-
interface is enabled.],
1813-
[
1814-
if test "$enableval" = "no"; then
1815-
AC_DEFINE(HAVE_UODBC, 0)
1816-
AC_MSG_RESULT(no)
1817-
else
1818-
if test "$with_solid" != ""; then
1819-
UODBC_TYPE=solid
1820-
elif test "$with_iodbc" != ""; then
1821-
UODBC_TYPE=iodbc
1822-
elif test "$with_adabas" != ""; then
1823-
UODBC_TYPE=adabas
1824-
elif test "$with_velocis" != ""; then
1825-
UODBC_TYPE=velocis
1826-
elif test "$with_custom_odbc" != ""; then
1827-
UODBC_TYPE=custom
1828-
else
1829-
AC_MSG_ERROR([no ODBC library! Include Solid, iODBC, Velocis, Adabas D or a custom ODBC support.])
1830-
fi
1831-
AC_DEFINE(HAVE_UODBC, 1)
1832-
AC_MSG_RESULT([yes, using $UODBC_TYPE])
1833-
fi
1834-
],[
1835-
if test "$UODBC_DEFAULT" = "yes"; then
1836-
AC_DEFINE(HAVE_UODBC, 1)
1837-
AC_MSG_RESULT(yes)
1838-
else
1839-
AC_DEFINE(HAVE_UODBC, 0)
1840-
AC_MSG_RESULT(no)
1841-
fi
1842-
])
1843-
1844-
18451567
AC_MSG_CHECKING(whether to enable System V semaphore support)
18461568
AC_ARG_ENABLE(sysvsem,
18471569
[ --enable-sysvsem Enable System V semaphore support.],

‎ext/odbc/Makefile.am

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
## Process this file with automake to produce Makefile.in
2+
INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
3+
noinst_LIBRARIES=libphpext_odbc.a
4+
libphpext_odbc_a_SOURCES=odbc.c velocis.c

0 commit comments

Comments
 (0)