cvs: php4 /ext/imap/ Makefile.in config.m4

sas		Wed May 24 01:36:44 2000 EDT

  Modified files:
    /php4/ext/imap	Makefile.in config.m4 
  Log:
  Make imap extension buildable as shared module.
  
  
Index: php4/ext/imap/Makefile.in
diff -u php4/ext/imap/Makefile.in:1.12 php4/ext/imap/Makefile.in:1.13
--- php4/ext/imap/Makefile.in:1.12	Tue May  2 00:38:28 2000
+++ php4/ext/imap/Makefile.in	Wed May 24 01:36:44 2000
@@ -1,5 +1,7 @@
 
 LTLIBRARY_NAME    = libimap.la
 LTLIBRARY_SOURCES = php_imap.c
+LTLIBRARY_SHARED_NAME = imap.la
+LTLIBRARY_SHARED_LIBADD = $(IMAP_SHARED_LIBADD)
 
 include $(top_srcdir)/build/dynlib.mk
Index: php4/ext/imap/config.m4
diff -u php4/ext/imap/config.m4:1.18 php4/ext/imap/config.m4:1.19
--- php4/ext/imap/config.m4:1.18	Sun Apr 30 18:10:29 2000
+++ php4/ext/imap/config.m4	Wed May 24 01:36:44 2000
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.18 2000/04/30 16:10:29 jah Exp $
+dnl $Id: config.m4,v 1.19 2000/05/23 23:36:44 sas Exp $
 
 AC_DEFUN(IMAP_INC_CHK,[if test -r $i$1/rfc822.h; then IMAP_DIR=$i; IMAP_INC_DIR=$i$1])
 
@@ -6,20 +6,18 @@
 		str="$IMAP_DIR/$1/lib$lib.*"
 		for i in `echo $str`; do
 			if test -r $i; then
-				IMAP_LIB_DIR=$IMAP_DIR/$1
+				IMAP_LIBDIR=$IMAP_DIR/$1
 				break 2
 			fi
 		done
 		])
 
-RESULT=no
-AC_MSG_CHECKING(for IMAP support)
-AC_ARG_WITH(imap,
+PHP_ARG_WITH(imap,for IMAP support,
 [  --with-imap[=DIR]       Include IMAP support.  DIR is the IMAP include
-                          and c-client.a directory.],
-[
-  if test "$withval" != "no"; then  
-    for i in /usr/local /usr $withval; do
+                          and c-client.a directory.])
+
+  if test "$PHP_IMAP" != "no"; then  
+    for i in /usr/local /usr $PHP_IMAP; do
       IMAP_INC_CHK()
       el[]IMAP_INC_CHK(/include)
       el[]IMAP_INC_CHK(/include/imap)
@@ -45,18 +43,20 @@
       IMAP_LIB_CHK(c-client)
     done
 
-    if test -z "$IMAP_LIB_DIR"; then
+    if test -z "$IMAP_LIBDIR"; then
       AC_MSG_ERROR(Cannot find imap library. Please check your IMAP installation)
     fi
 
     AC_ADD_INCLUDE($IMAP_INC_DIR)
-    AC_ADD_LIBPATH($IMAP_LIB_DIR)
-    AC_ADD_LIBRARY_DEFER($IMAP_LIB)
+    if test "$ext_shared" = "yes"; then
+      AC_ADD_LIBRARY_WITH_PATH($IMAP_LIB, $IMAP_LIBDIR, IMAP_SHARED_LIBADD)
+      PHP_SUBST(IMAP_SHARED_LIBADD)
+    else
+      AC_ADD_LIBPATH($IMAP_LIBDIR)
+      AC_ADD_LIBRARY_DEFER($IMAP_LIB)
+    fi
 
-    PHP_EXTENSION(imap)
+    PHP_EXTENSION(imap, $ext_shared)
 
     AC_DEFINE(HAVE_IMAP,1,[ ])
-    RESULT=yes
   fi
-])
-AC_MSG_RESULT($RESULT)