phanto          Sun Dec  1 08:36:54 2002 EDT

  Modified files:              
    /php4/sapi/milter   config.m4 
  Log:
  no message
  
  
Index: php4/sapi/milter/config.m4
diff -u php4/sapi/milter/config.m4:1.3 php4/sapi/milter/config.m4:1.4
--- php4/sapi/milter/config.m4:1.3      Sun Dec  1 00:14:56 2002
+++ php4/sapi/milter/config.m4  Sun Dec  1 08:36:53 2002
@@ -1,12 +1,18 @@
 dnl
-dnl $Id: config.m4,v 1.3 2002/12/01 05:14:56 sniper Exp $
+dnl $Id: config.m4,v 1.4 2002/12/01 13:36:53 phanto Exp $
 dnl
 
 AC_MSG_CHECKING(for Milter support)
 AC_ARG_WITH(milter,
 [  --with-milter=DIR       Build PHP as Milter application],[
   if test "$withval" = "yes"; then
-    MILTERPATH=/usr
+    if test -f /usr/lib/libmilter.a; then
+      MILTERPATH=/usr/lib
+    else if test -f /usr/lib/libmilter/libmilter.a; then
+      MILTERPATH=/usr/lib/libmilter
+    else
+      AC_MSG_ERROR(Unable to find libmilter.a)
+    fi
   else
     MILTERPATH=$withval
   fi
@@ -17,7 +23,7 @@
   PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/milter/Makefile.frag)
   
   PHP_SELECT_SAPI(milter, program, php_milter.c getopt.c,,'$(SAPI_MILTER_PATH)') 
-  PHP_ADD_LIBRARY_WITH_PATH(milter, "$MILTERPATH/lib",)
+  PHP_ADD_LIBRARY_WITH_PATH(milter, $MILTERPATH,)
   
   BUILD_MILTER="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) 
\$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) 
\$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_MILTER_PATH)"
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to