X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config.m4;h=6c1e49e0e95d7e1a0614aa6b72b6cc24e770f6ed;hp=26a5e918cd7c0e9e98abd753889f51b1e1afe9a5;hb=b6f1f30011e3834d4dc1ba8c93a2ece696bd6cbd;hpb=9949be4659856993b6f3668c87cdcf158f6c2ddf

diff --git a/config.m4 b/config.m4
index 26a5e91..6c1e49e 100644
--- a/config.m4
+++ b/config.m4
@@ -8,13 +8,6 @@ PHP_ARG_WITH([curl], [for CURL support],
 
 if test "$PHP_HTTP" != "no"; then
 
-dnl -----
-dnl CTYPE
-dnl -----
-	if test -r /usr/include/ctype.h -o -r /usr/local/include/ctype.h ; then
-		AC_DEFINE([HAVE_CTYPE], [1], [Have ctype support])
-	fi
-
 dnl ----
 dnl CURL
 dnl ----
@@ -31,48 +24,42 @@ dnl ----
 			fi
 			done
 		fi
-		
+
 		if test -z "$CURL_DIR"; then
 			AC_MSG_RESULT(not found)
 			AC_MSG_ERROR(Please reinstall the libcurl distribution -
 			easy.h should be in <curl-dir>/include/curl/)
 		fi
-		
+
 		CURL_CONFIG="curl-config"
-		
-		if ${CURL_DIR}/bin/curl-config --libs print > /dev/null 2>&1; then
+
+		if ${CURL_DIR}/bin/curl-config --libs > /dev/null 2>&1; then
 			CURL_CONFIG=${CURL_DIR}/bin/curl-config
 		else
-			if ${CURL_DIR}/curl-config --libs print > /dev/null 2>&1; then
+			if ${CURL_DIR}/curl-config --libs > /dev/null 2>&1; then
 			CURL_CONFIG=${CURL_DIR}/curl-config
 			fi
 		fi
-		
+
 		PHP_ADD_INCLUDE($CURL_DIR/include)
 		PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD)
 		PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/lib, HTTP_SHARED_LIBADD)
-		
-		PHP_CHECK_LIBRARY(curl,curl_easy_init, 
-		[ 
-			AC_DEFINE(HAVE_CURL,1,[Have CURL easy support])
+
+		PHP_CHECK_LIBRARY(curl,curl_easy_init,
+		[
+			AC_DEFINE(HTTP_HAVE_CURL,1,[Have CURL easy support])
 		],[
 			AC_MSG_ERROR(There is something wrong with libcurl. Please check config.log for more information.)
 		],[
 			$CURL_LIBS -L$CURL_DIR/lib
 		])
-		
-		PHP_CHECK_LIBRARY(curl,curl_version_info,
-		[
-			AC_DEFINE(HAVE_CURL_VERSION_INFO,1,[ ])
-		],[],[
-			$CURL_LIBS -L$CURL_DIR/lib
-		])
+
 	fi
 
 dnl ----
 dnl DONE
 dnl ----
-	PHP_NEW_EXTENSION([http], [http.c http_api.c], [$ext_shared])
+	PHP_NEW_EXTENSION([http], [http.c http_api.c http_curl_api.c http_functions.c http_methods.c], [$ext_shared])
 	PHP_SUBST([HTTP_SHARED_LIBADD])
 	AC_DEFINE([HAVE_HTTP], [1], [Have extended HTTP support])
 fi