cvs: php4 /ext/ircg config.m4

sas Tue Jun 3 21:38:03 2003 EDT Modified files: /php4/ext/ircg config.m4 Log: Properly support only giving --with-ircg-config Also fix libpath order and link order Index: php4/ext/ircg/config.m4 diff -u php4/ext/ircg/config.m4:1.22 php4/ext/ircg/config.m4:1.23 --- php4/ext/ircg/config.m4:1.22 Wed Apr 23 00:05:13 2003 +++ php4/ext/ircg/config.m4 Tue Jun 3 21:38:03 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.22 2003/04/23 04:05:13 sas Exp $ +dnl $Id: config.m4,v 1.23 2003/06/04 01:38:03 sas Exp $ dnl PHP_ARG_WITH(ircg, for IRCG support, @@ -17,25 +17,26 @@ ]) if test "$PHP_IRCG" != "no"; then - IRCG_PREFIX=$IRCG_CONFIG --prefix if test -z "$IRCG_PREFIX"; then AC_MSG_ERROR([I cannot run the ircg-config script which should have been installed by IRCG. Please ensure that the script is in your PATH or point --with-ircg-config to the path of the script.]) fi - + + PHP_ADD_INCLUDE($IRCG_PREFIX/include) + PHP_ADD_LIBRARY(ircg,yes,IRCG_SHARED_LIBADD) PHP_EVAL_LIBLINE($IRCG_CONFIG --ldflags, IRCG_SHARED_LIBADD) PHP_EVAL_INCLINE($IRCG_CONFIG --cppflags) - PHP_ADD_LIBRARY_WITH_PATH(ircg, $PHP_IRCG/lib, IRCG_SHARED_LIBADD) - PHP_ADD_INCLUDE($PHP_IRCG/include) + PHP_ADD_LIBPATH($IRCG_PREFIX/lib, IRCG_SHARED_LIBADD) PHP_SUBST(IRCG_SHARED_LIBADD) - ircg_src="ircg_common.c" + + ircg_src=ircg_common.c if test "$PHP_SAPI" = "thttpd"; then ircg_src= PHP_ADD_SOURCES(PHP_EXT_DIR(ircg),ircg_thttpd.c,[],sapi) PHP_ADD_SOURCES(PHP_EXT_DIR(ircg),ircg_common.c,[],cli) else - PHP_ADD_LIBRARY(dl,,IRCG_SHARED_LIBADD) + PHP_ADD_LIBRARY(dl,yes,IRCG_SHARED_LIBADD) fi PHP_NEW_EXTENSION(ircg,[ ircg.c ircg_scanner.c php_ircg_cache.c $ircg_src \ php_ircg_conversion.c php_ircg_error.c php_ircg_tokenizer.c],