emile Tue Feb 13 08:13:34 2001 EDT
Modified files:
/php4/ext/midgard config.m4
Log:
Misplaced if spotted by Sascha
Index: php4/ext/midgard/config.m4
diff -u php4/ext/midgard/config.m4:1.2 php4/ext/midgard/config.m4:1.3
--- php4/ext/midgard/config.m4:1.2 Tue Feb 13 03:58:34 2001
+++ php4/ext/midgard/config.m4 Tue Feb 13 08:13:34 2001
@@ -1,42 +1,42 @@
-dnl dnl $Id: config.m4,v 1.2 2001/02/13 11:58:34 sas Exp $
-dnl dnl config.m4 for extension midgard
-dnl dnl don't forget to call PHP_EXTENSION(midgard)
-dnl
-dnl AC_PROG_YACC
-dnl AC_DECL_YYTEXT
-dnl AC_PROG_LEX
-dnl
-dnl PHP_ARG_WITH(midgard, for midgard support,
-dnl [ --with-midgard Include midgard 1.4 support])
-dnl
-dnl if test "$PHP_MIDGARD" != "no"; then
-dnl if test "$PHP_MIDGARD" != "yes"; then
-dnl AC_ADD_LIBRARY_WITH_PATH(midgard, "$PHP_MIDGARD/lib", MIDGARD_SHARED_LIBADD)
-dnl AC_ADD_INCLUDE("$PHP_MIDGARD/include")
-dnl else
-dnl AC_ADD_LIBRARY(midgard)
-dnl fi
-dnl AC_DEFINE(HAVE_MIDGARD, 1, [ ])
-dnl PHP_EXTENSION(midgard, $ext_shared)
-dnl fi
-dnl
-dnl dnl EEH/TODO: Add checks for apache-static compilation
-dnl AC_PATH_PROG(APXS, apxs)
-dnl if test -z $APXS; then
-dnl AC_MSG_ERROR(apxs not found.)
-dnl fi
-dnl APACHE_INCLUDES=`$APXS -q INCLUDEDIR`
-dnl AC_ADD_INCLUDE($APACHE_INCLUDES)
-dnl
-dnl AC_PATH_PROG(GLIBCONFIG, glib-config)
-dnl dnl Ackackack... why do people do this?
-dnl if test -z $GLIBCONFIG; then
-dnl AC_PATH_PROG(GLIBCONFIG, glib12-config)
-dnl fi
-dnl if test -z $GLIBCONFIG; then
-dnl AC_MSG_ERROR(glib-config not found. Did you install glib?)
-dnl fi
-dnl AC_ADD_LIBRARY_WITH_PATH(`$GLIBCONFIG --libs`)
-dnl LFLAGS="-Pmgd -olex.yy.c"
-dnl
-dnl PHP_SUBST(GLIBCONFIG)
+dnl $Id: config.m4,v 1.3 2001/02/13 16:13:34 emile Exp $
+dnl config.m4 for extension midgard
+dnl don't forget to call PHP_EXTENSION(midgard)
+
+AC_PROG_YACC
+AC_DECL_YYTEXT
+AC_PROG_LEX
+
+PHP_ARG_WITH(midgard, for midgard support,
+[ --with-midgard Include midgard 1.4 support])
+
+if test "$PHP_MIDGARD" != "no"; then
+ if test "$PHP_MIDGARD" != "yes"; then
+ AC_ADD_LIBRARY_WITH_PATH(midgard, "$PHP_MIDGARD/lib", MIDGARD_SHARED_LIBADD)
+ AC_ADD_INCLUDE("$PHP_MIDGARD/include")
+ else
+ AC_ADD_LIBRARY(midgard)
+ fi
+ AC_DEFINE(HAVE_MIDGARD, 1, [ ])
+ PHP_EXTENSION(midgard, $ext_shared)
+
+dnl EEH/TODO: Add checks for apache-static compilation
+ AC_PATH_PROG(APXS, apxs)
+ if test -z $APXS; then
+ AC_MSG_ERROR(apxs not found.)
+ fi
+ APACHE_INCLUDES=`$APXS -q INCLUDEDIR`
+ AC_ADD_INCLUDE($APACHE_INCLUDES)
+
+ AC_PATH_PROG(GLIBCONFIG, glib-config)
+ dnl Ackackack... why do people do this?
+ if test -z $GLIBCONFIG; then
+ AC_PATH_PROG(GLIBCONFIG, glib12-config)
+ fi
+ if test -z $GLIBCONFIG; then
+ AC_MSG_ERROR(glib-config not found. Did you install glib?)
+ fi
+ AC_ADD_LIBRARY_WITH_PATH(`$GLIBCONFIG --libs`)
+ LFLAGS="-Pmgd -olex.yy.c"
+
+ PHP_SUBST(GLIBCONFIG)
+fi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
