wez Fri Dec 19 12:00:14 2003 EDT
Added files:
/php-src/ext/snmp config.w32
/php-src/ext/pdf config.w32
/php-src/ext/pspell config.w32
/php-src/ext/sockets config.w32
/php-src/ext/sybase_ct config.w32
/php-src/ext/tidy config.w32
Modified files:
/php-src/ext/snmp snmp.c
Log:
Make these build with new win32 build system.
Index: php-src/ext/snmp/snmp.c
diff -u php-src/ext/snmp/snmp.c:1.88 php-src/ext/snmp/snmp.c:1.89
--- php-src/ext/snmp/snmp.c:1.88 Thu Oct 16 22:21:27 2003
+++ php-src/ext/snmp/snmp.c Fri Dec 19 12:00:10 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: snmp.c,v 1.88 2003/10/17 02:21:27 iliaa Exp $ */
+/* $Id: snmp.c,v 1.89 2003/12/19 17:00:10 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -91,7 +91,11 @@
#include "keytools.h"
#include "parse.h"
#include "mib.h"
-#include "version.h"
+#ifndef PHP_WIN32
+/* this doesn't appear to be needed under win32 (perhaps at all)
+ * and the header file is not present in my UCD-SNMP headers */
+# include "version.h"
+#endif
#include "transform_oids.h"
#endif
/* Ugly macro, since the length of OIDs in UCD-SNMP and NET-SNMP
Index: php-src/ext/snmp/config.w32
+++ php-src/ext/snmp/config.w32
// $Id: config.w32,v 1.1 2003/12/19 17:00:10 wez Exp $
// vim:ft=javascript
ARG_WITH("snmp", "SNMP support", "no");
if (PHP_SNMP != "no") {
if (CHECK_HEADER_ADD_INCLUDE("snmp.h", "CFLAGS_SNMP", PHP_PHP_BUILD +
"\\include\\ucd-snmp;" + PHP_PHP_BUILD + "\\include\\net-snmp;" + PHP_SNMP) &&
CHECK_LIB("libsnmp.lib", "snmp", PHP_SNMP)) {
EXTENSION('snmp', 'snmp.c');
AC_DEFINE('HAVE_SNMP', 1);
} else {
WARNING("snmp not enabled; libraries and headers not found");
}
}
Index: php-src/ext/pdf/config.w32
+++ php-src/ext/pdf/config.w32
// $Id: config.w32,v 1.1 2003/12/19 17:00:11 wez Exp $
// vim:ft=javascript
ARG_WITH("pdf", "PDF support", "no");
if (PHP_PDF != "no") {
if (CHECK_HEADER_ADD_INCLUDE("pdflib.h", "CFLAGS_PDF", PHP_PDF) &&
CHECK_LIB("libtiff.lib", "pdf", PHP_PDF) &&
CHECK_LIB("libpng.lib", "pdf", PHP_PDF) &&
CHECK_LIB("zlib.lib", "pdf", PHP_PDF) &&
CHECK_LIB("gdi32.lib", "pdf", PHP_PDF) &&
CHECK_LIB("pdflib.lib", "pdf", PHP_PDF)) {
EXTENSION('pdf', 'pdf.c');
AC_DEFINE('HAVE_PDFLIB', 1);
} else {
WARNING("pdf not enabled; libraries and headers not found");
}
}
Index: php-src/ext/pspell/config.w32
+++ php-src/ext/pspell/config.w32
// $Id: config.w32,v 1.1 2003/12/19 17:00:11 wez Exp $
// vim:ft=javascript
ARG_WITH("pspell", "pspell/aspell (whatever it's called this month) support", "no");
if (PHP_PSPELL != "no") {
if (CHECK_HEADER_ADD_INCLUDE("pspell.h", "CFLAGS_PSPELL", PHP_PHP_BUILD +
"\\include\\pspell;" + PHP_PSPELL) &&
CHECK_LIB("aspell-15.lib", "pspell", PHP_PSPELL)) {
EXTENSION('pspell', 'pspell.c');
AC_DEFINE('HAVE_PSPELL', 1);
} else {
WARNING("pspell not enabled; libraries and headers not found");
}
}
Index: php-src/ext/sockets/config.w32
+++ php-src/ext/sockets/config.w32
// $Id: config.w32,v 1.1 2003/12/19 17:00:12 wez Exp $
// vim:ft=javascript
ARG_ENABLE("sockets", "SOCKETS support", "no");
if (PHP_SOCKETS != "no") {
if (CHECK_LIB("ws2_32.lib", "sockets", PHP_SOCKETS)) {
EXTENSION('sockets', 'sockets.c php_sockets_win.c');
AC_DEFINE('HAVE_SOCKETS', 1);
} else {
WARNING("sockets not enabled; libraries and headers not found");
}
}
Index: php-src/ext/sybase_ct/config.w32
+++ php-src/ext/sybase_ct/config.w32
// $Id: config.w32,v 1.1 2003/12/19 17:00:13 wez Exp $
// vim:ft=javascript
ARG_WITH("sybase-ct", "SYBASE_CT support", "no");
if (PHP_SYBASE_CT != "no") {
if (CHECK_HEADER_ADD_INCLUDE("ctpublic.h", "CFLAGS_SYBASE_CT", PHP_PHP_BUILD +
"\\sybase\\include;" + PHP_SYBASE_CT) &&
CHECK_LIB("libcs.lib", "sybase_ct", PHP_PHP_BUILD +
"\\sybase\\lib;" + PHP_SYBASE_CT) &&
CHECK_LIB("libct.lib", "sybase_ct", PHP_PHP_BUILD +
"\\sybase\\lib;" + PHP_SYBASE_CT)) {
EXTENSION('sybase_ct', 'php_sybase_ct.c');
AC_DEFINE('HAVE_SYBASE_CT', 1);
} else {
WARNING("sybase_ct not enabled; libraries and headers not found");
}
}
Index: php-src/ext/tidy/config.w32
+++ php-src/ext/tidy/config.w32
// $Id: config.w32,v 1.1 2003/12/19 17:00:13 wez Exp $
// vim:ft=javascript
ARG_WITH("tidy", "TIDY support", "no");
if (PHP_TIDY != "no") {
if (CHECK_LIB("libtidy.lib", "tidy", PHP_TIDY) &&
(
CHECK_HEADER_ADD_INCLUDE("tidy.h", "CFLAGS_TIDY") ||
CHECK_HEADER_ADD_INCLUDE("tidy/tidy.h", "CFLAGS_TIDY",
null, null, true) ||
CHECK_HEADER_ADD_INCLUDE("libtidy/tidy.h",
"CFLAGS_TIDY", null, null, true)
)) {
EXTENSION("tidy", "tidy.c");
AC_DEFINE('HAVE_TIDY', 1, 'Have TIDY library');
} else {
WARNING("tidy not enabled; libraries and headers not found");
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
