Changeset 2466

Timestamp:

10/14/03 11:16:04 (5 years ago)

Author:

dan

Message:

Added Apache version detection and set -DNEED_NONBLOCKING_STDERR when
Apache 2.x is found (bug 458)

Files:

• branches/branch-4-0/mapserver/configure (modified) (232 diffs)
• branches/branch-4-0/mapserver/configure.in (modified) (2 diffs)

branches/branch-4-0/mapserver/configure

@@ -77 +77 @@
-  --with-curl-config=PATH Specify path to curl-config."
-ac_help="$ac_help
+  --with-httpd            Specify path to 'httpd' executable."
+ac_help="$ac_help
-  --enable-ignore-missing-data   Ignore missing data file errors at runtime
-                                 (enabled by default).
@@ -624 +626 @@
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-7
+9
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -654 +656 @@
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-7
+9
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -705 +707 @@
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-08
+10
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -737 +739 @@
-
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-0
+2
-
-ac_ext=c
@@ -748 +750 @@
-cat > conftest.$ac_ext << EOF
-
-1
+3
-#include "confdefs.h"
-
-main(){return(0);}
-EOF
-6
+8
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
@@ -779 +781 @@
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-2
+4
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-7
+9
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -793 +795 @@
-#endif
-EOF
-6
+8
-  ac_cv_prog_gcc=yes
-else
@@ -812 +814 @@
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-5
+7
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -848 +850 @@
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-1
+3
-if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -880 +882 @@
-
-echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-3
+5
-
-ac_ext=C
@@ -891 +893 @@
-cat > conftest.$ac_ext << EOF
-
-4
+6
-#include "confdefs.h"
-
-int main(){return(0);}
-EOF
-899
+901
-  ac_cv_prog_cxx_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
@@ -922 +924 @@
-fi
-echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-5
+7
-echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
-cross_compiling=$ac_cv_prog_cxx_cross
-
-echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-0
+2
-if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -936 +938 @@
-#endif
-EOF
-39
+41
-  ac_cv_prog_gxx=yes
-else
@@ -955 +957 @@
-CXXFLAGS=
-echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-58
+60
-if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -986 +988 @@
-fi
-
-for ac_declaration in \
-   ''\
-   '#include <stdlib.h>' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat > conftest.$ac_ext <<EOF
-#line 999 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-$ac_declaration
-int main() {
-exit (42);
-; return 0; }
-EOF
-if { (eval echo configure:1007: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  :
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  continue
-fi
-rm -f conftest*
-  cat > conftest.$ac_ext <<EOF
-#line 1017 "configure"
-#include "confdefs.h"
-$ac_declaration
-int main() {
-exit (42);
-; return 0; }
-EOF
-if { (eval echo configure:1024: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-done
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
-fi
-
-
-# Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-1043
+994
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -1070 +1021 @@
-set dummy flex; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-73
+24
-if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -1104 +1055 @@
-  esac
-  echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-107
+058
-ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1112 +1063 @@
-LIBS="-l$ac_lib  $LIBS"
-cat > conftest.$ac_ext <<EOF
-115
+066
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -1123 +1074 @@
-; return 0; }
-EOF
-126
+077
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1150 +1101 @@
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-53
+04
-if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -1182 +1133 @@
-
-  echo $ac_n "checking if compiler supports -R""... $ac_c" 1>&6
-85
+36
-  if eval "test \"`echo '$''{'php_cv_cc_dashr'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -1190 +1141 @@
-        LIBS="-R /usr/lib ${LIBS}"
-        cat > conftest.$ac_ext <<EOF
-93
+44
-#include "confdefs.h"
-
@@ -1197 +1148 @@
-; return 0; }
-EOF
-200
+151
-  rm -rf conftest*
-  php_cv_cc_dashr=yes
@@ -1217 +1168 @@
-  if test -z "$ld_runpath_switch" ; then
-        echo $ac_n "checking if compiler supports -Wl,-rpath,""... $ac_c" 1>&6
-220
+171
-        if eval "test \"`echo '$''{'php_cv_cc_rpath'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -1225 +1176 @@
-                LIBS="-Wl,-rpath,/usr/lib ${LIBS}"
-                cat > conftest.$ac_ext <<EOF
-228
+179
-#include "confdefs.h"
-
@@ -1232 +1183 @@
-; return 0; }
-EOF
-235
+186
-  rm -rf conftest*
-  php_cv_cc_rpath=yes
@@ -1253 +1204 @@
-  if test -z "$ld_runpath_switch" ; then
-        echo $ac_n "checking if compiler supports -Wl,-R""... $ac_c" 1>&6
-56
+07
-        if eval "test \"`echo '$''{'php_cv_cc_dashwlr'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -1261 +1212 @@
-                LIBS="-Wl,-R/usr/lib ${LIBS}"
-                cat > conftest.$ac_ext <<EOF
-64
+15
-#include "confdefs.h"
-
@@ -1268 +1219 @@
-; return 0; }
-EOF
-71
+22
-  rm -rf conftest*
-  php_cv_cc_dashwlr=yes
@@ -1295 +1246 @@
-
-echo $ac_n "checking for exp in -lm""... $ac_c" 1>&6
-98
+49
-ac_lib_var=`echo m'_'exp | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1303 +1254 @@
-LIBS="-lm  $LIBS"
-cat > conftest.$ac_ext <<EOF
-306
+257
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -1314 +1265 @@
-; return 0; }
-EOF
-317
+268
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1337 +1288 @@
-
-echo $ac_n "checking for __gxx_personality_v0 in -lstdc++""... $ac_c" 1>&6
-340
+291
-ac_lib_var=`echo stdc++'_'__gxx_personality_v0 | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1345 +1296 @@
-LIBS="-lstdc++  $LIBS"
-cat > conftest.$ac_ext <<EOF
-348
+299
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -1356 +1307 @@
-; return 0; }
-EOF
-59
+10
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1381 +1332 @@
-
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-84
+35
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
@@ -1396 +1347 @@
-  # not just through cpp.
-  cat > conftest.$ac_ext <<EOF
-99
+50
-#include "confdefs.h"
-#include <assert.h>
@@ -1402 +1353 @@
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-405
+356
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -1413 +1364 @@
-  CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.$ac_ext <<EOF
-416
+367
-#include "confdefs.h"
-#include <assert.h>
@@ -1419 +1370 @@
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-422
+373
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -1430 +1381 @@
-  CPP="${CC-cc} -nologo -E"
-  cat > conftest.$ac_ext <<EOF
-433
+384
-#include "confdefs.h"
-#include <assert.h>
@@ -1436 +1387 @@
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-439
+390
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -1461 +1412 @@
-
-echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-64
+15
-if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-69
+20
-#include "confdefs.h"
-#include <stdlib.h>
@@ -1474 +1425 @@
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-77
+28
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -1491 +1442 @@
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-94
+45
-#include "confdefs.h"
-#include <string.h>
@@ -1509 +1460 @@
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-512
+463
-#include "confdefs.h"
-#include <stdlib.h>
@@ -1530 +1481 @@
-else
-  cat > conftest.$ac_ext <<EOF
-533
+484
-#include "confdefs.h"
-#include <ctype.h>
@@ -1541 +1492 @@
-
-EOF
-544
+495
-then
-  :
@@ -1566 +1517 @@
-
-echo $ac_n "checking for strcasecmp""... $ac_c" 1>&6
-69
+20
-if eval "test \"`echo '$''{'ac_cv_func_strcasecmp'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-74
+25
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
@@ -1594 +1545 @@
-; return 0; }
-EOF
-97
+48
-  rm -rf conftest*
-  eval "ac_cv_func_strcasecmp=yes"
@@ -1615 +1566 @@
-
-echo $ac_n "checking for strncasecmp""... $ac_c" 1>&6
-618
+569
-if eval "test \"`echo '$''{'ac_cv_func_strncasecmp'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-623
+574
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
@@ -1643 +1594 @@
-; return 0; }
-EOF
-646
+597
-  rm -rf conftest*
-  eval "ac_cv_func_strncasecmp=yes"
@@ -1664 +1615 @@
-
-echo $ac_n "checking for strdup""... $ac_c" 1>&6
-67
+18
-if eval "test \"`echo '$''{'ac_cv_func_strdup'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-72
+23
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
@@ -1692 +1643 @@
-; return 0; }
-EOF
-95
+46
-  rm -rf conftest*
-  eval "ac_cv_func_strdup=yes"
@@ -1719 +1670 @@
-
-echo "checking whether we should include JPEG support..." 1>&6
-722
+673
-# Check whether --with-jpeg or --without-jpeg was given.
-if test "${with_jpeg+set}" = set; then
@@ -1789 +1740 @@
-
-    echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
-92
+43
-ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1797 +1748 @@
-LIBS="-ljpeg  $LIBS"
-cat > conftest.$ac_ext <<EOF
-800
+751
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -1808 +1759 @@
-; return 0; }
-EOF
-811
+762
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1842 +1793 @@
-
-  echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
-845
+796
-ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1850 +1801 @@
-LIBS="-ljpeg  $LIBS"
-cat > conftest.$ac_ext <<EOF
-53
+04
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -1861 +1812 @@
-; return 0; }
-EOF
-64
+15
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1922 +1873 @@
-
-echo "checking where FreeType 2.x is installed..." 1>&6
-925
+876
-FT_LIB=''
-FT_BIN=''
@@ -1935 +1886 @@
-set dummy freetype-config; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-938
+889
-if eval "test \"`echo '$''{'ac_cv_path_FT_BIN'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -2033 +1984 @@
-else
-    echo $ac_n "checking for FT_Init_FreeType in -lfreetype""... $ac_c" 1>&6
-2036
+1987
-ac_lib_var=`echo freetype'_'FT_Init_FreeType | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -2041 +1992 @@
-LIBS="-lfreetype  $LIBS"
-cat > conftest.$ac_ext <<EOF
-2044
+1995
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -2052 +2003 @@
-; return 0; }
-EOF
-55
+06
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -2101 +2052 @@
-
-echo "checking where Zlib is installed..." 1>&6
-104
+055
-ZL_LIB=''
-
@@ -2138 +2089 @@
-  
-  echo $ac_n "checking for zlibVersion in -lz""... $ac_c" 1>&6
-141
+092
-ac_lib_var=`echo z'_'zlibVersion | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -2146 +2097 @@
-LIBS="-lz  $LIBS"
-cat > conftest.$ac_ext <<EOF
-49
+00
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -2157 +2108 @@
-; return 0; }
-EOF
-60
+11
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -2207 +2158 @@
-
-echo "checking where PNG is installed..." 1>&6
-210
+161
-PNG_LIB=''
-
@@ -2244 +2195 @@
-  
-  echo $ac_n "checking for png_init_io in -lpng""... $ac_c" 1>&6
-247
+198
-ac_lib_var=`echo png'_'png_init_io | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -2252 +2203 @@
-LIBS="-lpng $ZL_LIB $LIBS"
-cat > conftest.$ac_ext <<EOF
-55
+06
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -2263 +2214 @@
-; return 0; }
-EOF
-66
+17
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -2314 +2265 @@
-
-  echo "checking where libXpm is installed..." 1>&6
-317
+268
-  XPM_LIB=''
-
@@ -2351 +2302 @@
-    
-    echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6
-54
+05
-ac_lib_var=`echo Xpm'_'XpmFreeXpmImage | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -2359 +2310 @@
-LIBS="-lXpm -lX11 $LIBS"
-cat > conftest.$ac_ext <<EOF
-62
+13
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -2370 +2321 @@
-; return 0; }
-EOF
-73
+24
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -2422 +2373 @@
-
-echo "checking where libiconv is installed..." 1>&6
-425
+376
-ICONV_LIB=''
-
@@ -2459 +2410 @@
-  
-  echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6
-62
+13
-ac_lib_var=`echo iconv'_'libiconv_open | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -2467 +2418 @@
-LIBS="-liconv  $LIBS"
-cat > conftest.$ac_ext <<EOF
-70
+21
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -2478 +2429 @@
-; return 0; }
-EOF
-81
+32
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -2538 +2489 @@
-
-echo "checking for GD 2.0.12 or higher..." 1>&6
-541
+492
-# Check whether --with-gd or --without-gd was given.
-if test "${with_gd+set}" = set; then
@@ -2580 +2531 @@
-
-    echo $ac_n "checking for gdImageSetAntiAliased in -lgd""... $ac_c" 1>&6
-83
+34
-ac_lib_var=`echo gd'_'gdImageSetAntiAliased | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -2588 +2539 @@
-LIBS="-lgd $GD_XTRA_LIBS -L$GD_LIBDIR $LIBS"
-cat > conftest.$ac_ext <<EOF
-91
+42
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -2599 +2550 @@
-; return 0; }
-EOF
-602
+553
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -2623 +2574 @@
-        unset ac_cv_lib_gd_gdImageSetAntiAliased
-    echo "checking whether GD needs libiconv..." 1>&6
-626
+577
-    echo $ac_n "checking for gdImageSetAntiAliased in -lgd""... $ac_c" 1>&6
-628
+579
-ac_lib_var=`echo gd'_'gdImageSetAntiAliased | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -2633 +2584 @@
-LIBS="-lgd $GD_XTRA_LIBS -L$GD_LIBDIR $ICONV_LIB $LIBS"
-cat > conftest.$ac_ext <<EOF
-636
+587
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -2644 +2595 @@
-; return 0; }
-EOF
-647
+598
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -2706 +2657 @@
-
-        echo $ac_n "checking for gdImageSetAntiAliased in -lgd""... $ac_c" 1>&6
-709
+660
-ac_lib_var=`echo gd'_'gdImageSetAntiAliased | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -2714 +2665 @@
-LIBS="-lgd $GD_XTRA_LIBS $LIBS"
-cat > conftest.$ac_ext <<EOF
-717
+668
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -2725 +2676 @@
-; return 0; }
-EOF
-728
+679
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -2748 +2699 @@
-    if test "$IS_GD2" = "false" -a -n "$ICONV_LIB"; then
-            echo "checking whether GD needs libiconv..." 1>&6
-51
+02
-      unset ac_cv_lib_gd_gdImageSetAntiAliased
-      echo $ac_n "checking for gdImageSetAntiAliased in -lgd""... $ac_c" 1>&6
-54
+05
-ac_lib_var=`echo gd'_'gdImageSetAntiAliased | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -2759 +2710 @@
-LIBS="-lgd $GD_XTRA_LIBS $ICONV_LIB $LIBS"
-cat > conftest.$ac_ext <<EOF
-62
+13
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -2770 +2721 @@
-; return 0; }
-EOF
-73
+24
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -2846 +2797 @@
-
-  echo $ac_n "checking for gdImageGif in -l$GD_CHECKLIB""... $ac_c" 1>&6
-49
+00
-ac_lib_var=`echo $GD_CHECKLIB'_'gdImageGif | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -2854 +2805 @@
-LIBS="-l$GD_CHECKLIB $GD_STATIC $GD_LIB $GD_XTRA_LIBS $LIBS"
-cat > conftest.$ac_ext <<EOF
-57
+08
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -2865 +2816 @@
-; return 0; }
-EOF
-68
+19
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -2886 +2837 @@
-
-  echo $ac_n "checking for gdImagePng in -l$GD_CHECKLIB""... $ac_c" 1>&6
-89
+40
-ac_lib_var=`echo $GD_CHECKLIB'_'gdImagePng | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -2894 +2845 @@
-LIBS="-l$GD_CHECKLIB $GD_STATIC $GD_LIB $GD_XTRA_LIBS $LIBS"
-cat > conftest.$ac_ext <<EOF
-97
+48
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -2905 +2856 @@
-; return 0; }
-EOF
-908
+859
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -2926 +2877 @@
-
-  echo $ac_n "checking for gdImageJpeg in -l$GD_CHECKLIB""... $ac_c" 1>&6
-929
+880
-ac_lib_var=`echo $GD_CHECKLIB'_'gdImageJpeg | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -2934 +2885 @@
-LIBS="-l$GD_CHECKLIB $GD_STATIC $GD_LIB $GD_XTRA_LIBS $LIBS"
-cat > conftest.$ac_ext <<EOF
-937
+888
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -2945 +2896 @@
-; return 0; }
-EOF
-948
+899
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -2966 +2917 @@
-
-  echo $ac_n "checking for gdImageWBMP in -l$GD_CHECKLIB""... $ac_c" 1>&6
-69
+20
-ac_lib_var=`echo $GD_CHECKLIB'_'gdImageWBMP | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -2974 +2925 @@
-LIBS="-l$GD_CHECKLIB $GD_STATIC $GD_LIB $GD_XTRA_LIBS $LIBS"
-cat > conftest.$ac_ext <<EOF
-77
+28
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -2985 +2936 @@
-; return 0; }
-EOF
-88
+39
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -3007 +2958 @@
-
-    echo $ac_n "checking for gdImageStringFT in -l$GD_CHECKLIB""... $ac_c" 1>&6
-3010
+2961
-ac_lib_var=`echo $GD_CHECKLIB'_'gdImageStringFT | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -3015 +2966 @@
-LIBS="-l$GD_CHECKLIB $GD_STATIC $GD_LIB $GD_XTRA_LIBS $LIBS"
-cat > conftest.$ac_ext <<EOF
-3018
+2969
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -3026 +2977 @@
-; return 0; }
-EOF
-3029
+2980
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -3048 +2999 @@
-
-    echo $ac_n "checking for gdImageGifPtr in -l$GD_CHECKLIB""... $ac_c" 1>&6
-51
+02
-ac_lib_var=`echo $GD_CHECKLIB'_'gdImageGifPtr | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -3056 +3007 @@
-LIBS="-l$GD_CHECKLIB $GD_STATIC $GD_LIB $GD_XTRA_LIBS $LIBS"
-cat > conftest.$ac_ext <<EOF
-59
+10
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -3067 +3018 @@
-; return 0; }
-EOF
-70
+21
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -3094 +3045 @@
-      
-    echo $ac_n "checking for gdImageCreate in -lgd""... $ac_c" 1>&6
-97
+48
-ac_lib_var=`echo gd'_'gdImageCreate | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -3102 +3053 @@
-LIBS="-lgd $GD_XTRA_LIBS $LIBS"
-cat > conftest.$ac_ext <<EOF
-105
+056
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -3113 +3064 @@
-; return 0; }
-EOF
-116
+067
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -3138 +3089 @@
-
-    echo $ac_n "checking for gdImageGif in -lgd""... $ac_c" 1>&6
-141
+092
-ac_lib_var=`echo gd'_'gdImageGif | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -3146 +3097 @@
-LIBS="-lgd $GD_LIB $GD_XTRA_LIBS $LIBS"
-cat > conftest.$ac_ext <<EOF
-49
+00
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -3157 +3108 @@
-; return 0; }
-EOF
-60
+11
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -3178 +3129 @@
-
-  echo $ac_n "checking for gdImagePng in -lgd""... $ac_c" 1>&6
-81