cvs: /php3 configure.in

kk Mon Nov 22 03:18:20 1999 EDT Modified files: /php3 configure.in Log: Applied configure.in patch by Sascha. Index: php3/configure.in diff -u php3/configure.in:1.477 php3/configure.in:1.478 --- php3/configure.in:1.477 Sun Nov 21 19:12:24 1999 +++ php3/configure.in Mon Nov 22 03:18:19 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.477 1999/11/22 00:12:24 kk Exp $ +dnl $Id: configure.in,v 1.478 1999/11/22 08:18:19 kk Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -2893,48 +2893,38 @@ AC_MSG_RESULT(yes) ]) +RESULT=no AC_MSG_CHECKING(whether to include GNU recode support) AC_ARG_WITH(recode, [ --with-recode[=DIR] Include GNU recode support.], [ - if test "$withval" = "yes"; then - if test -f /usr/include/recode.h; then - withval=/usr - elif test -f /usr/local/include/recode.h; then - withval=/usr/local - elif test -f /opt/include/recode.h; then - withval=/opt - fi - fi - if test "$withval" != "no" && test "$withval" != "yes"; then - RECODE_DIR=$withval - if test -f $RECODE_DIR/include/recode/recode.h; then - RECODE_INC_DIR=$RECODE_DIR/include/recode - else - RECODE_INC_DIR=$withval/include - fi - - if test ! -f $RECODE_INC_DIR/recode.h; then - AC_MSG_ERROR(could not find recode.h in $RECODE_INC_DIR !) - fi + if test "$withval" != "no"; then + for i in /usr/local /usr /opt/recode $withval; do + if test -f $i/include/recode.h; then + RECODE_DIR=$i + RECODE_INC= + elif test -f $i/include/recode/recode.h; then + RECODE_DIR=$i + RECODE_INC=/recode + fi + done - AC_EXPAND_PATH($RECODE_DIR, RECODE_DIR) - if test -f "$RECODE_DIR/lib/librecode.a" ; then - AC_ADD_LIBRARY_WITH_PATH(recode, $RECODE_DIR/lib) - elif test -f "$RECODE_DIR/lib/librecode.so"; then - AC_ADD_LIBRARY_WITH_PATH(recode, $RECODE_DIR/lib) - else - AC_MSG_ERROR(could not find librecode.a or librecode.so in $RECODE_DIR/lib) + if test -z "$RECODE_DIR"; then + AC_MSG_ERROR(Cannot find recode.h. Please install recode-3.5 or higher) + fi + + AC_ADD_INCLUDE($RECODE_DIR$RECODE_INC) + + if test -f "$RECODE_DIR/lib/librecode.*"; then + AC_ADD_LIBRARY_WITH_PATH(recode, $RECODE_DIR/lib) + else + AC_MSG_ERROR(Cannot find librecode. Please install recode-3.5 or higher) fi - AC_ADD_INCLUDE($RECODE_INC_DIR) AC_DEFINE(HAVE_RECODE) - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) + RESULT=yes fi -],[ - AC_MSG_RESULT(no) ]) +AC_MSG_RESULT($RESULT) AC_MSG_CHECKING(whether to enable dmalloc support) AC_ARG_ENABLE(dmalloc,