wez Tue Jul 12 08:16:02 2005 EDT
Added files:
/php-src/ext/pdo_dblib config.m4
Modified files:
/php-src/ext/pdo_dblib dblib_driver.c pdo_dblib.c
php_pdo_dblib_int.h
Log:
Enable unix build for dblib/sybase/freetds.
The extension is named pdo_dblib and the driver dblib on unix.
http://cvs.php.net/diff.php/php-src/ext/pdo_dblib/dblib_driver.c?r1=1.7&r2=1.8&ty=u
Index: php-src/ext/pdo_dblib/dblib_driver.c
diff -u php-src/ext/pdo_dblib/dblib_driver.c:1.7
php-src/ext/pdo_dblib/dblib_driver.c:1.8
--- php-src/ext/pdo_dblib/dblib_driver.c:1.7 Sun Feb 6 17:28:50 2005
+++ php-src/ext/pdo_dblib/dblib_driver.c Tue Jul 12 08:16:02 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dblib_driver.c,v 1.7 2005/02/06 22:28:50 wez Exp $ */
+/* $Id: dblib_driver.c,v 1.8 2005/07/12 12:16:02 wez Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -257,8 +257,10 @@
pdo_driver_t pdo_dblib_driver = {
#if PDO_DBLIB_IS_MSSQL
PDO_DRIVER_HEADER(mssql),
-#else
+#elif defined(PHP_WIN32)
PDO_DRIVER_HEADER(sybase),
+#else
+ PDO_DRIVER_HEADER(dblib),
#endif
pdo_dblib_handle_factory
};
http://cvs.php.net/diff.php/php-src/ext/pdo_dblib/pdo_dblib.c?r1=1.5&r2=1.6&ty=u
Index: php-src/ext/pdo_dblib/pdo_dblib.c
diff -u php-src/ext/pdo_dblib/pdo_dblib.c:1.5
php-src/ext/pdo_dblib/pdo_dblib.c:1.6
--- php-src/ext/pdo_dblib/pdo_dblib.c:1.5 Tue Jul 12 07:02:23 2005
+++ php-src/ext/pdo_dblib/pdo_dblib.c Tue Jul 12 08:16:02 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_dblib.c,v 1.5 2005/07/12 11:02:23 wez Exp $ */
+/* $Id: pdo_dblib.c,v 1.6 2005/07/12 12:16:02 wez Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -42,8 +42,10 @@
STANDARD_MODULE_HEADER,
#if PDO_DBLIB_IS_MSSQL
"pdo_mssql",
-#else
+#elif define (PHP_WIN32)
"pdo_sybase",
+#else
+ "pdo_dblib"
#endif
pdo_dblib_functions,
PHP_MINIT(pdo_dblib),
@@ -197,7 +199,7 @@
#elif defined(PHP_WIN32)
"FreeTDS/Sybase/MSSQL"
#else
- "Sybase"
+ "FreeTDS/Sybase"
#endif
" DB-lib", "enabled");
php_info_print_table_row(2, "Flavour", PDO_DBLIB_FLAVOUR);
http://cvs.php.net/diff.php/php-src/ext/pdo_dblib/php_pdo_dblib_int.h?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/pdo_dblib/php_pdo_dblib_int.h
diff -u php-src/ext/pdo_dblib/php_pdo_dblib_int.h:1.3
php-src/ext/pdo_dblib/php_pdo_dblib_int.h:1.4
--- php-src/ext/pdo_dblib/php_pdo_dblib_int.h:1.3 Tue Jan 18 02:17:01 2005
+++ php-src/ext/pdo_dblib/php_pdo_dblib_int.h Tue Jul 12 08:16:02 2005
@@ -17,11 +17,15 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pdo_dblib_int.h,v 1.3 2005/01/18 07:17:01 fmk Exp $ */
+/* $Id: php_pdo_dblib_int.h,v 1.4 2005/07/12 12:16:02 wez Exp $ */
#ifndef PHP_PDO_DBLIB_INT_H
#define PHP_PDO_DBLIB_INT_H
+#ifndef PDO_DBLIB_FLAVOUR
+# define PDO_DBLIB_FLAVOUR "Generic DB-lib"
+#endif
+
#if PHP_DBLIB_IS_MSSQL
# include <sqlfront.h>
# include <sqldb.h>
http://cvs.php.net/co.php/php-src/ext/pdo_dblib/config.m4?r=1.1&p=1
Index: php-src/ext/pdo_dblib/config.m4
+++ php-src/ext/pdo_dblib/config.m4
dnl
dnl $Id: config.m4,v 1.1 2005/07/12 12:16:02 wez Exp $
dnl
if test "$PHP_PDO" != "no"; then
PHP_ARG_WITH(pdo-dblib, for PDO_DBLIB support via FreeTDS,
[ --with-pdo-dblib[=DIR] Include PDO_DBLIB-DB support. DIR is the
FreeTDS home
directory])
if test "$PHP_PDO_DBLIB" != "no"; then
PDO_FREETDS_INSTALLATION_DIR=""
if test "$PHP_PDO_DBLIB" = "yes"; then
for i in /usr/local /usr; do
if test -f $i/include/tds.h; then
PDO_FREETDS_INSTALLATION_DIR=$i
break
fi
done
if test -z "$PDO_FREETDS_INSTALLATION_DIR"; then
AC_MSG_ERROR(Cannot find FreeTDS in known installation directories)
fi
elif test "$PHP_PDO_DBLIB" != "no"; then
if test -f $PHP_PDO_DBLIB/include/tds.h; then
PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB
else
AC_MSG_ERROR(Directory $PHP_PDO_DBLIB is not a FreeTDS installation
directory)
fi
fi
if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.a" && test !
-r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.so"; then
AC_MSG_ERROR(Could not find
$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.[a|so])
fi
PDO_DBLIB_INCDIR=$PDO_FREETDS_INSTALLATION_DIR/include
PDO_DBLIB_LIBDIR=$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR
PHP_ADD_INCLUDE($PDO_DBLIB_INCDIR)
PHP_ADD_LIBRARY_WITH_PATH(sybdb, $PDO_DBLIB_LIBDIR, PDO_DBLIB_SHARED_LIBADD)
PHP_CHECK_PDO_INCLUDES
PDO_DBLIB_DEFS="-DPDO_DBLIB_FLAVOUR=\\\"freetds\\\""
PHP_NEW_EXTENSION(pdo_dblib, pdo_dblib.c dblib_driver.c dblib_stmt.c,
$ext_shared,,-I$pdo_inc_path $PDO_DBLIB_DEFS)
AC_CHECK_LIB(dnet_stub, dnet_addr,
[ PHP_ADD_LIBRARY_WITH_PATH(dnet_stub,,PDO_DBLIB_SHARED_LIBADD)
AC_DEFINE(HAVE_LIBDNET_STUB,1,[ ])
])
AC_DEFINE(HAVE_PDO_DBLIB,1,[ ])
AC_DEFINE(HAVE_FREETDS,1,[ ])
PHP_SUBST(PDO_DBLIB_SHARED_LIBADD)
fi
fi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
