[PHP-CVS] cvs: php-src /ext/ftp config.m4

2005-10-31 Thread Brian France 
bfrance Mon Oct 31 19:46:49 2005 EDT

  Modified files:  
/php-src/ext/ftpconfig.m4 
  Log:
  MFB: Fixed phpize build (default PHP_OPENSSL to no if not set)
  
http://cvs.php.net/diff.php/php-src/ext/ftp/config.m4?r1=1.10r2=1.11ty=u
Index: php-src/ext/ftp/config.m4
diff -u php-src/ext/ftp/config.m4:1.10 php-src/ext/ftp/config.m4:1.11
--- php-src/ext/ftp/config.m4:1.10  Sun Oct  9 16:44:26 2005
+++ php-src/ext/ftp/config.m4   Mon Oct 31 19:46:44 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.10 2005/10/09 20:44:26 sniper Exp $
+dnl $Id: config.m4,v 1.11 2005/11/01 00:46:44 bfrance Exp $
 dnl
 
 PHP_ARG_ENABLE(ftp,whether to enable FTP support,
@@ -12,6 +12,9 @@
   AC_DEFINE(HAVE_FTP,1,[Whether you want FTP support])
   PHP_NEW_EXTENSION(ftp, php_ftp.c ftp.c, $ext_shared)
 
+  dnl Empty variable means 'no'
+  test -z $PHP_OPENSSL  PHP_OPENSSL=no
+
   if test $PHP_OPENSSL != no || test $PHP_OPENSSL_DIR != no; then
 PHP_SETUP_OPENSSL(FTP_SHARED_LIBADD)
 PHP_SUBST(FTP_SHARED_LIBADD)

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

[PHP-CVS] cvs: php-src /ext/ftp config.m4

2005-10-09 Thread Jani Taskinen 
sniper  Sun Oct  9 16:38:28 2005 EDT

  Modified files:  
/php-src/ext/ftpconfig.m4 
  Log:
  Fix properly
  
http://cvs.php.net/diff.php/php-src/ext/ftp/config.m4?r1=1.8r2=1.9ty=u
Index: php-src/ext/ftp/config.m4
diff -u php-src/ext/ftp/config.m4:1.8 php-src/ext/ftp/config.m4:1.9
--- php-src/ext/ftp/config.m4:1.8   Sun Oct  9 16:33:09 2005
+++ php-src/ext/ftp/config.m4   Sun Oct  9 16:38:28 2005
@@ -1,13 +1,19 @@
 dnl
-dnl $Id: config.m4,v 1.8 2005/10/09 20:33:09 sniper Exp $
+dnl $Id: config.m4,v 1.9 2005/10/09 20:38:28 sniper Exp $
 dnl
 
 PHP_ARG_ENABLE(ftp,whether to enable FTP support,
 [  --enable-ftpEnable FTP support])
 
+PHP_ARG_WITH(openssl-dir,OpenSSL dir for SNMP,
+[  --with-openssl-dir[=DIR]  SNMP: openssl install prefix], no, no)
+
 if test $PHP_FTP = yes; then
   AC_DEFINE(HAVE_FTP,1,[Whether you want FTP support])
   PHP_NEW_EXTENSION(ftp, php_ftp.c ftp.c, $ext_shared)
-  PHP_SETUP_OPENSSL(FTP_SHARED_LIBADD)
-  PHP_SUBST(FTP_SHARED_LIBADD)
+
+  if test $PHP_OPENSSL != no || test $PHP_OPENSSL_DIR != no; then
+PHP_SETUP_OPENSSL(FTP_SHARED_LIBADD)
+PHP_SUBST(FTP_SHARED_LIBADD)
+  fi
 fi

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

[PHP-CVS] cvs: php-src /ext/ftp config.m4

2005-10-09 Thread Jani Taskinen 
sniper  Sun Oct  9 16:44:26 2005 EDT

  Modified files:  
/php-src/ext/ftpconfig.m4 
  Log:
  MFB
  
http://cvs.php.net/diff.php/php-src/ext/ftp/config.m4?r1=1.9r2=1.10ty=u
Index: php-src/ext/ftp/config.m4
diff -u php-src/ext/ftp/config.m4:1.9 php-src/ext/ftp/config.m4:1.10
--- php-src/ext/ftp/config.m4:1.9   Sun Oct  9 16:38:28 2005
+++ php-src/ext/ftp/config.m4   Sun Oct  9 16:44:26 2005
@@ -1,12 +1,12 @@
 dnl
-dnl $Id: config.m4,v 1.9 2005/10/09 20:38:28 sniper Exp $
+dnl $Id: config.m4,v 1.10 2005/10/09 20:44:26 sniper Exp $
 dnl
 
 PHP_ARG_ENABLE(ftp,whether to enable FTP support,
 [  --enable-ftpEnable FTP support])
 
-PHP_ARG_WITH(openssl-dir,OpenSSL dir for SNMP,
-[  --with-openssl-dir[=DIR]  SNMP: openssl install prefix], no, no)
+PHP_ARG_WITH(openssl-dir,OpenSSL dir for FTP,
+[  --with-openssl-dir[=DIR]  FTP: openssl install prefix], no, no)
 
 if test $PHP_FTP = yes; then
   AC_DEFINE(HAVE_FTP,1,[Whether you want FTP support])

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