jason Tue Mar 13 14:44:49 2001 EDT
Modified files:
/php4/ext/fbsql config.m4
Log:
fix broken m4, you should have all checking code withing your withval test
-Jason
Index: php4/ext/fbsql/config.m4
diff -u php4/ext/fbsql/config.m4:1.2 php4/ext/fbsql/config.m4:1.3
--- php4/ext/fbsql/config.m4:1.2 Tue Mar 13 14:33:53 2001
+++ php4/ext/fbsql/config.m4 Tue Mar 13 14:44:49 2001
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.2 2001/03/13 22:33:53 sniper Exp $
+dnl $Id: config.m4,v 1.3 2001/03/13 22:44:49 jason Exp $
PHP_ARG_WITH(fbsql, for FrontBase SQL92 (fbsql) support,
[ --with-fbsql[=DIR] Include FrontBase support. DIR is the FrontBase base
@@ -7,35 +7,35 @@
if test "$PHP_FBSQL" != "no"; then
AC_DEFINE(HAVE_FBSQL, 1, [Whether you have FrontBase])
PHP_EXTENSION(fbsql,$ext_shared)
-fi
-FBSQL_INSTALLATION_DIR=""
-if test "$PHP_FBSQL" = "yes"; then
- for i in /Local/Library /usr /usr/local /opt /Library
- do
- if test -f $i/FrontBase/include/FBCAccess/FBCAccess.h
- then
- FBSQL_INSTALLATION_DIR=$i/FrontBase
- break
- fi
- done
- if test -z "$FBSQL_INSTALLATION_DIR"
- then
- AC_MSG_ERROR(Cannot find FrontBase in well know installation directories)
- fi
-elif test "$PHP_FBSQL" != "no"; then
- if test -f $PHP_FBSQL/include/FBCAccess/FBCAccess.h
+
+ FBSQL_INSTALLATION_DIR=""
+ if test "$PHP_FBSQL" = "yes"; then
+ for i in /Local/Library /usr /usr/local /opt /Library
+ do
+ if test -f $i/FrontBase/include/FBCAccess/FBCAccess.h
+ then
+ FBSQL_INSTALLATION_DIR=$i/FrontBase
+ break
+ fi
+ done
+ if test -z "$FBSQL_INSTALLATION_DIR"
+ then
+ AC_MSG_ERROR(Cannot find FrontBase in well know installation directories)
+ fi
+ elif test "$PHP_FBSQL" != "no"; then
+ if test -f $PHP_FBSQL/include/FBCAccess/FBCAccess.h
+ then
+ FBSQL_INSTALLATION_DIR=$PHP_FBSQL
+ else
+ AC_MSG_ERROR(Directory $PHP_FBSQL is not a FrontBase installation directory)
+ fi
+ fi
+
+ if test ! -f "$FBSQL_INSTALLATION_DIR/lib/libFBCAccess.a"
then
- FBSQL_INSTALLATION_DIR=$PHP_FBSQL
- else
- AC_MSG_ERROR(Directory $PHP_FBSQL is not a FrontBase installation directory)
+ AC_MSG_ERROR(Could not find $FBSQL_INSTALLATION_DIR/lib/libFBCAccess.a)
fi
-fi
-
-if test ! -f "$FBSQL_INSTALLATION_DIR/lib/libFBCAccess.a"
-then
- AC_MSG_ERROR(Could not find $FBSQL_INSTALLATION_DIR/lib/libFBCAccess.a)
+ AC_ADD_LIBRARY_WITH_PATH(FBCAccess, $FBSQL_INSTALLATION_DIR/lib,
+$FBSQL_INSTALLATION_DIR/lib)
+ AC_ADD_INCLUDE($FBSQL_INSTALLATION_DIR/include)
fi
-AC_ADD_LIBRARY_WITH_PATH(FBCAccess, $FBSQL_INSTALLATION_DIR/lib,
$FBSQL_INSTALLATION_DIR/lib)
-AC_ADD_INCLUDE($FBSQL_INSTALLATION_DIR/include)
-
--
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]