fmk Thu Jan 9 17:35:16 2003 EDT
Modified files:
/php4/ext/mssql config.m4
Log:
Adding extended checks for where FreeTDS is installed
Index: php4/ext/mssql/config.m4
diff -u php4/ext/mssql/config.m4:1.3 php4/ext/mssql/config.m4:1.4
--- php4/ext/mssql/config.m4:1.3 Tue Jan 7 00:19:48 2003
+++ php4/ext/mssql/config.m4 Thu Jan 9 17:35:16 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.3 2003/01/07 05:19:48 fmk Exp $
+dnl $Id: config.m4,v 1.4 2003/01/09 22:35:16 fmk Exp $
dnl
PHP_ARG_WITH(mssql,for MSSQL support via FreeTDS,
@@ -8,13 +8,39 @@
if test "$PHP_MSSQL" != "no"; then
+
+ FREETDS_INSTALLATION_DIR=""
if test "$PHP_MSSQL" = "yes"; then
- MSSQL_INCDIR=/usr/local/freetds/include
- MSSQL_LIBDIR=/usr/local/freetds/lib
- else
- MSSQL_INCDIR=$PHP_MSSQL/include
- MSSQL_LIBDIR=$PHP_MSSQL/lib
+
+ for i in /usr/local /usr; do
+ if test -f $i/freetds/include/tds.h; then
+ FREETDS_INSTALLATION_DIR=$i/freetds
+ break
+ fi
+ done
+
+ if test -z "$FREETDS_INSTALLATION_DIR"; then
+ AC_MSG_ERROR(Cannot find FreeTDS in known installation directories)
+ fi
+
+ elif test "$PHP_MSSQL" != "no"; then
+
+ if test -f $PHP_MSSQL/include/tds.h; then
+ FREETDS_INSTALLATION_DIR=$PHP_MSSQL
+ elif test -f $PHP_MSSQL/freetds/include/tds.h; then
+ FREETDS_INSTALLATION_DIR=$PHP_MSSQL/freetds
+ else
+ AC_MSG_ERROR(Directory $PHP_MSSQL is not a FreeTDS installation directory)
+ fi
+ fi
+
+ if test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.a"; then
+ AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib/libtds.a)
fi
+
+ MSSQL_INCDIR=$FREETDS_INSTALLATION_DIR/include
+ MSSQL_LIBDIR=$FREETDS_INSTALLATION_DIR/lib
+
PHP_ADD_INCLUDE($MSSQL_INCDIR)
PHP_ADD_LIBRARY_WITH_PATH(sybdb, $MSSQL_LIBDIR, MSSQL_SHARED_LIBADD)
PHP_NEW_EXTENSION(mssql, php_mssql.c, $ext_shared)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
