 |
 |
Find a programming school near you
php4-beta | 199912
Date: 12/30/99
- Next message: Juan Luis Baptiste: "[PHP4BETA] problems running php4 beta 3..."
- Previous message: Sascha Schumann: "[PHP4BETA] cvs: /php4/build rules_pear.mk"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
sas Thu Dec 30 19:21:31 1999 EDT
Modified files:
/php4/ext/odbc config.m4
Log:
First try at getting the ODBC stuff right
Index: php4/ext/odbc/config.m4
diff -u php4/ext/odbc/config.m4:1.15 php4/ext/odbc/config.m4:1.16
--- php4/ext/odbc/config.m4:1.15 Thu Dec 30 08:19:56 1999
+++ php4/ext/odbc/config.m4 Thu Dec 30 19:21:01 1999
@@ -1,9 +1,3 @@
-dnl ODBC_INCDIR
-dnl ODBC_INCLUDE
-dnl ODBC_LIBDIR
-dnl ODBC_LIBS
-dnl ODBC_LFLAGS
-
dnl
dnl Figure out which library file to link with for the Solid support.
dnl
@@ -83,9 +77,12 @@
if test "$withval" != "no"; then
AC_ADD_INCLUDE($withval/incl)
AC_ADD_LIBPATH($withval/lib)
- ODBC_OBJS="${ODBC_LIBDIR}/odbclib.a"
- PHP_SUBST(ODBC_OBJS)
- AC_ADD_LIBRARY_WITH_PATH(php_odbc, $abs_builddir/ext/odbc)
+ ODBC_OBJS="$withval/lib/odbclib.a"
+ ODBC_LIB="$abs_builddir/ext/odbc/libodbc_adabas.a"
+ $srcdir/build/shtool mkdir -f -p ext/odbc
+ rm -f "$ODBC_LIB"
+ cp "$ODBC_OBJS" "$ODBC_LIB"
+ AC_ADD_LIBRARY_WITH_PATH(odbc_adabas, $abs_builddir/ext/odbc)
AC_ADD_LIBRARY(sqlrte)
AC_ADD_LIBRARY(sqlptc)
ODBC_TYPE=adabas
@@ -258,11 +255,8 @@
withval=/usr/local
fi
if test "$withval" != "no"; then
- ODBC_INCDIR=$withval/include
- ODBC_LIBDIR=$withval/lib
- ODBC_LFLAGS=-L$ODBC_LIBDIR
- ODBC_INCLUDE=-I$ODBC_INCDIR
- ODBC_LIBS=-liodbc
+ AC_ADD_LIBRARY_WITH_PATH(iodbc, $withval/lib)
+ AC_ADD_INCLUDE($withval/include)
ODBC_TYPE=iodbc
AC_DEFINE(HAVE_IODBC,1,[ ])
AC_MSG_RESULT(yes)
@@ -387,7 +381,7 @@
])
fi
-if test -n "$ODBC_TYPE" && test -n "$ODBC_INCLUDE"; then
+if test -n "$ODBC_TYPE"; then
INCLUDES="$INCLUDES $ODBC_INCLUDE"
EXTRA_LIBS="$EXTRA_LIBS $ODBC_LFLAGS $ODBC_LIBS"
AC_DEFINE(HAVE_UODBC,1,[ ])
-- PHP 4.0 Beta Mailing List <http://www.php.net/version4/> To unsubscribe, e-mail: php4beta-unsubscribe <email protected> For additional commands, e-mail: php4beta-help <email protected> To contact the list administrators, e-mail: php4beta-admin <email protected>
- Next message: Juan Luis Baptiste: "[PHP4BETA] problems running php4 beta 3..."
- Previous message: Sascha Schumann: "[PHP4BETA] cvs: /php4/build rules_pear.mk"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
