dmitry          Mon Sep  1 13:15:42 2008 UTC

  Modified files:              
    /php-src/sapi/cli   config.m4 
  Log:
  Fixed bug #42318 (problem with nm on AIX, not finding object files)
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/config.m4?r1=1.25&r2=1.26&diff_format=u
Index: php-src/sapi/cli/config.m4
diff -u php-src/sapi/cli/config.m4:1.25 php-src/sapi/cli/config.m4:1.26
--- php-src/sapi/cli/config.m4:1.25     Wed Jul 11 23:10:14 2007
+++ php-src/sapi/cli/config.m4  Mon Sep  1 13:15:42 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.25 2007/07/11 23:10:14 jani Exp $
+dnl $Id: config.m4,v 1.26 2008/09/01 13:15:42 dmitry Exp $
 dnl
 
 PHP_ARG_ENABLE(cli,,
@@ -13,7 +13,11 @@
 
   case $host_alias in
   *aix*)
-    BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo 
\$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | 
\$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && 
(substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && 
\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) 
\$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl 
-Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) 
\$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
+    if test "$php_build_target" = "shared"; then
+      BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo 
\$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) | sed 
's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || 
(\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print 
\$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) 
-export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) 
\$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) 
\$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
+    else
+      BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo 
\$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | 
\$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && 
(substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && 
\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) 
\$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl 
-Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) 
\$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
+    fi
     ;;
   *darwin*)
     BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) 
\$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) 
\$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) 
\$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"



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

Reply via email to