diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..596615322f --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +.gitattributes export-ignore +.gitignore export-ignore diff --git a/HISTORY.TXT b/HISTORY.TXT index 57a3edb78a..10dbe7b062 100644 --- a/HISTORY.TXT +++ b/HISTORY.TXT @@ -14,6 +14,8 @@ For a complete change history, please see the Git log comments. Current Version (git master, 6.1-dev, future 6.2): ------------------------------------------------- +- Fixed getFeature request with custom output format fails on filter encoding (#4190) + - Fixed resolution when UoM changes in WCS 2.0 (#4283) - Added missing DEFRESOLUTION parameter to msCopyMap() function (#4272) diff --git a/Makefile.in b/Makefile.in index 603bb2b79e..ec8632ecbe 100644 --- a/Makefile.in +++ b/Makefile.in @@ -447,7 +447,7 @@ php_mapscript_clean: cd mapscript/php; $(MAKE) clean; php_mapscript_install: - cd mapscript/php; $(MAKE) install; + cd mapscript/php; $(MAKE) install DESTDIR=$(DESTDIR); python_mapscript: $(LIBMAP) cd mapscript/python; $(MAKE); @@ -456,7 +456,7 @@ python_mapscript_clean: cd mapscript/python; $(MAKE) clean; python_mapscript_install: - cd mapscript/python; $(MAKE) install; + cd mapscript/python; $(MAKE) install DESTDIR=$(DESTDIR); install: install-lib install-bin install-cgibin @MAKE_PHP_MAPSCRIPT_INSTALL@ @MAKE_PYTHON_MAPSCRIPT_INSTALL@ diff --git a/aclocal.m4 b/aclocal.m4 index 366c495e9f..55f3c925f9 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,7 +1,8 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.11.3 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, +# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -2689,6 +2690,18 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -3294,7 +3307,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -4106,7 +4119,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4583,6 +4596,9 @@ m4_if([$1], [CXX], [ ;; esac ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -4645,6 +4661,9 @@ dnl Note also adjust exclude_expsyms for C++ above. openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -4866,7 +4885,7 @@ _LT_EOF fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5043,6 +5062,7 @@ _LT_EOF if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -5347,7 +5367,7 @@ _LT_EOF _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else diff --git a/configure b/configure index 853ba2b7ce..db579b44be 100755 --- a/configure +++ b/configure @@ -1,11 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68. +# Generated by GNU Autoconf 2.65. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # # # This configure script is free software; the Free Software Foundation @@ -89,7 +89,6 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -223,18 +222,11 @@ IFS=$as_save_IFS # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. BASH_ENV=/dev/null ENV=/dev/null (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} fi if test x$as_have_required = xno; then : @@ -332,7 +324,7 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -372,19 +364,19 @@ else fi # as_fn_arith -# as_fn_error STATUS ERROR [LINENO LOG_FD] -# ---------------------------------------- +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with STATUS, using 1 if that was 0. +# script with status $?, using 1 if that was 0. as_fn_error () { - as_status=$1; test $as_status -eq 0 && as_status=1 - if test "$4"; then - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 fi - $as_echo "$as_me: error: $2" >&2 + $as_echo "$as_me: error: $1" >&2 as_fn_exit $as_status } # as_fn_error @@ -548,7 +540,7 @@ test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. -# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -639,6 +631,7 @@ PHP_REGEX_INC PHP_VERSION_FLAG PHPCONFIG DEBUG_FLAGS +PROJ_FASTPATH_ENABLED USE_NINT USE_POINT_Z_M IGNORE_MISSING_DATA @@ -896,14 +889,15 @@ with_apxs with_apr_config enable_ignore_missing_data enable_point_z_m +enable_fast_nint with_warnings enable_debug +enable_proj_fastpath enable_cgi_cl_debug_args enable_gcov with_php enable_internal_ld_detect with_ld_shared -enable_java_mapscript with_java_include_os_name enable_python_mapscript with_python @@ -985,9 +979,8 @@ do fi case $ac_option in - *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *=) ac_optarg= ;; - *) ac_optarg=yes ;; + *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -1032,7 +1025,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1058,7 +1051,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1262,7 +1255,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1278,7 +1271,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1308,8 +1301,8 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error $? "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information" + -*) as_fn_error "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information." ;; *=*) @@ -1317,7 +1310,7 @@ Try \`$0 --help' for more information" # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + as_fn_error "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1327,7 +1320,7 @@ Try \`$0 --help' for more information" $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; esac @@ -1335,13 +1328,13 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error $? "missing argument to $ac_option" + as_fn_error "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1364,7 +1357,7 @@ do [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" + as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1378,8 +1371,8 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 + $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1394,9 +1387,9 @@ test "$silent" = yes && exec 6>/dev/null ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error $? "working directory cannot be determined" + as_fn_error "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error $? "pwd does not report name of working directory" + as_fn_error "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1435,11 +1428,11 @@ else fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" + as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1479,7 +1472,7 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking ...' messages + -q, --quiet, --silent do not print \`checking...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1550,6 +1543,8 @@ Optional Features: --disable-fast-nint Use safe MS_NINT with reliable rounding --enable-debug Include "-g" in CFLAGS for debugging. --disable-debug Do not include "-g" in CFLAGS (the default). + --enable-proj-fastpath bypass proj.4 for epsg:4326 to epsg:3857 + reprojections --enable-cgi-cl-debug-args Enable mapserv CGI command-line debug arguments (disabled by default). These command-line args may @@ -1562,7 +1557,6 @@ Optional Features: Use perl -V output to figure the command to use to link php_mapscript.so. Try this only if the default internal macro didn't work. - --enable-java-mapscript Specify if java mapscript should be configured --enable-python-mapscript build the python mapscript module. Optional Packages: @@ -1618,7 +1612,6 @@ Optional Packages: OGR required). --with-curl-config=PATH Specify path to curl-config. --with-kml= KML output Support (ARG=yes/no). -\ --with-exempi=DIR Specify path to exempi. --with-xml2-config=PATH Specify path to xml2-config. --with-xml-mapfile= Include xml-mapfile Support (ARG=yes/no). @@ -1643,13 +1636,13 @@ Optional Packages: --with-ld-shared=CMD Specify link command to use to build shared libs --without-ld-shared Disable shared library support --with-java-include-os-name=dirname - (AUTODETECTED) - Use this option only if building of Java Mapscript - fails because os-dependent headers are not found. - dirname is the name of subdirectory of the Java - installation where os-dependent include files are - found (for instance linux or solaris). - Only used by Java mapscript. + (AUTODETECTED) + Use this option only if building of Java Mapscript + fails because os-dependent headers are not found. + dirname is the name of subdirectory of the Java + installation where os-dependent include files are + found (for instance linux or solaris). + Only used by Java mapscript. --with-python[=PATH] Specify python binary (PATH is path to python) Some influential environment variables: @@ -1664,9 +1657,8 @@ Some influential environment variables: CXX C++ compiler command CXXFLAGS C++ compiler flags CXXCPP C++ preprocessor - YACC The `Yet Another Compiler Compiler' implementation to use. - Defaults to the first program found out of: `bison -y', `byacc', - `yacc'. + YACC The `Yet Another C Compiler' implementation to use. Defaults to + the first program found out of: `bison -y', `byacc', `yacc'. YFLAGS The list of arguments that will be passed by default to $YACC. This script will default YFLAGS to the empty string to avoid a default value of `-d' given by some make applications. @@ -1738,9 +1730,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.68 +generated by GNU Autoconf 2.65 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1784,7 +1776,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -1830,7 +1822,7 @@ fi # interfere with the next link command; also delete a directory that is # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} as_fn_set_status $ac_retval } # ac_fn_c_try_link @@ -1844,7 +1836,7 @@ ac_fn_c_check_header_compile () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1862,7 +1854,7 @@ fi eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} } # ac_fn_c_check_header_compile @@ -1887,7 +1879,7 @@ $as_echo "$ac_try_echo"; } >&5 mv -f conftest.er1 conftest.err fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { + test $ac_status = 0; } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : @@ -1898,7 +1890,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} as_fn_set_status $ac_retval } # ac_fn_c_try_cpp @@ -1940,7 +1932,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=$ac_status fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} as_fn_set_status $ac_retval } # ac_fn_c_try_run @@ -1953,7 +1945,7 @@ ac_fn_c_check_func () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2008,7 +2000,7 @@ fi eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} } # ac_fn_c_check_func @@ -2045,7 +2037,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} as_fn_set_status $ac_retval } # ac_fn_cxx_try_compile @@ -2071,7 +2063,7 @@ $as_echo "$ac_try_echo"; } >&5 mv -f conftest.er1 conftest.err fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { + test $ac_status = 0; } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err }; then : @@ -2082,7 +2074,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} as_fn_set_status $ac_retval } # ac_fn_cxx_try_cpp @@ -2128,7 +2120,7 @@ fi # interfere with the next link command; also delete a directory that is # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} as_fn_set_status $ac_retval } # ac_fn_cxx_try_link @@ -2141,10 +2133,10 @@ fi ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval \${$3+:} false; then : + if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -2180,7 +2172,7 @@ if ac_fn_c_try_cpp "$LINENO"; then : else ac_header_preproc=no fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 $as_echo "$ac_header_preproc" >&6; } @@ -2207,7 +2199,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -2216,22 +2208,19 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} } # ac_fn_c_check_header_mongrel -# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES -# --------------------------------------------- -# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR -# accordingly. +# ac_fn_c_check_decl LINENO SYMBOL VAR +# ------------------------------------ +# Tests whether SYMBOL is declared, setting cache variable VAR accordingly. ac_fn_c_check_decl () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - as_decl_name=`echo $2|sed 's/ *(.*//'` - as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 -$as_echo_n "checking whether $as_decl_name is declared... " >&6; } -if eval \${$3+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5 +$as_echo_n "checking whether $2 is declared... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2240,12 +2229,8 @@ $4 int main () { -#ifndef $as_decl_name -#ifdef __cplusplus - (void) $as_decl_use; -#else - (void) $as_decl_name; -#endif +#ifndef $2 + (void) $2; #endif ; @@ -2262,7 +2247,7 @@ fi eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} } # ac_fn_c_check_decl cat >config.log <<_ACEOF @@ -2270,7 +2255,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2380,9 +2365,11 @@ trap 'exit_status=$? { echo - $as_echo "## ---------------- ## + cat <<\_ASBOX +## ---------------- ## ## Cache variables. ## -## ---------------- ##" +## ---------------- ## +_ASBOX echo # The following way of writing the cache mishandles newlines in values, ( @@ -2416,9 +2403,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - $as_echo "## ----------------- ## + cat <<\_ASBOX +## ----------------- ## ## Output variables. ## -## ----------------- ##" +## ----------------- ## +_ASBOX echo for ac_var in $ac_subst_vars do @@ -2431,9 +2420,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; echo if test -n "$ac_subst_files"; then - $as_echo "## ------------------- ## + cat <<\_ASBOX +## ------------------- ## ## File substitutions. ## -## ------------------- ##" +## ------------------- ## +_ASBOX echo for ac_var in $ac_subst_files do @@ -2447,9 +2438,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; fi if test -s confdefs.h; then - $as_echo "## ----------- ## + cat <<\_ASBOX +## ----------- ## ## confdefs.h. ## -## ----------- ##" +## ----------- ## +_ASBOX echo cat confdefs.h echo @@ -2504,12 +2497,7 @@ _ACEOF ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - # We do not want a PATH search for config.site. - case $CONFIG_SITE in #(( - -*) ac_site_file1=./$CONFIG_SITE;; - */*) ac_site_file1=$CONFIG_SITE;; - *) ac_site_file1=./$CONFIG_SITE;; - esac + ac_site_file1=$CONFIG_SITE elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -2524,11 +2512,7 @@ do { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" \ - || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5; } + . "$ac_site_file" fi done @@ -2604,7 +2588,7 @@ if $ac_cache_corrupted; then $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2619,22 +2603,16 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi + for ac_t in install-sh install.sh shtool; do + if test -f "$ac_dir/$ac_t"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/$ac_t -c" + break 2 + fi + done done if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2673,27 +2651,27 @@ ltmain="$ac_aux_dir/ltmain.sh" # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if ${ac_cv_build+:} false; then : +if test "${ac_cv_build+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 + as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; +*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -2711,14 +2689,14 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if ${ac_cv_host+:} false; then : +if test "${ac_cv_host+set}" = set; then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi @@ -2726,7 +2704,7 @@ fi $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; +*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -2821,7 +2799,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2861,7 +2839,7 @@ if test -z "$ac_cv_prog_CC"; then set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2914,7 +2892,7 @@ if test -z "$CC"; then set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2954,7 +2932,7 @@ if test -z "$CC"; then set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3013,7 +2991,7 @@ if test -z "$CC"; then set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3057,7 +3035,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3111,8 +3089,8 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } +as_fn_error "no acceptable C compiler found in \$PATH +See \`config.log' for more details." "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3226,8 +3204,9 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5; } +{ as_fn_set_status 77 +as_fn_error "C compiler cannot create executables +See \`config.log' for more details." "$LINENO" 5; }; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3269,8 +3248,8 @@ done else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5; } +as_fn_error "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3327,9 +3306,9 @@ $as_echo "$ac_try_echo"; } >&5 else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run C compiled programs. +as_fn_error "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details." "$LINENO" 5; } fi fi fi @@ -3340,7 +3319,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if ${ac_cv_objext+:} false; then : +if test "${ac_cv_objext+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3380,8 +3359,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5; } +as_fn_error "cannot compute suffix of object files: cannot compile +See \`config.log' for more details." "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -3391,7 +3370,7 @@ OBJEXT=$ac_cv_objext ac_objext=$OBJEXT { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : +if test "${ac_cv_c_compiler_gnu+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3428,7 +3407,7 @@ ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : +if test "${ac_cv_prog_cc_g+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -3506,7 +3485,7 @@ else fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : +if test "${ac_cv_prog_cc_c89+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -3603,7 +3582,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 $as_echo_n "checking for a sed that does not truncate output... " >&6; } -if ${ac_cv_path_SED+:} false; then : +if test "${ac_cv_path_SED+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ @@ -3658,7 +3637,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_SED"; then - as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 + as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 fi else ac_cv_path_SED=$SED @@ -3685,7 +3664,7 @@ Xsed="$SED -e 1s/^X//" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if ${ac_cv_path_GREP+:} false; then : +if test "${ac_cv_path_GREP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -3734,7 +3713,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP @@ -3748,7 +3727,7 @@ $as_echo "$ac_cv_path_GREP" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if ${ac_cv_path_EGREP+:} false; then : +if test "${ac_cv_path_EGREP+set}" = set; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -3800,7 +3779,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -3815,7 +3794,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 $as_echo_n "checking for fgrep... " >&6; } -if ${ac_cv_path_FGREP+:} false; then : +if test "${ac_cv_path_FGREP+set}" = set; then : $as_echo_n "(cached) " >&6 else if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 @@ -3867,7 +3846,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_FGREP"; then - as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_FGREP=$FGREP @@ -3946,7 +3925,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 $as_echo_n "checking for non-GNU ld... " >&6; } fi -if ${lt_cv_path_LD+:} false; then : +if test "${lt_cv_path_LD+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then @@ -3983,10 +3962,10 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if ${lt_cv_prog_gnu_ld+:} false; then : +if test "${lt_cv_prog_gnu_ld+set}" = set; then : $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. @@ -4013,7 +3992,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -if ${lt_cv_path_NM+:} false; then : +if test "${lt_cv_path_NM+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$NM"; then @@ -4076,7 +4055,7 @@ else set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DUMPBIN+:} false; then : +if test "${ac_cv_prog_DUMPBIN+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$DUMPBIN"; then @@ -4120,7 +4099,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : +if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DUMPBIN"; then @@ -4192,7 +4171,7 @@ test -z "$NM" && NM=nm { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 $as_echo_n "checking the name lister ($NM) interface... " >&6; } -if ${lt_cv_nm_interface+:} false; then : +if test "${lt_cv_nm_interface+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_nm_interface="BSD nm" @@ -4227,7 +4206,7 @@ fi # find the maximum length of command line arguments { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 $as_echo_n "checking the maximum length of command line arguments... " >&6; } -if ${lt_cv_sys_max_cmd_len+:} false; then : +if test "${lt_cv_sys_max_cmd_len+set}" = set; then : $as_echo_n "(cached) " >&6 else i=0 @@ -4429,7 +4408,7 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 $as_echo_n "checking how to convert $build file names to $host format... " >&6; } -if ${lt_cv_to_host_file_cmd+:} false; then : +if test "${lt_cv_to_host_file_cmd+set}" = set; then : $as_echo_n "(cached) " >&6 else case $host in @@ -4476,7 +4455,7 @@ $as_echo "$lt_cv_to_host_file_cmd" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 $as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -if ${lt_cv_to_tool_file_cmd+:} false; then : +if test "${lt_cv_to_tool_file_cmd+set}" = set; then : $as_echo_n "(cached) " >&6 else #assume ordinary cross tools, or native build. @@ -4503,7 +4482,7 @@ $as_echo "$lt_cv_to_tool_file_cmd" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } -if ${lt_cv_ld_reload_flag+:} false; then : +if test "${lt_cv_ld_reload_flag+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_reload_flag='-r' @@ -4544,7 +4523,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}objdump; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OBJDUMP+:} false; then : +if test "${ac_cv_prog_OBJDUMP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$OBJDUMP"; then @@ -4584,7 +4563,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then set dummy objdump; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : +if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OBJDUMP"; then @@ -4643,7 +4622,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 $as_echo_n "checking how to recognize dependent libraries... " >&6; } -if ${lt_cv_deplibs_check_method+:} false; then : +if test "${lt_cv_deplibs_check_method+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_file_magic_cmd='$MAGIC_CMD' @@ -4768,7 +4747,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -4890,7 +4869,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}dlltool; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DLLTOOL+:} false; then : +if test "${ac_cv_prog_DLLTOOL+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$DLLTOOL"; then @@ -4930,7 +4909,7 @@ if test -z "$ac_cv_prog_DLLTOOL"; then set dummy dlltool; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : +if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DLLTOOL"; then @@ -4990,7 +4969,7 @@ test -z "$DLLTOOL" && DLLTOOL=dlltool { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 $as_echo_n "checking how to associate runtime and link libraries... " >&6; } -if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : +if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_sharedlib_from_linklib_cmd='unknown' @@ -5034,7 +5013,7 @@ if test -n "$ac_tool_prefix"; then set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AR+:} false; then : +if test "${ac_cv_prog_AR+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$AR"; then @@ -5078,7 +5057,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_AR+:} false; then : +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AR"; then @@ -5142,7 +5121,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 $as_echo_n "checking for archiver @FILE support... " >&6; } -if ${lt_cv_ar_at_file+:} false; then : +if test "${lt_cv_ar_at_file+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_ar_at_file=no @@ -5203,7 +5182,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : +if test "${ac_cv_prog_STRIP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -5243,7 +5222,7 @@ if test -z "$ac_cv_prog_STRIP"; then set dummy strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -5302,7 +5281,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}ranlib; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_RANLIB+:} false; then : +if test "${ac_cv_prog_RANLIB+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then @@ -5342,7 +5321,7 @@ if test -z "$ac_cv_prog_RANLIB"; then set dummy ranlib; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then @@ -5446,7 +5425,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AWK+:} false; then : +if test "${ac_cv_prog_AWK+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -5513,7 +5492,7 @@ compiler=$CC # Check for command to grab the raw symbol name followed by C symbol from nm. { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -if ${lt_cv_sys_global_symbol_pipe+:} false; then : +if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : $as_echo_n "(cached) " >&6 else @@ -5811,7 +5790,7 @@ case ${with_sysroot} in #( *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 $as_echo "${with_sysroot}" >&6; } - as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 ;; esac @@ -5947,7 +5926,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) CFLAGS="$CFLAGS -belf" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 $as_echo_n "checking whether the C compiler needs -belf... " >&6; } -if ${lt_cv_cc_needs_belf+:} false; then : +if test "${lt_cv_cc_needs_belf+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_ext=c @@ -6033,7 +6012,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}mt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : +if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$MANIFEST_TOOL"; then @@ -6073,7 +6052,7 @@ if test -z "$ac_cv_prog_MANIFEST_TOOL"; then set dummy mt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : +if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_MANIFEST_TOOL"; then @@ -6123,7 +6102,7 @@ fi test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 $as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -if ${lt_cv_path_mainfest_tool+:} false; then : +if test "${lt_cv_path_mainfest_tool+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_path_mainfest_tool=no @@ -6153,7 +6132,7 @@ fi set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DSYMUTIL+:} false; then : +if test "${ac_cv_prog_DSYMUTIL+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$DSYMUTIL"; then @@ -6193,7 +6172,7 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then set dummy dsymutil; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : +if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DSYMUTIL"; then @@ -6245,7 +6224,7 @@ fi set dummy ${ac_tool_prefix}nmedit; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_NMEDIT+:} false; then : +if test "${ac_cv_prog_NMEDIT+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$NMEDIT"; then @@ -6285,7 +6264,7 @@ if test -z "$ac_cv_prog_NMEDIT"; then set dummy nmedit; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : +if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_NMEDIT"; then @@ -6337,7 +6316,7 @@ fi set dummy ${ac_tool_prefix}lipo; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_LIPO+:} false; then : +if test "${ac_cv_prog_LIPO+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$LIPO"; then @@ -6377,7 +6356,7 @@ if test -z "$ac_cv_prog_LIPO"; then set dummy lipo; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_LIPO+:} false; then : +if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_LIPO"; then @@ -6429,7 +6408,7 @@ fi set dummy ${ac_tool_prefix}otool; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL+:} false; then : +if test "${ac_cv_prog_OTOOL+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$OTOOL"; then @@ -6469,7 +6448,7 @@ if test -z "$ac_cv_prog_OTOOL"; then set dummy otool; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : +if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL"; then @@ -6521,7 +6500,7 @@ fi set dummy ${ac_tool_prefix}otool64; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL64+:} false; then : +if test "${ac_cv_prog_OTOOL64+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$OTOOL64"; then @@ -6561,7 +6540,7 @@ if test -z "$ac_cv_prog_OTOOL64"; then set dummy otool64; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : +if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL64"; then @@ -6636,7 +6615,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 $as_echo_n "checking for -single_module linker flag... " >&6; } -if ${lt_cv_apple_cc_single_mod+:} false; then : +if test "${lt_cv_apple_cc_single_mod+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no @@ -6672,7 +6651,7 @@ $as_echo "$lt_cv_apple_cc_single_mod" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -if ${lt_cv_ld_exported_symbols_list+:} false; then : +if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_exported_symbols_list=no @@ -6705,7 +6684,7 @@ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 $as_echo_n "checking for -force_load linker flag... " >&6; } -if ${lt_cv_ld_force_load+:} false; then : +if test "${lt_cv_ld_force_load+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_force_load=no @@ -6784,7 +6763,7 @@ if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if ${ac_cv_prog_CPP+:} false; then : + if test "${ac_cv_prog_CPP+set}" = set; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -6814,7 +6793,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -6830,11 +6809,11 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -6873,7 +6852,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -6889,18 +6868,18 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } +as_fn_error "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." "$LINENO" 5; } fi ac_ext=c @@ -6912,7 +6891,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : +if test "${ac_cv_header_stdc+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -7029,7 +7008,8 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -7043,7 +7023,7 @@ for ac_header in dlfcn.h do : ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " -if test "x$ac_cv_header_dlfcn_h" = xyes; then : +if test "x$ac_cv_header_dlfcn_h" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_DLFCN_H 1 _ACEOF @@ -7248,7 +7228,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 $as_echo_n "checking for objdir... " >&6; } -if ${lt_cv_objdir+:} false; then : +if test "${lt_cv_objdir+set}" = set; then : $as_echo_n "(cached) " >&6 else rm -f .libs 2>/dev/null @@ -7326,7 +7306,7 @@ file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -7392,7 +7372,7 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 $as_echo_n "checking for file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -7530,7 +7510,7 @@ if test "$GCC" = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : +if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_rtti_exceptions=no @@ -7892,7 +7872,7 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 $as_echo_n "checking for $compiler option to produce PIC... " >&6; } -if ${lt_cv_prog_compiler_pic+:} false; then : +if test "${lt_cv_prog_compiler_pic+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic=$lt_prog_compiler_pic @@ -7907,7 +7887,7 @@ lt_prog_compiler_pic=$lt_cv_prog_compiler_pic if test -n "$lt_prog_compiler_pic"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if ${lt_cv_prog_compiler_pic_works+:} false; then : +if test "${lt_cv_prog_compiler_pic_works+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works=no @@ -7971,7 +7951,7 @@ fi wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if ${lt_cv_prog_compiler_static_works+:} false; then : +if test "${lt_cv_prog_compiler_static_works+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no @@ -8014,7 +7994,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o+:} false; then : +if test "${lt_cv_prog_compiler_c_o+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no @@ -8069,7 +8049,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o+:} false; then : +if test "${lt_cv_prog_compiler_c_o+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no @@ -8206,6 +8186,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs=no + ;; esac ld_shlibs=yes @@ -8427,7 +8410,7 @@ _LT_EOF fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -8604,6 +8587,7 @@ _LT_EOF if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + link_all_deplibs=no else # not using gcc if test "$host_cpu" = ia64; then @@ -8632,7 +8616,7 @@ _LT_EOF if test "${lt_cv_aix_libpath+set}" = set; then aix_libpath=$lt_cv_aix_libpath else - if ${lt_cv_aix_libpath_+:} false; then : + if test "${lt_cv_aix_libpath_+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -8685,7 +8669,7 @@ fi if test "${lt_cv_aix_libpath+set}" = set; then aix_libpath=$lt_cv_aix_libpath else - if ${lt_cv_aix_libpath_+:} false; then : + if test "${lt_cv_aix_libpath_+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -8954,7 +8938,7 @@ fi # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 $as_echo_n "checking if $CC understands -b... " >&6; } -if ${lt_cv_prog_compiler__b+:} false; then : +if test "${lt_cv_prog_compiler__b+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler__b=no @@ -9023,7 +9007,7 @@ fi # This should be the same for all languages, so no per-tag cache variable. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 $as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -if ${lt_cv_irix_exported_symbol+:} false; then : +if test "${lt_cv_irix_exported_symbol+set}" = set; then : $as_echo_n "(cached) " >&6 else save_LDFLAGS="$LDFLAGS" @@ -9057,7 +9041,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } link_all_deplibs=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -9339,7 +9323,7 @@ x|xyes) # to ld, don't add -lc before -lgcc. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -if ${lt_cv_archive_cmds_need_lc+:} false; then : +if test "${lt_cv_archive_cmds_need_lc+set}" = set; then : $as_echo_n "(cached) " >&6 else $RM conftest* @@ -10032,7 +10016,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) shlibpath_overrides_runpath=no # Some binutils ld are patched to set DT_RUNPATH - if ${lt_cv_shlibpath_overrides_runpath+:} false; then : + if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_shlibpath_overrides_runpath=no @@ -10085,6 +10069,18 @@ fi dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -10452,7 +10448,7 @@ else # if libdl is installed we need to link against it { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : +if test "${ac_cv_lib_dl_dlopen+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10486,7 +10482,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else @@ -10500,12 +10496,12 @@ fi *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" -if test "x$ac_cv_func_shl_load" = xyes; then : +if test "x$ac_cv_func_shl_load" = x""yes; then : lt_cv_dlopen="shl_load" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 $as_echo_n "checking for shl_load in -ldld... " >&6; } -if ${ac_cv_lib_dld_shl_load+:} false; then : +if test "${ac_cv_lib_dld_shl_load+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10539,16 +10535,16 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = xyes; then : +if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" else ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" -if test "x$ac_cv_func_dlopen" = xyes; then : +if test "x$ac_cv_func_dlopen" = x""yes; then : lt_cv_dlopen="dlopen" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : +if test "${ac_cv_lib_dl_dlopen+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10582,12 +10578,12 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 $as_echo_n "checking for dlopen in -lsvld... " >&6; } -if ${ac_cv_lib_svld_dlopen+:} false; then : +if test "${ac_cv_lib_svld_dlopen+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10621,12 +10617,12 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 $as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = xyes; then : +if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 $as_echo_n "checking for dld_link in -ldld... " >&6; } -if ${ac_cv_lib_dld_dld_link+:} false; then : +if test "${ac_cv_lib_dld_dld_link+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10660,7 +10656,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 $as_echo "$ac_cv_lib_dld_dld_link" >&6; } -if test "x$ac_cv_lib_dld_dld_link" = xyes; then : +if test "x$ac_cv_lib_dld_dld_link" = x""yes; then : lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi @@ -10701,7 +10697,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 $as_echo_n "checking whether a program can dlopen itself... " >&6; } -if ${lt_cv_dlopen_self+:} false; then : +if test "${lt_cv_dlopen_self+set}" = set; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -10807,7 +10803,7 @@ $as_echo "$lt_cv_dlopen_self" >&6; } wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } -if ${lt_cv_dlopen_self_static+:} false; then : +if test "${lt_cv_dlopen_self_static+set}" = set; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -11246,7 +11242,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -11286,7 +11282,7 @@ if test -z "$ac_cv_prog_CC"; then set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -11339,7 +11335,7 @@ if test -z "$CC"; then set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -11379,7 +11375,7 @@ if test -z "$CC"; then set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -11438,7 +11434,7 @@ if test -z "$CC"; then set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -11482,7 +11478,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -11536,8 +11532,8 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } +as_fn_error "no acceptable C compiler found in \$PATH +See \`config.log' for more details." "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -11566,7 +11562,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : +if test "${ac_cv_c_compiler_gnu+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11603,7 +11599,7 @@ ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : +if test "${ac_cv_prog_cc_g+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -11681,7 +11677,7 @@ else fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : +if test "${ac_cv_prog_cc_c89+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -11792,7 +11788,7 @@ if test -z "$CXX"; then set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CXX+:} false; then : +if test "${ac_cv_prog_CXX+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CXX"; then @@ -11836,7 +11832,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CXX+:} false; then : +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CXX"; then @@ -11914,7 +11910,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if ${ac_cv_cxx_compiler_gnu+:} false; then : +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11951,7 +11947,7 @@ ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 $as_echo_n "checking whether $CXX accepts -g... " >&6; } -if ${ac_cv_prog_cxx_g+:} false; then : +if test "${ac_cv_prog_cxx_g+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_save_cxx_werror_flag=$ac_cxx_werror_flag @@ -12054,7 +12050,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 $as_echo_n "checking how to run the C++ preprocessor... " >&6; } if test -z "$CXXCPP"; then - if ${ac_cv_prog_CXXCPP+:} false; then : + if test "${ac_cv_prog_CXXCPP+set}" = set; then : $as_echo_n "(cached) " >&6 else # Double quotes because CXXCPP needs to be expanded @@ -12084,7 +12080,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -12100,11 +12096,11 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -12143,7 +12139,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -12159,18 +12155,18 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } +as_fn_error "C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details." "$LINENO" 5; } fi ac_ext=c @@ -12356,7 +12352,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 $as_echo_n "checking for non-GNU ld... " >&6; } fi -if ${lt_cv_path_LD+:} false; then : +if test "${lt_cv_path_LD+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then @@ -12393,10 +12389,10 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if ${lt_cv_prog_gnu_ld+:} false; then : +if test "${lt_cv_prog_gnu_ld+set}" = set; then : $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. @@ -12568,7 +12564,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie if test "${lt_cv_aix_libpath+set}" = set; then aix_libpath=$lt_cv_aix_libpath else - if ${lt_cv_aix_libpath__CXX+:} false; then : + if test "${lt_cv_aix_libpath__CXX+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12622,7 +12618,7 @@ fi if test "${lt_cv_aix_libpath+set}" = set; then aix_libpath=$lt_cv_aix_libpath else - if ${lt_cv_aix_libpath__CXX+:} false; then : + if test "${lt_cv_aix_libpath__CXX+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13930,7 +13926,7 @@ lt_prog_compiler_static_CXX= ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -14030,7 +14026,7 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 $as_echo_n "checking for $compiler option to produce PIC... " >&6; } -if ${lt_cv_prog_compiler_pic_CXX+:} false; then : +if test "${lt_cv_prog_compiler_pic_CXX+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX @@ -14045,7 +14041,7 @@ lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX if test -n "$lt_prog_compiler_pic_CXX"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } -if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then : +if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works_CXX=no @@ -14103,7 +14099,7 @@ fi wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if ${lt_cv_prog_compiler_static_works_CXX+:} false; then : +if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works_CXX=no @@ -14143,7 +14139,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : +if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o_CXX=no @@ -14195,7 +14191,7 @@ $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : +if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o_CXX=no @@ -14301,6 +14297,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie ;; esac ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs_CXX=no + ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -14336,7 +14335,7 @@ x|xyes) # to ld, don't add -lc before -lgcc. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then : +if test "${lt_cv_archive_cmds_need_lc_CXX+set}" = set; then : $as_echo_n "(cached) " >&6 else $RM conftest* @@ -14873,7 +14872,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) shlibpath_overrides_runpath=no # Some binutils ld are patched to set DT_RUNPATH - if ${lt_cv_shlibpath_overrides_runpath+:} false; then : + if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_shlibpath_overrides_runpath=no @@ -14926,6 +14925,18 @@ fi dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -15234,7 +15245,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler works" >&5 $as_echo_n "checking whether the C++ compiler works... " >&6; } -if ${rw_cv_prog_cxx_works+:} false; then : +if test "${rw_cv_prog_cxx_works+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_ext=cpp @@ -15257,7 +15268,7 @@ _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : else - as_fn_error $? "$CXX cannot compile" "$LINENO" 5 + as_fn_error "$CXX cannot compile" "$LINENO" 5 fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -15277,7 +15288,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_LEX+:} false; then : +if test "${ac_cv_prog_LEX+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$LEX"; then @@ -15347,7 +15358,7 @@ $as_echo "$ac_try_echo"; } >&5 test $ac_status = 0; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5 $as_echo_n "checking lex output file root... " >&6; } -if ${ac_cv_prog_lex_root+:} false; then : +if test "${ac_cv_prog_lex_root+set}" = set; then : $as_echo_n "(cached) " >&6 else @@ -15356,7 +15367,7 @@ if test -f lex.yy.c; then elif test -f lexyy.c; then ac_cv_prog_lex_root=lexyy else - as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5 + as_fn_error "cannot find output from $LEX; giving up" "$LINENO" 5 fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5 @@ -15366,7 +15377,7 @@ LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root if test -z "${LEXLIB+set}"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5 $as_echo_n "checking lex library... " >&6; } -if ${ac_cv_lib_lex+:} false; then : +if test "${ac_cv_lib_lex+set}" = set; then : $as_echo_n "(cached) " >&6 else @@ -15396,7 +15407,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5 $as_echo_n "checking whether yytext is a pointer... " >&6; } -if ${ac_cv_prog_lex_yytext_pointer+:} false; then : +if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then : $as_echo_n "(cached) " >&6 else # POSIX says lex can declare yytext either as a pointer or an array; the @@ -15407,8 +15418,7 @@ ac_save_LIBS=$LIBS LIBS="$LEXLIB $ac_save_LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - - #define YYTEXT_POINTER 1 +#define YYTEXT_POINTER 1 `cat $LEX_OUTPUT_ROOT.c` _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -15435,7 +15445,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_YACC+:} false; then : +if test "${ac_cv_prog_YACC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$YACC"; then @@ -15490,7 +15500,7 @@ test -n "$YACC" || YACC="yacc" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if ${ac_cv_path_install+:} false; then : +if test "${ac_cv_path_install+set}" = set; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -15568,7 +15578,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 $as_echo_n "checking for a sed that does not truncate output... " >&6; } -if ${ac_cv_path_SED+:} false; then : +if test "${ac_cv_path_SED+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ @@ -15623,7 +15633,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_SED"; then - as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 + as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 fi else ac_cv_path_SED=$SED @@ -15646,7 +15656,7 @@ MS_VERSION="$MS_VERSION" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exp in -lm" >&5 $as_echo_n "checking for exp in -lm... " >&6; } -if ${ac_cv_lib_m_exp+:} false; then : +if test "${ac_cv_lib_m_exp+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -15680,7 +15690,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_exp" >&5 $as_echo "$ac_cv_lib_m_exp" >&6; } -if test "x$ac_cv_lib_m_exp" = xyes; then : +if test "x$ac_cv_lib_m_exp" = x""yes; then : XTRALIBS="$XTRALIBS -lm" fi @@ -15689,7 +15699,7 @@ XTRALIBS=$XTRALIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gxx_personality_v0 in -lstdc++" >&5 $as_echo_n "checking for __gxx_personality_v0 in -lstdc++... " >&6; } -if ${ac_cv_lib_stdcpp___gxx_personality_v0+:} false; then : +if test "${ac_cv_lib_stdcpp___gxx_personality_v0+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -15723,7 +15733,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_stdcpp___gxx_personality_v0" >&5 $as_echo "$ac_cv_lib_stdcpp___gxx_personality_v0" >&6; } -if test "x$ac_cv_lib_stdcpp___gxx_personality_v0" = xyes; then : +if test "x$ac_cv_lib_stdcpp___gxx_personality_v0" = x""yes; then : XTRALIBS="$XTRALIBS -lstdc++" fi @@ -15734,7 +15744,7 @@ LIBS="$XTRALIBS $LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : +if test "${ac_cv_header_stdc+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15846,56 +15856,56 @@ fi ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp" -if test "x$ac_cv_func_strcasecmp" = xyes; then : +if test "x$ac_cv_func_strcasecmp" = x""yes; then : else STRINGS="-DNEED_STRCASECMP $STRINGS" fi ac_fn_c_check_func "$LINENO" "strncasecmp" "ac_cv_func_strncasecmp" -if test "x$ac_cv_func_strncasecmp" = xyes; then : +if test "x$ac_cv_func_strncasecmp" = x""yes; then : else STRINGS="-DNEED_STRNCASECMP $STRINGS" fi ac_fn_c_check_func "$LINENO" "strdup" "ac_cv_func_strdup" -if test "x$ac_cv_func_strdup" = xyes; then : +if test "x$ac_cv_func_strdup" = x""yes; then : else STRINGS="-DNEED_STRDUP $STRINGS" fi ac_fn_c_check_func "$LINENO" "strrstr" "ac_cv_func_strrstr" -if test "x$ac_cv_func_strrstr" = xyes; then : +if test "x$ac_cv_func_strrstr" = x""yes; then : else STRINGS="-DNEED_STRRSTR $STRINGS" fi ac_fn_c_check_func "$LINENO" "strcasestr" "ac_cv_func_strcasestr" -if test "x$ac_cv_func_strcasestr" = xyes; then : +if test "x$ac_cv_func_strcasestr" = x""yes; then : else STRINGS="-DNEED_STRCASESTR $STRINGS" fi ac_fn_c_check_func "$LINENO" "strlcat" "ac_cv_func_strlcat" -if test "x$ac_cv_func_strlcat" = xyes; then : +if test "x$ac_cv_func_strlcat" = x""yes; then : else STRINGS="-DNEED_STRLCAT $STRINGS" fi ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy" -if test "x$ac_cv_func_strlcpy" = xyes; then : +if test "x$ac_cv_func_strlcpy" = x""yes; then : else STRINGS="-DNEED_STRLCPY $STRINGS" fi ac_fn_c_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf" -if test "x$ac_cv_func_vsnprintf" = xyes; then : +if test "x$ac_cv_func_vsnprintf" = x""yes; then : STRINGS="-DHAVE_VSNPRINTF $STRINGS" fi @@ -15931,7 +15941,7 @@ if test "$PKG_CONFIG" = "yes" ; then set dummy pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -15978,7 +15988,7 @@ elif test -f "$PKG_CONFIG" -a -x "$PKG_CONFIG" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: user supplied pkg-config ($PKG_CONFIG)" >&5 $as_echo "user supplied pkg-config ($PKG_CONFIG)" >&6; } else - as_fn_error $? "'$PKG_CONFIG' is not an executable. Make sure you use --with-pkg-config=/path/to/pkg-config" "$LINENO" 5 + as_fn_error "'$PKG_CONFIG' is not an executable. Make sure you use --with-pkg-config=/path/to/pkg-config" "$LINENO" 5 fi @@ -16000,7 +16010,7 @@ FT_CFLAGS='' FT_BIN='' if test "x$FT_DIR" = "xno" ; then - as_fn_error $? "Freetype support disabled but is now mandatory. Rerun without --without-freetype or --with-freetype=no" "$LINENO" 5 + as_fn_error "Freetype support disabled but is now mandatory. Rerun without --without-freetype or --with-freetype=no" "$LINENO" 5 fi @@ -16009,7 +16019,7 @@ if test -z "$FT_DIR" -o "$FT_DIR" = "yes" ; then set dummy freetype-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_FT_BIN+:} false; then : +if test "${ac_cv_path_FT_BIN+set}" = set; then : $as_echo_n "(cached) " >&6 else case $FT_BIN in @@ -16089,7 +16099,7 @@ LDFLAGS="$FT_LDFLAGS $LDFLAGS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_Init_FreeType in -lfreetype" >&5 $as_echo_n "checking for FT_Init_FreeType in -lfreetype... " >&6; } -if ${ac_cv_lib_freetype_FT_Init_FreeType+:} false; then : +if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -16123,7 +16133,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freetype_FT_Init_FreeType" >&5 $as_echo "$ac_cv_lib_freetype_FT_Init_FreeType" >&6; } -if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = xyes; then : +if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBFREETYPE 1 _ACEOF @@ -16131,20 +16141,20 @@ _ACEOF LIBS="-lfreetype $LIBS" else - as_fn_error $? "unable to link - reconfigure with correct --with-freetype=dir " "$LINENO" 5 + as_fn_error "unable to link - reconfigure with correct --with-freetype=dir " "$LINENO" 5 fi for ac_header in ft2build.h do : ac_fn_c_check_header_mongrel "$LINENO" "ft2build.h" "ac_cv_header_ft2build_h" "$ac_includes_default" -if test "x$ac_cv_header_ft2build_h" = xyes; then : +if test "x$ac_cv_header_ft2build_h" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_FT2BUILD_H 1 _ACEOF else - as_fn_error $? "ft2build.h header not found - reconfigure with correct --with-freetype=dir " "$LINENO" 5 + as_fn_error "ft2build.h header not found - reconfigure with correct --with-freetype=dir " "$LINENO" 5 fi done @@ -16258,7 +16268,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlibVersion in -lz" >&5 $as_echo_n "checking for zlibVersion in -lz... " >&6; } -if ${ac_cv_lib_z_zlibVersion+:} false; then : +if test "${ac_cv_lib_z_zlibVersion+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -16292,7 +16302,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_zlibVersion" >&5 $as_echo "$ac_cv_lib_z_zlibVersion" >&6; } -if test "x$ac_cv_lib_z_zlibVersion" = xyes; then : +if test "x$ac_cv_lib_z_zlibVersion" = x""yes; then : ZLIB_LIB="-lz" fi @@ -16381,7 +16391,7 @@ $as_echo " using libpng from $PNG_LIB" >&6; } fi else - as_fn_error $? "cannot find png lib in $PNG_DIR" "$LINENO" 5 + as_fn_error "cannot find png lib in $PNG_DIR" "$LINENO" 5 fi if test -n "$PNG_INCLUDE" ; then @@ -16389,17 +16399,18 @@ $as_echo " using libpng from $PNG_LIB" >&6; } CFLAGS="$ZLIB_INC $CFLAGS" as_ac_Header=`$as_echo "ac_cv_header_$PNG_INCLUDE/png.h" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$PNG_INCLUDE/png.h" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : PNG_INC=-I$PNG_INCLUDE else - as_fn_error $? "cannot find png headers" "$LINENO" 5 + as_fn_error "cannot find png headers" "$LINENO" 5 fi CFLAGS="$old_cflags" ALL_INC="$PNG_INC $ALL_INC" else - as_fn_error $? "cannot find png headers in $PNG_DIR" "$LINENO" 5 + as_fn_error "cannot find png headers in $PNG_DIR" "$LINENO" 5 fi PNG_ENABLED="-DUSE_PNG" else @@ -16407,7 +16418,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_init_io in -lpng" >&5 $as_echo_n "checking for png_init_io in -lpng... " >&6; } -if ${ac_cv_lib_png_png_init_io+:} false; then : +if test "${ac_cv_lib_png_png_init_io+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -16441,15 +16452,15 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_init_io" >&5 $as_echo "$ac_cv_lib_png_png_init_io" >&6; } -if test "x$ac_cv_lib_png_png_init_io" = xyes; then : +if test "x$ac_cv_lib_png_png_init_io" = x""yes; then : PNG_LIB="-lpng" fi ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default" -if test "x$ac_cv_header_png_h" = xyes; then : +if test "x$ac_cv_header_png_h" = x""yes; then : else - as_fn_error $? "cannot find png headers in system path" "$LINENO" 5 + as_fn_error "cannot find png headers in system path" "$LINENO" 5 fi @@ -16457,16 +16468,16 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: using libpng from system libs." >&5 $as_echo " using libpng from system libs." >&6; } else - as_fn_error $? "PNG (libpng) library cannot be found. install or reconfigure with --with-png=DIR" "$LINENO" 5 + as_fn_error "PNG (libpng) library cannot be found. install or reconfigure with --with-png=DIR" "$LINENO" 5 fi PNG_ENABLED="-DUSE_PNG" fi ac_fn_c_check_header_mongrel "$LINENO" "setjmp.h" "ac_cv_header_setjmp_h" "$ac_includes_default" -if test "x$ac_cv_header_setjmp_h" = xyes; then : +if test "x$ac_cv_header_setjmp_h" = x""yes; then : else - as_fn_error $? "setjmp.h is required with libpng" "$LINENO" 5 + as_fn_error "setjmp.h is required with libpng" "$LINENO" 5 fi @@ -16539,22 +16550,23 @@ $as_echo " using libgif from $GIF_LIB" >&6; } fi else - as_fn_error $? "cannot find gif lib in $GIF_DIR. To disable gif support run with --without-gif." "$LINENO" 5 + as_fn_error "cannot find gif lib in $GIF_DIR. To disable gif support run with --without-gif." "$LINENO" 5 fi if test -n "$GIF_INCLUDE" ; then as_ac_Header=`$as_echo "ac_cv_header_$GIF_INCLUDE/gif_lib.h" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$GIF_INCLUDE/gif_lib.h" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : GIF_INC=-I$GIF_INCLUDE else - as_fn_error $? "cannot find gif headers. To disable gif support run with --without-gif." "$LINENO" 5 + as_fn_error "cannot find gif headers. To disable gif support run with --without-gif." "$LINENO" 5 fi ALL_INC="$GIF_INC $ALL_INC" else - as_fn_error $? "cannot find gif headers in $GIF_DIR. To disable gif support run with --without-gif." "$LINENO" 5 + as_fn_error "cannot find gif headers in $GIF_DIR. To disable gif support run with --without-gif." "$LINENO" 5 fi GIF_ENABLED="-DUSE_GIF" else @@ -16562,7 +16574,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DGifOpenFileHandle in -lgif" >&5 $as_echo_n "checking for DGifOpenFileHandle in -lgif... " >&6; } -if ${ac_cv_lib_gif_DGifOpenFileHandle+:} false; then : +if test "${ac_cv_lib_gif_DGifOpenFileHandle+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -16596,15 +16608,15 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_DGifOpenFileHandle" >&5 $as_echo "$ac_cv_lib_gif_DGifOpenFileHandle" >&6; } -if test "x$ac_cv_lib_gif_DGifOpenFileHandle" = xyes; then : +if test "x$ac_cv_lib_gif_DGifOpenFileHandle" = x""yes; then : GIF_LIB="-lgif" fi ac_fn_c_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default" -if test "x$ac_cv_header_gif_lib_h" = xyes; then : +if test "x$ac_cv_header_gif_lib_h" = x""yes; then : else - as_fn_error $? "cannot find gif headers in system path. To disable gif support run with --without-gif." "$LINENO" 5 + as_fn_error "cannot find gif headers in system path. To disable gif support run with --without-gif." "$LINENO" 5 fi @@ -16612,7 +16624,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: using libgif from system libs." >&5 $as_echo " using libgif from system libs." >&6; } else - as_fn_error $? "GIF (libgif) library cannot be found. install or reconfigure with --with-gif=DIR. To disable gif support run with --without-gif." "$LINENO" 5 + as_fn_error "GIF (libgif) library cannot be found. install or reconfigure with --with-gif=DIR. To disable gif support run with --without-gif." "$LINENO" 5 fi GIF_ENABLED="-DUSE_GIF" fi @@ -16687,7 +16699,7 @@ if test -n "$with_jpeg" -a "$with_jpeg" != "yes" ; then fi else - as_fn_error $? "\"Could not find jpeglib.h or libjpeg.a/libjpeg.so/libjpeg.dylib in $JPEG_DIR.\"" "$LINENO" 5 + as_fn_error "\"Could not find jpeglib.h or libjpeg.a/libjpeg.so/libjpeg.dylib in $JPEG_DIR.\"" "$LINENO" 5 fi @@ -16698,7 +16710,7 @@ if test -n "$with_jpeg" -a "$with_jpeg" != "yes" ; then LDFLAGS="$JPEG_LIB $LDFLAGS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_read_header in -ljpeg" >&5 $as_echo_n "checking for jpeg_read_header in -ljpeg... " >&6; } -if ${ac_cv_lib_jpeg_jpeg_read_header+:} false; then : +if test "${ac_cv_lib_jpeg_jpeg_read_header+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -16732,7 +16744,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_read_header" >&5 $as_echo "$ac_cv_lib_jpeg_jpeg_read_header" >&6; } -if test "x$ac_cv_lib_jpeg_jpeg_read_header" = xyes; then : +if test "x$ac_cv_lib_jpeg_jpeg_read_header" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBJPEG 1 _ACEOF @@ -16740,14 +16752,14 @@ _ACEOF LIBS="-ljpeg $LIBS" else - as_fn_error $? "\"cannot link with libjpeg\"" "$LINENO" 5 + as_fn_error "\"cannot link with libjpeg\"" "$LINENO" 5 fi ac_fn_c_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default" -if test "x$ac_cv_header_jpeglib_h" = xyes; then : +if test "x$ac_cv_header_jpeglib_h" = x""yes; then : else - as_fn_error $? "\"cannot find jpeg headers\"" "$LINENO" 5 + as_fn_error "\"cannot find jpeg headers\"" "$LINENO" 5 fi @@ -16762,7 +16774,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_read_header in -ljpeg" >&5 $as_echo_n "checking for jpeg_read_header in -ljpeg... " >&6; } -if ${ac_cv_lib_jpeg_jpeg_read_header+:} false; then : +if test "${ac_cv_lib_jpeg_jpeg_read_header+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -16796,7 +16808,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_read_header" >&5 $as_echo "$ac_cv_lib_jpeg_jpeg_read_header" >&6; } -if test "x$ac_cv_lib_jpeg_jpeg_read_header" = xyes; then : +if test "x$ac_cv_lib_jpeg_jpeg_read_header" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBJPEG 1 _ACEOF @@ -16804,14 +16816,14 @@ _ACEOF LIBS="-ljpeg $LIBS" else - as_fn_error $? "\"cannot link with libjpeg\"" "$LINENO" 5 + as_fn_error "\"cannot link with libjpeg\"" "$LINENO" 5 fi ac_fn_c_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default" -if test "x$ac_cv_header_jpeglib_h" = xyes; then : +if test "x$ac_cv_header_jpeglib_h" = x""yes; then : else - as_fn_error $? "\"cannot find jpeg headers\"" "$LINENO" 5 + as_fn_error "\"cannot find jpeg headers\"" "$LINENO" 5 fi @@ -16891,7 +16903,7 @@ $as_echo " using libXpm from $XPM_LIB" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpmFreeXpmImage in -lXpm" >&5 $as_echo_n "checking for XpmFreeXpmImage in -lXpm... " >&6; } -if ${ac_cv_lib_Xpm_XpmFreeXpmImage+:} false; then : +if test "${ac_cv_lib_Xpm_XpmFreeXpmImage+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -16925,7 +16937,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xpm_XpmFreeXpmImage" >&5 $as_echo "$ac_cv_lib_Xpm_XpmFreeXpmImage" >&6; } -if test "x$ac_cv_lib_Xpm_XpmFreeXpmImage" = xyes; then : +if test "x$ac_cv_lib_Xpm_XpmFreeXpmImage" = x""yes; then : XPM_LIB="-lXpm -lX11" fi @@ -16980,7 +16992,7 @@ if test -n "$ICONV_DIR" -a "$ICONV_DIR" != "yes" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_open in -lc" >&5 $as_echo_n "checking for iconv_open in -lc... " >&6; } -if ${ac_cv_lib_c_iconv_open+:} false; then : +if test "${ac_cv_lib_c_iconv_open+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -17014,13 +17026,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_iconv_open" >&5 $as_echo "$ac_cv_lib_c_iconv_open" >&6; } -if test "x$ac_cv_lib_c_iconv_open" = xyes; then : +if test "x$ac_cv_lib_c_iconv_open" = x""yes; then : ICONV_LIB="-L$ICONV_LIBDIR -lc" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiconv_open in -liconv" >&5 $as_echo_n "checking for libiconv_open in -liconv... " >&6; } -if ${ac_cv_lib_iconv_libiconv_open+:} false; then : +if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -17054,13 +17066,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_libiconv_open" >&5 $as_echo "$ac_cv_lib_iconv_libiconv_open" >&6; } -if test "x$ac_cv_lib_iconv_libiconv_open" = xyes; then : +if test "x$ac_cv_lib_iconv_libiconv_open" = x""yes; then : ICONV_LIB="-L$ICONV_LIBDIR -liconv" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_open in -liconv" >&5 $as_echo_n "checking for iconv_open in -liconv... " >&6; } -if ${ac_cv_lib_iconv_iconv_open+:} false; then : +if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -17094,7 +17106,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_iconv_open" >&5 $as_echo "$ac_cv_lib_iconv_iconv_open" >&6; } -if test "x$ac_cv_lib_iconv_iconv_open" = xyes; then : +if test "x$ac_cv_lib_iconv_iconv_open" = x""yes; then : ICONV_LIB="-L$ICONV_LIBDIR -liconv" fi @@ -17137,7 +17149,7 @@ else unset ac_cv_lib_c_iconv_open { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_open in -lc" >&5 $as_echo_n "checking for iconv_open in -lc... " >&6; } -if ${ac_cv_lib_c_iconv_open+:} false; then : +if test "${ac_cv_lib_c_iconv_open+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -17171,13 +17183,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_iconv_open" >&5 $as_echo "$ac_cv_lib_c_iconv_open" >&6; } -if test "x$ac_cv_lib_c_iconv_open" = xyes; then : +if test "x$ac_cv_lib_c_iconv_open" = x""yes; then : ICONV_LIB="-lc" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiconv_open in -liconv" >&5 $as_echo_n "checking for libiconv_open in -liconv... " >&6; } -if ${ac_cv_lib_iconv_libiconv_open+:} false; then : +if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -17211,13 +17223,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_libiconv_open" >&5 $as_echo "$ac_cv_lib_iconv_libiconv_open" >&6; } -if test "x$ac_cv_lib_iconv_libiconv_open" = xyes; then : +if test "x$ac_cv_lib_iconv_libiconv_open" = x""yes; then : ICONV_LIB="-liconv" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_open in -liconv" >&5 $as_echo_n "checking for iconv_open in -liconv... " >&6; } -if ${ac_cv_lib_iconv_iconv_open+:} false; then : +if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -17251,7 +17263,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_iconv_open" >&5 $as_echo "$ac_cv_lib_iconv_iconv_open" >&6; } -if test "x$ac_cv_lib_iconv_iconv_open" = xyes; then : +if test "x$ac_cv_lib_iconv_iconv_open" = x""yes; then : ICONV_LIB="-liconv" fi @@ -17346,19 +17358,21 @@ if test "x$with_gd" != "xno" ; then test -f $GD_DIR/lib/libgd.a && GD_LIBDIR="$GD_DIR/lib" test -f $GD_DIR/lib64/libgd.a && GD_LIBDIR="$GD_DIR/lib64" + test -f $GD_DIR/lib/x86_64-linux-gnu/libgd.a && GD_LIBDIR="$GD_DIR/lib/x86_64-linux-gnu" test -f $GD_DIR/.libs/libgd.a && GD_LIBDIR="$GD_DIR/.libs" test -f $GD_DIR/_libs/libgd.a && GD_LIBDIR="$GD_DIR/_libs" test -f $GD_DIR/libgd.a && GD_LIBDIR="$GD_DIR" test -f $GD_DIR/lib/libgd.so -o -f $GD_DIR/lib/libgd.sl -o -f $GD_DIR/lib/libgd.dylib && GD_LIBDIR="$GD_DIR/lib" test -f $GD_DIR/lib64/libgd.so -o -f $GD_DIR/lib/libgd.sl && GD_LIBDIR="$GD_DIR/lib64" + test -f $GD_DIR/lib/x86_64-linux-gnu/libgd.so && GD_LIBDIR="$GD_DIR/lib/x86_64-linux-gnu" test -f $GD_DIR/.libs/libgd.so -o -f $GD_DIR/.libs/libgd.sl -o -f $GD_DIR/.libs/libgd.dylib && GD_LIBDIR="$GD_DIR/.libs" test -f $GD_DIR/_libs/libgd.so -o -f $GD_DIR/_libs/libgd.sl -o -f $GD_DIR/_libs/libgd.dylib && GD_LIBDIR="$GD_DIR/_libs" test -f $GD_DIR/libgd.so -o -f $GD_DIR/libgd.sl -o -f $GD_DIR/libgd.dylib && GD_LIBDIR="$GD_DIR" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageCreatePaletteFromTrueColor in -lgd" >&5 $as_echo_n "checking for gdImageCreatePaletteFromTrueColor in -lgd... " >&6; } -if ${ac_cv_lib_gd_gdImageCreatePaletteFromTrueColor+:} false; then : +if test "${ac_cv_lib_gd_gdImageCreatePaletteFromTrueColor+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -17392,7 +17406,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageCreatePaletteFromTrueColor" >&5 $as_echo "$ac_cv_lib_gd_gdImageCreatePaletteFromTrueColor" >&6; } -if test "x$ac_cv_lib_gd_gdImageCreatePaletteFromTrueColor" = xyes; then : +if test "x$ac_cv_lib_gd_gdImageCreatePaletteFromTrueColor" = x""yes; then : IS_GD2="true" fi @@ -17403,7 +17417,7 @@ fi $as_echo "$as_me: checking whether GD needs libiconv..." >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageCreatePaletteFromTrueColor in -lgd" >&5 $as_echo_n "checking for gdImageCreatePaletteFromTrueColor in -lgd... " >&6; } -if ${ac_cv_lib_gd_gdImageCreatePaletteFromTrueColor+:} false; then : +if test "${ac_cv_lib_gd_gdImageCreatePaletteFromTrueColor+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -17437,7 +17451,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageCreatePaletteFromTrueColor" >&5 $as_echo "$ac_cv_lib_gd_gdImageCreatePaletteFromTrueColor" >&6; } -if test "x$ac_cv_lib_gd_gdImageCreatePaletteFromTrueColor" = xyes; then : +if test "x$ac_cv_lib_gd_gdImageCreatePaletteFromTrueColor" = x""yes; then : IS_GD2="true" fi @@ -17473,7 +17487,7 @@ $as_echo " using libgd 2.0.28 (or higher) from $GD_LIB $GD_XTRA_LIBS" >&6 fi else - as_fn_error $? "Could not find gd.h or libgd.a/libgd.so in $GD_DIR. Make sure GD 2.0.28 or higher is compiled before calling configure. You may also get this error if you didn't specify the appropriate location for one of GD's dependencies (freetype, libpng, libjpeg or libiconv)." "$LINENO" 5 + as_fn_error "Could not find gd.h or libgd.a/libgd.so in $GD_DIR. Make sure GD 2.0.28 or higher is compiled before calling configure. You may also get this error if you didn't specify the appropriate location for one of GD's dependencies (freetype, libpng, libjpeg or libiconv)." "$LINENO" 5 fi else FOUND_GD="false" @@ -17487,7 +17501,7 @@ $as_echo " using libgd 2.0.28 (or higher) from $GD_LIB $GD_XTRA_LIBS" >&6 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageCreatePaletteFromTrueColor in -lgd" >&5 $as_echo_n "checking for gdImageCreatePaletteFromTrueColor in -lgd... " >&6; } -if ${ac_cv_lib_gd_gdImageCreatePaletteFromTrueColor+:} false; then : +if test "${ac_cv_lib_gd_gdImageCreatePaletteFromTrueColor+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -17521,7 +17535,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageCreatePaletteFromTrueColor" >&5 $as_echo "$ac_cv_lib_gd_gdImageCreatePaletteFromTrueColor" >&6; } -if test "x$ac_cv_lib_gd_gdImageCreatePaletteFromTrueColor" = xyes; then : +if test "x$ac_cv_lib_gd_gdImageCreatePaletteFromTrueColor" = x""yes; then : IS_GD2="true" fi @@ -17532,7 +17546,7 @@ $as_echo "$as_me: checking whether GD needs libiconv..." >&6;} unset ac_cv_lib_gd_gdImageCreatePaletteFromTrueColor { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageCreatePaletteFromTrueColor in -lgd" >&5 $as_echo_n "checking for gdImageCreatePaletteFromTrueColor in -lgd... " >&6; } -if ${ac_cv_lib_gd_gdImageCreatePaletteFromTrueColor+:} false; then : +if test "${ac_cv_lib_gd_gdImageCreatePaletteFromTrueColor+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -17566,7 +17580,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageCreatePaletteFromTrueColor" >&5 $as_echo "$ac_cv_lib_gd_gdImageCreatePaletteFromTrueColor" >&6; } -if test "x$ac_cv_lib_gd_gdImageCreatePaletteFromTrueColor" = xyes; then : +if test "x$ac_cv_lib_gd_gdImageCreatePaletteFromTrueColor" = x""yes; then : IS_GD2="true" fi @@ -17585,7 +17599,7 @@ $as_echo " using libgd 2.0.28 (or higher) from system libs ($GD_LIB $GD_X done if test "$FOUND_GD" = "false" ; then - as_fn_error $? "Could not find gd.h or libgd.a/libgd.so in $GD_DIR. Make sure GD 2.0.28 or higher is compiled before calling configure. You may also get this error if you didn't specify the appropriate location for one of GD's dependencies (freetype, libpng, libjpeg or libiconv)." "$LINENO" 5 + as_fn_error "Could not find gd.h or libgd.a/libgd.so in $GD_DIR. Make sure GD 2.0.28 or higher is compiled before calling configure. You may also get this error if you didn't specify the appropriate location for one of GD's dependencies (freetype, libpng, libjpeg or libiconv)." "$LINENO" 5 fi fi @@ -17608,7 +17622,7 @@ $as_echo "static linkage of $GD_STATIC requested... testing supported formats... as_ac_Lib=`$as_echo "ac_cv_lib_$GD_CHECKLIB''_gdImageGif" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageGif in -l$GD_CHECKLIB" >&5 $as_echo_n "checking for gdImageGif in -l$GD_CHECKLIB... " >&6; } -if eval \${$as_ac_Lib+:} false; then : +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -17643,14 +17657,15 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : GD_DEF="$GD_DEF -DUSE_GD_GIF" fi as_ac_Lib=`$as_echo "ac_cv_lib_$GD_CHECKLIB''_gdImagePng" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImagePng in -l$GD_CHECKLIB" >&5 $as_echo_n "checking for gdImagePng in -l$GD_CHECKLIB... " >&6; } -if eval \${$as_ac_Lib+:} false; then : +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -17685,14 +17700,15 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : GD_DEF="$GD_DEF -DUSE_GD_PNG" fi as_ac_Lib=`$as_echo "ac_cv_lib_$GD_CHECKLIB''_gdImageJpeg" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageJpeg in -l$GD_CHECKLIB" >&5 $as_echo_n "checking for gdImageJpeg in -l$GD_CHECKLIB... " >&6; } -if eval \${$as_ac_Lib+:} false; then : +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -17727,14 +17743,15 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : GD_DEF="$GD_DEF -DUSE_GD_JPEG" fi as_ac_Lib=`$as_echo "ac_cv_lib_$GD_CHECKLIB''_gdImageWBMP" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageWBMP in -l$GD_CHECKLIB" >&5 $as_echo_n "checking for gdImageWBMP in -l$GD_CHECKLIB... " >&6; } -if eval \${$as_ac_Lib+:} false; then : +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -17769,7 +17786,8 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : GD_DEF="$GD_DEF -DUSE_GD_WBMP" fi @@ -17778,7 +17796,7 @@ fi as_ac_Lib=`$as_echo "ac_cv_lib_$GD_CHECKLIB''_gdImageStringFT" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageStringFT in -l$GD_CHECKLIB" >&5 $as_echo_n "checking for gdImageStringFT in -l$GD_CHECKLIB... " >&6; } -if eval \${$as_ac_Lib+:} false; then : +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -17813,7 +17831,8 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : GD_FT_SUPPORT=yes fi @@ -17824,7 +17843,7 @@ fi as_ac_Lib=`$as_echo "ac_cv_lib_$GD_CHECKLIB''_gdImageStringFT" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageStringFT in -l$GD_CHECKLIB" >&5 $as_echo_n "checking for gdImageStringFT in -l$GD_CHECKLIB... " >&6; } -if eval \${$as_ac_Lib+:} false; then : +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -17859,7 +17878,8 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : GD_FT_SUPPORT=yes fi @@ -17873,7 +17893,7 @@ fi as_ac_Lib=`$as_echo "ac_cv_lib_$GD_CHECKLIB''_gdImageSetResolution" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageSetResolution in -l$GD_CHECKLIB" >&5 $as_echo_n "checking for gdImageSetResolution in -l$GD_CHECKLIB... " >&6; } -if eval \${$as_ac_Lib+:} false; then : +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -17908,7 +17928,8 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : GD_RESOLUTION_SUPPORT=yes fi @@ -17920,7 +17941,7 @@ fi as_ac_Lib=`$as_echo "ac_cv_lib_$GD_CHECKLIB''_gdImageOpenPolygon" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageOpenPolygon in -l$GD_CHECKLIB" >&5 $as_echo_n "checking for gdImageOpenPolygon in -l$GD_CHECKLIB... " >&6; } -if eval \${$as_ac_Lib+:} false; then : +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -17955,7 +17976,8 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : GD_DEF="$GD_DEF -DGD_HAS_FTEX_XSHOW" fi @@ -17963,7 +17985,7 @@ fi as_ac_Lib=`$as_echo "ac_cv_lib_$GD_CHECKLIB''_gdImageGifPtr" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageGifPtr in -l$GD_CHECKLIB" >&5 $as_echo_n "checking for gdImageGifPtr in -l$GD_CHECKLIB... " >&6; } -if eval \${$as_ac_Lib+:} false; then : +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -17998,7 +18020,8 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : GD_DEF="$GD_DEF -DGD_HAS_GDIMAGEGIFPTR" fi @@ -18006,7 +18029,7 @@ fi as_ac_Lib=`$as_echo "ac_cv_lib_$GD_CHECKLIB''_gdFontGetTiny" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdFontGetTiny in -l$GD_CHECKLIB" >&5 $as_echo_n "checking for gdFontGetTiny in -l$GD_CHECKLIB... " >&6; } -if eval \${$as_ac_Lib+:} false; then : +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -18041,7 +18064,8 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : GD_DEF="$GD_DEF -DGD_HAS_GETBITMAPFONTS" fi @@ -18054,7 +18078,7 @@ fi CXXFLAGS="$CXXFLAGS $GD_INC" ac_fn_c_check_decl "$LINENO" "gdImageGetTrueColorPixel" "ac_cv_have_decl_gdImageGetTrueColorPixel" "#include " -if test "x$ac_cv_have_decl_gdImageGetTrueColorPixel" = xyes; then : +if test "x$ac_cv_have_decl_gdImageGetTrueColorPixel" = x""yes; then : GD_HAS_GET_TRUE_COLOR_PIXEL=yes fi @@ -18065,7 +18089,7 @@ fi as_ac_Lib=`$as_echo "ac_cv_lib_$GD_CHECKLIB''_gdImageGetTrueColorPixel" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageGetTrueColorPixel in -l$GD_CHECKLIB" >&5 $as_echo_n "checking for gdImageGetTrueColorPixel in -l$GD_CHECKLIB... " >&6; } -if eval \${$as_ac_Lib+:} false; then : +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -18100,7 +18124,8 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : GD_DEF="$GD_DEF -DGD_HAS_GET_TRUE_COLOR_PIXEL" fi @@ -18114,7 +18139,7 @@ $as_echo " using GD ($GD_DEF) from $GD_DIR." >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageCreate in -lgd" >&5 $as_echo_n "checking for gdImageCreate in -lgd... " >&6; } -if ${ac_cv_lib_gd_gdImageCreate+:} false; then : +if test "${ac_cv_lib_gd_gdImageCreate+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -18148,17 +18173,17 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageCreate" >&5 $as_echo "$ac_cv_lib_gd_gdImageCreate" >&6; } -if test "x$ac_cv_lib_gd_gdImageCreate" = xyes; then : +if test "x$ac_cv_lib_gd_gdImageCreate" = x""yes; then : GD_FOUND=yes fi if test -z "$GD_FOUND" ; then - as_fn_error $? "GD is required but was not found... use --with-gd=DIR to specify its location." "$LINENO" 5 + as_fn_error "GD is required but was not found... use --with-gd=DIR to specify its location." "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageGif in -lgd" >&5 $as_echo_n "checking for gdImageGif in -lgd... " >&6; } -if ${ac_cv_lib_gd_gdImageGif+:} false; then : +if test "${ac_cv_lib_gd_gdImageGif+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -18192,13 +18217,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageGif" >&5 $as_echo "$ac_cv_lib_gd_gdImageGif" >&6; } -if test "x$ac_cv_lib_gd_gdImageGif" = xyes; then : +if test "x$ac_cv_lib_gd_gdImageGif" = x""yes; then : GD_DEF="$GD_DEF -DUSE_GD_GIF" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImagePng in -lgd" >&5 $as_echo_n "checking for gdImagePng in -lgd... " >&6; } -if ${ac_cv_lib_gd_gdImagePng+:} false; then : +if test "${ac_cv_lib_gd_gdImagePng+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -18232,13 +18257,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImagePng" >&5 $as_echo "$ac_cv_lib_gd_gdImagePng" >&6; } -if test "x$ac_cv_lib_gd_gdImagePng" = xyes; then : +if test "x$ac_cv_lib_gd_gdImagePng" = x""yes; then : GD_DEF="$GD_DEF -DUSE_GD_PNG" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageJpeg in -lgd" >&5 $as_echo_n "checking for gdImageJpeg in -lgd... " >&6; } -if ${ac_cv_lib_gd_gdImageJpeg+:} false; then : +if test "${ac_cv_lib_gd_gdImageJpeg+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -18272,13 +18297,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageJpeg" >&5 $as_echo "$ac_cv_lib_gd_gdImageJpeg" >&6; } -if test "x$ac_cv_lib_gd_gdImageJpeg" = xyes; then : +if test "x$ac_cv_lib_gd_gdImageJpeg" = x""yes; then : GD_DEF="$GD_DEF -DUSE_GD_JPEG" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageWBMP in -lgd" >&5 $as_echo_n "checking for gdImageWBMP in -lgd... " >&6; } -if ${ac_cv_lib_gd_gdImageWBMP+:} false; then : +if test "${ac_cv_lib_gd_gdImageWBMP+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -18312,14 +18337,14 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageWBMP" >&5 $as_echo "$ac_cv_lib_gd_gdImageWBMP" >&6; } -if test "x$ac_cv_lib_gd_gdImageWBMP" = xyes; then : +if test "x$ac_cv_lib_gd_gdImageWBMP" = x""yes; then : GD_DEF="$GD_DEF -DUSE_GD_WBMP" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageStringFT in -lgd" >&5 $as_echo_n "checking for gdImageStringFT in -lgd... " >&6; } -if ${ac_cv_lib_gd_gdImageStringFT+:} false; then : +if test "${ac_cv_lib_gd_gdImageStringFT+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -18353,14 +18378,14 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageStringFT" >&5 $as_echo "$ac_cv_lib_gd_gdImageStringFT" >&6; } -if test "x$ac_cv_lib_gd_gdImageStringFT" = xyes; then : +if test "x$ac_cv_lib_gd_gdImageStringFT" = x""yes; then : GD_DEF="$GD_DEF -DUSE_GD_FT" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageOpenPolygon in -lgd" >&5 $as_echo_n "checking for gdImageOpenPolygon in -lgd... " >&6; } -if ${ac_cv_lib_gd_gdImageOpenPolygon+:} false; then : +if test "${ac_cv_lib_gd_gdImageOpenPolygon+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -18394,14 +18419,14 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageOpenPolygon" >&5 $as_echo "$ac_cv_lib_gd_gdImageOpenPolygon" >&6; } -if test "x$ac_cv_lib_gd_gdImageOpenPolygon" = xyes; then : +if test "x$ac_cv_lib_gd_gdImageOpenPolygon" = x""yes; then : GD_DEF="$GD_DEF -DGD_HAS_FTEX_XSHOW" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageGifPtr in -lgd" >&5 $as_echo_n "checking for gdImageGifPtr in -lgd... " >&6; } -if ${ac_cv_lib_gd_gdImageGifPtr+:} false; then : +if test "${ac_cv_lib_gd_gdImageGifPtr+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -18435,14 +18460,14 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageGifPtr" >&5 $as_echo "$ac_cv_lib_gd_gdImageGifPtr" >&6; } -if test "x$ac_cv_lib_gd_gdImageGifPtr" = xyes; then : +if test "x$ac_cv_lib_gd_gdImageGifPtr" = x""yes; then : GD_DEF="$GD_DEF -DGD_HAS_GDIMAGEGIFPTR" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdFontGetTiny in -lgd" >&5 $as_echo_n "checking for gdFontGetTiny in -lgd... " >&6; } -if ${ac_cv_lib_gd_gdFontGetTiny+:} false; then : +if test "${ac_cv_lib_gd_gdFontGetTiny+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -18476,7 +18501,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdFontGetTiny" >&5 $as_echo "$ac_cv_lib_gd_gdFontGetTiny" >&6; } -if test "x$ac_cv_lib_gd_gdFontGetTiny" = xyes; then : +if test "x$ac_cv_lib_gd_gdFontGetTiny" = x""yes; then : GD_DEF="$GD_DEF -DGD_HAS_GETBITMAPFONTS" fi @@ -18485,7 +18510,7 @@ fi as_ac_Lib=`$as_echo "ac_cv_lib_$GD_CHECKLIB''_gdImageSetResolution" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageSetResolution in -l$GD_CHECKLIB" >&5 $as_echo_n "checking for gdImageSetResolution in -l$GD_CHECKLIB... " >&6; } -if eval \${$as_ac_Lib+:} false; then : +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -18520,7 +18545,8 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : GD_RESOLUTION_SUPPORT=yes fi @@ -18532,14 +18558,14 @@ fi GD_HAS_GET_TRUE_COLOR_PIXEL= ac_fn_c_check_decl "$LINENO" "gdImageGetTrueColorPixel" "ac_cv_have_decl_gdImageGetTrueColorPixel" "#include " -if test "x$ac_cv_have_decl_gdImageGetTrueColorPixel" = xyes; then : +if test "x$ac_cv_have_decl_gdImageGetTrueColorPixel" = x""yes; then : GD_HAS_GET_TRUE_COLOR_PIXEL=yes fi if test .$GD_HAS_GET_TRUE_COLOR_PIXEL = .yes ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageGetTrueColorPixel in -lgd" >&5 $as_echo_n "checking for gdImageGetTrueColorPixel in -lgd... " >&6; } -if ${ac_cv_lib_gd_gdImageGetTrueColorPixel+:} false; then : +if test "${ac_cv_lib_gd_gdImageGetTrueColorPixel+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -18573,7 +18599,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageGetTrueColorPixel" >&5 $as_echo "$ac_cv_lib_gd_gdImageGetTrueColorPixel" >&6; } -if test "x$ac_cv_lib_gd_gdImageGetTrueColorPixel" = xyes; then : +if test "x$ac_cv_lib_gd_gdImageGetTrueColorPixel" = x""yes; then : GD_DEF="$GD_DEF -DGD_HAS_GET_TRUE_COLOR_PIXEL" fi @@ -18646,7 +18672,7 @@ if test -n "$with_ftgl" -a "$with_ftgl" != "no" ; then fi if test -z "$FTGL_INCLUDE" ; then - as_fn_error $? "\"could not find ftgl.h/FTGL.h in $FTGL_DIR/include/FTGL.\"" "$LINENO" 5 + as_fn_error "\"could not find ftgl.h/FTGL.h in $FTGL_DIR/include/FTGL.\"" "$LINENO" 5 fi test -f $FTGL_DIR/lib/libftgl.so && FTGL_LIBDIR="$FTGL_DIR/lib" @@ -18654,7 +18680,7 @@ if test -n "$with_ftgl" -a "$with_ftgl" != "no" ; then test -f $FTGL_DIR/lib64/libftgl.so && FTGL_LIBDIR="$FTGL_DIR/lib64" if test -z "$FTGL_LIBDIR" ; then - as_fn_error $? "\"could not find libftgl in $FTGL_DIR.\"" "$LINENO" 5 + as_fn_error "\"could not find libftgl in $FTGL_DIR.\"" "$LINENO" 5 fi @@ -18727,7 +18753,7 @@ fi if test -n "$with_opengl" -a "$with_opengl" != "no" ; then if test -z "$FTGL_LIB" ; then - as_fn_error $? "FTGL required for opengl support - please configure --with-ftgl." "$LINENO" 5 + as_fn_error "FTGL required for opengl support - please configure --with-ftgl." "$LINENO" 5 fi @@ -18741,7 +18767,7 @@ if test -n "$with_opengl" -a "$with_opengl" != "no" ; then test -f $OGL_DIR/include/GL/gl.h -a -f $OGL_DIR/include/GL/glx.h -a -f $OGL_DIR/include/GL/glu.h && OGL_INCLUDE="-I$OGL_DIR/include" if test -z "$OGL_INCLUDE" ; then - as_fn_error $? "\"could not find gl.h in $OGL_DIR/include/.\"" "$LINENO" 5 + as_fn_error "\"could not find gl.h in $OGL_DIR/include/.\"" "$LINENO" 5 fi test -f $OGL_DIR/lib/libGL.so -a -f $OGL_DIR/lib/libGLU.so && OGL_LIBDIR="$OGL_DIR/lib" @@ -18749,7 +18775,7 @@ if test -n "$with_opengl" -a "$with_opengl" != "no" ; then test -f $OGL_DIR/lib64/libGL.so -a -f $OGL_DIR/lib64/libGLU.so && OGL_LIBDIR="$OGL_DIR/lib64" if test -z "$OGL_LIBDIR" ; then - as_fn_error $? "\"could not find libGL or libGLU in $OGL_DIR/lib/ or $OGL_DIR/lib64/.\"" "$LINENO" 5 + as_fn_error "\"could not find libGL or libGLU in $OGL_DIR/lib/ or $OGL_DIR/lib64/.\"" "$LINENO" 5 fi @@ -18863,22 +18889,23 @@ $as_echo " using libexpat from $EXPAT_LIB" >&6; } fi else - as_fn_error $? "cannot find expat lib in $EXPAT_DIR" "$LINENO" 5 + as_fn_error "cannot find expat lib in $EXPAT_DIR" "$LINENO" 5 fi if test -n "$EXPAT_INCDIR" ; then as_ac_Header=`$as_echo "ac_cv_header_$EXPAT_INCDIR/expat.h" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$EXPAT_INCDIR/expat.h" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : EXPAT_INC=-I$EXPAT_INCDIR else - as_fn_error $? "cannot find expat headers" "$LINENO" 5 + as_fn_error "cannot find expat headers" "$LINENO" 5 fi ALL_INC="$EXPAT_INC $ALL_INC" else - as_fn_error $? "cannot find expat headers in $EXPAT_DIR" "$LINENO" 5 + as_fn_error "cannot find expat headers in $EXPAT_DIR" "$LINENO" 5 fi EXPAT_FOUND="yes" else @@ -18886,7 +18913,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML_ParserCreate in -lexpat" >&5 $as_echo_n "checking for XML_ParserCreate in -lexpat... " >&6; } -if ${ac_cv_lib_expat_XML_ParserCreate+:} false; then : +if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -18920,12 +18947,12 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_expat_XML_ParserCreate" >&5 $as_echo "$ac_cv_lib_expat_XML_ParserCreate" >&6; } -if test "x$ac_cv_lib_expat_XML_ParserCreate" = xyes; then : +if test "x$ac_cv_lib_expat_XML_ParserCreate" = x""yes; then : EXPAT_LIB="-lexpat" fi ac_fn_c_check_header_mongrel "$LINENO" "expat.h" "ac_cv_header_expat_h" "$ac_includes_default" -if test "x$ac_cv_header_expat_h" = xyes; then : +if test "x$ac_cv_header_expat_h" = x""yes; then : else EXPAT_HEADER_FOUND="no" @@ -18970,7 +18997,7 @@ if test "$with_proj" = "yes" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pj_init in -lproj" >&5 $as_echo_n "checking for pj_init in -lproj... " >&6; } -if ${ac_cv_lib_proj_pj_init+:} false; then : +if test "${ac_cv_lib_proj_pj_init+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -19004,13 +19031,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_proj_pj_init" >&5 $as_echo "$ac_cv_lib_proj_pj_init" >&6; } -if test "x$ac_cv_lib_proj_pj_init" = xyes; then : +if test "x$ac_cv_lib_proj_pj_init" = x""yes; then : PROJ_ENABLED=-DUSE_PROJ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pj_transform in -lproj" >&5 $as_echo_n "checking for pj_transform in -lproj... " >&6; } -if ${ac_cv_lib_proj_pj_transform+:} false; then : +if test "${ac_cv_lib_proj_pj_transform+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -19044,7 +19071,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_proj_pj_transform" >&5 $as_echo "$ac_cv_lib_proj_pj_transform" >&6; } -if test "x$ac_cv_lib_proj_pj_transform" = xyes; then : +if test "x$ac_cv_lib_proj_pj_transform" = x""yes; then : PJ_TRANSFORM=yes else PJ_TRANSFORM=no @@ -19052,7 +19079,7 @@ fi if test -n "$PROJ_ENABLED" -a "$PJ_TRANSFORM" = "no"; then - as_fn_error $? "This version of PROJ is too old. PROJ4.4.2 or later is required." "$LINENO" 5 + as_fn_error "This version of PROJ is too old. PROJ4.4.2 or later is required." "$LINENO" 5 elif test -n "$PROJ_ENABLED" -a "$PJ_TRANSFORM" = "yes"; then PROJ_LIBS="-lproj" { $as_echo "$as_me:${as_lineno-$LINENO}: result: using PROJ.4 from system libs." >&5 @@ -19112,12 +19139,12 @@ elif test -n "$with_proj" -a "$with_proj" != "no" ; then fi else - as_fn_error $? "\"Could not find proj_api.h or libproj.a/libproj.so in $PROJ_DIR.\"" "$LINENO" 5 + as_fn_error "\"Could not find proj_api.h or libproj.a/libproj.so in $PROJ_DIR.\"" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pj_transform in -lproj" >&5 $as_echo_n "checking for pj_transform in -lproj... " >&6; } -if ${ac_cv_lib_proj_pj_transform+:} false; then : +if test "${ac_cv_lib_proj_pj_transform+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -19151,14 +19178,14 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_proj_pj_transform" >&5 $as_echo "$ac_cv_lib_proj_pj_transform" >&6; } -if test "x$ac_cv_lib_proj_pj_transform" = xyes; then : +if test "x$ac_cv_lib_proj_pj_transform" = x""yes; then : PJ_TRANSFORM=yes else PJ_TRANSFORM=no fi if test "$PJ_TRANSFORM" = "no"; then - as_fn_error $? "This version of PROJ is too old. PROJ4.4.2 or later is required." "$LINENO" 5 + as_fn_error "This version of PROJ is too old. PROJ4.4.2 or later is required." "$LINENO" 5 fi PROJ_ENABLED=-DUSE_PROJ @@ -19199,7 +19226,7 @@ if test "$with_threads" = "yes" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5 $as_echo_n "checking for pthread_create in -lpthread... " >&6; } -if ${ac_cv_lib_pthread_pthread_create+:} false; then : +if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -19233,7 +19260,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5 $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; } -if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then : +if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then : THREAD_FLAG=-DUSE_THREAD fi @@ -19243,7 +19270,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: using -lpthread from system libs." >&5 $as_echo " using -lpthread from system libs." >&6; } else - as_fn_error $? " -lpthread not found, use --with-thread=" "$LINENO" 5 + as_fn_error " -lpthread not found, use --with-thread=" "$LINENO" 5 fi elif test -n "$with_threads" -a "$with_threads" != "no" ; then @@ -19294,7 +19321,7 @@ if test "$with_sde" = "yes" ; then as_ac_Lib=`$as_echo "ac_cv_lib_sde$SDE_VERSION''_SE_connection_create" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SE_connection_create in -lsde$SDE_VERSION" >&5 $as_echo_n "checking for SE_connection_create in -lsde$SDE_VERSION... " >&6; } -if eval \${$as_ac_Lib+:} false; then : +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -19329,7 +19356,8 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : SDE_ENABLED=-DUSE_SDE fi @@ -19338,7 +19366,7 @@ fi SDE_LIB="-lsde$SDE_VERSION -lpe$SDE_VERSION -lsg$SDE_VERSION" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpthread" >&5 $as_echo_n "checking for main in -lpthread... " >&6; } -if ${ac_cv_lib_pthread_main+:} false; then : +if test "${ac_cv_lib_pthread_main+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -19366,13 +19394,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_main" >&5 $as_echo "$ac_cv_lib_pthread_main" >&6; } -if test "x$ac_cv_lib_pthread_main" = xyes; then : +if test "x$ac_cv_lib_pthread_main" = x""yes; then : SDE_LIB="$SDE_LIB -lpthread" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lsocket" >&5 $as_echo_n "checking for main in -lsocket... " >&6; } -if ${ac_cv_lib_socket_main+:} false; then : +if test "${ac_cv_lib_socket_main+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -19400,13 +19428,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_main" >&5 $as_echo "$ac_cv_lib_socket_main" >&6; } -if test "x$ac_cv_lib_socket_main" = xyes; then : +if test "x$ac_cv_lib_socket_main" = x""yes; then : SDE_LIB="$SDE_LIB -lsocket" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ldl" >&5 $as_echo_n "checking for main in -ldl... " >&6; } -if ${ac_cv_lib_dl_main+:} false; then : +if test "${ac_cv_lib_dl_main+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -19434,7 +19462,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_main" >&5 $as_echo "$ac_cv_lib_dl_main" >&6; } -if test "x$ac_cv_lib_dl_main" = xyes; then : +if test "x$ac_cv_lib_dl_main" = x""yes; then : SDE_LIB="$SDE_LIB -ldl" fi @@ -19472,7 +19500,7 @@ elif test -n "$with_sde" -a "$with_sde" != "no" ; then SDE_LIB="-L$SDE_LIBDIR -lsde$SDE_VERSION -lpe$SDE_VERSION -lsg$SDE_VERSION" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpthread" >&5 $as_echo_n "checking for main in -lpthread... " >&6; } -if ${ac_cv_lib_pthread_main+:} false; then : +if test "${ac_cv_lib_pthread_main+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -19500,13 +19528,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_main" >&5 $as_echo "$ac_cv_lib_pthread_main" >&6; } -if test "x$ac_cv_lib_pthread_main" = xyes; then : +if test "x$ac_cv_lib_pthread_main" = x""yes; then : SDE_LIB="$SDE_LIB -lpthread" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lsocket" >&5 $as_echo_n "checking for main in -lsocket... " >&6; } -if ${ac_cv_lib_socket_main+:} false; then : +if test "${ac_cv_lib_socket_main+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -19534,13 +19562,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_main" >&5 $as_echo "$ac_cv_lib_socket_main" >&6; } -if test "x$ac_cv_lib_socket_main" = xyes; then : +if test "x$ac_cv_lib_socket_main" = x""yes; then : SDE_LIB="$SDE_LIB -lsocket" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ldl" >&5 $as_echo_n "checking for main in -ldl... " >&6; } -if ${ac_cv_lib_dl_main+:} false; then : +if test "${ac_cv_lib_dl_main+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -19568,7 +19596,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_main" >&5 $as_echo "$ac_cv_lib_dl_main" >&6; } -if test "x$ac_cv_lib_dl_main" = xyes; then : +if test "x$ac_cv_lib_dl_main" = x""yes; then : SDE_LIB="$SDE_LIB -ldl" fi @@ -19595,7 +19623,7 @@ fi fi else - as_fn_error $? "\"Could not find sdetype.h or libsde$SDE_VERSION.a/libsde$SDE_VERSION.so in $SDE_DIR.\"" "$LINENO" 5 + as_fn_error "\"Could not find sdetype.h or libsde$SDE_VERSION.a/libsde$SDE_VERSION.so in $SDE_DIR.\"" "$LINENO" 5 fi SDE_ENABLED=-DUSE_SDE @@ -19643,7 +19671,7 @@ $as_echo "yes" >&6; } set dummy geos-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GEOS_CONFIG+:} false; then : +if test "${ac_cv_path_GEOS_CONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $GEOS_CONFIG in @@ -19682,14 +19710,14 @@ fi if test "$GEOS_CONFIG" = "no" ; then - as_fn_error $? "couldn't find geos-config in default path. Please specify full path to geos-config" "$LINENO" 5 + as_fn_error "couldn't find geos-config in default path. Please specify full path to geos-config" "$LINENO" 5 fi elif test -f "$GEOS_CONFIG" -a -x "$GEOS_CONFIG" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: user supplied geos-config ($GEOS_CONFIG)" >&5 $as_echo "user supplied geos-config ($GEOS_CONFIG)" >&6; } else - as_fn_error $? "'$GEOS_CONFIG' is not an executable. Make sure you use --with-geos=/path/to/geos-config" "$LINENO" 5 + as_fn_error "'$GEOS_CONFIG' is not an executable. Make sure you use --with-geos=/path/to/geos-config" "$LINENO" 5 fi @@ -19721,7 +19749,7 @@ $as_echo "yes. Found version ${geos_major_version}.${geos_minor_version}.${geos_ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "geos-config reports version ${geos_major_version}.${geos_minor_version}.${geos_micro_version}, need at least $min_geos_version or configure --without-geos" "$LINENO" 5 + as_fn_error "geos-config reports version ${geos_major_version}.${geos_minor_version}.${geos_micro_version}, need at least $min_geos_version or configure --without-geos" "$LINENO" 5 fi @@ -19769,7 +19797,7 @@ if test "$with_ogr" = "yes" ; then set dummy gdal-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GDAL_CONFIG+:} false; then : +if test "${ac_cv_path_GDAL_CONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $GDAL_CONFIG in @@ -19808,7 +19836,7 @@ fi if test "$GDAL_CONFIG" = "no" ; then - as_fn_error $? "couldn't find gdal-config" "$LINENO" 5 + as_fn_error "couldn't find gdal-config" "$LINENO" 5 fi fi @@ -19855,7 +19883,7 @@ $as_echo "yes" >&6; } set dummy gdal-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GDAL_CONFIG+:} false; then : +if test "${ac_cv_path_GDAL_CONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $GDAL_CONFIG in @@ -19895,7 +19923,7 @@ fi fi if test "$GDAL_CONFIG" = "no" ; then - as_fn_error $? "couldn't find gdal-config" "$LINENO" 5 + as_fn_error "couldn't find gdal-config" "$LINENO" 5 fi GDAL_ENABLED=-DUSE_GDAL @@ -19908,7 +19936,7 @@ elif test -n "$with_gdal" -a "$with_gdal" != "no" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, user supplied gdal-config ($GDAL_CONFIG)" >&5 $as_echo "yes, user supplied gdal-config ($GDAL_CONFIG)" >&6; } else - as_fn_error $? "'$GDAL_CONFIG' is not an executable. Make sure you use --with-gdal=/path/to/gdal-config" "$LINENO" 5 + as_fn_error "'$GDAL_CONFIG' is not an executable. Make sure you use --with-gdal=/path/to/gdal-config" "$LINENO" 5 fi GDAL_ENABLED=-DUSE_GDAL @@ -19965,7 +19993,7 @@ $as_echo "yes" >&6; } set dummy pg_config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PG_CONFIG+:} false; then : +if test "${ac_cv_path_PG_CONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $PG_CONFIG in @@ -20017,7 +20045,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, user supplied pg_config ($PG_CONFIG)" >&5 $as_echo "yes, user supplied pg_config ($PG_CONFIG)" >&6; } else - as_fn_error $? "'$PG_CONFIG' is not an executable. Make sure you use --with-postgis=/path/to/pg_config" "$LINENO" 5 + as_fn_error "'$PG_CONFIG' is not an executable. Make sure you use --with-postgis=/path/to/pg_config" "$LINENO" 5 fi POSTGIS_EXTRALIBS="`$PG_CONFIG --libs`" @@ -20034,7 +20062,7 @@ $as_echo "yes, user supplied pg_config ($PG_CONFIG)" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQconnectdb in -lpq" >&5 $as_echo_n "checking for PQconnectdb in -lpq... " >&6; } -if ${ac_cv_lib_pq_PQconnectdb+:} false; then : +if test "${ac_cv_lib_pq_PQconnectdb+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -20068,7 +20096,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQconnectdb" >&5 $as_echo "$ac_cv_lib_pq_PQconnectdb" >&6; } -if test "x$ac_cv_lib_pq_PQconnectdb" = xyes; then : +if test "x$ac_cv_lib_pq_PQconnectdb" = x""yes; then : POSTGIS_ENABLED="-DUSE_POSTGIS" fi @@ -20079,7 +20107,7 @@ fi unset ac_cv_lib_pq_PQconnectdb { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQconnectdb in -lpq" >&5 $as_echo_n "checking for PQconnectdb in -lpq... " >&6; } -if ${ac_cv_lib_pq_PQconnectdb+:} false; then : +if test "${ac_cv_lib_pq_PQconnectdb+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -20113,7 +20141,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQconnectdb" >&5 $as_echo "$ac_cv_lib_pq_PQconnectdb" >&6; } -if test "x$ac_cv_lib_pq_PQconnectdb" = xyes; then : +if test "x$ac_cv_lib_pq_PQconnectdb" = x""yes; then : POSTGIS_ENABLED="-DUSE_POSTGIS" fi @@ -20122,7 +20150,7 @@ fi if test "$POSTGIS_ENABLED" = "-DUSE_POSTGIS" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQserverVersion in -lpq" >&5 $as_echo_n "checking for PQserverVersion in -lpq... " >&6; } -if ${ac_cv_lib_pq_PQserverVersion+:} false; then : +if test "${ac_cv_lib_pq_PQserverVersion+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -20156,7 +20184,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQserverVersion" >&5 $as_echo "$ac_cv_lib_pq_PQserverVersion" >&6; } -if test "x$ac_cv_lib_pq_PQserverVersion" = xyes; then : +if test "x$ac_cv_lib_pq_PQserverVersion" = x""yes; then : POSTGIS_ENABLED="$POSTGIS_ENABLED -DPOSTGIS_HAS_SERVER_VERSION" fi @@ -20199,7 +20227,7 @@ $as_echo "yes" >&6; } set dummy mysql_config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MY_CONFIG+:} false; then : +if test "${ac_cv_path_MY_CONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $MY_CONFIG in @@ -20249,7 +20277,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, user supplied mysql_config ($MY_CONFIG)" >&5 $as_echo "yes, user supplied mysql_config ($MY_CONFIG)" >&6; } else - as_fn_error $? "'$MY_CONFIG' is not an executable. Make sure you use --with-mysql=/path/to/mysql_config" "$LINENO" 5 + as_fn_error "'$MY_CONFIG' is not an executable. Make sure you use --with-mysql=/path/to/mysql_config" "$LINENO" 5 fi MYSQL_ENABLED=-DUSE_MYSQL @@ -20291,7 +20319,7 @@ $as_echo "yes, set from ORACLE_HOME environment variable" >&6; } ORA_HOME="$ORACLE_HOME" else ORA_HOME="no" - as_fn_error $? "ORACLE_HOME variable is not properly set" "$LINENO" 5 + as_fn_error "ORACLE_HOME variable is not properly set" "$LINENO" 5 fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, user supplied ORACLE_HOME" >&5 @@ -20311,7 +20339,7 @@ else test -f $ORA_HOME/lib/oracle/10*/client/lib/libclntsh.dylib && ORA_LIBDIR=`dirname $ORA_HOME/lib/oracle/10*/client/lib/libclntsh.dylib` if test -z "$ORA_LIBDIR" ; then - as_fn_error $? "Oracle Spatial: libclntsh.so not found." "$LINENO" 5 + as_fn_error "Oracle Spatial: libclntsh.so not found." "$LINENO" 5 fi test -f $ORA_HOME/sdk/include/oci.h && ORA_INCDIR="$ORA_HOME/sdk/include" @@ -20320,7 +20348,7 @@ else test -f $ORA_HOME/include/oracle/10*/client/oci.h && ORA_INCDIR=`dirname $ORA_HOME/include/oracle/10*/client/oci.h` if test -z "$ORA_INCDIR" ; then - as_fn_error $? "Oracle Spatial: oci.h not found." "$LINENO" 5 + as_fn_error "Oracle Spatial: oci.h not found." "$LINENO" 5 fi ORACLESPATIAL_ENABLED=-DUSE_ORACLESPATIAL @@ -20396,11 +20424,11 @@ $as_echo " OGC WFS Server support not requested." >&6; } elif test -z "$OGR_ENABLED" ; then - as_fn_error $? "OGC WFS Server support cannot be enabled: missing OGR which is required)." "$LINENO" 5 + as_fn_error "OGC WFS Server support cannot be enabled: missing OGR which is required)." "$LINENO" 5 elif test -z "$PROJ_ENABLED" ; then - as_fn_error $? "OGC WFS Server support cannot be enabled: missing PROJ4 which is required)." "$LINENO" 5 + as_fn_error "OGC WFS Server support cannot be enabled: missing PROJ4 which is required)." "$LINENO" 5 elif test "$with_wfs" = "yes" ; then @@ -20430,9 +20458,9 @@ if test "$with_wcs" != "yes" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: OGC WCS Server support not requested." >&5 $as_echo " OGC WCS Server support not requested." >&6; } elif test -z "$GDAL_ENABLED" ; then - as_fn_error $? "OGC WCS Server support cannot be enabled: missing GDAL which is required)." "$LINENO" 5 + as_fn_error "OGC WCS Server support cannot be enabled: missing GDAL which is required)." "$LINENO" 5 elif test -z "$PROJ_ENABLED" ; then - as_fn_error $? "OGC WCS Server support cannot be enabled: missing PROJ4 which is required)." "$LINENO" 5 + as_fn_error "OGC WCS Server support cannot be enabled: missing PROJ4 which is required)." "$LINENO" 5 elif test "$with_wcs" = "yes" ; then WCS_SVR_ENABLED="-DUSE_WCS_SVR" { $as_echo "$as_me:${as_lineno-$LINENO}: result: OGC WCS Server support enabled ($WCS_SVR_ENABLED)." >&5 @@ -20514,10 +20542,10 @@ $as_echo " OGC SOS Server support not requested." >&6; } else if test -z "$PROJ_ENABLED" ; then - as_fn_error $? " OGC SOS Support requested, but PROJ.4 required and missing." "$LINENO" 5 + as_fn_error " OGC SOS Support requested, but PROJ.4 required and missing." "$LINENO" 5 fi if test -z "$OGR_ENABLED" ; then - as_fn_error $? " OGC SOS Support requested, but OGR required and missing." "$LINENO" 5 + as_fn_error " OGC SOS Support requested, but OGR required and missing." "$LINENO" 5 fi SOS_REQUESTED="yes" @@ -20546,14 +20574,14 @@ if test "$WMS_REQUESTED" = "yes" -o "$WFS_REQUESTED" = "yes" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, user supplied curl-config ($LIBCURL_CONFIG)" >&5 $as_echo "yes, user supplied curl-config ($LIBCURL_CONFIG)" >&6; } else - as_fn_error $? "'$LIBCURL_CONFIG' is not an executable. Make sure you use --with-curl-config=/path/to/curl-config" "$LINENO" 5 + as_fn_error "'$LIBCURL_CONFIG' is not an executable. Make sure you use --with-curl-config=/path/to/curl-config" "$LINENO" 5 fi else # Extract the first word of "curl-config", so it can be a program name with args. set dummy curl-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_LIBCURL_CONFIG+:} false; then : +if test "${ac_cv_path_LIBCURL_CONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $LIBCURL_CONFIG in @@ -20593,7 +20621,7 @@ fi fi if test "$LIBCURL_CONFIG" = "no" ; then - as_fn_error $? "couldn't find curl-config, try using --with-curl-config=PATH" "$LINENO" 5 + as_fn_error "couldn't find curl-config, try using --with-curl-config=PATH" "$LINENO" 5 fi CURL_VERNUM=`$LIBCURL_CONFIG --vernum` @@ -20604,7 +20632,7 @@ fi $as_echo " found libcurl version $CURL_VER" >&6; } if test -z "$CURL_VERNUM" -o `expr "0x$CURL_VERNUM" \< "0x070a01"` = 1; then - as_fn_error $? "libcurl version 7.10.1 or more recent is required." "$LINENO" 5 + as_fn_error "libcurl version 7.10.1 or more recent is required." "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CURLOPT_PROXYAUTH support" >&5 @@ -20683,10 +20711,10 @@ if test -n "$with_exempi" -a "$with_exempi" != "no" ; then EXEMPI_LIB="-lexempi" else ac_fn_c_check_header_mongrel "$LINENO" "xmp.h" "ac_cv_header_xmp_h" "$ac_includes_default" -if test "x$ac_cv_header_xmp_h" = xyes; then : +if test "x$ac_cv_header_xmp_h" = x""yes; then : else - as_fn_error $? "cannot find xmp.h" "$LINENO" 5 + as_fn_error "cannot find xmp.h" "$LINENO" 5 fi @@ -20701,14 +20729,15 @@ fi for xmp_subdir in / /exempi /exempi-2.0/exempi; do as_ac_Header=`$as_echo "ac_cv_header_$xmp_include$xmp_subdir/xmp.h" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$xmp_include$xmp_subdir/xmp.h" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : xmp_found=$xmp_subdir fi done if test "x$xmp_found" = "x" ; then - as_fn_error $? "cannot find xmp.h in $xmp_include" "$LINENO" 5 + as_fn_error "cannot find xmp.h in $xmp_include" "$LINENO" 5 else EXEMPI_INC="-I$xmp_include$xmp_subdir" fi @@ -20717,7 +20746,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmp_init in -lexempi" >&5 $as_echo_n "checking for xmp_init in -lexempi... " >&6; } -if ${ac_cv_lib_exempi_xmp_init+:} false; then : +if test "${ac_cv_lib_exempi_xmp_init+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -20751,7 +20780,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_exempi_xmp_init" >&5 $as_echo "$ac_cv_lib_exempi_xmp_init" >&6; } -if test "x$ac_cv_lib_exempi_xmp_init" = xyes; then : +if test "x$ac_cv_lib_exempi_xmp_init" = x""yes; then : EXEMPI_ENABLED=-DUSE_EXEMPI fi @@ -20823,14 +20852,14 @@ if test "$with_xml2_config" != "no" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, user supplied xml2-config ($LIBXML2_CONFIG)" >&5 $as_echo "yes, user supplied xml2-config ($LIBXML2_CONFIG)" >&6; } else - as_fn_error $? "'$LIBXML2_CONFIG' is not an executable. Make sure you use --with-xml2-config=/path/to/xml2-config" "$LINENO" 5 + as_fn_error "'$LIBXML2_CONFIG' is not an executable. Make sure you use --with-xml2-config=/path/to/xml2-config" "$LINENO" 5 fi else # Extract the first word of "xml2-config", so it can be a program name with args. set dummy xml2-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_LIBXML2_CONFIG+:} false; then : +if test "${ac_cv_path_LIBXML2_CONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $LIBXML2_CONFIG in @@ -20870,7 +20899,7 @@ fi fi if test "$LIBXML2_CONFIG" = "no" ; then - as_fn_error $? "couldn't find xml2-config, try using --with-xml2-config=PATH" "$LINENO" 5 + as_fn_error "couldn't find xml2-config, try using --with-xml2-config=PATH" "$LINENO" 5 fi XML2_VER=`$LIBXML2_CONFIG --version` @@ -20958,6 +20987,7 @@ else test -f $XSLT_DIR/include/libxslt/xslt.h && XSLT_INCDIR="$XSLT_DIR/include" test -f $XSLT_DIR/lib/libxslt.so && XSLT_LIBDIR="$XSLT_DIR/lib" test -f $XSLT_DIR/lib64/libxslt.so && XSLT_LIBDIR="$XSLT_DIR/lib64" + test -f $XSLT_DIR/lib/x86_64-linux-gnu/libxslt.so && XSLT_LIBDIR="$XSLT_DIR/lib/x86_64-linux-gnu" if test -n "$XSLT_LIBDIR" -a -n "$XSLT_INCDIR" ; then XSLT_ENABLED="-DUSE_XSLT" @@ -20989,7 +21019,7 @@ $as_echo "using xslt from $XSLT_LIB ($XSLT_ENABLED)" >&6; } else - as_fn_error $? "'$XSLT_DIR' not a valid installation path of xslt." "$LINENO" 5 + as_fn_error "'$XSLT_DIR' not a valid installation path of xslt." "$LINENO" 5 fi fi @@ -21030,6 +21060,7 @@ else test -f $EXSLT_DIR/include/libexslt/exslt.h && EXSLT_INCDIR="$EXSLT_DIR/include" test -f $EXSLT_DIR/lib/libexslt.so && EXSLT_LIBDIR="$EXSLT_DIR/lib" test -f $EXSLT_DIR/lib64/libexslt.so && EXSLT_LIBDIR="$EXSLT_DIR/lib64" + test -f $EXSLT_DIR/lib/x86_64-linux-gnu/libexslt.so && EXSLT_LIBDIR="$EXSLT_DIR/lib/x86_64-linux-gnu" if test -n "$EXSLT_LIBDIR" -a -n "$EXSLT_INCDIR" ; then EXSLT_ENABLED="-DUSE_EXSLT" @@ -21060,7 +21091,7 @@ $as_echo "using exslt from $EXSLT_LIB ($EXSLT_ENABLED)" >&6; } fi else - as_fn_error $? "'$EXSLT_DIR' not a valid installation path of exslt." "$LINENO" 5 + as_fn_error "'$EXSLT_DIR' not a valid installation path of exslt." "$LINENO" 5 fi fi @@ -21099,7 +21130,7 @@ $as_echo "yes" >&6; } set dummy fribidi-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_FRIBIDI_CONFIG+:} false; then : +if test "${ac_cv_path_FRIBIDI_CONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $FRIBIDI_CONFIG in @@ -21171,7 +21202,7 @@ $as_echo "yes, user supplied path to fribidi.pc" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, user supplied fribidi-config ($FRIBIDI_CONFIG)" >&5 $as_echo "yes, user supplied fribidi-config ($FRIBIDI_CONFIG)" >&6; } else - as_fn_error $? "'$FRIBIDI_CONFIG' is not an executable. Make sure you use --with-fribidi-config=/path/to/fribidi-config or fribidi.pc" "$LINENO" 5 + as_fn_error "'$FRIBIDI_CONFIG' is not an executable. Make sure you use --with-fribidi-config=/path/to/fribidi-config or fribidi.pc" "$LINENO" 5 fi FRIBIDI_ENABLED=-DUSE_FRIBIDI FRIBIDI_LIB=`$FRIBIDI_CONFIG --libs` @@ -21219,10 +21250,10 @@ $as_echo_n "checking for cairo pkg-config path... " >&6; } $as_echo "yes" >&6; } CAIRO_CONFIG="cairo cairo-ft cairo-svg cairo-pdf cairo-png" else - as_fn_error $? "cairo support requested, but not found.Try installing the cairo development headers" "$LINENO" 5 + as_fn_error "cairo support requested, but not found.Try installing the cairo development headers" "$LINENO" 5 fi else - as_fn_error $? "pkg-config required for cairo support, try using --with-pkg-config=PATH" "$LINENO" 5 + as_fn_error "pkg-config required for cairo support, try using --with-pkg-config=PATH" "$LINENO" 5 fi else CAIRO_CONFIG=$with_cairo @@ -21287,10 +21318,10 @@ $as_echo_n "checking for libsvg-cairo pkg-config path... " >&6; } $as_echo "yes" >&6; } LIBSVG_CAIRO_CONFIG="libsvg-cairo" else - as_fn_error $? "libsvg-cairo support requested, but not found." "$LINENO" 5 + as_fn_error "libsvg-cairo support requested, but not found." "$LINENO" 5 fi else - as_fn_error $? "pkg-config required for libsvg-cairo support, try using --with-pkg-config=PATH" "$LINENO" 5 + as_fn_error "pkg-config required for libsvg-cairo support, try using --with-pkg-config=PATH" "$LINENO" 5 fi else LIBSVG_CAIRO_CONFIG=$with_libsvg_cairo @@ -21302,7 +21333,7 @@ if test "$LIBSVG_CAIRO_CONFIG" = "no" ; then LIBSVG_CAIRO_LIB= else if test -z "$CAIRO_ENABLED"; then - as_fn_error $? "libsvg-cairo support requires cairo support. (hint: rerun with --with-cairo)" "$LINENO" 5 + as_fn_error "libsvg-cairo support requires cairo support. (hint: rerun with --with-cairo)" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, pkg-config defaults, or user supplied path to cairo.pc" >&5 $as_echo "yes, pkg-config defaults, or user supplied path to cairo.pc" >&6; } @@ -21352,7 +21383,7 @@ $as_echo "requested." >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FCGI_Accept in -lfcgi" >&5 $as_echo_n "checking for FCGI_Accept in -lfcgi... " >&6; } -if ${ac_cv_lib_fcgi_FCGI_Accept+:} false; then : +if test "${ac_cv_lib_fcgi_FCGI_Accept+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -21386,13 +21417,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fcgi_FCGI_Accept" >&5 $as_echo "$ac_cv_lib_fcgi_FCGI_Accept" >&6; } -if test "x$ac_cv_lib_fcgi_FCGI_Accept" = xyes; then : +if test "x$ac_cv_lib_fcgi_FCGI_Accept" = x""yes; then : FASTCGI_ENABLED=-DUSE_FASTCGI fi if test "x$FASTCGI_ENABLED" = "x" ; then - as_fn_error $? "Unable to link against $FASTCGI_LIB" "$LINENO" 5 + as_fn_error "Unable to link against $FASTCGI_LIB" "$LINENO" 5 fi fi @@ -21436,7 +21467,7 @@ fi set dummy apxs2; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_APXS+:} false; then : +if test "${ac_cv_path_APXS+set}" = set; then : $as_echo_n "(cached) " >&6 else case $APXS in @@ -21477,7 +21508,7 @@ fi set dummy apxs; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_APXS+:} false; then : +if test "${ac_cv_path_APXS+set}" = set; then : $as_echo_n "(cached) " >&6 else case $APXS in @@ -21515,7 +21546,7 @@ fi fi elif test "$with_apxs" = "no"; then - as_fn_error $? "apxs is required and cannot be disabled" "$LINENO" 5 + as_fn_error "apxs is required and cannot be disabled" "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for apxs usability in $with_apxs" >&5 $as_echo_n "checking for apxs usability in $with_apxs... " >&6; } @@ -21524,11 +21555,11 @@ $as_echo_n "checking for apxs usability in $with_apxs... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - as_fn_error $? "$with_apxs not found or not executable" "$LINENO" 5 + as_fn_error "$with_apxs not found or not executable" "$LINENO" 5 fi fi if test -z "$APXS"; then - as_fn_error $? "apxs utility not found. use --with-apxs to specify its location." "$LINENO" 5 + as_fn_error "apxs utility not found. use --with-apxs to specify its location." "$LINENO" 5 fi APACHE_SBINDIR=`$APXS -q SBINDIR` @@ -21548,7 +21579,7 @@ $as_echo_n "checking for apachectl utility... " >&6; } set dummy apachectl; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_APACHECTL+:} false; then : +if test "${ac_cv_path_APACHECTL+set}" = set; then : $as_echo_n "(cached) " >&6 else case $APACHECTL in @@ -21589,7 +21620,7 @@ fi set dummy apache2ctl; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_APACHECTL+:} false; then : +if test "${ac_cv_path_APACHECTL+set}" = set; then : $as_echo_n "(cached) " >&6 else case $APACHECTL in @@ -21688,7 +21719,7 @@ $as_echo_n "checking for apr-config in default locations... " >&6; } set dummy apr-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_APRCONFIG+:} false; then : +if test "${ac_cv_path_APRCONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $APRCONFIG in @@ -21730,7 +21761,7 @@ fi set dummy apr-1-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_APRCONFIG+:} false; then : +if test "${ac_cv_path_APRCONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $APRCONFIG in @@ -21775,7 +21806,7 @@ $as_echo "using $APRCONFIG, use --with-apr-config=/path/to/apr-(1-)config to mod $as_echo "not found" >&6; } fi elif test "$with_apr_config" = "no"; then - as_fn_error $? "apr-config is required and cannot be disabled" "$LINENO" 5 + as_fn_error "apr-config is required and cannot be disabled" "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for apr-config usability in $with_apr_config" >&5 $as_echo_n "checking for apr-config usability in $with_apr_config... " >&6; } @@ -21784,11 +21815,11 @@ $as_echo_n "checking for apr-config usability in $with_apr_config... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - as_fn_error $? "$with_apr_config not found or not executable" "$LINENO" 5 + as_fn_error "$with_apr_config not found or not executable" "$LINENO" 5 fi fi if test -z "$APRCONFIG"; then - as_fn_error $? "apr-config utility not found. use --with-apr-config to specify its location." "$LINENO" 5 + as_fn_error "apr-config utility not found. use --with-apr-config to specify its location." "$LINENO" 5 fi APR_CFLAGS=`$APRCONFIG --cppflags --cflags` @@ -21799,7 +21830,7 @@ $as_echo "yes" >&6; } if test -z "$APRCONFIG"; then - as_fn_error $? "apr-config utility not found. use --with-apr-config to specify its location." "$LINENO" 5 + as_fn_error "apr-config utility not found. use --with-apr-config to specify its location." "$LINENO" 5 else ALL_ENABLED="-DMOD_WMS_ENABLED $ALL_ENABLED" fi @@ -21874,9 +21905,9 @@ ALL_ENABLED="$USE_POINT_Z_M $ALL_ENABLED" -# Check whether --enable-point-z-m was given. -if test "${enable_point_z_m+set}" = set; then : - enableval=$enable_point_z_m; +# Check whether --enable-fast-nint was given. +if test "${enable_fast_nint+set}" = set; then : + enableval=$enable_fast_nint; fi @@ -21972,6 +22003,21 @@ else CFLAGS=`echo "$CFLAGS -DNDEBUG " | sed "s/-g //"` fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable proj shortcuts..." >&5 +$as_echo "$as_me: checking whether to enable proj shortcuts..." >&6;} +# Check whether --enable-proj-fastpath was given. +if test "${enable_proj_fastpath+set}" = set; then : + enableval=$enable_proj_fastpath; +fi + + +if test "$enable_proj_fastpath" = "yes" ; then + PROJ_FASTPATH_ENABLED="-DUSE_PROJ_FASTPATHS" + ALL_ENABLED="$PROJ_FASTPATH_ENABLED $ALL_ENABLED" +fi +PROJ_FASTPATH_ENABLED=$PROJ_FASTPATH_ENABLED + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we should enable mapserv CGI command-line debug arguments..." >&5 $as_echo "$as_me: checking whether we should enable mapserv CGI command-line debug arguments..." >&6;} @@ -22021,14 +22067,14 @@ fi if test "$with_php" != "no" ; then if test -d "$with_php"; then - as_fn_error $? "--with-php now expects an optional path to php-config, not a directory" "$LINENO" 5 + as_fn_error "--with-php now expects an optional path to php-config, not a directory" "$LINENO" 5 fi if test "$with_php" == "yes" ; then # Extract the first word of "php-config", so it can be a program name with args. set dummy php-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PHPCONFIG+:} false; then : +if test "${ac_cv_path_PHPCONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $PHPCONFIG in @@ -22066,13 +22112,13 @@ fi if test "x$PHPCONFIG" == "xno"; then - as_fn_error $? "php-config not found on path, please give its full location" "$LINENO" 5 + as_fn_error "php-config not found on path, please give its full location" "$LINENO" 5 fi else PHPCONFIG="$with_php" fi if test ! -f "$PHPCONFIG"; then - as_fn_error $? "$PHPCONFIG not found" "$LINENO" 5 + as_fn_error "$PHPCONFIG not found" "$LINENO" 5 fi PHPINCDIR=`$PHPCONFIG --include-dir` @@ -22085,7 +22131,7 @@ $as_echo_n "checking for location of php_config.h... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_CONFIG_H" >&5 $as_echo "$PHP_CONFIG_H" >&6; } else - as_fn_error $? " + as_fn_error " !!! Could not find php_config.h and php_version.h in $PHPINCDIR. !!! !!! Has PHP been installed yet? !!!" "$LINENO" 5 fi @@ -22095,7 +22141,7 @@ $as_echo "$PHP_CONFIG_H" >&6; } $as_echo_n "checking if we have PHP 5.2.0+... " >&6; } PHP_VERSION=`$PHPCONFIG --vernum` if test -z "$PHP_VERSION" || test $PHP_VERSION -lt 50200; then - as_fn_error $? " + as_fn_error " !!! PHP MapScript now requires PHP 5.2.0 or more recent. !!! !!! Support for PHP3 has been dropped after MapServer version 3.5. !!! !!! Support for PHP4 has been dropped after MapServer version 5.6. !!!" "$LINENO" 5 @@ -22126,7 +22172,7 @@ $as_echo " found regex_extra.h - building PHP MapScript with PHP's bundle { $as_echo "$as_me:${as_lineno-$LINENO}: result: found regex.h - building PHP MapScript with PHP's bundled regex " >&5 $as_echo " found regex.h - building PHP MapScript with PHP's bundled regex " >&6; } else - as_fn_error $? " + as_fn_error " !!! PHP uses its bundled regex library but regex/regex_extra.h (PHP <=5.2) or !!! !!! ext/ereg/regex/regex.h (PHP >=5.3) cannot be found. !!!" "$LINENO" 5 fi @@ -22333,17 +22379,7 @@ fi -# Check whether --enable-java-mapscript was given. -if test "${enable_java_mapscript+set}" = set; then : - enableval=$enable_java_mapscript; -else - enable_java_mapscript=no -fi - - -if test "x$enable_java_mapscript" == "xyes" ; then - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if --with-java-include-os-name specified" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if --with-java-include-os-name specified" >&5 $as_echo_n "checking if --with-java-include-os-name specified... " >&6; } # Check whether --with-java-include-os-name was given. @@ -22351,36 +22387,36 @@ if test "${with_java_include_os_name+set}" = set; then : withval=$with_java_include_os_name; fi - if test -n "${with_java_include_os_name}" ; then - OS_INCLUDE_DIR="${with_java_include_os_name}" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($OS_INCLUDE_DIR)" >&5 +if test -n "${with_java_include_os_name}" ; then +OS_INCLUDE_DIR="${with_java_include_os_name}" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($OS_INCLUDE_DIR)" >&5 $as_echo "yes ($OS_INCLUDE_DIR)" >&6; } - else - OUR_OSNAME=`uname -s` - case "${OUR_OSNAME}" in - [Ll]inux) OS_INCLUDE_DIR="linux" ;; - [sS]olaris*) OS_INCLUDE_DIR="solaris" ;; - [sS]unOS*) OS_INCLUDE_DIR="solaris" ;; - [Ww]in*) OS_INCLUDE_DIR="win32" ;; - *) OS_INCLUDE_DIR="linux" ;; - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, autodetected $OS_INCLUDE_DIR" >&5 +else +OUR_OSNAME=`uname -s` +case "${OUR_OSNAME}" in +[Ll]inux) OS_INCLUDE_DIR="linux" ;; +[sS]olaris*) OS_INCLUDE_DIR="solaris" ;; +[sS]unOS*) OS_INCLUDE_DIR="solaris" ;; +[Ww]in*) OS_INCLUDE_DIR="win32" ;; +*) OS_INCLUDE_DIR="linux" ;; +esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no, autodetected $OS_INCLUDE_DIR" >&5 $as_echo "no, autodetected $OS_INCLUDE_DIR" >&6; } - fi +fi - if test -z $JAVAC; then - JAVAC="javac" - fi +if test -z $JAVAC; then + JAVAC="javac" +fi JNI_INCLUDE_DIRS="" -test "x$JAVAC" = x && as_fn_error $? "'\$JAVAC' undefined" "$LINENO" 5 +test "x$JAVAC" = x && as_fn_error "'\$JAVAC' undefined" "$LINENO" 5 # Extract the first word of "$JAVAC", so it can be a program name with args. set dummy $JAVAC; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path__ACJNI_JAVAC+:} false; then : +if test "${ac_cv_path__ACJNI_JAVAC+set}" = set; then : $as_echo_n "(cached) " >&6 else case $_ACJNI_JAVAC in @@ -22457,7 +22493,7 @@ _ACJNI_FOLLOWED="$_cur" if test -f "$_JTOPDIR/include/jni.h"; then JNI_INCLUDE_DIRS="$JNI_INCLUDE_DIRS $_JTOPDIR/include" else - as_fn_error $? "cannot find java include files" "$LINENO" 5 + as_fn_error "cannot find java include files" "$LINENO" 5 fi fi @@ -22481,19 +22517,16 @@ _ACJNI_FOLLOWED="$_cur" done fi - for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS - do - JAVA_INCLUDE="$JAVA_INCLUDE -I$JNI_INCLUDE_DIR" - done -fi +for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS +do + JAVA_INCLUDE="$JAVA_INCLUDE -I$JNI_INCLUDE_DIR" +done JAVA_INCLUDE=$JAVA_INCLUDE - - # Check whether --enable-python-mapscript was given. if test "${enable_python_mapscript+set}" = set; then : enableval=$enable_python_mapscript; @@ -22512,7 +22545,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_SWIG+:} false; then : +if test "${ac_cv_path_SWIG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $SWIG in @@ -22645,7 +22678,7 @@ $as_echo "yes" >&6; } if test -x "$with_python"; then PYTHON=$with_python else - as_fn_error $? "$with_python does not seem to be an executable" "$LINENO" 5 + as_fn_error "$with_python does not seem to be an executable" "$LINENO" 5 fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: using system default" >&5 @@ -22654,7 +22687,7 @@ $as_echo "using system default" >&6; } set dummy python; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PYTHON+:} false; then : +if test "${ac_cv_path_PYTHON+set}" = set; then : $as_echo_n "(cached) " >&6 else case $PYTHON in @@ -22691,7 +22724,7 @@ fi if test -z "$PYTHON"; then - as_fn_error $? "no python found on path" "$LINENO" 5 + as_fn_error "no python found on path" "$LINENO" 5 fi fi PYTHON=$PYTHON @@ -22796,21 +22829,10 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - if test "x$cache_file" != "x/dev/null"; then + test "x$cache_file" != "x/dev/null" && { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - if test ! -f "$cache_file" || test -h "$cache_file"; then - cat confcache >"$cache_file" - else - case $cache_file in #( - */* | ?:*) - mv -f confcache "$cache_file"$$ && - mv -f "$cache_file"$$ "$cache_file" ;; #( - *) - mv -f confcache "$cache_file" ;; - esac - fi - fi + cat confcache >$cache_file else { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} @@ -22862,7 +22884,6 @@ DEFS=`sed -n "$ac_script" confdefs.h` ac_libobjs= ac_ltlibobjs= -U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -22878,7 +22899,7 @@ LTLIBOBJS=$ac_ltlibobjs -: "${CONFIG_STATUS=./config.status}" +: ${CONFIG_STATUS=./config.status} ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" @@ -22979,7 +23000,6 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -23025,19 +23045,19 @@ export LANGUAGE (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error STATUS ERROR [LINENO LOG_FD] -# ---------------------------------------- +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with STATUS, using 1 if that was 0. +# script with status $?, using 1 if that was 0. as_fn_error () { - as_status=$1; test $as_status -eq 0 && as_status=1 - if test "$4"; then - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 fi - $as_echo "$as_me: error: $2" >&2 + $as_echo "$as_me: error: $1" >&2 as_fn_exit $as_status } # as_fn_error @@ -23233,7 +23253,7 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -23287,7 +23307,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -23344,10 +23364,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.68, +configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -23364,16 +23384,11 @@ ac_need_defaults=: while test $# != 0 do case $1 in - --*=?*) + --*=*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; - --*=) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg= - ac_shift=: - ;; *) ac_option=$1 ac_optarg=$2 @@ -23395,7 +23410,6 @@ do $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; @@ -23406,7 +23420,7 @@ do ac_cs_silent=: ;; # This is an error. - -*) as_fn_error $? "unrecognized option: \`$1' + -*) as_fn_error "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" @@ -23842,7 +23856,7 @@ do "mapscript/csharp/Makefile") CONFIG_FILES="$CONFIG_FILES mapscript/csharp/Makefile" ;; "mapscript/perl/Makefile.PL") CONFIG_FILES="$CONFIG_FILES mapscript/perl/Makefile.PL" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -23864,10 +23878,9 @@ fi # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= ac_tmp= + tmp= trap 'exit_status=$? - : "${ac_tmp:=$tmp}" - { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 } @@ -23875,13 +23888,12 @@ $debug || { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -d "$tmp" + test -n "$tmp" && test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 -ac_tmp=$tmp +} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -23898,12 +23910,12 @@ if test "x$ac_cr" = x; then fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\\r' + ac_cs_awk_cr='\r' else ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$ac_tmp/subs1.awk" && +echo 'BEGIN {' >"$tmp/subs1.awk" && _ACEOF @@ -23912,18 +23924,18 @@ _ACEOF echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -23931,7 +23943,7 @@ done rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -23979,7 +23991,7 @@ t delim rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && +cat >>"\$tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -24011,29 +24023,21 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ - || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ + || as_fn_error "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove sole $(srcdir), -# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove $(srcdir), +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ -h -s/// -s/^/:/ -s/[ ]*$/:/ -s/:\$(srcdir):/:/g -s/:\${srcdir}:/:/g -s/:@srcdir@:/:/g -s/^:*// + ac_vpsub='/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/ +s/:*\${srcdir}:*/:/ +s/:*@srcdir@:*/:/ +s/^\([^=]*=[ ]*\):*/\1/ s/:*$// -x -s/\(=[ ]*\).*/\1/ -G -s/\n// s/^[^=]*=[ ]*$// }' fi @@ -24051,7 +24055,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -24070,7 +24074,7 @@ do for ac_f do case $ac_f in - -) ac_f="$ac_tmp/stdin";; + -) ac_f="$tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -24079,7 +24083,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -24105,8 +24109,8 @@ $as_echo "$as_me: creating $ac_file" >&6;} esac case $ac_tag in - *:-:* | *:-) cat >"$ac_tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + *:-:* | *:-) cat >"$tmp/stdin" \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -24236,24 +24240,23 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ - >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ - "$ac_tmp/out"`; test -z "$ac_out"; } && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&5 +which seems to be undefined. Please make sure it is defined." >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&2;} +which seems to be undefined. Please make sure it is defined." >&2;} - rm -f "$ac_tmp/stdin" + rm -f "$tmp/stdin" case $ac_file in - -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; - *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; + -) cat "$tmp/out" && rm -f "$tmp/out";; + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; @@ -25071,7 +25074,7 @@ _ACEOF ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -25092,7 +25095,7 @@ if test "$no_create" != yes; then exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit 1 + $ac_cs_success || as_fn_exit $? fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 @@ -25153,6 +25156,8 @@ $as_echo "" >&6; } $as_echo " -------------- Support Libraries --------- " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: Proj.4 support: ${PROJ_ENABLED}" >&5 $as_echo " Proj.4 support: ${PROJ_ENABLED}" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Proj Fastpaths: ${PROJ_FASTPATH_ENABLED}" >&5 +$as_echo " Proj Fastpaths: ${PROJ_FASTPATH_ENABLED}" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: Libxml2 support: ${XML2_ENABLED}" >&5 $as_echo " Libxml2 support: ${XML2_ENABLED}" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: FriBidi support: ${FRIBIDI_ENABLED}" >&5 diff --git a/configure.in b/configure.in index 83e72c2080..3fff62e738 100755 --- a/configure.in +++ b/configure.in @@ -647,12 +647,14 @@ if test "x$with_gd" != "xno" ; then test -f $GD_DIR/lib/libgd.a && GD_LIBDIR="$GD_DIR/lib" test -f $GD_DIR/lib64/libgd.a && GD_LIBDIR="$GD_DIR/lib64" + test -f $GD_DIR/lib/x86_64-linux-gnu/libgd.a && GD_LIBDIR="$GD_DIR/lib/x86_64-linux-gnu" test -f $GD_DIR/.libs/libgd.a && GD_LIBDIR="$GD_DIR/.libs" test -f $GD_DIR/_libs/libgd.a && GD_LIBDIR="$GD_DIR/_libs" test -f $GD_DIR/libgd.a && GD_LIBDIR="$GD_DIR" test -f $GD_DIR/lib/libgd.so -o -f $GD_DIR/lib/libgd.sl -o -f $GD_DIR/lib/libgd.dylib && GD_LIBDIR="$GD_DIR/lib" test -f $GD_DIR/lib64/libgd.so -o -f $GD_DIR/lib/libgd.sl && GD_LIBDIR="$GD_DIR/lib64" + test -f $GD_DIR/lib/x86_64-linux-gnu/libgd.so && GD_LIBDIR="$GD_DIR/lib/x86_64-linux-gnu" test -f $GD_DIR/.libs/libgd.so -o -f $GD_DIR/.libs/libgd.sl -o -f $GD_DIR/.libs/libgd.dylib && GD_LIBDIR="$GD_DIR/.libs" test -f $GD_DIR/_libs/libgd.so -o -f $GD_DIR/_libs/libgd.sl -o -f $GD_DIR/_libs/libgd.dylib && GD_LIBDIR="$GD_DIR/_libs" test -f $GD_DIR/libgd.so -o -f $GD_DIR/libgd.sl -o -f $GD_DIR/libgd.dylib && GD_LIBDIR="$GD_DIR" @@ -1918,7 +1920,7 @@ dnl Exempi support dnl --------------------------------------------------------------------- AC_MSG_CHECKING(if exempi support requested) -AC_ARG_WITH(exempi,\ +AC_ARG_WITH(exempi, [ --with-exempi=DIR Specify path to exempi.],,) if test -n "$with_exempi" -a "$with_exempi" != "no" ; then @@ -2090,6 +2092,7 @@ else test -f $XSLT_DIR/include/libxslt/xslt.h && XSLT_INCDIR="$XSLT_DIR/include" test -f $XSLT_DIR/lib/libxslt.so && XSLT_LIBDIR="$XSLT_DIR/lib" test -f $XSLT_DIR/lib64/libxslt.so && XSLT_LIBDIR="$XSLT_DIR/lib64" + test -f $XSLT_DIR/lib/x86_64-linux-gnu/libxslt.so && XSLT_LIBDIR="$XSLT_DIR/lib/x86_64-linux-gnu" if test -n "$XSLT_LIBDIR" -a -n "$XSLT_INCDIR" ; then dnl @@ -2137,6 +2140,7 @@ else test -f $EXSLT_DIR/include/libexslt/exslt.h && EXSLT_INCDIR="$EXSLT_DIR/include" test -f $EXSLT_DIR/lib/libexslt.so && EXSLT_LIBDIR="$EXSLT_DIR/lib" test -f $EXSLT_DIR/lib64/libexslt.so && EXSLT_LIBDIR="$EXSLT_DIR/lib64" + test -f $EXSLT_DIR/lib/x86_64-linux-gnu/libexslt.so && EXSLT_LIBDIR="$EXSLT_DIR/lib/x86_64-linux-gnu" if test -n "$EXSLT_LIBDIR" -a -n "$EXSLT_INCDIR" ; then dnl @@ -2442,7 +2446,7 @@ dnl --------------------------------------------------------------------- dnl Force use of slow (generic) MS_NINT macro. dnl --------------------------------------------------------------------- -AC_ARG_ENABLE(point-z-m, +AC_ARG_ENABLE(fast-nint, [ --disable-fast-nint Use safe MS_NINT with reliable rounding],,) if test "$enable_fast_nint" = "no" ; then @@ -2529,6 +2533,16 @@ else CFLAGS=`echo "$CFLAGS -DNDEBUG " | sed "s/-g //"` fi +AC_CHECKING(whether to enable proj shortcuts) +AC_ARG_ENABLE(proj-fastpath, + AC_HELP_STRING([--enable-proj-fastpath], [bypass proj.4 for epsg:4326 to epsg:3857 reprojections]),,) + +if test "$enable_proj_fastpath" = "yes" ; then + PROJ_FASTPATH_ENABLED="-DUSE_PROJ_FASTPATHS" + ALL_ENABLED="$PROJ_FASTPATH_ENABLED $ALL_ENABLED" +fi +AC_SUBST(PROJ_FASTPATH_ENABLED,$PROJ_FASTPATH_ENABLED) + dnl --------------------------------------------------------------------- dnl Check --enable-cgi-cl-debug-args option (OFF by default) dnl --------------------------------------------------------------------- @@ -2701,50 +2715,42 @@ dnl Check operating system (used by Java Mapscript and possibily dnl other mapscripts) dnl --------------------------------------------------------------------- -AC_ARG_ENABLE(java-mapscript, -[ --enable-java-mapscript Specify if java mapscript should be configured],,[enable_java_mapscript=no]) - -if test "x$enable_java_mapscript" == "xyes" ; then - - AC_MSG_CHECKING([if --with-java-include-os-name specified]) - AC_ARG_WITH(java-include-os-name, - [ --with-java-include-os-name=dirname - (AUTODETECTED) - Use this option only if building of Java Mapscript - fails because os-dependent headers are not found. - dirname is the name of subdirectory of the Java - installation where os-dependent include files are - found (for instance linux or solaris). - Only used by Java mapscript.],,) - if test -n "${with_java_include_os_name}" ; then - OS_INCLUDE_DIR="${with_java_include_os_name}" - AC_MSG_RESULT([yes ($OS_INCLUDE_DIR)]) - else - dnl might break on Windows??? - OUR_OSNAME=`uname -s` - case "${OUR_OSNAME}" in - [[Ll]inux]) OS_INCLUDE_DIR="linux" ;; - [[sS]olaris*]) OS_INCLUDE_DIR="solaris" ;; - [[sS]unOS*]) OS_INCLUDE_DIR="solaris" ;; - [[Ww]in*]) OS_INCLUDE_DIR="win32" ;; - *) OS_INCLUDE_DIR="linux" ;; - esac - AC_MSG_RESULT([no, autodetected $OS_INCLUDE_DIR]) - fi - - if test -z $JAVAC; then - JAVAC="javac" - fi - AX_JNI_INCLUDE_DIR - for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS - do - JAVA_INCLUDE="$JAVA_INCLUDE -I$JNI_INCLUDE_DIR" - done -fi +AC_MSG_CHECKING([if --with-java-include-os-name specified]) +AC_ARG_WITH(java-include-os-name, +[ --with-java-include-os-name=dirname + (AUTODETECTED) + Use this option only if building of Java Mapscript + fails because os-dependent headers are not found. + dirname is the name of subdirectory of the Java + installation where os-dependent include files are + found (for instance linux or solaris). + Only used by Java mapscript.],,) +if test -n "${with_java_include_os_name}" ; then +OS_INCLUDE_DIR="${with_java_include_os_name}" +AC_MSG_RESULT([yes ($OS_INCLUDE_DIR)]) +else +dnl might break on Windows??? +OUR_OSNAME=`uname -s` +case "${OUR_OSNAME}" in +[[Ll]inux]) OS_INCLUDE_DIR="linux" ;; +[[sS]olaris*]) OS_INCLUDE_DIR="solaris" ;; +[[sS]unOS*]) OS_INCLUDE_DIR="solaris" ;; +[[Ww]in*]) OS_INCLUDE_DIR="win32" ;; +*) OS_INCLUDE_DIR="linux" ;; +esac +AC_MSG_RESULT([no, autodetected $OS_INCLUDE_DIR]) +fi + +if test -z $JAVAC; then + JAVAC="javac" +fi +AX_JNI_INCLUDE_DIR +for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS +do + JAVA_INCLUDE="$JAVA_INCLUDE -I$JNI_INCLUDE_DIR" +done AC_SUBST(JAVA_INCLUDE,$JAVA_INCLUDE) - - AC_DEFUN([PYTHON_CHECK],[ AC_MSG_CHECKING(if python path is provided) @@ -2836,6 +2842,7 @@ AC_MSG_RESULT() AC_MSG_RESULT([ -------------- Support Libraries --------- ]) AC_MSG_RESULT([ Proj.4 support: ${PROJ_ENABLED}]) +AC_MSG_RESULT([ Proj Fastpaths: ${PROJ_FASTPATH_ENABLED}]) AC_MSG_RESULT([ Libxml2 support: ${XML2_ENABLED}]) AC_MSG_RESULT([ FriBidi support: ${FRIBIDI_ENABLED}]) AC_MSG_RESULT([ Curl support: ${CURL_ENABLED}]) diff --git a/mapcopy.c b/mapcopy.c index 3eefd53a1b..ee92aba241 100644 --- a/mapcopy.c +++ b/mapcopy.c @@ -72,6 +72,7 @@ int msCopyProjection(projectionObj *dst, projectionObj *src) { } #endif + MS_COPYSTELEM(wellknownprojection); return MS_SUCCESS; } diff --git a/mapfile.c b/mapfile.c index 047611f6bd..3d2b6a6c0f 100644 --- a/mapfile.c +++ b/mapfile.c @@ -1026,6 +1026,7 @@ int msInitProjection(projectionObj *p) p->gt.need_geotransform = MS_FALSE; p->numargs = 0; p->args = NULL; + p->wellknownprojection = wkp_none; #ifdef USE_PROJ p->proj = NULL; p->args = (char **)malloc(MS_MAXPROJARGS*sizeof(char *)); @@ -1038,7 +1039,12 @@ void msFreeProjection(projectionObj *p) { #ifdef USE_PROJ if(p->proj) { +#if PJ_VERSION < 480 pj_free(p->proj); +#else + pj_ctx_free(p->proj_ctx); + p->proj_ctx = NULL; +#endif p->proj = NULL; } @@ -1165,8 +1171,8 @@ static int _msProcessAutoProjection(projectionObj *p) if( !(p->proj = pj_init(numargs, args)) ) { int *pj_errno_ref = pj_get_errno_ref(); msReleaseLock( TLOCK_PROJ ); - msSetError(MS_PROJERR, pj_strerrno(*pj_errno_ref), - "msProcessProjection()"); + msSetError(MS_PROJERR, "proj error \"%s\" for \"%s\"", + "msProcessProjection()", pj_strerrno(*pj_errno_ref), szProjBuf) ; return(-1); } @@ -1194,7 +1200,7 @@ int msProcessProjection(projectionObj *p) } if (strcasecmp(p->args[0], "AUTO") == 0) { - p->proj = NULL; + p->proj = NULL; return 0; } @@ -1206,16 +1212,33 @@ int msProcessProjection(projectionObj *p) return _msProcessAutoProjection(p); } msAcquireLock( TLOCK_PROJ ); +#if PJ_VERSION < 480 if( !(p->proj = pj_init(p->numargs, p->args)) ) { +#else + p->proj_ctx = pj_ctx_alloc(); + if( !(p->proj=pj_init_ctx(p->proj_ctx, p->numargs, p->args)) ) { +#endif + int *pj_errno_ref = pj_get_errno_ref(); msReleaseLock( TLOCK_PROJ ); - msSetError(MS_PROJERR, pj_strerrno(*pj_errno_ref), - "msProcessProjection()"); + msSetError(MS_PROJERR, "proj error \"%s\" for \"%s:%s\"", + "msProcessProjection()", pj_strerrno(*pj_errno_ref), p->args[0],p->args[1]) ; return(-1); } msReleaseLock( TLOCK_PROJ ); +#ifdef USE_PROJ_FASTPATHS + if(strcasestr(p->args[0],"epsg:4326")) { + p->wellknownprojection = wkp_lonlat; + } else if(strcasestr(p->args[0],"epsg:3857")) { + p->wellknownprojection = wkp_gmerc; + } else { + p->wellknownprojection = wkp_none; + } +#endif + + return(0); #else msSetError(MS_PROJERR, "Projection support is not available.", @@ -1298,6 +1321,16 @@ int msLoadProjectionStringEPSG(projectionObj *p, const char *value) if(p) msFreeProjection(p); p->gt.need_geotransform = MS_FALSE; +#ifdef USE_PROJ_FASTPATHS + if(strcasestr(value,"epsg:4326")) { + p->wellknownprojection = wkp_lonlat; + } else if(strcasestr(value,"epsg:3857")) { + p->wellknownprojection = wkp_gmerc; + } else { + p->wellknownprojection = wkp_none; + } +#endif + if (strncasecmp(value, "EPSG:", 5) == 0) { diff --git a/maplabel.c b/maplabel.c index 7a5abf1ec3..394912a6d3 100644 --- a/maplabel.c +++ b/maplabel.c @@ -804,7 +804,8 @@ int msTestLabelCacheCollisions(mapObj *map, labelCacheMemberObj *cachePtr, shape if(mindistance >0 && (cachePtr->layerindex == curCachePtr->layerindex) && (cachePtr->classindex == curCachePtr->classindex) && - (strcmp(cachePtr->labels[0].annotext, curCachePtr->labels[0].annotext) == 0) && + (cachePtr->labels[0].annotext && curCachePtr->labels[0].annotext && + strcmp(cachePtr->labels[0].annotext, curCachePtr->labels[0].annotext) == 0) && (msDistancePointToPoint(&(cachePtr->point), &(curCachePtr->point)) <= (mindistance + label_width))) { /* label is a duplicate */ return MS_FALSE; } diff --git a/mapproject.c b/mapproject.c index 5c56c9a981..9db0f717c2 100644 --- a/mapproject.c +++ b/mapproject.c @@ -90,10 +90,14 @@ int msProjectPoint(projectionObj *in, projectionObj *out, pointObj *point) point->y *= DEG_TO_RAD; } +#if PJ_VERSION < 480 msAcquireLock( TLOCK_PROJ ); +#endif error = pj_transform( in->proj, out->proj, 1, 0, &(point->x), &(point->y), &z ); +#if PJ_VERSION < 480 msReleaseLock( TLOCK_PROJ ); +#endif if( error || point->x == HUGE_VAL || point->y == HUGE_VAL ) return MS_FAILURE; @@ -288,6 +292,30 @@ msProjectShapeLine(projectionObj *in, projectionObj *out, int line_alloc = numpoints_in; int wrap_test; +#ifdef USE_PROJ_FASTPATHS +#define MAXEXTENT 20037508.34 +#define M_PIby360 .0087266462599716479 +#define MAXEXTENTby180 111319.4907777777777777777 + if(in->wellknownprojection == wkp_lonlat && out->wellknownprojection == wkp_gmerc) { + for( i = line->numpoints-1; i >= 0; i-- ) { +#define p_x line->point[i].x +#define p_y line->point[i].y + p_x *= MAXEXTENTby180; + p_y = log(tan((90 + p_y) * M_PIby360)) * MS_RAD_TO_DEG; + p_y *= MAXEXTENTby180; + if (p_x > MAXEXTENT) p_x = MAXEXTENT; + if (p_x < -MAXEXTENT) p_x = -MAXEXTENT; + if (p_y > MAXEXTENT) p_y = MAXEXTENT; + if (p_y < -MAXEXTENT) p_y = -MAXEXTENT; +#undef p_x +#undef p_y + } + return MS_SUCCESS; + } +#endif + + + wrap_test = out != NULL && out->proj != NULL && pj_is_latlong(out->proj) && !pj_is_latlong(in->proj); @@ -469,6 +497,30 @@ int msProjectShape(projectionObj *in, projectionObj *out, shapeObj *shape) { #ifdef USE_PROJ int i; +#ifdef USE_PROJ_FASTPATHS + int j; + + if(in->wellknownprojection == wkp_lonlat && out->wellknownprojection == wkp_gmerc) { + for( i = shape->numlines-1; i >= 0; i-- ) { + for( j = shape->line[i].numpoints-1; j >= 0; j-- ) { +#define p_x shape->line[i].point[j].x +#define p_y shape->line[i].point[j].y + p_x *= MAXEXTENTby180; + p_y = log(tan((90 + p_y) * M_PIby360)) * MS_RAD_TO_DEG; + p_y *= MAXEXTENTby180; + if (p_x > MAXEXTENT) p_x = MAXEXTENT; + if (p_x < -MAXEXTENT) p_x = -MAXEXTENT; + if (p_y > MAXEXTENT) p_y = MAXEXTENT; + if (p_y < -MAXEXTENT) p_y = -MAXEXTENT; +#undef p_x +#undef p_y + } + } + return MS_SUCCESS; + } +#endif + + for( i = shape->numlines-1; i >= 0; i-- ) { diff --git a/mapproject.h b/mapproject.h index b788a84681..d2e384f524 100644 --- a/mapproject.h +++ b/mapproject.h @@ -41,6 +41,10 @@ extern "C" { # include #endif +#define wkp_none 0 +#define wkp_lonlat 1 +#define wkp_gmerc 2 + typedef struct { #ifdef SWIG @@ -55,11 +59,15 @@ typedef struct { char **args; /* variable number of projection args */ #ifdef USE_PROJ projPJ proj; /* a projection structure for the PROJ package */ +#if PJ_VERSION >= 480 + projCtx proj_ctx; +#endif #else void *proj; #endif geotransformObj gt; /* extra transformation to apply */ #endif + int wellknownprojection; } projectionObj; #ifndef SWIG diff --git a/mapscript/python/Makefile.in b/mapscript/python/Makefile.in index f583af1407..df04296e6d 100644 --- a/mapscript/python/Makefile.in +++ b/mapscript/python/Makefile.in @@ -23,8 +23,8 @@ LTINSTALL=$(LIBTOOL) --mode=install XTRALIBS= @XTRALIBS@ -PYLIBDIR=`$(PYTHON) -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"` -PYINCDIR=`$(PYTHON) -c "from distutils.sysconfig import get_python_inc; print get_python_inc()"` +PYLIBDIR=`$(PYTHON) -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)"` +PYINCDIR=`$(PYTHON) -c "from distutils.sysconfig import get_python_inc; print get_python_inc(1)"` RUNPATH= -rpath $(PYLIBDIR) DEFINES=@ALL_ENABLED@ @@ -51,9 +51,9 @@ mapscript_wrap.c: ../mapscript.i $(SWIG) -python -shadow -modern -templatereduce -fastdispatch -fvirtual -fastproxy -modernargs -castmode -dirvtable -fastinit -fastquery -noproxydel -nobuildnone $(DEFINES) -o mapscript_wrap.c ../mapscript.i install: _mapscript.la - $(LTINSTALL) $(INSTALL) _mapscript.la $(PYLIBDIR) - $(INSTALL) -c mapscript.py $(PYLIBDIR) + $(LTINSTALL) $(INSTALL) _mapscript.la $(DESTDIR)$(PYLIBDIR) + $(INSTALL) -c mapscript.py $(DESTDIR)$(PYLIBDIR) clean: - -rm -rf .libs *.lo *.la *.so *.o pygdioctx/*.o pygdioctx/*.lo mapscript_wrap.c mapscript.py + -rm -rf .libs *.lo *.la *.so *.o pygdioctx/.libs pygdioctx/*.o pygdioctx/*.lo mapscript_wrap.c mapscript.py diff --git a/mapscript/python/setup.py b/mapscript/python/setup.py index 4ac33b5ad0..4bc5a924ce 100644 --- a/mapscript/python/setup.py +++ b/mapscript/python/setup.py @@ -50,7 +50,7 @@ def unique(list): # --------------------------------------------------------------------------- include_dirs = ['../..'] -library_dirs = ['../../'] +library_dirs = ['../../.libs'] libraries = ['mapserver'] extra_link_args = [] @@ -273,4 +273,4 @@ def finalize_options(self): py_modules = py_modules, url=url, cmdclass={'build_ext':ms_ext}, - ext_modules = ext_modules ) \ No newline at end of file + ext_modules = ext_modules ) diff --git a/mapscript/ruby/extconf.rb b/mapscript/ruby/extconf.rb index d5693af183..7a2a0cfae4 100755 --- a/mapscript/ruby/extconf.rb +++ b/mapscript/ruby/extconf.rb @@ -13,7 +13,7 @@ $CFLAGS = "" $CPPFLAGS = make_inc + " -idirafter $(rubylibdir)/$(arch) " + make_define $LDFLAGS += " -fPIC" -$LOCAL_LIBS += " -L../.. " + make_libs + " " + make_static_libs +$LOCAL_LIBS += " -L../../.libs/ " + " -lmapserver " + make_static_libs # if the source file 'mapscript_wrap.c' is missing nothing works # this is a workaround !! diff --git a/mapwfs.c b/mapwfs.c index 5599c7edc0..2ce14777e1 100644 --- a/mapwfs.c +++ b/mapwfs.c @@ -2640,7 +2640,6 @@ int msWFSGetFeature(mapObj *map, wfsParamsObj *paramsObj, cgiRequestObj *req, ow if( to_allow < 0 ) to_allow = 0; - lp->resultcache->numresults = 0; } } }