[PHP-CVS] cvs: php-src /ext/mssql config.w32

[Frank M. Kromann]

fmk             Tue Jan 18 17:38:24 2005 EDT

  Modified files:              
    /php-src/ext/mssql  config.w32 
  Log:
  Rename php_freetds.dll to php_dblib.dll (still using the freetds libs).
  Allow the build of both versions in the same process
  
http://cvs.php.net/diff.php/php-src/ext/mssql/config.w32?r1=1.6&r2=1.7&ty=u
Index: php-src/ext/mssql/config.w32
diff -u php-src/ext/mssql/config.w32:1.6 php-src/ext/mssql/config.w32:1.7
--- php-src/ext/mssql/config.w32:1.6    Tue Jan 18 01:42:08 2005
+++ php-src/ext/mssql/config.w32        Tue Jan 18 17:38:24 2005
@@ -1,29 +1,28 @@
-// $Id: config.w32,v 1.6 2005/01/18 06:42:08 fmk Exp $
+// $Id: config.w32,v 1.7 2005/01/18 22:38:24 fmk Exp $
 // vim:ft=javascript
 
 ARG_WITH("mssql", "mssql support", "no");
 
-if (PHP_MSSQL == "yes") {
-       if (CHECK_LIB("ntwdblib.lib", "mssql", "\\MSSQL7\\DevTools\\Lib") &&
-                       CHECK_HEADER_ADD_INCLUDE("sqlfront.h", "CFLAGS_MSSQL")) 
{
+if (PHP_MSSQL != "no") {
+       if (CHECK_LIB("ntwdblib.lib", "mssql", 
"\\MSSQL7\\DevTools\\Lib;\\MSSQL7\\DevTools\\Lib;" + PHP_MSSQL) &&
+                       CHECK_HEADER_ADD_INCLUDE("sqlfront.h", "CFLAGS_MSSQL", 
"\\MSSQL7\\DevTools\\Include;\\MSSQL7\\DevTools\\Include" + PHP_MSSQL)) {
                EXTENSION("mssql", "php_mssql.c");
-               ADD_FLAG("CFLAGS_MSSQL", "/D DBNTWIN32=1 /D MSSQL70=1");
                AC_DEFINE('HAVE_MSSQL', 1, 'Have MSSQL support');
+               ADD_FLAG("CFLAGS_MSSQL", "/D DBNTWIN32=1 /D MSSQL70=1");
        } else {
                WARNING("mssql not enabled; libraries and headers not found");
        }
 }
 
-ARG_WITH("freetds", "mssql support with freetds", "no");
+ARG_WITH("dblib", "mssql support with freetds", "no");
 
-if (PHP_FREETDS == "yes") {
-       if (CHECK_LIB("dblib.lib", "freetds", PHP_PHP_BUILD + "\\freetds") &&
-                       CHECK_HEADER_ADD_INCLUDE("sybfront.h", 
"CFLAGS_FREETDS", PHP_PHP_BUILD + "\\freetds;" + PHP_FREETDS)) {
-               EXTENSION("freetds", "php_mssql.c");
-               ADD_FLAG("CFLAGS_FREETDS", "/D DBNTWIN32=1 /D MSSQL70=1");
-               AC_DEFINE('HAVE_FREETDS', 1, 'Have MSSQL support');
-               ADD_FLAG("CFLAGS_FREETDS", "/D HAVE_MSSQL /D MSSQL_EXPORTS /D 
COMPILE_DL_MSSQL");
+if (PHP_DBLIB != "no") {
+       if (CHECK_LIB("dblib.lib", "dblib", PHP_PHP_BUILD + "\\freetds") &&
+                       CHECK_HEADER_ADD_INCLUDE("sybfront.h", "CFLAGS_DBLIB", 
PHP_PHP_BUILD + "\\freetds;" + PHP_DBLIB)) {
+               EXTENSION("dblib", "php_mssql.c", null, null, null, 
"ext\\dblib");
+               AC_DEFINE('HAVE_MSSQL', 1, 'Have MSSQL support');
+               ADD_FLAG("CFLAGS_DBLIB", "/D HAVE_FREETDS=1 /D DBNTWIN32=1 /D 
MSSQL70=1 /D MSSQL_EXPORTS /D COMPILE_DL_MSSQL");
        } else {
-               WARNING("freetds not enabled; libraries and headers not found");
+               WARNING("dblib not enabled; libraries and headers not found");
        }
 }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php