From: Rasmus Lerdorf <rasmus@php.net>
Date: Fri, 23 Apr 1999 03:28:47 +0000 (+0000)
Subject: Module work
X-Git-Tag: BEFORE_PHP4_APACHE_MODULE_CHANGE~211
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cad2318a549dff68a7c4d36b5b6b8924f57e6547;p=php

Module work
---

diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index b4bc182982..2d0a470fd9 100644
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -49,15 +49,8 @@ void *ldap_mutex;
 
 #if HAVE_LDAP
 
-#if COMPILE_DL
-#if PHP_31
-#include "ext/phpdl.h"
-#include "ext/standard/dl.h"
-#else
 #include "dl/phpdl.h"
-#include "functions/dl.h"
-#endif
-#endif
+#include "ext/standard/dl.h"
 #include "php3_ldap.h"
 
 #if WIN32|WINNT
@@ -73,11 +66,7 @@ void *ldap_mutex;
 #define __STDC__ 1
 #endif
 
-#if PHP_31
 #include "ext/standard/php3_string.h"
-#else
-#include "functions/php3_string.h"
-#endif
 
 
 #if THREAD_SAFE & HAVE_NSLDAP
@@ -268,7 +257,7 @@ int php3_minit_ldap(INIT_FUNC_ARGS)
 	return SUCCESS;
 }
 
-int php3_mshutdown_ldap(void){
+int php3_mshutdown_ldap(SHUTDOWN_FUNC_ARGS) {
 #ifdef THREAD_SAFE
 	LDAP_TLS_VARS;
 	PHP3_TLS_THREAD_FREE(php3_ldap_module);
diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4
index a6ba195a0e..d8c826bfe6 100644
--- a/ext/mysql/config.m4
+++ b/ext/mysql/config.m4
@@ -3,13 +3,28 @@ dnl $Id$
 AC_MSG_CHECKING(for MySQL support)
 AC_ARG_WITH(mysql,
 [  --with-mysql[=DIR]      Include MySQL support.  DIR is the MySQL base
-                          install directory, defaults to /usr/local.],
+                          install directory, defaults to searching through
+                          a number of common places for the MySQL files.],
 [
   if test "$withval" != "no"; then
     if test "$withval" = "yes"; then
-      MYSQL_INCDIR=/usr/local/include/mysql
-      MYSQL_LIBDIR=/usr/local/lib/mysql
-    else
+		if test -f /usr/include/mysql/mysql.h; then
+			MYSQL_INCDIR=/usr/include/mysql
+			MYSQL_LIBDIR=/usr/lib/mysql
+		elif test -f /usr/include/mysql.h; then
+			MYSQL_INCDIR=/usr/include
+			MYSQL_LIBDIR=/usr/lib
+		elif test -f /usr/local/include/mysql/mysql.h; then
+			MYSQL_INCDIR=/usr/local/include/mysql
+			MYSQL_LIBDIR=/usr/local/lib/mysql
+		elif test -f /usr/local/include/mysql.h; then
+			MYSQL_INCDIR=/usr/local/include
+			MYSQL_LIBDIR=/usr/local/lib  
+		else
+			AC_MSG_RESULT(no)
+			AC_MSG_ERROR(Invalid MySQL directory - unable to find mysql.h)
+		fi   
+	else
       if test -f $withval/include/mysql/mysql.h; then
         MYSQL_INCDIR=$withval/include/mysql
         MYSQL_LIBDIR=$withval/lib/mysql
diff --git a/ext/snmp/config.m4 b/ext/snmp/config.m4
index 928dad4187..e7a5fab7f5 100644
--- a/ext/snmp/config.m4
+++ b/ext/snmp/config.m4
@@ -3,13 +3,16 @@ dnl $Id$
 AC_MSG_CHECKING(for SNMP support)
 AC_ARG_WITH(snmp,
 [  --with-snmp[=DIR]       Include SNMP support.  DIR is the SNMP base
-                          install directory, defaults to /usr/local],
+                          install directory, defaults to searching through
+                          a number of common locations for the snmp install.],
 [
   if test "$withval" != "no"; then
     if test "$withval" = "yes"; then
       SNMP_INCDIR=/usr/local/include
-      test -d /usr/local/include/ucd-snmp && SNMP_INCDIR=/usr/local/include/ucd-snmp
       SNMP_LIBDIR=/usr/local/lib
+      test -d /usr/local/include/ucd-snmp && SNMP_INCDIR=/usr/local/include/ucd-snmp
+	  test -d /usr/include/ucd-snmp && SNMP_INCDIR=/usr/include/ucd-snmp
+	  test -f /usr/lib/libsnmp.a && SNMP_LIBDIR=/usr/lib
     else
       SNMP_INCDIR=$withval/include
       test -d $withval/include/ucd-snmp && SNMP_INCDIR=$withval/include/ucd-snmp