[mapserver-commits] r12168 - trunk/mapserver/mapcache
svn at osgeo.org
svn at osgeo.org
Fri Aug 26 07:03:51 EDT 2011
Author: tbonfort
Date: 2011-08-26 04:03:51 -0700 (Fri, 26 Aug 2011)
New Revision: 12168
Modified:
trunk/mapserver/mapcache/configure
trunk/mapserver/mapcache/configure.in
Log:
very unuseful commit message
thomas.bonfort | 2010-12-09 12:06:31 +0100 (Thu, 09 Dec 2010)
Modified: trunk/mapserver/mapcache/configure
===================================================================
--- trunk/mapserver/mapcache/configure 2011-08-26 11:03:47 UTC (rev 12167)
+++ trunk/mapserver/mapcache/configure 2011-08-26 11:03:51 UTC (rev 12168)
@@ -10602,6 +10602,12 @@
fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking where FASTCGI is installed..." >&5
+$as_echo "$as_me: checking where FASTCGI is installed..." >&6;}
+ FASTCGI_LIB=''
+ FASTCGI_INC=''
+ if test -n "$FASTCGI_DIR" -a x"$FASTCGI_DIR" != "xyes"; then
+ if test x"$FASTCGI_DIR" != "xno"; then
if test -z "$FASTCGI_DIR" || echo "$FASTCGI_DIR" | grep '^/' >/dev/null ; then
FASTCGI_DIR="$FASTCGI_DIR"
@@ -10609,30 +10615,23 @@
FASTCGI_DIR="`pwd`/$FASTCGI_DIR"
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking where FASTCGI is installed..." >&5
-$as_echo "$as_me: checking where FASTCGI is installed..." >&6;}
- FASTCGI_LIB=''
- FASTCGI_INC=''
- FASTCGI_FOUND='no'
+ test -f $FASTCGI_DIR/lib/libfcgi.a -o -f $FASTCGI_DIR/lib/libfcgi.so -o -f $FASTCGI_DIR/lib/libfcgi.sl -o -f $FASTCGI_DIR/lib/libfcgi.dylib && FASTCGI_LIBDIR="$FASTCGI_DIR/lib"
+ test -f $FASTCGI_DIR/lib64/libfcgi.a -o -f $FASTCGI_DIR/lib64/libfcgi.so -o -f $FASTCGI_DIR/lib64/libfcgi.sl -o -f $FASTCGI_DIR/libfcgi.dylib && FASTCGI_LIBDIR="$FASTCGI_DIR/lib64"
+ test -f $FASTCGI_DIR/libfcgi.a -o -f $FASTCGI_DIR/libfcgi.so -o -f $FASTCGI_DIR/libfcgi.sl -o -f $FASTCGI_DIR/libfcgi.dylib && FASTCGI_LIBDIR="$FASTCGI_DIR"
+ test -f $FASTCGI_DIR/include/fcgiapp.h && FASTCGI_INCLUDE="$FASTCGI_DIR/include"
+ test -f $FASTCGI_DIR/lib/fcgiapp.h && FASTCGI_INCLUDE="$FASTCGI_DIR/lib"
+ test -f $FASTCGI_DIR/fcgiapp.h && FASTCGI_INCLUDE="$FASTCGI_DIR"
- if test -n "$FASTCGI_DIR" ; then
- test -f $FASTCGI_DIR/lib/libfcgi.a -o -f $FASTCGI_DIR/lib/libfcgi.so -o -f $FASTCGI_DIR/lib/libfcgi.sl -o -f $FASTCGI_DIR/lib/libfcgi.dylib && FASTCGI_LIBDIR="$FASTCGI_DIR/lib"
- test -f $FASTCGI_DIR/lib64/libfcgi.a -o -f $FASTCGI_DIR/lib64/libfcgi.so -o -f $FASTCGI_DIR/lib64/libfcgi.sl -o -f $FASTCGI_DIR/libfcgi.dylib && FASTCGI_LIBDIR="$FASTCGI_DIR/lib64"
- test -f $FASTCGI_DIR/libfcgi.a -o -f $FASTCGI_DIR/libfcgi.so -o -f $FASTCGI_DIR/libfcgi.sl -o -f $FASTCGI_DIR/libfcgi.dylib && FASTCGI_LIBDIR="$FASTCGI_DIR"
- test -f $FASTCGI_DIR/include/fcgiapp.h && FASTCGI_INCLUDE="$FASTCGI_DIR/include"
- test -f $FASTCGI_DIR/lib/fcgiapp.h && FASTCGI_INCLUDE="$FASTCGI_DIR/lib"
- test -f $FASTCGI_DIR/fcgiapp.h && FASTCGI_INCLUDE="$FASTCGI_DIR"
-
- if test -n "$FASTCGI_LIBDIR" ; then
- FASTCGI_LIB="-L$FASTCGI_LIBDIR -lfcgi"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: using libfastcgi from $FASTCGI_LIB" >&5
+ if test -n "$FASTCGI_LIBDIR" ; then
+ FASTCGI_LIB="-L$FASTCGI_LIBDIR -lfcgi"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: using libfastcgi from $FASTCGI_LIB" >&5
$as_echo " using libfastcgi from $FASTCGI_LIB" >&6; }
- else
- as_fn_error $? "cannot find fastcgi lib in $FASTCGI_DIR" "$LINENO" 5
- fi
+ else
+ as_fn_error $? "cannot find fastcgi lib in $FASTCGI_DIR" "$LINENO" 5
+ fi
- if test -n "$FASTCGI_INCLUDE" ; then
- as_ac_Header=`$as_echo "ac_cv_header_$FASTCGI_INCLUDE/fcgiapp.h" | $as_tr_sh`
+ if test -n "$FASTCGI_INCLUDE" ; then
+ as_ac_Header=`$as_echo "ac_cv_header_$FASTCGI_INCLUDE/fcgiapp.h" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$FASTCGI_INCLUDE/fcgiapp.h" "$as_ac_Header" "$ac_includes_default"
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
FASTCGI_INC=-I$FASTCGI_INCLUDE
@@ -10641,13 +10640,14 @@
fi
- else
- as_fn_error $? "cannot find fastcgi headers in $FASTCGI_DIR" "$LINENO" 5
+ else
+ as_fn_error $? "cannot find fastcgi headers in $FASTCGI_DIR" "$LINENO" 5
+ fi
fi
else
+ if test x"$FASTCGI_DIR" != "xno"; then
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FCGX_Init in -lfcgi" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FCGX_Init in -lfcgi" >&5
$as_echo_n "checking for FCGX_Init in -lfcgi... " >&6; }
if test "${ac_cv_lib_fcgi_FCGX_Init+set}" = set; then :
$as_echo_n "(cached) " >&6
@@ -10687,7 +10687,7 @@
FASTCGI_LIB="-lfcgi"
fi
- ac_fn_c_check_header_mongrel "$LINENO" "fcgiapp.h" "ac_cv_header_fcgiapp_h" "$ac_includes_default"
+ ac_fn_c_check_header_mongrel "$LINENO" "fcgiapp.h" "ac_cv_header_fcgiapp_h" "$ac_includes_default"
if test "x$ac_cv_header_fcgiapp_h" = x""yes; then :
else
@@ -10695,12 +10695,13 @@
fi
- if test -n "$FASTCGI_LIB" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: using libfastcgi from system libs." >&5
+ if test -n "$FASTCGI_LIB" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: using libfastcgi from system libs." >&5
$as_echo "using libfastcgi from system libs." >&6; }
- else
- as_fn_error $? "FASTCGI (libfastcgi) library cannot be found. install or reconfigure with --with-fastcgi=DIR" "$LINENO" 5
- fi
+ else
+ as_fn_error $? "FASTCGI (libfastcgi) library cannot be found. install or reconfigure with --with-fastcgi=DIR" "$LINENO" 5
+ fi
+ fi
fi
FASTCGI_INC=$FASTCGI_INC
Modified: trunk/mapserver/mapcache/configure.in
===================================================================
--- trunk/mapserver/mapcache/configure.in 2011-08-26 11:03:47 UTC (rev 12167)
+++ trunk/mapserver/mapcache/configure.in 2011-08-26 11:03:51 UTC (rev 12168)
@@ -273,45 +273,46 @@
AC_HELP_STRING([--with-fastcgi=DIR],[Specify where FASTCGI is installed]),
FASTCGI_DIR=$withval,FASTCGI_DIR='')
- AC_EXPAND_PATH($FASTCGI_DIR, FASTCGI_DIR)
AC_CHECKING(where FASTCGI is installed)
FASTCGI_LIB=''
FASTCGI_INC=''
- FASTCGI_FOUND='no'
-
- if test -n "$FASTCGI_DIR" ; then
- test -f $FASTCGI_DIR/lib/libfcgi.a -o -f $FASTCGI_DIR/lib/libfcgi.so -o -f $FASTCGI_DIR/lib/libfcgi.sl -o -f $FASTCGI_DIR/lib/libfcgi.dylib && FASTCGI_LIBDIR="$FASTCGI_DIR/lib"
- test -f $FASTCGI_DIR/lib64/libfcgi.a -o -f $FASTCGI_DIR/lib64/libfcgi.so -o -f $FASTCGI_DIR/lib64/libfcgi.sl -o -f $FASTCGI_DIR/libfcgi.dylib && FASTCGI_LIBDIR="$FASTCGI_DIR/lib64"
- test -f $FASTCGI_DIR/libfcgi.a -o -f $FASTCGI_DIR/libfcgi.so -o -f $FASTCGI_DIR/libfcgi.sl -o -f $FASTCGI_DIR/libfcgi.dylib && FASTCGI_LIBDIR="$FASTCGI_DIR"
- test -f $FASTCGI_DIR/include/fcgiapp.h && FASTCGI_INCLUDE="$FASTCGI_DIR/include"
- test -f $FASTCGI_DIR/lib/fcgiapp.h && FASTCGI_INCLUDE="$FASTCGI_DIR/lib"
- test -f $FASTCGI_DIR/fcgiapp.h && FASTCGI_INCLUDE="$FASTCGI_DIR"
-
- if test -n "$FASTCGI_LIBDIR" ; then
- FASTCGI_LIB="-L$FASTCGI_LIBDIR -lfcgi"
- AC_MSG_RESULT([ using libfastcgi from $FASTCGI_LIB])
- else
- AC_MSG_ERROR([cannot find fastcgi lib in $FASTCGI_DIR])
+ if test -n "$FASTCGI_DIR" -a x"$FASTCGI_DIR" != "xyes"; then
+ if test x"$FASTCGI_DIR" != "xno"; then
+ AC_EXPAND_PATH($FASTCGI_DIR, FASTCGI_DIR)
+ test -f $FASTCGI_DIR/lib/libfcgi.a -o -f $FASTCGI_DIR/lib/libfcgi.so -o -f $FASTCGI_DIR/lib/libfcgi.sl -o -f $FASTCGI_DIR/lib/libfcgi.dylib && FASTCGI_LIBDIR="$FASTCGI_DIR/lib"
+ test -f $FASTCGI_DIR/lib64/libfcgi.a -o -f $FASTCGI_DIR/lib64/libfcgi.so -o -f $FASTCGI_DIR/lib64/libfcgi.sl -o -f $FASTCGI_DIR/libfcgi.dylib && FASTCGI_LIBDIR="$FASTCGI_DIR/lib64"
+ test -f $FASTCGI_DIR/libfcgi.a -o -f $FASTCGI_DIR/libfcgi.so -o -f $FASTCGI_DIR/libfcgi.sl -o -f $FASTCGI_DIR/libfcgi.dylib && FASTCGI_LIBDIR="$FASTCGI_DIR"
+ test -f $FASTCGI_DIR/include/fcgiapp.h && FASTCGI_INCLUDE="$FASTCGI_DIR/include"
+ test -f $FASTCGI_DIR/lib/fcgiapp.h && FASTCGI_INCLUDE="$FASTCGI_DIR/lib"
+ test -f $FASTCGI_DIR/fcgiapp.h && FASTCGI_INCLUDE="$FASTCGI_DIR"
+
+ if test -n "$FASTCGI_LIBDIR" ; then
+ FASTCGI_LIB="-L$FASTCGI_LIBDIR -lfcgi"
+ AC_MSG_RESULT([ using libfastcgi from $FASTCGI_LIB])
+ else
+ AC_MSG_ERROR([cannot find fastcgi lib in $FASTCGI_DIR])
+ fi
+
+ if test -n "$FASTCGI_INCLUDE" ; then
+ AC_CHECK_HEADER([$FASTCGI_INCLUDE/fcgiapp.h],FASTCGI_INC=-I$FASTCGI_INCLUDE,
+ [AC_MSG_ERROR([cannot find fastcgi headers])])
+ else
+ AC_MSG_ERROR([cannot find fastcgi headers in $FASTCGI_DIR])
+ fi
fi
+ else
+ if test x"$FASTCGI_DIR" != "xno"; then
+ dnl check for fastcgi in system locations
- if test -n "$FASTCGI_INCLUDE" ; then
- AC_CHECK_HEADER([$FASTCGI_INCLUDE/fcgiapp.h],FASTCGI_INC=-I$FASTCGI_INCLUDE,
- [AC_MSG_ERROR([cannot find fastcgi headers])])
- else
- AC_MSG_ERROR([cannot find fastcgi headers in $FASTCGI_DIR])
+ AC_CHECK_LIB(fcgi, FCGX_Init, FASTCGI_LIB="-lfcgi",,)
+ AC_CHECK_HEADER([fcgiapp.h],,
+ [AC_MSG_ERROR([cannot find fastcgi headers in system path])])
+ if test -n "$FASTCGI_LIB" ; then
+ AC_MSG_RESULT([using libfastcgi from system libs.])
+ else
+ AC_MSG_ERROR([FASTCGI (libfastcgi) library cannot be found. install or reconfigure with --with-fastcgi=DIR])
+ fi
fi
- else
-
- dnl check for fastcgi in system locations
-
- AC_CHECK_LIB(fcgi, FCGX_Init, FASTCGI_LIB="-lfcgi",,)
- AC_CHECK_HEADER([fcgiapp.h],,
- [AC_MSG_ERROR([cannot find fastcgi headers in system path])])
- if test -n "$FASTCGI_LIB" ; then
- AC_MSG_RESULT([using libfastcgi from system libs.])
- else
- AC_MSG_ERROR([FASTCGI (libfastcgi) library cannot be found. install or reconfigure with --with-fastcgi=DIR])
- fi
fi
AC_SUBST(FASTCGI_INC,$FASTCGI_INC)
More information about the mapserver-commits
mailing list