cvs: php4 /ext/odbc config.m4

kalowsky Fri Jul 6 10:30:36 2001 EDT Modified files: /php4/ext/odbc config.m4 Log: Making --with-openlink work the same as --with-iodbc for it's eventual disappearing act. # As requested by the Openlink Software people Index: php4/ext/odbc/config.m4 diff -u php4/ext/odbc/config.m4:1.45 php4/ext/odbc/config.m4:1.46 --- php4/ext/odbc/config.m4:1.45 Fri Jun 1 02:26:22 2001 +++ php4/ext/odbc/config.m4 Fri Jul 6 10:30:34 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.45 2001/06/01 06:26:22 sniper Exp $ +dnl $Id: config.m4,v 1.46 2001/07/06 14:30:34 kalowsky Exp $ dnl dnl Figure out which library file to link with for the Solid support. @@ -441,21 +441,25 @@ AC_ARG_WITH(openlink, [ --with-openlink[=DIR] Include OpenLink ODBC support. DIR is the OpenLink base install directory, defaults to - /usr/local/openlink.], + /usr/local. This is the same as iODBC.], [ PHP_WITH_SHARED if test "$withval" = "yes"; then - withval=/usr/local/openlink + withval=/usr/local fi if test "$withval" != "no"; then - ODBC_INCDIR=$withval/odbcsdk/include - ODBC_LIBDIR=$withval/odbcsdk/lib - ODBC_LFLAGS=-L$ODBC_LIBDIR - ODBC_INCLUDE=-I$ODBC_INCDIR + PHP_ADD_LIBRARY_WITH_PATH(iodbc, $withval/lib) + PHP_ADD_INCLUDE($withval/include, 1) + ODBC_TYPE=iodbc + ODBC_INCLUDE=-I$withval/include + ODBC_LFLAGS=-L$withval/lib ODBC_LIBS=-liodbc - ODBC_TYPE=openlink - AC_DEFINE(HAVE_OPENLINK,1,[ ]) + AC_DEFINE(HAVE_IODBC,1,[ ]) AC_MSG_RESULT(yes) + echo "****************************************************************" + echo " --with-openlink will not be valid in future releases. Please " + echo " update your configure script to use --with-iodbc instead. " + echo "****************************************************************" else AC_MSG_RESULT(no) fi