last bunch of extensions moving to ext/

fhttpd module taken out of functions, functions is ready to go.
The only extensions I have tested are gd+freetype and odbc(solid).
Please try compiling in your favourite extensions and let me know how it
works.

1 files changed, 111 insertions, 0 deletions

diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
index f44a1df39f..c20daccc4a 100644
--- a/ext/standard/config.m4
+++ b/ext/standard/config.m4
@@ -1,3 +1,114 @@
 dnl $Id$ -*- sh -*-
 
+divert(1)
+
+dnl
+dnl Check for crypt() capabilities
+dnl
+AC_DEFUN(AC_CRYPT_CAP,[
+
+  AC_MSG_CHECKING([for standard DES crypt])
+  AC_TRY_RUN([
+main() {
+#if HAVE_CRYPT
+    exit (strcmp((char *)crypt("rasmuslerdorf","rl"),"rl.3StKT.4T8M"));
+#else
+	exit(0);
+#endif
+}],[
+    AC_DEFINE(PHP3_STD_DES_CRYPT,1)
+    AC_MSG_RESULT(yes)
+  ],[
+    AC_DEFINE(PHP3_STD_DES_CRYPT,0)
+    AC_MSG_RESULT(no)
+  ],[
+    AC_DEFINE(PHP3_STD_DES_CRYPT,1)
+    AC_MSG_RESULT(cannot check, guessing yes)
+  ])
+
+  AC_MSG_CHECKING([for extended DES crypt])
+  AC_TRY_RUN([
+main() {
+#if HAVE_CRYPT
+    exit (strcmp((char *)crypt("rasmuslerdorf","_J9..rasm"),"_J9..rasmBYk8r9AiWNc"));
+#else
+	exit(0);
+#endif
+}],[
+    AC_DEFINE(PHP3_EXT_DES_CRYPT,1)
+    AC_MSG_RESULT(yes)
+  ],[
+    AC_DEFINE(PHP3_EXT_DES_CRYPT,0)
+    AC_MSG_RESULT(no)
+  ],[
+    AC_DEFINE(PHP3_EXT_DES_CRYPT,0)
+    AC_MSG_RESULT(cannot check, guessing no)
+  ])
+
+  AC_MSG_CHECKING([for MD5 crypt])
+  AC_TRY_RUN([
+main() {
+#if HAVE_CRYPT
+    char salt[15], answer[40];
+
+    salt[0]='$'; salt[1]='1'; salt[2]='$'; 
+    salt[3]='r'; salt[4]='a'; salt[5]='s';
+    salt[6]='m'; salt[7]='u'; salt[8]='s';
+    salt[9]='l'; salt[10]='e'; salt[11]='$';
+    salt[12]='\0';
+    strcpy(answer,salt);
+    strcat(answer,"rISCgZzpwk3UhDidwXvin0");
+    exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer));
+#else
+	exit(0);
+#endif
+}],[
+    AC_DEFINE(PHP3_MD5_CRYPT,1)
+    AC_MSG_RESULT(yes)
+  ],[
+    AC_DEFINE(PHP3_MD5_CRYPT,0)
+    AC_MSG_RESULT(no)
+  ],[
+    AC_DEFINE(PHP3_MD5_CRYPT,0)
+    AC_MSG_RESULT(cannot check, guessing no)
+  ])
+
+  AC_MSG_CHECKING([for Blowfish crypt])
+  AC_TRY_RUN([
+main() {
+#if HAVE_CRYPT
+    char salt[25], answer[70];
+    
+    salt[0]='$'; salt[1]='2'; salt[2]='a'; salt[3]='$'; salt[4]='0'; salt[5]='7'; salt[6]='$'; salt[7]='\0';
+    strcat(salt,"rasmuslerd");
+    strcpy(answer,salt);
+    strcpy(&answer[16],"O............gl95GkTKn53Of.H4YchXl5PwvvW.5ri");
+    exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer));
+#else
+	exit(0);
+#endif
+}],[
+    AC_DEFINE(PHP3_BLOWFISH_CRYPT,1)
+    AC_MSG_RESULT(yes)
+  ],[
+    AC_DEFINE(PHP3_BLOWFISH_CRYPT,0)
+    AC_MSG_RESULT(no)
+  ],[
+    AC_DEFINE(PHP3_BLOWFISH_CRYPT,0)
+    AC_MSG_RESULT(cannot check, guessing no)
+  ])
+])
+
+AC_CHECK_LIB(c, dlopen, [
+ # fake it
+ AC_DEFINE(HAVE_LIBDL) ], [
+ AC_CHECK_LIB(dl, dlopen, [
+  LIBS="-ldl $LIBS"
+  AC_DEFINE(HAVE_LIBDL) ], []) ])
+
+AC_CRYPT_CAP
+
+divert(3)
+
 PHP_EXTENSION(standard)
+