cvs: php4 /ext/swf/ config.m4 swf.h

steinm Fri May 26 02:34:13 2000 EDT Removed files: /php4/ext/swf swf.h Modified files: /php4/ext/swf config.m4 Log: - swf.h belongs to the libswf distribution and should not be copied in the php distribution. - the configure script now checks for the libswf.a and swf.h in <swf-dir>/lib and <swf-dir>/include. If it doesn't find it the default directories /usr/local and /usr are checked. Index: php4/ext/swf/config.m4 diff -u php4/ext/swf/config.m4:1.6 php4/ext/swf/config.m4:1.7 --- php4/ext/swf/config.m4:1.6 Wed May 24 17:15:29 2000 +++ php4/ext/swf/config.m4 Fri May 26 02:34:13 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.6 2000/05/25 00:15:29 sterling Exp $ +dnl $Id: config.m4,v 1.7 2000/05/26 09:34:13 steinm Exp $ dnl config.m4 for extension libswf dnl don't forget to call PHP_EXTENSION(swf) dnl This file is a modified version of config.m4 @@ -8,14 +8,23 @@ [ --with-swf[=DIR] Include swf support]) if test "$PHP_SWF" != "no"; then - for i in /usr/local/lib /usr/lib $PHP_SWF; do - if test -r $i/libswf.a; then - SWF_DIR=$i - fi - done + if test -r $PHP_SWF/lib/libswf.a; then + SWF_DIR=$PHP_SWF + else + AC_MSG_CHECKING(for libswf in default path) + for i in /usr/local /usr; do + if test -r $i/lib/libswf.a; then + SWF_DIR=$i + AC_MSG_RESULT(found in $i) + fi + done + fi if test -z "$SWF_DIR"; then - AC_MSG_ERROR(Please reinstall libswf.a - I cannot find libswf.a) + AC_MSG_RESULT(not found) + AC_MSG_ERROR(Please reinstall the libswf distribution - + swf.h should be <swf-dir>/include and + libswf.a should be in <swf-dir>/lib) fi AC_ADD_INCLUDE($SWF_DIR/include)