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

[Antony Dovgal]

tony2001                Wed Jul 11 22:15:44 2007 UTC

  Modified files:              
    /php-src/ext/oci8   config.m4 
  Log:
  check PHP version only when enabled
  and replace tabs with spaces
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/config.m4?r1=1.66&r2=1.67&diff_format=u
Index: php-src/ext/oci8/config.m4
diff -u php-src/ext/oci8/config.m4:1.66 php-src/ext/oci8/config.m4:1.67
--- php-src/ext/oci8/config.m4:1.66     Tue Jul  3 17:24:37 2007
+++ php-src/ext/oci8/config.m4  Wed Jul 11 22:15:44 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.66 2007/07/03 17:24:37 sniper Exp $
+dnl $Id: config.m4,v 1.67 2007/07/11 22:15:44 tony2001 Exp $
 dnl
 
 if test -z "$SED"; then
@@ -37,9 +37,9 @@
 
   AC_MSG_CHECKING([OCI8 libraries dir])
   if test -d "$OCI8_DIR/lib" -a ! -d "$OCI8_DIR/lib32"; then
-       OCI8_LIB_DIR=lib
+    OCI8_LIB_DIR=lib
   elif ! test -d "$OCI8_DIR/lib" -a -d "$OCI8_DIR/lib32"; then
-       OCI8_LIB_DIR=lib32
+    OCI8_LIB_DIR=lib32
   elif test -d "$OCI8_DIR/lib" -a -d "$OCI8_DIR/lib32"; then
     OCI8_LIB_DIR=$TMP_OCI8_LIB_DIR
   else
@@ -100,6 +100,7 @@
                           Use --with-oci8=instantclient,/path/to/oic/lib 
                           for an Oracle Instant Client installation])
 
+if test "$PHP_OCI8" != "no"; then 
   AC_MSG_CHECKING([PHP version])
 
   tmp_version=$PHP_VERSION
@@ -127,22 +128,22 @@
   else
     AC_MSG_RESULT([$php_version, ok])
   fi
-
+fi
 
 PHP_OCI8_INSTANT_CLIENT="no"
 
 if test "`echo $PHP_OCI8 | cut -d, -f2`" = "instantclient"; then
-       PHP_OCI8_INSTANT_CLIENT="`echo $PHP_OCI8 | cut -d, -f3`"
+    PHP_OCI8_INSTANT_CLIENT="`echo $PHP_OCI8 | cut -d, -f3`"
     PHP_OCI8="`echo $PHP_OCI8 | cut -d, -f1,4`"
-       if test "$PHP_OCI8_INSTANT_CLIENT" = ""; then
-               PHP_OCI8_INSTANT_CLIENT="yes"
-       fi
+    if test "$PHP_OCI8_INSTANT_CLIENT" = ""; then
+        PHP_OCI8_INSTANT_CLIENT="yes"
+    fi
 elif test "`echo $PHP_OCI8 | cut -d, -f1`" = "instantclient"; then
-       PHP_OCI8_INSTANT_CLIENT="`echo $PHP_OCI8 | cut -d, -f2`"
+    PHP_OCI8_INSTANT_CLIENT="`echo $PHP_OCI8 | cut -d, -f2`"
     PHP_OCI8="`echo $PHP_OCI8 | cut -d, -f3,4`"
-       if test "$PHP_OCI8_INSTANT_CLIENT" = ""; then
-               PHP_OCI8_INSTANT_CLIENT="yes"
-       fi
+    if test "$PHP_OCI8_INSTANT_CLIENT" = ""; then
+        PHP_OCI8_INSTANT_CLIENT="yes"
+    fi
 fi
 
 if test "$PHP_OCI8" != "no" && test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then
@@ -215,7 +216,7 @@
         -L$OCI8_DIR/$OCI8_LIB_DIR $OCI8_SHARED_LIBADD
       ])
 
-         PHP_CHECK_LIBRARY(clntsh, OCIStmtPrepare2,
+      PHP_CHECK_LIBRARY(clntsh, OCIStmtPrepare2,
       [
         AC_DEFINE(HAVE_OCI_STMT_PREPARE2,1,[ ])
       ], [], [

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