From 78b560e6c080117a96aa2dc2f594e62f523b3004 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C4=81ris=20Narti=C5=A1s?= Date: Wed, 15 Oct 2025 10:17:05 +0300 Subject: [PATCH 1/3] Build: move config.h.in customizations to configure.ac to make config.h.in purely reconfigurable Some obsolete code removed, LFS detection modernized Contains files regenerated with autoconf 2.72 --- configure | 3576 +++++++++++++++++++++---------------- configure.ac | 33 +- include/grass/config.h.in | 150 +- 3 files changed, 2077 insertions(+), 1682 deletions(-) diff --git a/configure b/configure index 276fb1f4331..39e178677b8 100755 --- a/configure +++ b/configure @@ -1,9 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71. +# Generated by GNU Autoconf 2.72. # # -# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, +# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation, # Inc. # # @@ -15,7 +15,6 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh @@ -24,12 +23,13 @@ then : # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else $as_nop - case `(set -o) 2>/dev/null` in #( +else case e in #( + e) case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; +esac ;; esac fi @@ -101,7 +101,7 @@ IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as `sh COMMAND' +# We did not find ourselves, most probably we were run as 'sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 @@ -131,15 +131,14 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. +# out after a failed 'exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="as_nop=: -if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 + as_bourne_compatible="if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh NULLCMD=: @@ -147,12 +146,13 @@ then : # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else \$as_nop - case \`(set -o) 2>/dev/null\` in #( +else case e in #( + e) case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( *) : ;; +esac ;; esac fi " @@ -170,8 +170,9 @@ as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } if ( set x; as_fn_ret_success y && test x = \"\$1\" ) then : -else \$as_nop - exitcode=1; echo positional parameters were not saved. +else case e in #( + e) exitcode=1; echo positional parameters were not saved. ;; +esac fi test x\$exitcode = x0 || exit 1 blah=\$(echo \$(echo blah)) @@ -180,19 +181,19 @@ test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && - test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 -test \$(( 1 + 1 )) = 2 || exit 1" + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1" if (eval "$as_required") 2>/dev/null then : as_have_required=yes -else $as_nop - as_have_required=no +else case e in #( + e) as_have_required=no ;; +esac fi if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null then : -else $as_nop - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +else case e in #( + e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do @@ -225,12 +226,13 @@ IFS=$as_save_IFS if $as_found then : -else $as_nop - if { test -f "$SHELL" || test -f "$SHELL.exe"; } && +else case e in #( + e) if { test -f "$SHELL" || test -f "$SHELL.exe"; } && as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null then : CONFIG_SHELL=$SHELL as_have_required=yes -fi +fi ;; +esac fi @@ -252,7 +254,7 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. +# out after a failed 'exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi @@ -271,7 +273,8 @@ $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." fi exit 1 -fi +fi ;; +esac fi fi SHELL=${CONFIG_SHELL-/bin/sh} @@ -310,14 +313,6 @@ as_fn_exit () as_fn_set_status $1 exit $1 } # as_fn_exit -# as_fn_nop -# --------- -# Do nothing but, unlike ":", preserve the value of $?. -as_fn_nop () -{ - return $? -} -as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -386,11 +381,12 @@ then : { eval $1+=\$2 }' -else $as_nop - as_fn_append () +else case e in #( + e) as_fn_append () { eval $1=\$$1\$2 - } + } ;; +esac fi # as_fn_append # as_fn_arith ARG... @@ -404,21 +400,14 @@ then : { as_val=$(( $* )) }' -else $as_nop - as_fn_arith () +else case e in #( + e) as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } + } ;; +esac fi # as_fn_arith -# as_fn_nop -# --------- -# Do nothing but, unlike ":", preserve the value of $?. -as_fn_nop () -{ - return $? -} -as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -492,6 +481,8 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits /[$]LINENO/= ' <$as_myself | sed ' + t clear + :clear s/[$]LINENO.*/&-/ t lineno b @@ -540,7 +531,6 @@ esac as_echo='printf %s\n' as_echo_n='printf %s' - rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -552,9 +542,9 @@ if (echo >conf$$.file) 2>/dev/null; then if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. + # In both cases, we have to default to 'cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -579,10 +569,12 @@ as_test_x='test -x' as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated # Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed '$as_sed_sh'" # deprecated test -n "$DJDIR" || exec 7<&0 /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=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1120,7 +1108,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=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1333,7 +1321,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=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1349,7 +1337,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=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1379,8 +1367,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" ;; *=*) @@ -1388,7 +1376,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 ;; @@ -1438,7 +1426,7 @@ do 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' +# There might be people who depend on the old broken behavior: '$host' # used to hold the argument of --host etc. # FIXME: To remove some day. build=$build_alias @@ -1506,7 +1494,7 @@ 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" fi -ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +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" pwd)` @@ -1534,7 +1522,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures this package to adapt to many kinds of systems. +'configure' configures this package to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1548,11 +1536,11 @@ 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' + -C, --config-cache alias for '--cache-file=config.cache' -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] + --srcdir=DIR find the sources in DIR [configure dir or '..'] Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX @@ -1560,10 +1548,10 @@ Installation directories: --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX [PREFIX] -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. +By default, 'make install' will install all the files in +'$ac_default_prefix/bin', '$ac_default_prefix/lib' etc. You can specify +an installation prefix other than '$ac_default_prefix' using '--prefix', +for instance '--prefix=\$HOME'. For better control, use the options below. @@ -1755,16 +1743,16 @@ Some influential environment variables: you have headers in a nonstandard directory CXX C++ compiler command CXXFLAGS C++ compiler flags - 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 Compiler 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. - CPP C preprocessor + default value of '-d' given by some make applications. XMKMF Path to xmkmf, Makefile generator for X Window System + CPP C preprocessor -Use these variables to override the choices made by `configure' or to help +Use these variables to override the choices made by 'configure' or to help it to find libraries and programs with nonstandard names/locations. Report bugs to the package provider. @@ -1832,9 +1820,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.71 +generated by GNU Autoconf 2.72 -Copyright (C) 2021 Free Software Foundation, Inc. +Copyright (C) 2023 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1873,11 +1861,12 @@ printf "%s\n" "$ac_try_echo"; } >&5 } && test -s conftest.$ac_objext then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 + ac_retval=1 ;; +esac fi eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval @@ -1912,11 +1901,12 @@ printf "%s\n" "$ac_try_echo"; } >&5 } && test -s conftest.$ac_objext then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 + ac_retval=1 ;; +esac fi eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval @@ -1953,12 +1943,13 @@ printf "%s\n" "$ac_try_echo"; } >&5 test $ac_status = 0; }; } then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: program exited with status $ac_status" >&5 +else case e in #( + e) printf "%s\n" "$as_me: program exited with status $ac_status" >&5 printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=$ac_status + ac_retval=$ac_status ;; +esac fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno @@ -1997,11 +1988,12 @@ printf "%s\n" "$ac_try_echo"; } >&5 } then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 + ac_retval=1 ;; +esac fi # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would @@ -2031,8 +2023,9 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : eval "$3=yes" -else $as_nop - eval "$3=no" +else case e in #( + e) eval "$3=no" ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext eval ac_res=\$$3 @@ -2082,8 +2075,9 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : -else $as_nop - eval "$3=yes" +else case e in #( + e) eval "$3=yes" ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi @@ -2095,44 +2089,6 @@ printf "%s\n" "$ac_res" >&6; } } # ac_fn_c_check_type -# ac_fn_c_try_cpp LINENO -# ---------------------- -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_cpp () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - } -then : - ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_cpp - # ac_fn_c_check_func LINENO FUNC VAR # ---------------------------------- # Tests whether FUNC exists, setting the cache variable VAR accordingly @@ -2149,7 +2105,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #define $2 innocuous_$2 /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. */ + which can conflict with char $2 (void); below. */ #include #undef $2 @@ -2160,7 +2116,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char $2 (); +char $2 (void); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ @@ -2179,8 +2135,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : eval "$3=yes" -else $as_nop - eval "$3=no" +else case e in #( + e) eval "$3=no" ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -2191,6 +2148,45 @@ printf "%s\n" "$ac_res" >&6; } } # ac_fn_c_check_func +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + } +then : + ac_retval=0 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 ;; +esac +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + # ac_fn_cxx_try_link LINENO # ------------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -2222,11 +2218,12 @@ printf "%s\n" "$ac_try_echo"; } >&5 } then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 + ac_retval=1 ;; +esac fi # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would @@ -2254,7 +2251,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #define $2 innocuous_$2 /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. */ + which can conflict with char $2 (void); below. */ #include #undef $2 @@ -2265,7 +2262,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char $2 (); +char $2 (void); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ @@ -2284,8 +2281,9 @@ _ACEOF if ac_fn_cxx_try_link "$LINENO" then : eval "$3=yes" -else $as_nop - eval "$3=no" +else case e in #( + e) eval "$3=no" ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -2320,7 +2318,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.71. Invocation command line was +generated by GNU Autoconf 2.72. Invocation command line was $ $0$ac_configure_args_raw @@ -2566,10 +2564,10 @@ esac printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$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; } +See 'config.log' for more details" "$LINENO" 5; } fi done @@ -2589,9 +2587,7 @@ struct stat; /* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ struct buf { int x; }; struct buf * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; +static char *e (char **p, int i) { return p[i]; } @@ -2605,6 +2601,21 @@ static char *f (char * (*g) (char **, int), char **p, ...) return s; } +/* C89 style stringification. */ +#define noexpand_stringify(a) #a +const char *stringified = noexpand_stringify(arbitrary+token=sequence); + +/* C89 style token pasting. Exercises some of the corner cases that + e.g. old MSVC gets wrong, but not very hard. */ +#define noexpand_concat(a,b) a##b +#define expand_concat(a,b) noexpand_concat(a,b) +extern int vA; +extern int vbee; +#define aye A +#define bee B +int *pvA = &expand_concat(v,aye); +int *pvbee = &noexpand_concat(v,bee); + /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not \xHH hex character constants. These do not provoke an error unfortunately, instead are silently treated @@ -2632,16 +2643,19 @@ ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); # Test code for whether the C compiler supports C99 (global declarations) ac_c_conftest_c99_globals=' -// Does the compiler advertise C99 conformance? +/* Does the compiler advertise C99 conformance? */ #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L # error "Compiler does not advertise C99 conformance" #endif +// See if C++-style comments work. + #include extern int puts (const char *); extern int printf (const char *, ...); extern int dprintf (int, const char *, ...); extern void *malloc (size_t); +extern void free (void *); // Check varargs macros. These examples are taken from C99 6.10.3.5. // dprintf is used instead of fprintf to avoid needing to declare @@ -2691,7 +2705,6 @@ typedef const char *ccp; static inline int test_restrict (ccp restrict text) { - // See if C++-style comments work. // Iterate through items via the restricted pointer. // Also check for declarations in for loops. for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) @@ -2757,6 +2770,8 @@ ac_c_conftest_c99_main=' ia->datasize = 10; for (int i = 0; i < ia->datasize; ++i) ia->data[i] = i * 1.234; + // Work around memory leak warnings. + free (ia); // Check named initializers. struct named_init ni = { @@ -2778,7 +2793,7 @@ ac_c_conftest_c99_main=' # Test code for whether the C compiler supports C11 (global declarations) ac_c_conftest_c11_globals=' -// Does the compiler advertise C11 conformance? +/* Does the compiler advertise C11 conformance? */ #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L # error "Compiler does not advertise C11 conformance" #endif @@ -3186,8 +3201,9 @@ IFS=$as_save_IFS if $as_found then : -else $as_nop - as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 +else case e in #( + e) as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 ;; +esac fi @@ -3215,12 +3231,12 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) @@ -3229,18 +3245,18 @@ printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: '$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: '$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: '$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: '$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. @@ -3256,11 +3272,11 @@ printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} fi done if $ac_cache_corrupted; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' + as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## @@ -3755,10 +3771,10 @@ fi fi -test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$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; } +See 'config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3830,8 +3846,8 @@ printf "%s\n" "$ac_try_echo"; } >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' + # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'. +# So ignore a value of 'no', otherwise this would lead to 'EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, # so that the user can short-circuit this test for compilers unknown to # Autoconf. @@ -3851,7 +3867,7 @@ do ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' + # safe: cross compilers may not add the suffix if given an '-o' # argument, so we may need to know it at that point already. # Even if this section looks crufty: it has the advantage of # actually working. @@ -3862,8 +3878,9 @@ do done test "$ac_cv_exeext" = no && ac_cv_exeext= -else $as_nop - ac_file='' +else case e in #( + e) ac_file='' ;; +esac fi if test -z "$ac_file" then : @@ -3872,13 +3889,14 @@ printf "%s\n" "no" >&6; } printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } +See 'config.log' for more details" "$LINENO" 5; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 printf %s "checking for C compiler default output file name... " >&6; } @@ -3902,10 +3920,10 @@ printf "%s\n" "$ac_try_echo"; } >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. + # If both 'conftest.exe' and 'conftest' are 'present' (well, observable) +# catch 'conftest.exe'. For instance with Cygwin, 'ls conftest' will +# work properly (i.e., refer to 'conftest.exe'), while it won't with +# 'rm'. for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in @@ -3915,11 +3933,12 @@ for ac_file in conftest.exe conftest conftest.*; do * ) break;; esac done -else $as_nop - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +else case e in #( + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$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; } +See 'config.log' for more details" "$LINENO" 5; } ;; +esac fi rm -f conftest conftest$ac_cv_exeext { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3935,6 +3954,8 @@ int main (void) { FILE *f = fopen ("conftest.out", "w"); + if (!f) + return 1; return ferror (f) || fclose (f) != 0; ; @@ -3974,18 +3995,19 @@ printf "%s\n" "$ac_try_echo"; } >&5 if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error 77 "cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } +If you meant to cross compile, use '--host'. +See 'config.log' for more details" "$LINENO" 5; } fi fi fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 printf "%s\n" "$cross_compiling" >&6; } -rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +rm -f conftest.$ac_ext conftest$ac_cv_exeext \ + conftest.o conftest.obj conftest.out ac_clean_files=$ac_clean_files_save { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 printf %s "checking for suffix of object files... " >&6; } @@ -4022,14 +4044,15 @@ then : break;; esac done -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$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; } +See 'config.log' for more details" "$LINENO" 5; } ;; +esac fi rm -f conftest.$ac_cv_objext conftest.$ac_ext { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 @@ -4056,8 +4079,9 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_compiler_gnu=yes -else $as_nop - ac_compiler_gnu=no +else case e in #( + e) ac_compiler_gnu=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu @@ -4094,8 +4118,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes -else $as_nop - CFLAGS="" +else case e in #( + e) CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -4110,8 +4134,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : -else $as_nop - ac_c_werror_flag=$ac_save_c_werror_flag +else case e in #( + e) ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -4128,9 +4152,11 @@ if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag @@ -4180,18 +4206,20 @@ if test "x$ac_cv_prog_cc_c11" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c11" = x +else case e in #( + e) if test "x$ac_cv_prog_cc_c11" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } - CC="$CC $ac_cv_prog_cc_c11" + CC="$CC $ac_cv_prog_cc_c11" ;; +esac fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 - ac_prog_cc_stdc=c11 + ac_prog_cc_stdc=c11 ;; +esac fi fi if test x$ac_prog_cc_stdc = xno @@ -4222,18 +4250,20 @@ if test "x$ac_cv_prog_cc_c99" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c99" = x +else case e in #( + e) if test "x$ac_cv_prog_cc_c99" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } - CC="$CC $ac_cv_prog_cc_c99" + CC="$CC $ac_cv_prog_cc_c99" ;; +esac fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 - ac_prog_cc_stdc=c99 + ac_prog_cc_stdc=c99 ;; +esac fi fi if test x$ac_prog_cc_stdc = xno @@ -4264,18 +4294,20 @@ if test "x$ac_cv_prog_cc_c89" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c89" = x +else case e in #( + e) if test "x$ac_cv_prog_cc_c89" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } - CC="$CC $ac_cv_prog_cc_c89" + CC="$CC $ac_cv_prog_cc_c89" ;; +esac fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 - ac_prog_cc_stdc=c89 + ac_prog_cc_stdc=c89 ;; +esac fi fi @@ -4294,8 +4326,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test ${with_cxx+y} then : withval=$with_cxx; -else $as_nop - with_cxx=yes +else case e in #( + e) with_cxx=yes ;; +esac fi @@ -4478,8 +4511,9 @@ _ACEOF if ac_fn_cxx_try_compile "$LINENO" then : ac_compiler_gnu=yes -else $as_nop - ac_compiler_gnu=no +else case e in #( + e) ac_compiler_gnu=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu @@ -4516,8 +4550,8 @@ _ACEOF if ac_fn_cxx_try_compile "$LINENO" then : ac_cv_prog_cxx_g=yes -else $as_nop - CXXFLAGS="" +else case e in #( + e) CXXFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -4532,8 +4566,8 @@ _ACEOF if ac_fn_cxx_try_compile "$LINENO" then : -else $as_nop - ac_cxx_werror_flag=$ac_save_cxx_werror_flag +else case e in #( + e) ac_cxx_werror_flag=$ac_save_cxx_werror_flag CXXFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -4550,9 +4584,11 @@ if ac_fn_cxx_try_compile "$LINENO" then : ac_cv_prog_cxx_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cxx_werror_flag=$ac_save_cxx_werror_flag @@ -4579,7 +4615,7 @@ then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5 printf %s "checking for $CXX option to enable C++11 features... " >&6; } -ac_cv_prog_cxx_11=no +ac_cv_prog_cxx_cxx11=no ac_save_CXX=$CXX cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -4602,18 +4638,20 @@ if test "x$ac_cv_prog_cxx_cxx11" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cxx_cxx11" = x +else case e in #( + e) if test "x$ac_cv_prog_cxx_cxx11" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5 printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; } - CXX="$CXX $ac_cv_prog_cxx_cxx11" + CXX="$CXX $ac_cv_prog_cxx_cxx11" ;; +esac fi ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11 - ac_prog_cxx_stdcxx=cxx11 + ac_prog_cxx_stdcxx=cxx11 ;; +esac fi fi if test x$ac_prog_cxx_stdcxx = xno @@ -4621,7 +4659,7 @@ then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5 printf %s "checking for $CXX option to enable C++98 features... " >&6; } -ac_cv_prog_cxx_98=no +ac_cv_prog_cxx_cxx98=no ac_save_CXX=$CXX cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -4644,18 +4682,20 @@ if test "x$ac_cv_prog_cxx_cxx98" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cxx_cxx98" = x +else case e in #( + e) if test "x$ac_cv_prog_cxx_cxx98" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5 printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; } - CXX="$CXX $ac_cv_prog_cxx_cxx98" + CXX="$CXX $ac_cv_prog_cxx_cxx98" ;; +esac fi ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98 - ac_prog_cxx_stdcxx=cxx98 + ac_prog_cxx_stdcxx=cxx98 ;; +esac fi fi @@ -4745,16 +4785,17 @@ then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } IEEEFLAG="-mieee" -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CFLAGS=${ac_save_cflags} -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -4773,8 +4814,8 @@ then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } ac_save_cflags=${CFLAGS} CFLAGS=-mieee @@ -4787,8 +4828,8 @@ then : printf "%s\n" "unknown (cross-compiling)" >&6; } as_fn_error $? "*** INTERNAL CONFIGURE ERROR" "$LINENO" 5 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -4807,21 +4848,25 @@ then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } IEEEFLAG="-mieee" -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** Incomplete floating-point support." >&5 -printf "%s\n" "$as_me: WARNING: *** Incomplete floating-point support." >&2;} +printf "%s\n" "$as_me: WARNING: *** Incomplete floating-point support." >&2;} ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - CFLAGS=${ac_save_cflags} + CFLAGS=${ac_save_cflags} ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi @@ -4991,7 +5036,7 @@ printf "%s\n" "no" >&6; } fi -as_ac_File=`printf "%s\n" "ac_cv_file_$GRASS_VERSION_GIT_FILE" | $as_tr_sh` +as_ac_File=`printf "%s\n" "ac_cv_file_$GRASS_VERSION_GIT_FILE" | sed "$as_sed_sh"` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $GRASS_VERSION_GIT_FILE" >&5 printf %s "checking for $GRASS_VERSION_GIT_FILE... " >&6; } @@ -5054,8 +5099,9 @@ printf "%s\n" "$GRASS_HEADERS_GIT_DATE" >&6; } if test ${enable_macosx_app+y} then : enableval=$enable_macosx_app; -else $as_nop - enable_macosx_app=no +else case e in #( + e) enable_macosx_app=no ;; +esac fi @@ -5112,7 +5158,7 @@ if test -z "$with_macosx_sdk" ; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } else - as_ac_File=`printf "%s\n" "ac_cv_file_$with_macosx_sdk/SDKSettings.plist" | $as_tr_sh` + as_ac_File=`printf "%s\n" "ac_cv_file_$with_macosx_sdk/SDKSettings.plist" | sed "$as_sed_sh"` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $with_macosx_sdk/SDKSettings.plist" >&5 printf %s "checking for $with_macosx_sdk/SDKSettings.plist... " >&6; } @@ -5130,9 +5176,10 @@ if eval test \"x\$"$as_ac_File"\" = x"yes" then : MACOSX_SDK="-isysroot $with_macosx_sdk" -else $as_nop - - as_fn_error $? "*** specified SDK does not exist or is not a SDK" "$LINENO" 5 +else case e in #( + e) + as_fn_error $? "*** specified SDK does not exist or is not a SDK" "$LINENO" 5 ;; +esac fi LDFLAGS="$LDFLAGS $MACOSX_SDK" @@ -5163,8 +5210,9 @@ printf %s "checking how to build libraries... " >&6; } if test ${enable_shared+y} then : enableval=$enable_shared; shared_ok=$enableval -else $as_nop - shared_ok=yes +else case e in #( + e) shared_ok=yes ;; +esac fi @@ -5375,8 +5423,9 @@ LDFLAGS="${ac_save_ldflags} $LDFLAGS" if test ${enable_w11+y} then : enableval=$enable_w11; -else $as_nop - enable_w11=no +else case e in #( + e) enable_w11=no ;; +esac fi @@ -5389,8 +5438,9 @@ fi if test ${with_macosx_archs+y} then : withval=$with_macosx_archs; -else $as_nop - with_macosx_archs="no" +else case e in #( + e) with_macosx_archs="no" ;; +esac fi @@ -5398,8 +5448,9 @@ fi if test ${with_macosx_sdk+y} then : withval=$with_macosx_sdk; -else $as_nop - with_macosx_sdk="no" +else case e in #( + e) with_macosx_sdk="no" ;; +esac fi @@ -5408,8 +5459,9 @@ fi if test ${with_tiff+y} then : withval=$with_tiff; -else $as_nop - with_tiff=yes +else case e in #( + e) with_tiff=yes ;; +esac fi @@ -5419,8 +5471,9 @@ fi if test ${with_postgres+y} then : withval=$with_postgres; -else $as_nop - with_postgres=no +else case e in #( + e) with_postgres=no ;; +esac fi @@ -5430,8 +5483,9 @@ fi if test ${with_mysql+y} then : withval=$with_mysql; -else $as_nop - with_mysql=no +else case e in #( + e) with_mysql=no ;; +esac fi @@ -5441,8 +5495,9 @@ fi if test ${with_sqlite+y} then : withval=$with_sqlite; -else $as_nop - with_sqlite=yes +else case e in #( + e) with_sqlite=yes ;; +esac fi @@ -5452,8 +5507,9 @@ fi if test ${with_opengl+y} then : withval=$with_opengl; -else $as_nop - with_opengl=yes +else case e in #( + e) with_opengl=yes ;; +esac fi @@ -5463,8 +5519,9 @@ fi if test ${with_odbc+y} then : withval=$with_odbc; -else $as_nop - with_odbc=no +else case e in #( + e) with_odbc=no ;; +esac fi @@ -5474,8 +5531,9 @@ fi if test ${with_fftw+y} then : withval=$with_fftw; -else $as_nop - with_fftw=yes +else case e in #( + e) with_fftw=yes ;; +esac fi @@ -5485,8 +5543,9 @@ fi if test ${with_libsvm+y} then : withval=$with_libsvm; -else $as_nop - with_libsvm=no +else case e in #( + e) with_libsvm=no ;; +esac fi @@ -5496,8 +5555,9 @@ fi if test ${with_cairo+y} then : withval=$with_cairo; -else $as_nop - with_cairo=yes +else case e in #( + e) with_cairo=yes ;; +esac fi @@ -5507,8 +5567,9 @@ fi if test ${with_freetype+y} then : withval=$with_freetype; -else $as_nop - with_freetype=yes +else case e in #( + e) with_freetype=yes ;; +esac fi @@ -5518,8 +5579,9 @@ fi if test ${with_nls+y} then : withval=$with_nls; -else $as_nop - with_nls=no +else case e in #( + e) with_nls=no ;; +esac fi @@ -5529,8 +5591,9 @@ fi if test ${with_readline+y} then : withval=$with_readline; -else $as_nop - with_readline=no +else case e in #( + e) with_readline=no ;; +esac fi @@ -5540,8 +5603,9 @@ fi if test ${with_regex+y} then : withval=$with_regex; -else $as_nop - with_regex=yes +else case e in #( + e) with_regex=yes ;; +esac fi @@ -5551,8 +5615,9 @@ fi if test ${with_pcre+y} then : withval=$with_pcre; -else $as_nop - with_pcre=no +else case e in #( + e) with_pcre=no ;; +esac fi @@ -5562,8 +5627,9 @@ fi if test ${with_pthread+y} then : withval=$with_pthread; -else $as_nop - with_pthread=no +else case e in #( + e) with_pthread=no ;; +esac fi @@ -5573,8 +5639,9 @@ fi if test ${with_openmp+y} then : withval=$with_openmp; -else $as_nop - with_openmp=no +else case e in #( + e) with_openmp=no ;; +esac fi @@ -5584,8 +5651,9 @@ fi if test ${with_opencl+y} then : withval=$with_opencl; -else $as_nop - with_opencl=no +else case e in #( + e) with_opencl=no ;; +esac fi @@ -5595,8 +5663,9 @@ fi if test ${with_bzlib+y} then : withval=$with_bzlib; -else $as_nop - with_bzlib=no +else case e in #( + e) with_bzlib=no ;; +esac fi @@ -5606,8 +5675,9 @@ fi if test ${with_zstd+y} then : withval=$with_zstd; -else $as_nop - with_zstd=yes +else case e in #( + e) with_zstd=yes ;; +esac fi @@ -5617,8 +5687,9 @@ fi if test ${with_pdal+y} then : withval=$with_pdal; -else $as_nop - with_pdal=yes +else case e in #( + e) with_pdal=yes ;; +esac fi @@ -5629,8 +5700,9 @@ fi if test ${with_blas+y} then : withval=$with_blas; -else $as_nop - with_blas=no +else case e in #( + e) with_blas=no ;; +esac fi @@ -5639,8 +5711,9 @@ fi if test ${with_lapack+y} then : withval=$with_lapack; -else $as_nop - with_lapack=no +else case e in #( + e) with_lapack=no ;; +esac fi @@ -5665,8 +5738,9 @@ fi if test ${with_liblas+y} then : withval=$with_liblas; -else $as_nop - with_liblas="no" +else case e in #( + e) with_liblas="no" ;; +esac fi @@ -5675,8 +5749,9 @@ fi if test ${with_netcdf+y} then : withval=$with_netcdf; -else $as_nop - with_netcdf="no" +else case e in #( + e) with_netcdf="no" ;; +esac fi @@ -5687,8 +5762,9 @@ fi if test ${with_geos+y} then : withval=$with_geos; -else $as_nop - with_geos="no" +else case e in #( + e) with_geos="no" ;; +esac fi @@ -6383,8 +6459,8 @@ LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root if test ${LEXLIB+y} then : -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lex library" >&5 printf %s "checking for lex library... " >&6; } @@ -6429,10 +6505,12 @@ printf "%s\n" "$as_me: WARNING: required lex library not found; giving up on $LE elif test "$ac_cv_lib_lex" = 'none needed' then : LEXLIB='' -else $as_nop - LEXLIB=$ac_cv_lib_lex +else case e in #( + e) LEXLIB=$ac_cv_lib_lex ;; +esac fi - + ;; +esac fi @@ -6965,326 +7043,58 @@ ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" if test "x$ac_cv_type_off_t" = xyes then : -else $as_nop - +else case e in #( + e) printf "%s\n" "#define off_t long int" >>confdefs.h - + ;; +esac fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -printf %s "checking how to run the C preprocessor... " >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= +ac_fn_c_check_type "$LINENO" "uid_t" "ac_cv_type_uid_t" "$ac_includes_default" +if test "x$ac_cv_type_uid_t" = xyes +then : + +else case e in #( + e) +printf "%s\n" "#define uid_t int" >>confdefs.h + ;; +esac fi -if test -z "$CPP"; then - # Double quotes because $CC needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO" +ac_fn_c_check_type "$LINENO" "gid_t" "ac_cv_type_gid_t" "$ac_includes_default" +if test "x$ac_cv_type_gid_t" = xyes then : -else $as_nop - # Broken: fails on valid input. -continue +else case e in #( + e) +printf "%s\n" "#define gid_t int" >>confdefs.h + ;; +esac fi -rm -f conftest.err conftest.i conftest.$ac_ext - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO" + + +case $host_os in + *cygwin* ) CYGWIN=yes;; + * ) CYGWIN=no;; +esac + +ac_fn_c_check_func "$LINENO" "ftime" "ac_cv_func_ftime" +if test "x$ac_cv_func_ftime" = xyes then : - # Broken: success on invalid input. -continue -else $as_nop - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext + printf "%s\n" "#define HAVE_FTIME 1" >>confdefs.h -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok +fi +ac_fn_c_check_func "$LINENO" "gethostname" "ac_cv_func_gethostname" +if test "x$ac_cv_func_gethostname" = xyes then : - break + printf "%s\n" "#define HAVE_GETHOSTNAME 1" >>confdefs.h + fi - - done - ac_cv_prog_CPP=$CPP - - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -printf "%s\n" "$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : - -else $as_nop - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : - # Broken: success on invalid input. -continue -else $as_nop - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok -then : - -else $as_nop - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -printf %s "checking for grep that handles long lines and -e... " >&6; } - -if test -z "$GREP"; then - ac_path_GREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_prog in grep ggrep - do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_GREP" || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - printf %s 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - printf "%s\n" 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_GREP_found && break 3 - done - done - 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 - fi -else - ac_cv_path_GREP=$GREP -fi - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -printf "%s\n" "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -printf %s "checking for egrep... " >&6; } - -if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - if test -z "$EGREP"; then - ac_path_EGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_prog in egrep - do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_EGREP" || continue -# Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - printf %s 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - printf "%s\n" 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_EGREP_found && break 3 - done - done - 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 - fi -else - ac_cv_path_EGREP=$EGREP -fi - - fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -printf "%s\n" "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5 -printf %s "checking for uid_t in sys/types.h... " >&6; } - -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "uid_t" >/dev/null 2>&1 -then : - ac_cv_type_uid_t=yes -else $as_nop - ac_cv_type_uid_t=no -fi -rm -rf conftest* - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5 -printf "%s\n" "$ac_cv_type_uid_t" >&6; } -if test $ac_cv_type_uid_t = no; then - -printf "%s\n" "#define uid_t int" >>confdefs.h - - -printf "%s\n" "#define gid_t int" >>confdefs.h - -fi - - - -case $host_os in - *cygwin* ) CYGWIN=yes;; - * ) CYGWIN=no;; -esac - -ac_fn_c_check_func "$LINENO" "ftime" "ac_cv_func_ftime" -if test "x$ac_cv_func_ftime" = xyes -then : - printf "%s\n" "#define HAVE_FTIME 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "gethostname" "ac_cv_func_gethostname" -if test "x$ac_cv_func_gethostname" = xyes -then : - printf "%s\n" "#define HAVE_GETHOSTNAME 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday" -if test "x$ac_cv_func_gettimeofday" = xyes -then : - printf "%s\n" "#define HAVE_GETTIMEOFDAY 1" >>confdefs.h +ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday" +if test "x$ac_cv_func_gettimeofday" = xyes +then : + printf "%s\n" "#define HAVE_GETTIMEOFDAY 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "lseek" "ac_cv_func_lseek" @@ -7383,8 +7193,9 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_func_setpgrp_void=no -else $as_nop - ac_cv_func_setpgrp_void=yes +else case e in #( + e) ac_cv_func_setpgrp_void=yes ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -7423,11 +7234,12 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_LONG_LONG_INT 1" >>confdefs.h -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -7453,11 +7265,12 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_INT64_T 1" >>confdefs.h -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -7486,7 +7299,141 @@ if test "$enable_w11" = "yes" ; then CFLAGS="$CFLAGS -D__W98__" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for X" >&5 + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +printf %s "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + + # Double quotes because $CC needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : + +else case e in #( + e) # Broken: fails on valid input. +continue ;; +esac +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : + # Broken: success on invalid input. +continue +else case e in #( + e) # Passes both tests. +ac_preproc_ok=: +break ;; +esac +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok +then : + break +fi + + done + ac_cv_prog_CPP=$CPP + + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +printf "%s\n" "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : + +else case e in #( + e) # Broken: fails on valid input. +continue ;; +esac +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : + # Broken: success on invalid input. +continue +else case e in #( + e) # Passes both tests. +ac_preproc_ok=: +break ;; +esac +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok +then : + +else case e in #( + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See 'config.log' for more details" "$LINENO" 5; } ;; +esac +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for X" >&5 printf %s "checking for X... " >&6; } @@ -7496,7 +7443,7 @@ then : withval=$with_x; fi -# $have_x is `yes', `no', `disabled', or empty when we do not yet know. +# $have_x is 'yes', 'no', 'disabled', or empty when we do not yet know. if test "x$with_x" = xno; then # The user explicitly disabled X. have_x=disabled @@ -7627,13 +7574,14 @@ if ac_fn_c_try_cpp "$LINENO" then : # We can compile using X headers with no special include directory. ac_x_includes= -else $as_nop - for ac_dir in $ac_x_header_dirs; do +else case e in #( + e) for ac_dir in $ac_x_header_dirs; do if test -r "$ac_dir/X11/Xlib.h"; then ac_x_includes=$ac_dir break fi -done +done ;; +esac fi rm -f conftest.err conftest.i conftest.$ac_ext fi # $ac_x_includes = no @@ -7660,8 +7608,8 @@ then : LIBS=$ac_save_LIBS # We can link X programs with no special library path. ac_x_libraries= -else $as_nop - LIBS=$ac_save_LIBS +else case e in #( + e) LIBS=$ac_save_LIBS for ac_dir in `printf "%s\n" "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` do # Don't even attempt the hair of trying to link an X program! @@ -7671,7 +7619,8 @@ do break 2 fi done -done +done ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -7748,8 +7697,8 @@ then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } X_LIBS="$X_LIBS -R$x_libraries" -else $as_nop - LIBS="$ac_xsave_LIBS -R $x_libraries" +else case e in #( + e) LIBS="$ac_xsave_LIBS -R $x_libraries" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7766,12 +7715,14 @@ then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } X_LIBS="$X_LIBS -R $x_libraries" -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: neither works" >&5 -printf "%s\n" "neither works" >&6; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: neither works" >&5 +printf "%s\n" "neither works" >&6; } ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext + conftest$ac_exeext conftest.$ac_ext ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -7795,8 +7746,14 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char XOpenDisplay (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char XOpenDisplay (void); int main (void) { @@ -7808,8 +7765,8 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 printf %s "checking for dnet_ntoa in -ldnet... " >&6; } ac_check_lib_save_LIBS=$LIBS @@ -7819,8 +7776,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char dnet_ntoa (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char dnet_ntoa (void); int main (void) { @@ -7832,8 +7795,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_dnet_dnet_ntoa=yes -else $as_nop - ac_cv_lib_dnet_dnet_ntoa=no +else case e in #( + e) ac_cv_lib_dnet_dnet_ntoa=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -7856,8 +7820,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char dnet_ntoa (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char dnet_ntoa (void); int main (void) { @@ -7869,8 +7839,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_dnet_stub_dnet_ntoa=yes -else $as_nop - ac_cv_lib_dnet_stub_dnet_ntoa=no +else case e in #( + e) ac_cv_lib_dnet_stub_dnet_ntoa=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -7882,7 +7853,8 @@ then : X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" fi - fi + fi ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -7913,8 +7885,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char gethostbyname (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char gethostbyname (void); int main (void) { @@ -7926,8 +7904,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_nsl_gethostbyname=yes -else $as_nop - ac_cv_lib_nsl_gethostbyname=no +else case e in #( + e) ac_cv_lib_nsl_gethostbyname=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -7950,8 +7929,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char gethostbyname (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char gethostbyname (void); int main (void) { @@ -7963,8 +7948,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_bsd_gethostbyname=yes -else $as_nop - ac_cv_lib_bsd_gethostbyname=no +else case e in #( + e) ac_cv_lib_bsd_gethostbyname=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -8003,8 +7989,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char connect (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char connect (void); int main (void) { @@ -8016,8 +8008,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_socket_connect=yes -else $as_nop - ac_cv_lib_socket_connect=no +else case e in #( + e) ac_cv_lib_socket_connect=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -8049,8 +8042,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char remove (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char remove (void); int main (void) { @@ -8062,8 +8061,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_posix_remove=yes -else $as_nop - ac_cv_lib_posix_remove=no +else case e in #( + e) ac_cv_lib_posix_remove=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -8095,8 +8095,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char shmat (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char shmat (void); int main (void) { @@ -8108,8 +8114,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_ipc_shmat=yes -else $as_nop - ac_cv_lib_ipc_shmat=no +else case e in #( + e) ac_cv_lib_ipc_shmat=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -8143,8 +8150,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char IceConnectionNumber (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char IceConnectionNumber (void); int main (void) { @@ -8156,8 +8169,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_ICE_IceConnectionNumber=yes -else $as_nop - ac_cv_lib_ICE_IceConnectionNumber=no +else case e in #( + e) ac_cv_lib_ICE_IceConnectionNumber=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -8197,8 +8211,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char cuserid (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char cuserid (void); int main (void) { @@ -8229,8 +8249,9 @@ done if test ${ac_cv_search_cuserid+y} then : -else $as_nop - ac_cv_search_cuserid=no +else case e in #( + e) ac_cv_search_cuserid=no ;; +esac fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS @@ -8281,8 +8302,8 @@ ac_fn_c_check_func "$LINENO" "atan" "ac_cv_func_atan" if test "x$ac_cv_func_atan" = xyes then : MATHLIB= -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for atan in -lm" >&5 printf %s "checking for atan in -lm... " >&6; } @@ -8293,8 +8314,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char atan (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char atan (void); int main (void) { @@ -8306,8 +8333,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_m_atan=yes -else $as_nop - ac_cv_lib_m_atan=no +else case e in #( + e) ac_cv_lib_m_atan=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -8317,12 +8345,14 @@ printf "%s\n" "$ac_cv_lib_m_atan" >&6; } if test "x$ac_cv_lib_m_atan" = xyes then : MATHLIB=-lm -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Failed check for math library." "$LINENO" 5 - + ;; +esac fi - + ;; +esac fi @@ -8331,8 +8361,8 @@ ac_fn_c_check_func "$LINENO" "dlsym" "ac_cv_func_dlsym" if test "x$ac_cv_func_dlsym" = xyes then : DLLIB= -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlsym in -ldl" >&5 printf %s "checking for dlsym in -ldl... " >&6; } @@ -8343,8 +8373,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char dlsym (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char dlsym (void); int main (void) { @@ -8356,8 +8392,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_dl_dlsym=yes -else $as_nop - ac_cv_lib_dl_dlsym=no +else case e in #( + e) ac_cv_lib_dl_dlsym=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -8367,12 +8404,14 @@ printf "%s\n" "$ac_cv_lib_dl_dlsym" >&6; } if test "x$ac_cv_lib_dl_dlsym" = xyes then : DLLIB=-ldl -else $as_nop - +else case e in #( + e) DLLIB= - + ;; +esac fi - + ;; +esac fi @@ -8381,8 +8420,8 @@ ac_fn_c_check_func "$LINENO" "iconv" "ac_cv_func_iconv" if test "x$ac_cv_func_iconv" = xyes then : ICONVLIB= -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv in -liconv" >&5 printf %s "checking for iconv in -liconv... " >&6; } @@ -8393,8 +8432,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char iconv (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char iconv (void); int main (void) { @@ -8406,8 +8451,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_iconv_iconv=yes -else $as_nop - ac_cv_lib_iconv_iconv=no +else case e in #( + e) ac_cv_lib_iconv_iconv=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -8417,8 +8463,8 @@ printf "%s\n" "$ac_cv_lib_iconv_iconv" >&6; } if test "x$ac_cv_lib_iconv_iconv" = xyes then : ICONVLIB=-liconv -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv in -lgiconv" >&5 printf %s "checking for iconv in -lgiconv... " >&6; } @@ -8429,8 +8475,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char iconv (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char iconv (void); int main (void) { @@ -8442,8 +8494,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_giconv_iconv=yes -else $as_nop - ac_cv_lib_giconv_iconv=no +else case e in #( + e) ac_cv_lib_giconv_iconv=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -8453,14 +8506,14 @@ printf "%s\n" "$ac_cv_lib_giconv_iconv" >&6; } if test "x$ac_cv_lib_giconv_iconv" = xyes then : ICONVLIB=-lgiconv -else $as_nop - +else case e in #( + e) ac_fn_c_check_func "$LINENO" "libiconv" "ac_cv_func_libiconv" if test "x$ac_cv_func_libiconv" = xyes then : ICONVLIB= -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libiconv in -liconv" >&5 printf %s "checking for libiconv in -liconv... " >&6; } @@ -8471,8 +8524,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char libiconv (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char libiconv (void); int main (void) { @@ -8484,8 +8543,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_iconv_libiconv=yes -else $as_nop - ac_cv_lib_iconv_libiconv=no +else case e in #( + e) ac_cv_lib_iconv_libiconv=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -8495,8 +8555,8 @@ printf "%s\n" "$ac_cv_lib_iconv_libiconv" >&6; } if test "x$ac_cv_lib_iconv_libiconv" = xyes then : ICONVLIB=-liconv -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libiconv in -lgiconv" >&5 printf %s "checking for libiconv in -lgiconv... " >&6; } @@ -8507,8 +8567,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char libiconv (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char libiconv (void); int main (void) { @@ -8520,8 +8586,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_giconv_libiconv=yes -else $as_nop - ac_cv_lib_giconv_libiconv=no +else case e in #( + e) ac_cv_lib_giconv_libiconv=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -8531,22 +8598,28 @@ printf "%s\n" "$ac_cv_lib_giconv_libiconv" >&6; } if test "x$ac_cv_lib_giconv_libiconv" = xyes then : ICONVLIB=-lgiconv -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** Unable to locate iconv() function." >&5 printf "%s\n" "$as_me: WARNING: *** Unable to locate iconv() function." >&2;} ICONVLIB= - + ;; +esac fi - + ;; +esac fi - + ;; +esac fi - + ;; +esac fi - + ;; +esac fi - + ;; +esac fi @@ -8556,8 +8629,8 @@ ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket" if test "x$ac_cv_func_socket" = xyes then : SOCKLIB= -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5 printf %s "checking for socket in -lsocket... " >&6; } @@ -8568,8 +8641,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char socket (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char socket (void); int main (void) { @@ -8581,8 +8660,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_socket_socket=yes -else $as_nop - ac_cv_lib_socket_socket=no +else case e in #( + e) ac_cv_lib_socket_socket=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -8592,14 +8672,16 @@ printf "%s\n" "$ac_cv_lib_socket_socket" >&6; } if test "x$ac_cv_lib_socket_socket" = xyes then : SOCKLIB=-lsocket -else $as_nop - +else case e in #( + e) have_socket=0 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** Unable to locate socket() function." >&5 printf "%s\n" "$as_me: WARNING: *** Unable to locate socket() function." >&2;} - + ;; +esac fi - + ;; +esac fi @@ -8654,10 +8736,11 @@ if test "x$ac_cv_header_zlib_h" = xyes then : printf "%s\n" "#define HAVE_ZLIB_H 1" >>confdefs.h -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate zlib includes." "$LINENO" 5 - + ;; +esac fi done @@ -8703,8 +8786,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char deflate (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char deflate (void); int main (void) { @@ -8716,8 +8805,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_z_deflate=yes -else $as_nop - ac_cv_lib_z_deflate=no +else case e in #( + e) ac_cv_lib_z_deflate=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -8727,13 +8817,14 @@ printf "%s\n" "$ac_cv_lib_z_deflate" >&6; } if test "x$ac_cv_lib_z_deflate" = xyes then : ZLIB="$ZLIB -lz " -else $as_nop - +else case e in #( + e) LDFLAGS=${ac_save_ldflags} as_fn_error $? "*** Unable to locate zlib library." "$LINENO" 5 - + ;; +esac fi @@ -8804,10 +8895,11 @@ if test "x$ac_cv_header_bzlib_h" = xyes then : printf "%s\n" "#define HAVE_BZLIB_H 1" >>confdefs.h -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate bzlib includes." "$LINENO" 5 - + ;; +esac fi done @@ -8853,8 +8945,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char BZ2_bzBuffToBuffCompress (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char BZ2_bzBuffToBuffCompress (void); int main (void) { @@ -8866,8 +8964,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress=yes -else $as_nop - ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress=no +else case e in #( + e) ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -8877,13 +8976,14 @@ printf "%s\n" "$ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress" >&6; } if test "x$ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress" = xyes then : BZIP2LIB="$BZIP2LIB -lbz2 " -else $as_nop - +else case e in #( + e) LDFLAGS=${ac_save_ldflags} as_fn_error $? "*** Unable to locate bzlib library." "$LINENO" 5 - + ;; +esac fi @@ -8955,10 +9055,11 @@ if test "x$ac_cv_header_zstd_h" = xyes then : printf "%s\n" "#define HAVE_ZSTD_H 1" >>confdefs.h -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate zstd includes." "$LINENO" 5 - + ;; +esac fi done @@ -9004,8 +9105,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char ZSTD_compress (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char ZSTD_compress (void); int main (void) { @@ -9017,8 +9124,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_zstd_ZSTD_compress=yes -else $as_nop - ac_cv_lib_zstd_ZSTD_compress=no +else case e in #( + e) ac_cv_lib_zstd_ZSTD_compress=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -9028,13 +9136,14 @@ printf "%s\n" "$ac_cv_lib_zstd_ZSTD_compress" >&6; } if test "x$ac_cv_lib_zstd_ZSTD_compress" = xyes then : ZSTDLIB="$ZSTDLIB -lzstd " -else $as_nop - +else case e in #( + e) LDFLAGS=${ac_save_ldflags} as_fn_error $? "*** Unable to locate zstd library." "$LINENO" 5 - + ;; +esac fi @@ -9095,8 +9204,9 @@ if test "x$ac_cv_header_proj_h" = xyes then : printf "%s\n" "#define HAVE_PROJ_H 1" >>confdefs.h -else $as_nop - PROJ4API=1 +else case e in #( + e) PROJ4API=1 ;; +esac fi done @@ -9114,8 +9224,8 @@ then : proj_ver_major=0 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unknown (cross-compiling)" >&5 printf "%s\n" "unknown (cross-compiling)" >&6; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -9132,11 +9242,13 @@ then : proj_ver_major=`cat conftestdata` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $proj_ver_major" >&5 printf "%s\n" "$proj_ver_major" >&6; } -else $as_nop - as_fn_error $? "*** Could not determine External PROJ major version." "$LINENO" 5 +else case e in #( + e) as_fn_error $? "*** Could not determine External PROJ major version." "$LINENO" 5 ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi CPPFLAGS=$ac_save_cppflags @@ -9151,8 +9263,8 @@ then : proj_ver_minor=0 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unknown (cross-compiling)" >&5 printf "%s\n" "unknown (cross-compiling)" >&6; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -9169,11 +9281,13 @@ then : proj_ver_minor=`cat conftestdata` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $proj_ver_minor" >&5 printf "%s\n" "$proj_ver_minor" >&6; } -else $as_nop - as_fn_error $? "*** Could not determine External PROJ minor version." "$LINENO" 5 +else case e in #( + e) as_fn_error $? "*** Could not determine External PROJ minor version." "$LINENO" 5 ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi CPPFLAGS=$ac_save_cppflags @@ -9188,8 +9302,8 @@ then : proj_ver_patch=0 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unknown (cross-compiling)" >&5 printf "%s\n" "unknown (cross-compiling)" >&6; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -9206,11 +9320,13 @@ then : proj_ver_patch=`cat conftestdata` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $proj_ver_patch" >&5 printf "%s\n" "$proj_ver_patch" >&6; } -else $as_nop - as_fn_error $? "*** Could not determine External PROJ patch version." "$LINENO" 5 +else case e in #( + e) as_fn_error $? "*** Could not determine External PROJ patch version." "$LINENO" 5 ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi CPPFLAGS=$ac_save_cppflags @@ -9235,8 +9351,8 @@ then : proj_ver=0 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unknown (cross-compiling)" >&5 printf "%s\n" "unknown (cross-compiling)" >&6; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -9253,11 +9369,13 @@ then : proj_ver=`cat conftestdata` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $proj_ver" >&5 printf "%s\n" "$proj_ver" >&6; } -else $as_nop - as_fn_error $? "*** Could not determine External PROJ.4 version." "$LINENO" 5 +else case e in #( + e) as_fn_error $? "*** Could not determine External PROJ.4 version." "$LINENO" 5 ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi CPPFLAGS=$ac_save_cppflags @@ -9315,8 +9433,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char proj_pj_info (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char proj_pj_info (void); int main (void) { @@ -9328,8 +9452,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_proj_proj_pj_info=yes -else $as_nop - ac_cv_lib_proj_proj_pj_info=no +else case e in #( + e) ac_cv_lib_proj_proj_pj_info=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -9339,13 +9464,14 @@ printf "%s\n" "$ac_cv_lib_proj_proj_pj_info" >&6; } if test "x$ac_cv_lib_proj_proj_pj_info" = xyes then : PROJLIB="$PROJLIB -lproj " -else $as_nop - +else case e in #( + e) LDFLAGS=${ac_save_ldflags} as_fn_error $? "*** Unable to locate External PROJ library." "$LINENO" 5 - + ;; +esac fi @@ -9369,10 +9495,11 @@ if test "x$ac_cv_header_proj_api_h" = xyes then : printf "%s\n" "#define HAVE_PROJ_API_H 1" >>confdefs.h -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate External PROJ includes." "$LINENO" 5 - + ;; +esac fi done @@ -9394,8 +9521,8 @@ then : proj_ver=0 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unknown (cross-compiling)" >&5 printf "%s\n" "unknown (cross-compiling)" >&6; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -9412,11 +9539,13 @@ then : proj_ver=`cat conftestdata` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $proj_ver" >&5 printf "%s\n" "$proj_ver" >&6; } -else $as_nop - as_fn_error $? "*** Could not determine External PROJ.4 version." "$LINENO" 5 +else case e in #( + e) as_fn_error $? "*** Could not determine External PROJ.4 version." "$LINENO" 5 ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi CPPFLAGS=$ac_save_cppflags @@ -9465,8 +9594,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char pj_get_def (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pj_get_def (void); int main (void) { @@ -9478,8 +9613,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_proj_pj_get_def=yes -else $as_nop - ac_cv_lib_proj_pj_get_def=no +else case e in #( + e) ac_cv_lib_proj_pj_get_def=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -9489,13 +9625,14 @@ printf "%s\n" "$ac_cv_lib_proj_pj_get_def" >&6; } if test "x$ac_cv_lib_proj_pj_get_def" = xyes then : PROJLIB="$PROJLIB -lproj " -else $as_nop - +else case e in #( + e) LDFLAGS=${ac_save_ldflags} as_fn_error $? "*** Unable to locate External PROJ.4 library." "$LINENO" 5 - + ;; +esac fi @@ -9541,7 +9678,7 @@ printf %s "checking for epsg... " >&6; } printf "%s\n" "unknown (cross-compiling)" >&6; } else -as_ac_File=`printf "%s\n" "ac_cv_file_$PROJSHARE/epsg" | $as_tr_sh` +as_ac_File=`printf "%s\n" "ac_cv_file_$PROJSHARE/epsg" | sed "$as_sed_sh"` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $PROJSHARE/epsg" >&5 printf %s "checking for $PROJSHARE/epsg... " >&6; } @@ -9558,10 +9695,11 @@ printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_File"\" = x"yes" then : -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** Unable to locate PROJ data files." >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** Unable to locate PROJ data files." >&5 printf "%s\n" "$as_me: WARNING: *** Unable to locate PROJ data files." >&2;} - + ;; +esac fi @@ -9641,10 +9779,11 @@ if test "x$ac_cv_header_regex_h" = xyes then : printf "%s\n" "#define HAVE_REGEX_H 1" >>confdefs.h -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate regex includes." "$LINENO" 5 - + ;; +esac fi done @@ -9688,8 +9827,8 @@ then : REGEXLIB="$REGEXLIB " -else $as_nop - +else case e in #( + e) ac_save_ldflags="$LDFLAGS" LDFLAGS="$REGEXLIBPATH $LDFLAGS" @@ -9705,8 +9844,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char regcomp (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char regcomp (void); int main (void) { @@ -9718,8 +9863,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_regex_regcomp=yes -else $as_nop - ac_cv_lib_regex_regcomp=no +else case e in #( + e) ac_cv_lib_regex_regcomp=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -9729,13 +9875,14 @@ printf "%s\n" "$ac_cv_lib_regex_regcomp" >&6; } if test "x$ac_cv_lib_regex_regcomp" = xyes then : REGEXLIB="$REGEXLIB -lregex " -else $as_nop - +else case e in #( + e) LDFLAGS=${ac_save_ldflags} as_fn_error $? "*** Unable to locate regex library." "$LINENO" 5 - + ;; +esac fi @@ -9743,7 +9890,8 @@ fi LDFLAGS=${ac_save_ldflags} - + ;; +esac fi LIBS=${ac_save_libs} @@ -9787,10 +9935,11 @@ if test "x$ac_cv_header_pcre_h" = xyes then : printf "%s\n" "#define HAVE_PCRE_H 1" >>confdefs.h -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate pcre includes." "$LINENO" 5 - + ;; +esac fi done @@ -9834,8 +9983,8 @@ then : REGEXLIB="$REGEXLIB " -else $as_nop - +else case e in #( + e) ac_save_ldflags="$LDFLAGS" LDFLAGS="$REGEXLIBPATH $LDFLAGS" @@ -9851,8 +10000,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char pcre_compile (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pcre_compile (void); int main (void) { @@ -9864,8 +10019,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pcre_pcre_compile=yes -else $as_nop - ac_cv_lib_pcre_pcre_compile=no +else case e in #( + e) ac_cv_lib_pcre_pcre_compile=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -9875,13 +10031,14 @@ printf "%s\n" "$ac_cv_lib_pcre_pcre_compile" >&6; } if test "x$ac_cv_lib_pcre_pcre_compile" = xyes then : REGEXLIB="$REGEXLIB -lpcre " -else $as_nop - +else case e in #( + e) LDFLAGS=${ac_save_ldflags} as_fn_error $? "*** Unable to locate pcre library." "$LINENO" 5 - + ;; +esac fi @@ -9889,7 +10046,8 @@ fi LDFLAGS=${ac_save_ldflags} - + ;; +esac fi LIBS=${ac_save_libs} @@ -9962,10 +10120,11 @@ if test "x$ac_cv_header_readline_readline_h" = xyes then : printf "%s\n" "#define HAVE_READLINE_READLINE_H 1" >>confdefs.h -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate Readline includes." "$LINENO" 5 - + ;; +esac fi done @@ -9981,10 +10140,11 @@ if test "x$ac_cv_header_readline_history_h" = xyes then : printf "%s\n" "#define HAVE_READLINE_HISTORY_H 1" >>confdefs.h -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate Readline includes." "$LINENO" 5 - + ;; +esac fi done @@ -10030,8 +10190,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char readline (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char readline (void); int main (void) { @@ -10043,8 +10209,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_readline_readline=yes -else $as_nop - ac_cv_lib_readline_readline=no +else case e in #( + e) ac_cv_lib_readline_readline=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -10054,13 +10221,14 @@ printf "%s\n" "$ac_cv_lib_readline_readline" >&6; } if test "x$ac_cv_lib_readline_readline" = xyes then : READLINELIB="$READLINELIB -lreadline " -else $as_nop - +else case e in #( + e) LDFLAGS=${ac_save_ldflags} as_fn_error $? "*** Unable to locate Readline library." "$LINENO" 5 - + ;; +esac fi @@ -10082,8 +10250,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char add_history (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char add_history (void); int main (void) { @@ -10095,8 +10269,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_history_add_history=yes -else $as_nop - ac_cv_lib_history_add_history=no +else case e in #( + e) ac_cv_lib_history_add_history=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -10106,13 +10281,14 @@ printf "%s\n" "$ac_cv_lib_history_add_history" >&6; } if test "x$ac_cv_lib_history_add_history" = xyes then : HISTORYLIB="$HISTORYLIB -lhistory " -else $as_nop - +else case e in #( + e) LDFLAGS=${ac_save_ldflags} as_fn_error $? "*** Unable to locate History library." "$LINENO" 5 - + ;; +esac fi @@ -10221,8 +10397,8 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -10237,14 +10413,16 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : PNGLIB="$PNGLIB" -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate libpng library." "$LINENO" 5 - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -10359,8 +10537,8 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : -else $as_nop - +else case e in #( + e) LIBS="$LIBS $GDAL_DEP_LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -10376,14 +10554,16 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : GDAL_LIBS="$GDAL_LIBS $GDAL_DEP_LIBS" -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate GDAL library." "$LINENO" 5 - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -10501,8 +10681,8 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -10517,14 +10697,16 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : LAS_LIBS="$LAS_LIBS" -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate libLAS library." "$LINENO" 5 - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -10596,10 +10778,11 @@ _ACEOF if ac_fn_cxx_try_link "$LINENO" then : PDAL_LIBS="$PDAL_LIBS" -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate suitable (>=1.7.1) PDAL library." "$LINENO" 5 - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -10715,8 +10898,8 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : -else $as_nop - +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -10731,14 +10914,16 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : NETCDF_LIBS="$NETCDF_LIBS" -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate NetCDF library." "$LINENO" 5 - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -10837,10 +11022,11 @@ if test "x$ac_cv_header_geos_c_h" = xyes then : printf "%s\n" "#define HAVE_GEOS_C_H 1" >>confdefs.h -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate GEOS includes." "$LINENO" 5 - + ;; +esac fi done @@ -10865,8 +11051,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char initGEOS (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char initGEOS (void); int main (void) { @@ -10878,8 +11070,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_geos_c_initGEOS=yes -else $as_nop - ac_cv_lib_geos_c_initGEOS=no +else case e in #( + e) ac_cv_lib_geos_c_initGEOS=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -10889,13 +11082,14 @@ printf "%s\n" "$ac_cv_lib_geos_c_initGEOS" >&6; } if test "x$ac_cv_lib_geos_c_initGEOS" = xyes then : GEOS_LIBS="$GEOS_LIBS -lgeos_c " -else $as_nop - +else case e in #( + e) LDFLAGS=${ac_save_ldflags} as_fn_error $? "*** Unable to locate GEOS library." "$LINENO" 5 - + ;; +esac fi @@ -10967,10 +11161,11 @@ if test "x$ac_cv_header_tiffio_h" = xyes then : printf "%s\n" "#define HAVE_TIFFIO_H 1" >>confdefs.h -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate TIFF includes." "$LINENO" 5 - + ;; +esac fi done @@ -11022,8 +11217,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char TIFFOpen (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char TIFFOpen (void); int main (void) { @@ -11035,8 +11236,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_tiff_TIFFOpen=yes -else $as_nop - ac_cv_lib_tiff_TIFFOpen=no +else case e in #( + e) ac_cv_lib_tiff_TIFFOpen=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -11046,8 +11248,8 @@ printf "%s\n" "$ac_cv_lib_tiff_TIFFOpen" >&6; } if test "x$ac_cv_lib_tiff_TIFFOpen" = xyes then : TIFFLIB="$TIFFLIB -ltiff " -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TIFFOpen in -ltiff" >&5 printf %s "checking for TIFFOpen in -ltiff... " >&6; } @@ -11058,8 +11260,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char TIFFOpen (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char TIFFOpen (void); int main (void) { @@ -11071,8 +11279,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_tiff_TIFFOpen=yes -else $as_nop - ac_cv_lib_tiff_TIFFOpen=no +else case e in #( + e) ac_cv_lib_tiff_TIFFOpen=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -11082,8 +11291,8 @@ printf "%s\n" "$ac_cv_lib_tiff_TIFFOpen" >&6; } if test "x$ac_cv_lib_tiff_TIFFOpen" = xyes then : TIFFLIB="$TIFFLIB -ltiff $MATHLIB" -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TIFFOpen in -ltiff" >&5 printf %s "checking for TIFFOpen in -ltiff... " >&6; } @@ -11094,8 +11303,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char TIFFOpen (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char TIFFOpen (void); int main (void) { @@ -11107,8 +11322,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_tiff_TIFFOpen=yes -else $as_nop - ac_cv_lib_tiff_TIFFOpen=no +else case e in #( + e) ac_cv_lib_tiff_TIFFOpen=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -11118,8 +11334,8 @@ printf "%s\n" "$ac_cv_lib_tiff_TIFFOpen" >&6; } if test "x$ac_cv_lib_tiff_TIFFOpen" = xyes then : TIFFLIB="$TIFFLIB -ltiff $ZLIB" -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TIFFOpen in -ltiff" >&5 printf %s "checking for TIFFOpen in -ltiff... " >&6; } @@ -11130,8 +11346,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char TIFFOpen (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char TIFFOpen (void); int main (void) { @@ -11143,8 +11365,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_tiff_TIFFOpen=yes -else $as_nop - ac_cv_lib_tiff_TIFFOpen=no +else case e in #( + e) ac_cv_lib_tiff_TIFFOpen=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -11154,8 +11377,8 @@ printf "%s\n" "$ac_cv_lib_tiff_TIFFOpen" >&6; } if test "x$ac_cv_lib_tiff_TIFFOpen" = xyes then : TIFFLIB="$TIFFLIB -ltiff $ZLIB $MATHLIB" -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TIFFOpen in -ltiff" >&5 printf %s "checking for TIFFOpen in -ltiff... " >&6; } @@ -11166,8 +11389,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char TIFFOpen (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char TIFFOpen (void); int main (void) { @@ -11179,8 +11408,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_tiff_TIFFOpen=yes -else $as_nop - ac_cv_lib_tiff_TIFFOpen=no +else case e in #( + e) ac_cv_lib_tiff_TIFFOpen=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -11190,8 +11420,8 @@ printf "%s\n" "$ac_cv_lib_tiff_TIFFOpen" >&6; } if test "x$ac_cv_lib_tiff_TIFFOpen" = xyes then : TIFFLIB="$TIFFLIB -ltiff -ljpeg" -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TIFFOpen in -ltiff" >&5 printf %s "checking for TIFFOpen in -ltiff... " >&6; } @@ -11202,8 +11432,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char TIFFOpen (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char TIFFOpen (void); int main (void) { @@ -11215,8 +11451,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_tiff_TIFFOpen=yes -else $as_nop - ac_cv_lib_tiff_TIFFOpen=no +else case e in #( + e) ac_cv_lib_tiff_TIFFOpen=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -11226,8 +11463,8 @@ printf "%s\n" "$ac_cv_lib_tiff_TIFFOpen" >&6; } if test "x$ac_cv_lib_tiff_TIFFOpen" = xyes then : TIFFLIB="$TIFFLIB -ltiff -ljpeg $MATHLIB" -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TIFFOpen in -ltiff" >&5 printf %s "checking for TIFFOpen in -ltiff... " >&6; } @@ -11238,8 +11475,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char TIFFOpen (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char TIFFOpen (void); int main (void) { @@ -11251,8 +11494,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_tiff_TIFFOpen=yes -else $as_nop - ac_cv_lib_tiff_TIFFOpen=no +else case e in #( + e) ac_cv_lib_tiff_TIFFOpen=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -11262,8 +11506,8 @@ printf "%s\n" "$ac_cv_lib_tiff_TIFFOpen" >&6; } if test "x$ac_cv_lib_tiff_TIFFOpen" = xyes then : TIFFLIB="$TIFFLIB -ltiff -ljpeg $ZLIB" -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TIFFOpen in -ltiff" >&5 printf %s "checking for TIFFOpen in -ltiff... " >&6; } @@ -11274,8 +11518,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char TIFFOpen (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char TIFFOpen (void); int main (void) { @@ -11287,8 +11537,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_tiff_TIFFOpen=yes -else $as_nop - ac_cv_lib_tiff_TIFFOpen=no +else case e in #( + e) ac_cv_lib_tiff_TIFFOpen=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -11298,18 +11549,20 @@ printf "%s\n" "$ac_cv_lib_tiff_TIFFOpen" >&6; } if test "x$ac_cv_lib_tiff_TIFFOpen" = xyes then : TIFFLIB="$TIFFLIB -ltiff -ljpeg $ZLIB $MATHLIB" -else $as_nop - +else case e in #( + e) LDFLAGS=${ac_save_ldflags} as_fn_error $? "*** Unable to locate TIFF library." "$LINENO" 5 - + ;; +esac fi - + ;; +esac fi @@ -11317,12 +11570,14 @@ fi - + ;; +esac fi - + ;; +esac fi @@ -11333,12 +11588,14 @@ fi - + ;; +esac fi - + ;; +esac fi @@ -11346,12 +11603,14 @@ fi - + ;; +esac fi - + ;; +esac fi @@ -11437,10 +11696,11 @@ if test "x$ac_cv_header_libpq_fe_h" = xyes then : printf "%s\n" "#define HAVE_LIBPQ_FE_H 1" >>confdefs.h -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate PostgreSQL includes." "$LINENO" 5 - + ;; +esac fi done @@ -11494,8 +11754,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char PQsetdbLogin (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char PQsetdbLogin (void); int main (void) { @@ -11507,8 +11773,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pq_PQsetdbLogin=yes -else $as_nop - ac_cv_lib_pq_PQsetdbLogin=no +else case e in #( + e) ac_cv_lib_pq_PQsetdbLogin=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -11518,8 +11785,8 @@ printf "%s\n" "$ac_cv_lib_pq_PQsetdbLogin" >&6; } if test "x$ac_cv_lib_pq_PQsetdbLogin" = xyes then : PQLIB="$PQLIB -lpq " -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PQsetdbLogin in -lpq" >&5 printf %s "checking for PQsetdbLogin in -lpq... " >&6; } @@ -11530,8 +11797,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char PQsetdbLogin (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char PQsetdbLogin (void); int main (void) { @@ -11543,8 +11816,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pq_PQsetdbLogin=yes -else $as_nop - ac_cv_lib_pq_PQsetdbLogin=no +else case e in #( + e) ac_cv_lib_pq_PQsetdbLogin=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -11554,8 +11828,8 @@ printf "%s\n" "$ac_cv_lib_pq_PQsetdbLogin" >&6; } if test "x$ac_cv_lib_pq_PQsetdbLogin" = xyes then : PQLIB="$PQLIB -lpq -lssl -lcrypto" -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PQsetdbLogin in -lpq" >&5 printf %s "checking for PQsetdbLogin in -lpq... " >&6; } @@ -11566,8 +11840,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char PQsetdbLogin (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char PQsetdbLogin (void); int main (void) { @@ -11579,8 +11859,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pq_PQsetdbLogin=yes -else $as_nop - ac_cv_lib_pq_PQsetdbLogin=no +else case e in #( + e) ac_cv_lib_pq_PQsetdbLogin=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -11590,8 +11871,8 @@ printf "%s\n" "$ac_cv_lib_pq_PQsetdbLogin" >&6; } if test "x$ac_cv_lib_pq_PQsetdbLogin" = xyes then : PQLIB="$PQLIB -lpq -lcrypt" -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PQsetdbLogin in -lpq" >&5 printf %s "checking for PQsetdbLogin in -lpq... " >&6; } @@ -11602,8 +11883,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char PQsetdbLogin (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char PQsetdbLogin (void); int main (void) { @@ -11615,8 +11902,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pq_PQsetdbLogin=yes -else $as_nop - ac_cv_lib_pq_PQsetdbLogin=no +else case e in #( + e) ac_cv_lib_pq_PQsetdbLogin=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -11626,18 +11914,20 @@ printf "%s\n" "$ac_cv_lib_pq_PQsetdbLogin" >&6; } if test "x$ac_cv_lib_pq_PQsetdbLogin" = xyes then : PQLIB="$PQLIB -lpq -lcrypt -lssl -lcrypto" -else $as_nop - +else case e in #( + e) LDFLAGS=${ac_save_ldflags} as_fn_error $? "*** Unable to locate PostgreSQL library." "$LINENO" 5 - + ;; +esac fi - + ;; +esac fi @@ -11645,12 +11935,14 @@ fi - + ;; +esac fi - + ;; +esac fi @@ -11676,8 +11968,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char PQcmdTuples (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char PQcmdTuples (void); int main (void) { @@ -11689,8 +11987,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pq_PQcmdTuples=yes -else $as_nop - ac_cv_lib_pq_PQcmdTuples=no +else case e in #( + e) ac_cv_lib_pq_PQcmdTuples=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -11702,8 +12001,8 @@ then : printf "%s\n" "#define HAVE_PQCMDTUPLES 1" >>confdefs.h -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PQcmdTuples in -lpq" >&5 printf %s "checking for PQcmdTuples in -lpq... " >&6; } @@ -11714,8 +12013,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char PQcmdTuples (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char PQcmdTuples (void); int main (void) { @@ -11727,8 +12032,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pq_PQcmdTuples=yes -else $as_nop - ac_cv_lib_pq_PQcmdTuples=no +else case e in #( + e) ac_cv_lib_pq_PQcmdTuples=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -11742,7 +12048,8 @@ printf "%s\n" "#define HAVE_PQCMDTUPLES 1" >>confdefs.h fi - + ;; +esac fi LDFLAGS="${ac_save_ldflags}" @@ -11812,10 +12119,11 @@ if test "x$ac_cv_header_mysql_h" = xyes then : printf "%s\n" "#define HAVE_MYSQL_H 1" >>confdefs.h -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate MySQL includes." "$LINENO" 5 - + ;; +esac fi done @@ -11870,8 +12178,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char mysql_query (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char mysql_query (void); int main (void) { @@ -11883,8 +12197,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_mysqlclient_mysql_query=yes -else $as_nop - ac_cv_lib_mysqlclient_mysql_query=no +else case e in #( + e) ac_cv_lib_mysqlclient_mysql_query=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -11894,8 +12209,8 @@ printf "%s\n" "$ac_cv_lib_mysqlclient_mysql_query" >&6; } if test "x$ac_cv_lib_mysqlclient_mysql_query" = xyes then : MYSQLLIB="$MYSQLLIB -lmysqlclient " -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -lmysqlclient" >&5 printf %s "checking for mysql_query in -lmysqlclient... " >&6; } @@ -11906,8 +12221,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char mysql_query (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char mysql_query (void); int main (void) { @@ -11919,8 +12240,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_mysqlclient_mysql_query=yes -else $as_nop - ac_cv_lib_mysqlclient_mysql_query=no +else case e in #( + e) ac_cv_lib_mysqlclient_mysql_query=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -11930,8 +12252,8 @@ printf "%s\n" "$ac_cv_lib_mysqlclient_mysql_query" >&6; } if test "x$ac_cv_lib_mysqlclient_mysql_query" = xyes then : MYSQLLIB="$MYSQLLIB -lmysqlclient $MATHLIB" -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -lmysqlclient" >&5 printf %s "checking for mysql_query in -lmysqlclient... " >&6; } @@ -11942,8 +12264,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char mysql_query (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char mysql_query (void); int main (void) { @@ -11955,8 +12283,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_mysqlclient_mysql_query=yes -else $as_nop - ac_cv_lib_mysqlclient_mysql_query=no +else case e in #( + e) ac_cv_lib_mysqlclient_mysql_query=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -11966,8 +12295,8 @@ printf "%s\n" "$ac_cv_lib_mysqlclient_mysql_query" >&6; } if test "x$ac_cv_lib_mysqlclient_mysql_query" = xyes then : MYSQLLIB="$MYSQLLIB -lmysqlclient $SOCKLIB" -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -lmysqlclient" >&5 printf %s "checking for mysql_query in -lmysqlclient... " >&6; } @@ -11978,8 +12307,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char mysql_query (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char mysql_query (void); int main (void) { @@ -11991,8 +12326,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_mysqlclient_mysql_query=yes -else $as_nop - ac_cv_lib_mysqlclient_mysql_query=no +else case e in #( + e) ac_cv_lib_mysqlclient_mysql_query=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -12002,8 +12338,8 @@ printf "%s\n" "$ac_cv_lib_mysqlclient_mysql_query" >&6; } if test "x$ac_cv_lib_mysqlclient_mysql_query" = xyes then : MYSQLLIB="$MYSQLLIB -lmysqlclient $SOCKLIB $MATHLIB" -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -lmysqlclient" >&5 printf %s "checking for mysql_query in -lmysqlclient... " >&6; } @@ -12014,8 +12350,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char mysql_query (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char mysql_query (void); int main (void) { @@ -12027,8 +12369,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_mysqlclient_mysql_query=yes -else $as_nop - ac_cv_lib_mysqlclient_mysql_query=no +else case e in #( + e) ac_cv_lib_mysqlclient_mysql_query=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -12038,8 +12381,8 @@ printf "%s\n" "$ac_cv_lib_mysqlclient_mysql_query" >&6; } if test "x$ac_cv_lib_mysqlclient_mysql_query" = xyes then : MYSQLLIB="$MYSQLLIB -lmysqlclient $ZLIB" -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -lmysqlclient" >&5 printf %s "checking for mysql_query in -lmysqlclient... " >&6; } @@ -12050,8 +12393,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char mysql_query (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char mysql_query (void); int main (void) { @@ -12063,8 +12412,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_mysqlclient_mysql_query=yes -else $as_nop - ac_cv_lib_mysqlclient_mysql_query=no +else case e in #( + e) ac_cv_lib_mysqlclient_mysql_query=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -12074,8 +12424,8 @@ printf "%s\n" "$ac_cv_lib_mysqlclient_mysql_query" >&6; } if test "x$ac_cv_lib_mysqlclient_mysql_query" = xyes then : MYSQLLIB="$MYSQLLIB -lmysqlclient $ZLIB $MATHLIB" -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -lmysqlclient" >&5 printf %s "checking for mysql_query in -lmysqlclient... " >&6; } @@ -12086,8 +12436,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char mysql_query (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char mysql_query (void); int main (void) { @@ -12099,8 +12455,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_mysqlclient_mysql_query=yes -else $as_nop - ac_cv_lib_mysqlclient_mysql_query=no +else case e in #( + e) ac_cv_lib_mysqlclient_mysql_query=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -12110,8 +12467,8 @@ printf "%s\n" "$ac_cv_lib_mysqlclient_mysql_query" >&6; } if test "x$ac_cv_lib_mysqlclient_mysql_query" = xyes then : MYSQLLIB="$MYSQLLIB -lmysqlclient $ZLIB $SOCKLIB" -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -lmysqlclient" >&5 printf %s "checking for mysql_query in -lmysqlclient... " >&6; } @@ -12122,8 +12479,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char mysql_query (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char mysql_query (void); int main (void) { @@ -12135,8 +12498,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_mysqlclient_mysql_query=yes -else $as_nop - ac_cv_lib_mysqlclient_mysql_query=no +else case e in #( + e) ac_cv_lib_mysqlclient_mysql_query=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -12146,18 +12510,20 @@ printf "%s\n" "$ac_cv_lib_mysqlclient_mysql_query" >&6; } if test "x$ac_cv_lib_mysqlclient_mysql_query" = xyes then : MYSQLLIB="$MYSQLLIB -lmysqlclient $ZLIB $SOCKLIB $MATHLIB" -else $as_nop - +else case e in #( + e) LDFLAGS=${ac_save_ldflags} as_fn_error $? "*** Unable to locate MySQL library." "$LINENO" 5 - + ;; +esac fi - + ;; +esac fi @@ -12165,12 +12531,14 @@ fi - + ;; +esac fi - + ;; +esac fi @@ -12181,12 +12549,14 @@ fi - + ;; +esac fi - + ;; +esac fi @@ -12194,12 +12564,14 @@ fi - + ;; +esac fi - + ;; +esac fi @@ -12283,9 +12655,10 @@ if test "x$ac_cv_func_mysql_server_init" = xyes then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libmysqld found" >&5 printf "%s\n" "libmysqld found" >&6; } -else $as_nop - MYSQLDLIB=""; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libmysqld not found" >&5 -printf "%s\n" "$as_me: WARNING: libmysqld not found" >&2;} +else case e in #( + e) MYSQLDLIB=""; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libmysqld not found" >&5 +printf "%s\n" "$as_me: WARNING: libmysqld not found" >&2;} ;; +esac fi LIBS=$ac_save_libs @@ -12363,10 +12736,11 @@ if test "x$ac_cv_header_sqlite3_h" = xyes then : printf "%s\n" "#define HAVE_SQLITE3_H 1" >>confdefs.h -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate SQLite includes." "$LINENO" 5 - + ;; +esac fi done @@ -12424,8 +12798,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char sqlite3_open (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char sqlite3_open (void); int main (void) { @@ -12437,8 +12817,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_sqlite3_sqlite3_open=yes -else $as_nop - ac_cv_lib_sqlite3_sqlite3_open=no +else case e in #( + e) ac_cv_lib_sqlite3_sqlite3_open=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -12448,8 +12829,8 @@ printf "%s\n" "$ac_cv_lib_sqlite3_sqlite3_open" >&6; } if test "x$ac_cv_lib_sqlite3_sqlite3_open" = xyes then : SQLITELIB="$SQLITELIB -lsqlite3 " -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3_open in -lsqlite3" >&5 printf %s "checking for sqlite3_open in -lsqlite3... " >&6; } @@ -12460,8 +12841,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char sqlite3_open (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char sqlite3_open (void); int main (void) { @@ -12473,8 +12860,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_sqlite3_sqlite3_open=yes -else $as_nop - ac_cv_lib_sqlite3_sqlite3_open=no +else case e in #( + e) ac_cv_lib_sqlite3_sqlite3_open=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -12484,8 +12872,8 @@ printf "%s\n" "$ac_cv_lib_sqlite3_sqlite3_open" >&6; } if test "x$ac_cv_lib_sqlite3_sqlite3_open" = xyes then : SQLITELIB="$SQLITELIB -lsqlite3 $DLLIB" -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3_open in -lsqlite3" >&5 printf %s "checking for sqlite3_open in -lsqlite3... " >&6; } @@ -12496,8 +12884,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char sqlite3_open (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char sqlite3_open (void); int main (void) { @@ -12509,8 +12903,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_sqlite3_sqlite3_open=yes -else $as_nop - ac_cv_lib_sqlite3_sqlite3_open=no +else case e in #( + e) ac_cv_lib_sqlite3_sqlite3_open=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -12520,8 +12915,8 @@ printf "%s\n" "$ac_cv_lib_sqlite3_sqlite3_open" >&6; } if test "x$ac_cv_lib_sqlite3_sqlite3_open" = xyes then : SQLITELIB="$SQLITELIB -lsqlite3 $MATHLIB" -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3_open in -lsqlite3" >&5 printf %s "checking for sqlite3_open in -lsqlite3... " >&6; } @@ -12532,8 +12927,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char sqlite3_open (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char sqlite3_open (void); int main (void) { @@ -12545,8 +12946,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_sqlite3_sqlite3_open=yes -else $as_nop - ac_cv_lib_sqlite3_sqlite3_open=no +else case e in #( + e) ac_cv_lib_sqlite3_sqlite3_open=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -12556,18 +12958,20 @@ printf "%s\n" "$ac_cv_lib_sqlite3_sqlite3_open" >&6; } if test "x$ac_cv_lib_sqlite3_sqlite3_open" = xyes then : SQLITELIB="$SQLITELIB -lsqlite3 $MATHLIB $DLLIB" -else $as_nop - +else case e in #( + e) LDFLAGS=${ac_save_ldflags} as_fn_error $? "*** Unable to locate SQLite library." "$LINENO" 5 - + ;; +esac fi - + ;; +esac fi @@ -12575,12 +12979,14 @@ fi - + ;; +esac fi - + ;; +esac fi @@ -12644,6 +13050,13 @@ esac if test -n "$USE_OPENGL" ; then +# We assume any OpenGL capable of running GRASS also is recent enough +# to have FBO support. +# Moved here from customizations of config.h.in + +printf "%s\n" "#define OPENGL_FBO 1" >>confdefs.h + + if test "$OPENGL_X11" = 1 ; then # With OpenGL includes directory @@ -12675,18 +13088,19 @@ ac_save_cppflags="$CPPFLAGS" CPPFLAGS="$OPENGLINC $X_CFLAGS $CPPFLAGS" for ac_header in GL/gl.h GL/glu.h do : - as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh` + as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | sed "$as_sed_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 : cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `printf "%s\n" "HAVE_$ac_header" | sed "$as_sed_cpp"` 1 _ACEOF -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate OpenGL includes." "$LINENO" 5 - + ;; +esac fi done @@ -12736,8 +13150,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char glBegin (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char glBegin (void); int main (void) { @@ -12749,8 +13169,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_GL_glBegin=yes -else $as_nop - ac_cv_lib_GL_glBegin=no +else case e in #( + e) ac_cv_lib_GL_glBegin=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -12760,8 +13181,8 @@ printf "%s\n" "$ac_cv_lib_GL_glBegin" >&6; } if test "x$ac_cv_lib_GL_glBegin" = xyes then : OPENGLLIB="$OPENGLLIB -lGL " -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glBegin in -lGL" >&5 printf %s "checking for glBegin in -lGL... " >&6; } @@ -12772,8 +13193,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char glBegin (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char glBegin (void); int main (void) { @@ -12785,8 +13212,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_GL_glBegin=yes -else $as_nop - ac_cv_lib_GL_glBegin=no +else case e in #( + e) ac_cv_lib_GL_glBegin=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -12796,8 +13224,8 @@ printf "%s\n" "$ac_cv_lib_GL_glBegin" >&6; } if test "x$ac_cv_lib_GL_glBegin" = xyes then : OPENGLLIB="$OPENGLLIB -lGL -lXext" -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glBegin in -lGL" >&5 printf %s "checking for glBegin in -lGL... " >&6; } @@ -12808,8 +13236,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char glBegin (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char glBegin (void); int main (void) { @@ -12821,8 +13255,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_GL_glBegin=yes -else $as_nop - ac_cv_lib_GL_glBegin=no +else case e in #( + e) ac_cv_lib_GL_glBegin=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -12832,8 +13267,8 @@ printf "%s\n" "$ac_cv_lib_GL_glBegin" >&6; } if test "x$ac_cv_lib_GL_glBegin" = xyes then : OPENGLLIB="$OPENGLLIB -lGL -lpthread" -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glBegin in -lGL" >&5 printf %s "checking for glBegin in -lGL... " >&6; } @@ -12844,8 +13279,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char glBegin (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char glBegin (void); int main (void) { @@ -12857,8 +13298,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_GL_glBegin=yes -else $as_nop - ac_cv_lib_GL_glBegin=no +else case e in #( + e) ac_cv_lib_GL_glBegin=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -12868,18 +13310,20 @@ printf "%s\n" "$ac_cv_lib_GL_glBegin" >&6; } if test "x$ac_cv_lib_GL_glBegin" = xyes then : OPENGLLIB="$OPENGLLIB -lGL -lpthread -lXext" -else $as_nop - +else case e in #( + e) LDFLAGS=${ac_save_ldflags} as_fn_error $? "*** Unable to locate OpenGL library." "$LINENO" 5 - + ;; +esac fi - + ;; +esac fi @@ -12887,12 +13331,14 @@ fi - + ;; +esac fi - + ;; +esac fi @@ -12923,8 +13369,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char gluBeginCurve (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char gluBeginCurve (void); int main (void) { @@ -12936,8 +13388,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_GLU_gluBeginCurve=yes -else $as_nop - ac_cv_lib_GLU_gluBeginCurve=no +else case e in #( + e) ac_cv_lib_GLU_gluBeginCurve=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -12947,8 +13400,8 @@ printf "%s\n" "$ac_cv_lib_GLU_gluBeginCurve" >&6; } if test "x$ac_cv_lib_GLU_gluBeginCurve" = xyes then : OPENGLULIB="$OPENGLULIB -lGLU " -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gluBeginCurve in -lGLU" >&5 printf %s "checking for gluBeginCurve in -lGLU... " >&6; } @@ -12959,8 +13412,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char gluBeginCurve (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char gluBeginCurve (void); int main (void) { @@ -12972,8 +13431,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_GLU_gluBeginCurve=yes -else $as_nop - ac_cv_lib_GLU_gluBeginCurve=no +else case e in #( + e) ac_cv_lib_GLU_gluBeginCurve=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -12983,18 +13443,20 @@ printf "%s\n" "$ac_cv_lib_GLU_gluBeginCurve" >&6; } if test "x$ac_cv_lib_GLU_gluBeginCurve" = xyes then : OPENGLULIB="$OPENGLULIB -lGLU -lstdc++" -else $as_nop - +else case e in #( + e) LDFLAGS=${ac_save_ldflags} as_fn_error $? "*** Unable to locate GLU library." "$LINENO" 5 - + ;; +esac fi - + ;; +esac fi @@ -13021,12 +13483,13 @@ then : printf "%s\n" "#define HAVE_PBUFFERS 1" >>confdefs.h -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate glXCreatePbuffer." "$LINENO" 5 - + ;; +esac fi LIBS=${ac_save_libs} @@ -13045,12 +13508,13 @@ then : printf "%s\n" "#define HAVE_PIXMAPS 1" >>confdefs.h -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate glXCreateGLXPixmap." "$LINENO" 5 - + ;; +esac fi LIBS=${ac_save_libs} @@ -13090,18 +13554,19 @@ ac_save_cppflags="$CPPFLAGS" CPPFLAGS="$OPENGLPATH $CPPFLAGS" for ac_header in OpenGL/gl.h OpenGL/glu.h do : - as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh` + as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | sed "$as_sed_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 : cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `printf "%s\n" "HAVE_$ac_header" | sed "$as_sed_cpp"` 1 _ACEOF -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate OpenGL includes." "$LINENO" 5 - + ;; +esac fi done @@ -13121,13 +13586,14 @@ then : OPENGLLIB="$OPENGLLIB -framework OpenGL -framework AGL -framework ApplicationServices" -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate OpenGL library." "$LINENO" 5 - + ;; +esac fi LIBS=${ac_save_libs} @@ -13146,13 +13612,14 @@ then : OPENGLLIB="$OPENGLLIB " -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate GLU library." "$LINENO" 5 - + ;; +esac fi LIBS=${ac_save_libs} @@ -13166,6 +13633,9 @@ OPENGLLIBPATH="$OPENGLPATH" printf "%s\n" "#define OPENGL_AQUA 1" >>confdefs.h +printf "%s\n" "#define OPENGL_AGL 1" >>confdefs.h + + fi # $OPENGL_AQUA if test "$OPENGL_WINDOWS" = 1 ; then @@ -13199,18 +13669,19 @@ ac_save_cppflags="$CPPFLAGS" CPPFLAGS="$OPENGLINC $CPPFLAGS" for ac_header in GL/gl.h GL/glu.h do : - as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh` + as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | sed "$as_sed_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 : cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `printf "%s\n" "HAVE_$ac_header" | sed "$as_sed_cpp"` 1 _ACEOF -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate OpenGL includes." "$LINENO" 5 - + ;; +esac fi done @@ -13268,12 +13739,13 @@ then : printf "%s\n" "found" >&6; } OPENGLLIB="$OPENGLLIB -lopengl32 " -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate OpenGL library." "$LINENO" 5 - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -13305,12 +13777,13 @@ then : printf "%s\n" "found" >&6; } OPENGLULIB="$OPENGLULIB -lglu32 " -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate GLU library." "$LINENO" 5 - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -13406,8 +13879,9 @@ then : printf "%s\n" "#define HAVE_SQL_H 1" >>confdefs.h -else $as_nop - as_fn_error $? "*** Unable to locate ." "$LINENO" 5 +else case e in #( + e) as_fn_error $? "*** Unable to locate ." "$LINENO" 5 ;; +esac fi CPPFLAGS=$ac_save_cppflags @@ -13451,8 +13925,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char SQLConnect (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char SQLConnect (void); int main (void) { @@ -13464,8 +13944,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_odbc_SQLConnect=yes -else $as_nop - ac_cv_lib_odbc_SQLConnect=no +else case e in #( + e) ac_cv_lib_odbc_SQLConnect=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -13475,8 +13956,8 @@ printf "%s\n" "$ac_cv_lib_odbc_SQLConnect" >&6; } if test "x$ac_cv_lib_odbc_SQLConnect" = xyes then : ODBCLIB="$ODBCLIB -lodbc " -else $as_nop - +else case e in #( + e) LDFLAGS=${ac_save_ldflags} ac_save_ldflags="$LDFLAGS" @@ -13493,8 +13974,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char SQLConnect (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char SQLConnect (void); int main (void) { @@ -13506,8 +13993,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_iodbc_SQLConnect=yes -else $as_nop - ac_cv_lib_iodbc_SQLConnect=no +else case e in #( + e) ac_cv_lib_iodbc_SQLConnect=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -13517,8 +14005,8 @@ printf "%s\n" "$ac_cv_lib_iodbc_SQLConnect" >&6; } if test "x$ac_cv_lib_iodbc_SQLConnect" = xyes then : ODBCLIB="$ODBCLIB -liodbc " -else $as_nop - +else case e in #( + e) LDFLAGS=${ac_save_ldflags} ac_save_cflags="$CFLAGS" CFLAGS="$CFLAGS $ODBCINC" @@ -13548,12 +14036,13 @@ then : printf "%s\n" "found" >&6; } ODBCLIB="$ODBCLIB -lodbc32 " -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate ODBC library." "$LINENO" 5 - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -13562,7 +14051,8 @@ LDFLAGS=${ac_save_ldflags} CFLAGS="${ac_save_cflags}" - + ;; +esac fi @@ -13570,7 +14060,8 @@ fi LDFLAGS=${ac_save_ldflags} - + ;; +esac fi @@ -13639,8 +14130,8 @@ if test "x$ac_cv_header_fftw3_h" = xyes then : printf "%s\n" "#define HAVE_FFTW3_H 1" >>confdefs.h -else $as_nop - +else case e in #( + e) ac_save_cppflags="$CPPFLAGS" CPPFLAGS=" $CPPFLAGS" for ac_header in fftw.h @@ -13650,8 +14141,8 @@ if test "x$ac_cv_header_fftw_h" = xyes then : printf "%s\n" "#define HAVE_FFTW_H 1" >>confdefs.h -else $as_nop - +else case e in #( + e) ac_save_cppflags="$CPPFLAGS" CPPFLAGS=" $CPPFLAGS" for ac_header in dfftw.h @@ -13661,22 +14152,25 @@ if test "x$ac_cv_header_dfftw_h" = xyes then : printf "%s\n" "#define HAVE_DFFTW_H 1" >>confdefs.h -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate FFTW includes." "$LINENO" 5 - + ;; +esac fi done CPPFLAGS=$ac_save_cppflags - + ;; +esac fi done CPPFLAGS=$ac_save_cppflags - + ;; +esac fi done @@ -13722,8 +14216,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char fftw_execute (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char fftw_execute (void); int main (void) { @@ -13735,8 +14235,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_fftw3_fftw_execute=yes -else $as_nop - ac_cv_lib_fftw3_fftw_execute=no +else case e in #( + e) ac_cv_lib_fftw3_fftw_execute=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -13746,8 +14247,8 @@ printf "%s\n" "$ac_cv_lib_fftw3_fftw_execute" >&6; } if test "x$ac_cv_lib_fftw3_fftw_execute" = xyes then : FFTWLIB="$FFTWLIB -lfftw3 $MATHLIB" -else $as_nop - +else case e in #( + e) LDFLAGS=${ac_save_ldflags} ac_save_ldflags="$LDFLAGS" @@ -13764,8 +14265,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char fftwnd_one (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char fftwnd_one (void); int main (void) { @@ -13777,8 +14284,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_fftw_fftwnd_one=yes -else $as_nop - ac_cv_lib_fftw_fftwnd_one=no +else case e in #( + e) ac_cv_lib_fftw_fftwnd_one=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -13788,8 +14296,8 @@ printf "%s\n" "$ac_cv_lib_fftw_fftwnd_one" >&6; } if test "x$ac_cv_lib_fftw_fftwnd_one" = xyes then : FFTWLIB="$FFTWLIB -lfftw $MATHLIB" -else $as_nop - +else case e in #( + e) LDFLAGS=${ac_save_ldflags} ac_save_ldflags="$LDFLAGS" @@ -13806,8 +14314,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char fftwnd_one (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char fftwnd_one (void); int main (void) { @@ -13819,8 +14333,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_dfftw_fftwnd_one=yes -else $as_nop - ac_cv_lib_dfftw_fftwnd_one=no +else case e in #( + e) ac_cv_lib_dfftw_fftwnd_one=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -13830,13 +14345,14 @@ printf "%s\n" "$ac_cv_lib_dfftw_fftwnd_one" >&6; } if test "x$ac_cv_lib_dfftw_fftwnd_one" = xyes then : FFTWLIB="$FFTWLIB -ldfftw $MATHLIB" -else $as_nop - +else case e in #( + e) LDFLAGS=${ac_save_ldflags} as_fn_error $? "*** Unable to locate FFTW library." "$LINENO" 5 - + ;; +esac fi @@ -13844,7 +14360,8 @@ fi LDFLAGS=${ac_save_ldflags} - + ;; +esac fi @@ -13852,7 +14369,8 @@ fi LDFLAGS=${ac_save_ldflags} - + ;; +esac fi @@ -13924,19 +14442,21 @@ if test "x$ac_cv_header_cblas_h" = xyes then : printf "%s\n" "#define HAVE_CBLAS_H 1" >>confdefs.h -else $as_nop - for ac_header in cblas-atlas.h +else case e in #( + e) for ac_header in cblas-atlas.h do : ac_fn_c_check_header_compile "$LINENO" "cblas-atlas.h" "ac_cv_header_cblas_atlas_h" "$ac_includes_default" if test "x$ac_cv_header_cblas_atlas_h" = xyes then : printf "%s\n" "#define HAVE_CBLAS_ATLAS_H 1" >>confdefs.h -else $as_nop - as_fn_error $? "*** Failed to find either \"cblas.h\" or \"cblas-atlas.h\" with \"$CFLAGS\"" "$LINENO" 5 +else case e in #( + e) as_fn_error $? "*** Failed to find either \"cblas.h\" or \"cblas-atlas.h\" with \"$CFLAGS\"" "$LINENO" 5 ;; +esac fi -done +done ;; +esac fi done @@ -13957,9 +14477,10 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : blas_ok=yes -else $as_nop - - as_fn_error $? "*** Unable to link to (C)BLAS library with \"$LIBS\"." "$LINENO" 5 +else case e in #( + e) + as_fn_error $? "*** Unable to link to (C)BLAS library with \"$LIBS\"." "$LINENO" 5 ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -14044,8 +14565,9 @@ if test "x$ac_cv_header_lapacke_h" = xyes then : printf "%s\n" "#define HAVE_LAPACKE_H 1" >>confdefs.h -else $as_nop - as_fn_error $? "*** Unable to find \"lapacke.h\" with \"$CFLAGS\"." "$LINENO" 5 +else case e in #( + e) as_fn_error $? "*** Unable to find \"lapacke.h\" with \"$CFLAGS\"." "$LINENO" 5 ;; +esac fi done @@ -14066,9 +14588,10 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : lapack_ok=yes -else $as_nop - - as_fn_error $? "*** Unable to link to LAPACK(E) library with \"$LIBS\"." "$LINENO" 5 +else case e in #( + e) + as_fn_error $? "*** Unable to link to LAPACK(E) library with \"$LIBS\"." "$LINENO" 5 ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -14139,8 +14662,8 @@ if test "x$ac_cv_header_svm_h" = xyes then : printf "%s\n" "#define HAVE_SVM_H 1" >>confdefs.h -else $as_nop - +else case e in #( + e) ac_save_cppflags="$CPPFLAGS" CPPFLAGS="$LIBSVM_INC $CPPFLAGS" for ac_header in libsvm/svm.h @@ -14150,16 +14673,18 @@ if test "x$ac_cv_header_libsvm_svm_h" = xyes then : printf "%s\n" "#define HAVE_LIBSVM_SVM_H 1" >>confdefs.h -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate LIBSVM includes." "$LINENO" 5 - + ;; +esac fi done CPPFLAGS=$ac_save_cppflags - + ;; +esac fi done @@ -14201,8 +14726,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char svm_load_model (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char svm_load_model (void); int main (void) { @@ -14214,8 +14745,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_svm_svm_load_model=yes -else $as_nop - ac_cv_lib_svm_svm_load_model=no +else case e in #( + e) ac_cv_lib_svm_svm_load_model=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -14225,13 +14757,14 @@ printf "%s\n" "$ac_cv_lib_svm_svm_load_model" >&6; } if test "x$ac_cv_lib_svm_svm_load_model" = xyes then : LIBSVM_LIB="$LIBSVM_LIB -lsvm " -else $as_nop - +else case e in #( + e) LDFLAGS=${ac_save_ldflags} as_fn_error $? "*** Unable to locate LIBSVM library." "$LINENO" 5 - + ;; +esac fi @@ -14315,10 +14848,11 @@ if test "x$ac_cv_header_cairo_h" = xyes then : printf "%s\n" "#define HAVE_CAIRO_H 1" >>confdefs.h -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate Cairo includes." "$LINENO" 5 - + ;; +esac fi done @@ -14374,12 +14908,13 @@ then : : -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate cairo_create." "$LINENO" 5 - + ;; +esac fi LIBS=${ac_save_libs} @@ -14396,10 +14931,11 @@ then : CAIRO_HAS_XRENDER=1 -else $as_nop - +else case e in #( + e) CAIRO_HAS_XRENDER= - + ;; +esac fi LIBS=${ac_save_libs} @@ -14417,10 +14953,11 @@ then : CAIRO_HAS_XRENDER_SURFACE=1 -else $as_nop - +else case e in #( + e) CAIRO_HAS_XRENDER_SURFACE= - + ;; +esac fi LIBS=${ac_save_libs} @@ -14494,10 +15031,11 @@ if test "x$ac_cv_header_ft2build_h" = xyes then : printf "%s\n" "#define HAVE_FT2BUILD_H 1" >>confdefs.h -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate FreeType includes." "$LINENO" 5 - + ;; +esac fi done @@ -14545,8 +15083,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char FT_Init_FreeType (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char FT_Init_FreeType (void); int main (void) { @@ -14558,8 +15102,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_freetype_FT_Init_FreeType=yes -else $as_nop - ac_cv_lib_freetype_FT_Init_FreeType=no +else case e in #( + e) ac_cv_lib_freetype_FT_Init_FreeType=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -14569,13 +15114,14 @@ printf "%s\n" "$ac_cv_lib_freetype_FT_Init_FreeType" >&6; } if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = xyes then : FTLIB="$FTLIB -lfreetype " -else $as_nop - +else case e in #( + e) LDFLAGS=${ac_save_ldflags} as_fn_error $? "*** Unable to locate FreeType library." "$LINENO" 5 - + ;; +esac fi @@ -14617,8 +15163,8 @@ ac_fn_c_check_func "$LINENO" "gettext" "ac_cv_func_gettext" if test "x$ac_cv_func_gettext" = xyes then : INTLLIB= -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gettext in -lintl" >&5 printf %s "checking for gettext in -lintl... " >&6; } @@ -14629,8 +15175,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char gettext (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char gettext (void); int main (void) { @@ -14642,8 +15194,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_intl_gettext=yes -else $as_nop - ac_cv_lib_intl_gettext=no +else case e in #( + e) ac_cv_lib_intl_gettext=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -14653,12 +15206,14 @@ printf "%s\n" "$ac_cv_lib_intl_gettext" >&6; } if test "x$ac_cv_lib_intl_gettext" = xyes then : INTLLIB=-lintl -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate gettext() function." "$LINENO" 5 - + ;; +esac fi - + ;; +esac fi @@ -14723,10 +15278,11 @@ if test "x$ac_cv_header_pthread_h" = xyes then : printf "%s\n" "#define HAVE_PTHREAD_H 1" >>confdefs.h -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate POSIX threads includes." "$LINENO" 5 - + ;; +esac fi done @@ -14770,8 +15326,8 @@ then : PTHREADLIB="$PTHREADLIB " -else $as_nop - +else case e in #( + e) ac_save_ldflags="$LDFLAGS" LDFLAGS="$PTHREADLIBPATH $LDFLAGS" @@ -14787,8 +15343,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char pthread_create (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pthread_create (void); int main (void) { @@ -14800,8 +15362,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pthread_pthread_create=yes -else $as_nop - ac_cv_lib_pthread_pthread_create=no +else case e in #( + e) ac_cv_lib_pthread_pthread_create=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -14811,13 +15374,14 @@ printf "%s\n" "$ac_cv_lib_pthread_pthread_create" >&6; } if test "x$ac_cv_lib_pthread_pthread_create" = xyes then : PTHREADLIB="$PTHREADLIB -lpthread " -else $as_nop - +else case e in #( + e) LDFLAGS=${ac_save_ldflags} as_fn_error $? "*** Unable to locate POSIX threads library." "$LINENO" 5 - + ;; +esac fi @@ -14825,7 +15389,8 @@ fi LDFLAGS=${ac_save_ldflags} - + ;; +esac fi LIBS=${ac_save_libs} @@ -14917,10 +15482,11 @@ if test "x$ac_cv_header_omp_h" = xyes then : printf "%s\n" "#define HAVE_OMP_H 1" >>confdefs.h -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate OpenMP includes." "$LINENO" 5 - + ;; +esac fi done @@ -14942,8 +15508,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char omp_get_num_threads (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char omp_get_num_threads (void); int main (void) { @@ -14955,8 +15527,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_omp_omp_get_num_threads=yes -else $as_nop - ac_cv_lib_omp_omp_get_num_threads=no +else case e in #( + e) ac_cv_lib_omp_omp_get_num_threads=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -14966,8 +15539,8 @@ printf "%s\n" "$ac_cv_lib_omp_omp_get_num_threads" >&6; } if test "x$ac_cv_lib_omp_omp_get_num_threads" = xyes then : OPENMP_LIB="$OPENMP_LIB -lomp " -else $as_nop - +else case e in #( + e) LDFLAGS=${ac_save_ldflags} ac_save_ldflags="$LDFLAGS" @@ -14984,8 +15557,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char GOMP_parallel_start (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char GOMP_parallel_start (void); int main (void) { @@ -14997,8 +15576,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_gomp_GOMP_parallel_start=yes -else $as_nop - ac_cv_lib_gomp_GOMP_parallel_start=no +else case e in #( + e) ac_cv_lib_gomp_GOMP_parallel_start=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -15008,20 +15588,22 @@ printf "%s\n" "$ac_cv_lib_gomp_GOMP_parallel_start" >&6; } if test "x$ac_cv_lib_gomp_GOMP_parallel_start" = xyes then : OPENMP_LIB="$OPENMP_LIB -lgomp " -else $as_nop - +else case e in #( + e) LDFLAGS=${ac_save_ldflags} as_fn_error $? "*** Unable to locate OpenMP library." "$LINENO" 5 - + ;; +esac fi LDFLAGS=${ac_save_ldflags} - + ;; +esac fi @@ -15076,8 +15658,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_prog_c_openmp=$ac_option -else $as_nop - ac_cv_prog_c_openmp='unsupported' +else case e in #( + e) ac_cv_prog_c_openmp='unsupported' ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -15184,10 +15767,11 @@ if test "x$ac_cv_header_OpenCL_opencl_h" = xyes then : printf "%s\n" "#define HAVE_OPENCL_OPENCL_H 1" >>confdefs.h -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate OpenCL includes." "$LINENO" 5 - + ;; +esac fi done @@ -15211,13 +15795,14 @@ then : OCLLIB="$OCLLIB -framework OpenCL" -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate OpenCL library." "$LINENO" 5 - + ;; +esac fi LIBS=${ac_save_libs} @@ -15234,10 +15819,11 @@ if test "x$ac_cv_header_CL_cl_h" = xyes then : printf "%s\n" "#define HAVE_CL_CL_H 1" >>confdefs.h -else $as_nop - +else case e in #( + e) as_fn_error $? "*** Unable to locate OpenCL includes." "$LINENO" 5 - + ;; +esac fi done @@ -15281,8 +15867,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char clGetPlatformInfo (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char clGetPlatformInfo (void); int main (void) { @@ -15294,8 +15886,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_OpenCL_clGetPlatformInfo=yes -else $as_nop - ac_cv_lib_OpenCL_clGetPlatformInfo=no +else case e in #( + e) ac_cv_lib_OpenCL_clGetPlatformInfo=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -15305,13 +15898,14 @@ printf "%s\n" "$ac_cv_lib_OpenCL_clGetPlatformInfo" >&6; } if test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" = xyes then : OCLLIB="$OCLLIB -lOpenCL " -else $as_nop - +else case e in #( + e) LDFLAGS=${ac_save_ldflags} as_fn_error $? "*** Unable to locate OpenCL library." "$LINENO" 5 - + ;; +esac fi @@ -15333,7 +15927,9 @@ fi # $USE_OPENCL # Done checking OpenCL -# Enable LFS (from cdr-tools, tar, and autoconf 2.68) +# Check for large file support. AC_SYS_LARGEFILE is the modern, portable +# way to handle this. It sets the appropriate CFLAGS and defines necessary +# preprocessor macros (e.g., _FILE_OFFSET_BITS=64) for the compiler. # Check whether --enable-largefile was given. if test ${enable_largefile+y} then : @@ -15379,8 +15975,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : -else $as_nop - ac_save_CC="${CC-cc}" +else case e in #( + e) ac_save_CC="${CC-cc}" CC="$CC -n32" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -15407,7 +16003,8 @@ then : ac_cv_sys_largefile_CC=' -n32' fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - CC="$ac_save_CC" + CC="$ac_save_CC" ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi @@ -15452,8 +16049,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _FILE_OFFSET_BITS 64 #include @@ -15479,7 +16076,8 @@ if ac_fn_c_try_compile "$LINENO" then : ac_cv_sys_file_offset_bits=64 fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 @@ -15523,8 +16121,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _LARGE_FILES 1 #include @@ -15550,7 +16148,8 @@ if ac_fn_c_try_compile "$LINENO" then : ac_cv_sys_large_files=1 fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 @@ -15585,8 +16184,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _LARGEFILE_SOURCE 1 #include @@ -15603,7 +16202,8 @@ if ac_fn_c_try_compile "$LINENO" then : ac_cv_sys_largefile_source=1 fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5 @@ -15624,160 +16224,19 @@ printf "%s\n" "#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source" >>confdefs CFLAGS=$ac_save_cflags fi -ac_save_cflags=${CFLAGS} -CFLAGS="$LFS_CFLAGS ${ac_save_cflags}" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 -printf %s "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; } - -ac_cv_sys_largefile_source=no - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main (void) -{ -return !fseeko; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#define _LARGEFILE_SOURCE 1 -#include - -int -main (void) -{ -return !fseeko; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_sys_largefile_source=1 -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5 -printf "%s\n" "$ac_cv_sys_largefile_source" >&6; } - if test "$ac_cv_sys_largefile_source" != no; then - -printf "%s\n" "#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source" >>confdefs.h - - - if test "$LFS_CFLAGS" ; then - LFS_CFLAGS="$LFS_CFLAGS -D_LARGEFILE_SOURCE=$ac_cv_sys_largefile_source" - else - LFS_CFLAGS="-D_LARGEFILE_SOURCE=$ac_cv_sys_largefile_source" - fi - - fi - # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug - # in glibc 2.1.3, but that breaks too many other things. - # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fseeko" >&5 -printf %s "checking for fseeko... " >&6; } - -ac_cv_func_fseeko=no - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main (void) -{ -return fseeko && fseeko (stdin, 0, 0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_cv_func_fseeko=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fseeko" >&5 -printf "%s\n" "$ac_cv_func_fseeko" >&6; } - if test $ac_cv_func_fseeko != no; then - -printf "%s\n" "#define HAVE_FSEEKO 1" >>confdefs.h - - fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if system supports Large Files at all" >&5 -printf %s "checking if system supports Large Files at all... " >&6; } - -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -int -main (void) -{ - -/* - * Check that off_t can represent 2**63 - 1 correctly. - * We can't simply "#define LARGE_OFF_T 9223372036854775807", - * since some C++ compilers masquerading as C compilers - * incorrectly reject 9223372036854775807. - * - * For MinGW, off64_t should be used and __MSVCRT_VERSION__ >= 0x0601 - * (msvcrt.dll version 6.10 or higher) is needed for _fstat64 and _stat64. - */ -#ifdef __MINGW32__ -# define LARGE_OFF_T (((off64_t) 1 << 62) - 1 + ((off64_t) 1 << 62)) -#else -# define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -#endif - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -#ifdef __MINGW32__ -return !fseeko64; -return !ftello64; -#else -return !fseeko; -return !ftello; -#endif - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_largefiles=yes -else $as_nop - ac_cv_largefiles=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_largefiles" >&5 -printf "%s\n" "$ac_cv_largefiles" >&6; } - if test $ac_cv_largefiles = yes; then -printf "%s\n" "#define HAVE_LARGEFILES 1" >>confdefs.h +USE_TERMIO= - USE_LARGEFILES=1 - else - USE_LARGEFILES= - LFS_CFLAGS= - fi +STRIPFLAG= -CFLAGS=${ac_save_cflags} -# Done large file support +# Some old system hack migrated from config.h.in. Probably obsolete in 2025? -USE_TERMIO= +# Migrated from config.h.in. Unused, purpose – unknown. -STRIPFLAG= +printf "%s\n" "#define GDEBUG 1" >>confdefs.h GRASS_HOME="${DSTDIR}" @@ -15839,7 +16298,6 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh @@ -15848,12 +16306,13 @@ then : # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else $as_nop - case `(set -o) 2>/dev/null` in #( +else case e in #( + e) case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; +esac ;; esac fi @@ -15925,7 +16384,7 @@ IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as `sh COMMAND' +# We did not find ourselves, most probably we were run as 'sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 @@ -15954,7 +16413,6 @@ as_fn_error () } # as_fn_error - # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -15994,11 +16452,12 @@ then : { eval $1+=\$2 }' -else $as_nop - as_fn_append () +else case e in #( + e) as_fn_append () { eval $1=\$$1\$2 - } + } ;; +esac fi # as_fn_append # as_fn_arith ARG... @@ -16012,11 +16471,12 @@ then : { as_val=$(( $* )) }' -else $as_nop - as_fn_arith () +else case e in #( + e) as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } + } ;; +esac fi # as_fn_arith @@ -16099,9 +16559,9 @@ if (echo >conf$$.file) 2>/dev/null; then if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. + # In both cases, we have to default to 'cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -16182,10 +16642,12 @@ as_test_x='test -x' as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated # Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed '$as_sed_sh'" # deprecated exec 6>&1 @@ -16201,7 +16663,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.71. Invocation command line was +generated by GNU Autoconf 2.72. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -16232,7 +16694,7 @@ _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files and other configuration actions +'$as_me' instantiates files and other configuration actions from templates according to the current configuration. Unless the files and actions are specified as TAGs, all are instantiated by default. @@ -16265,10 +16727,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.71, +configured by $0, generated by GNU Autoconf 2.72, with options \\"\$ac_cs_config\\" -Copyright (C) 2021 Free Software Foundation, Inc. +Copyright (C) 2023 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -16328,8 +16790,8 @@ do ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - as_fn_error $? "ambiguous option: \`$1' -Try \`$0 --help' for more information.";; + as_fn_error $? "ambiguous option: '$1' +Try '$0 --help' for more information.";; --help | --hel | -h ) printf "%s\n" "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ @@ -16337,8 +16799,8 @@ Try \`$0 --help' for more information.";; ac_cs_silent=: ;; # This is an error. - -*) as_fn_error $? "unrecognized option: \`$1' -Try \`$0 --help' for more information." ;; + -*) as_fn_error $? "unrecognized option: '$1' +Try '$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; @@ -16393,7 +16855,7 @@ do "include/grass/version.h") CONFIG_FILES="$CONFIG_FILES include/grass/version.h" ;; "grass.pc") CONFIG_FILES="$CONFIG_FILES grass.pc" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;; esac done @@ -16412,7 +16874,7 @@ fi # creating and moving files from /tmp can sometimes cause problems. # Hook for its removal unless debugging. # Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to `$tmp'. +# after its creation but before its name has been assigned to '$tmp'. $debug || { tmp= ac_tmp= @@ -16436,7 +16898,7 @@ ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. -# This happens for instance with `./config.status config.h'. +# This happens for instance with './config.status config.h'. if test -n "$CONFIG_FILES"; then @@ -16594,13 +17056,13 @@ fi # test -n "$CONFIG_FILES" # Set up the scripts for CONFIG_HEADERS section. # No need to generate them if there are no CONFIG_HEADERS. -# This happens for instance with `./config.status Makefile'. +# This happens for instance with './config.status Makefile'. if test -n "$CONFIG_HEADERS"; then cat >"$ac_tmp/defines.awk" <<\_ACAWK || BEGIN { _ACEOF -# Transform confdefs.h into an awk script `defines.awk', embedded as +# Transform confdefs.h into an awk script 'defines.awk', embedded as # here-document in config.status, that substitutes the proper values into # config.h.in to produce config.h. @@ -16710,7 +17172,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 @@ -16732,19 +17194,19 @@ do -) ac_f="$ac_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 `:'. + # because $ac_f cannot contain ':'. test -f "$ac_f" || case $ac_f in [\\/$]*) 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 1 "cannot find input file: '$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done - # Let's still pretend it is `configure' which instantiates (i.e., don't + # Let's still pretend it is 'configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` @@ -16872,7 +17334,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 esac _ACEOF -# Neutralize VPATH when `$srcdir' = `.'. +# Neutralize VPATH when '$srcdir' = '.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -16902,9 +17364,9 @@ 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"; } && - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { printf "%s\n" "$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 -printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" diff --git a/configure.ac b/configure.ac index aac84e9436b..9724c99899f 100644 --- a/configure.ac +++ b/configure.ac @@ -1430,6 +1430,11 @@ esac if test -n "$USE_OPENGL" ; then +# We assume any OpenGL capable of running GRASS also is recent enough +# to have FBO support. +# Moved here from customizations of config.h.in +AC_DEFINE(OPENGL_FBO, 1, [Use framebuffer objects for off-screen OpenGL rendering]) + if test "$OPENGL_X11" = 1 ; then # With OpenGL includes directory @@ -1469,6 +1474,7 @@ OPENGLINC="$OPENGLPATH" OPENGLLIBPATH="$OPENGLPATH" AC_DEFINE(OPENGL_AQUA, 1, [Define to 1 if OpenGL uses Aqua (MacOS X).]) +AC_DEFINE(OPENGL_AGL, 1, [Define to 1 if OpenGL uses AGL (MacOS X).]) fi # $OPENGL_AQUA @@ -1989,21 +1995,10 @@ AC_SUBST(USE_OPENCL) # Done checking OpenCL -# Enable LFS (from cdr-tools, tar, and autoconf 2.68) -dnl Check for large file support -dnl Do this last to make sure that no large file definition -dnl in confdefs.h will modify our results +# Check for large file support. AC_SYS_LARGEFILE is the modern, portable +# way to handle this. It sets the appropriate CFLAGS and defines necessary +# preprocessor macros (e.g., _FILE_OFFSET_BITS=64) for the compiler. AC_SYS_LARGEFILE -ac_save_cflags=${CFLAGS} -CFLAGS="$LFS_CFLAGS ${ac_save_cflags}" -dnl Warning do not run this test. it interferes with the test -dnl AC_CHECK_FUNCS(fseeko ftello) from above. -dnl The test AC_HAVE_LARGEFILES will check whether ftello/fseeko -dnl are available in Large File mode -AC_FUNC_FSEEKO -AC_HAVE_LARGEFILES -CFLAGS=${ac_save_cflags} -# Done large file support USE_TERMIO= AC_SUBST(USE_TERMIO) @@ -2011,6 +2006,16 @@ AC_SUBST(USE_TERMIO) STRIPFLAG= AC_SUBST(STRIPFLAG) +# Some old system hack migrated from config.h.in. Probably obsolete in 2025? +AH_VERBATIM([INT_MIN_FALLBACK], +[#if defined(HAVE_VALUES_H) && !defined(HAVE_LIMITS_H) +#define INT_MIN -MAXINT +#endif +]) + +# Migrated from config.h.in. Unused, purpose – unknown. +AC_DEFINE(GDEBUG, 1, [Define GDEBUG to 1 for historic reasons]) + GRASS_HOME="${DSTDIR}" AC_SUBST(GRASS_HOME) diff --git a/include/grass/config.h.in b/include/grass/config.h.in index ec01b623faa..878d9c70fd6 100644 --- a/include/grass/config.h.in +++ b/include/grass/config.h.in @@ -1,17 +1,9 @@ +/* include/grass/config.h.in. Generated from configure.ac by autoheader. */ -/* - * config.h.in - */ +/* Define GDEBUG to 1 for historic reasons */ +#undef GDEBUG -#ifndef _config_h -#define _config_h - -#define GDEBUG 1 - -/* Define to 1 if you have the header file. */ -#undef HAVE_AD2_H - -/* Define to 1 if you have the `asprintf' function. */ +/* Define to 1 if you have the 'asprintf' function. */ #undef HAVE_ASPRINTF /* Define to 1 if you have the header file. */ @@ -32,7 +24,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_DFFTW_H -/* Define to 1 if you have the `drand48' function. */ +/* Define to 1 if you have the 'drand48' function. */ #undef HAVE_DRAND48 /* Define to 1 if you have the header file. */ @@ -41,13 +33,10 @@ /* Define to 1 if you have the header file. */ #undef HAVE_FFTW_H -/* Define if fseeko (and presumably ftello) exists and is declared. */ -#undef HAVE_FSEEKO - /* Define to 1 if you have the header file. */ #undef HAVE_FT2BUILD_H -/* Define to 1 if you have the `ftime' function. */ +/* Define to 1 if you have the 'ftime' function. */ #undef HAVE_FTIME /* Define to 1 if GDAL is to be used. */ @@ -59,10 +48,10 @@ /* Define to 1 if you have the header file. */ #undef HAVE_GEOS_C_H -/* Define to 1 if you have the `gethostname' function. */ +/* Define to 1 if you have the 'gethostname' function. */ #undef HAVE_GETHOSTNAME -/* Define to 1 if you have the `gettimeofday' function. */ +/* Define to 1 if you have the 'gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY /* Define to 1 if you have the header file. */ @@ -116,19 +105,19 @@ /* Define to 1 if "long long int" is available. */ #undef HAVE_LONG_LONG_INT -/* Define to 1 if you have the `lseek' function. */ +/* Define to 1 if you have the 'lseek' function. */ #undef HAVE_LSEEK /* Define to 1 if you have the header file. */ #undef HAVE_MYSQL_H -/* Define to 1 if you have the `nanosleep' function. */ +/* Define to 1 if you have the 'nanosleep' function. */ #undef HAVE_NANOSLEEP /* Define to 1 if NetCDF exists. */ #undef HAVE_NETCDF -/* Define to 1 if you have the `nice' function. */ +/* Define to 1 if you have the 'nice' function. */ #undef HAVE_NICE /* Define to 1 if OGR is to be used. */ @@ -176,7 +165,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_PTHREAD_H -/* Define to 1 if you have the `putenv' function. */ +/* Define to 1 if you have the 'putenv' function. */ #undef HAVE_PUTENV /* Define to 1 if you have the header file. */ @@ -188,22 +177,19 @@ /* Define to 1 if you have the header file. */ #undef HAVE_REGEX_H -/* Define to 1 if you have the header file. */ -#undef HAVE_PCRE_H - -/* Define to 1 if you have the `setenv' function. */ +/* Define to 1 if you have the 'setenv' function. */ #undef HAVE_SETENV -/* Define to 1 if you have the `seteuid' function. */ +/* Define to 1 if you have the 'seteuid' function. */ #undef HAVE_SETEUID -/* Define to 1 if you have the `setpriority' function. */ +/* Define to 1 if you have the 'setpriority' function. */ #undef HAVE_SETPRIORITY -/* Define to 1 if you have the `setreuid' function. */ +/* Define to 1 if you have the 'setreuid' function. */ #undef HAVE_SETREUID -/* Define to 1 if you have the `setruid' function. */ +/* Define to 1 if you have the 'setruid' function. */ #undef HAVE_SETRUID /* define if socket() exists */ @@ -233,10 +219,10 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STRING_H -/* Define to 1 if you have the `strlcat' function. */ +/* Define to 1 if you have the 'strlcat' function. */ #undef HAVE_STRLCAT -/* Define to 1 if you have the `strlcpy' function. */ +/* Define to 1 if you have the 'strlcpy' function. */ #undef HAVE_STRLCPY /* Define to 1 if you have the header file. */ @@ -275,10 +261,10 @@ /* Define to 1 if you have the header file. */ #undef HAVE_TIFFIO_H -/* Define to 1 if you have the `time' function. */ +/* Define to 1 if you have the 'time' function. */ #undef HAVE_TIME -/* Define to 1 if you have the `uname' function. */ +/* Define to 1 if you have the 'uname' function. */ #undef HAVE_UNAME /* Define to 1 if you have the header file. */ @@ -296,9 +282,20 @@ /* Define to 1 if you have the header file. */ #undef HAVE_ZSTD_H +#if defined(HAVE_VALUES_H) && !defined(HAVE_LIMITS_H) +#define INT_MIN -MAXINT +#endif + + +/* Define to 1 if OpenGL uses AGL (MacOS X). */ +#undef OPENGL_AGL + /* Define to 1 if OpenGL uses Aqua (MacOS X). */ #undef OPENGL_AQUA +/* Use framebuffer objects for off-screen OpenGL rendering */ +#undef OPENGL_FBO + /* Define to 1 if OpenGL uses Windows. */ #undef OPENGL_WINDOWS @@ -323,13 +320,13 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Define to 1 if the `setpgrp' function requires zero arguments. */ +/* Define to 1 if the 'setpgrp' function requires zero arguments. */ #undef SETPGRP_VOID /* Define to 1 for Windows static build. */ #undef STATIC_BUILD -/* Define to 1 if all of the C90 standard headers exist (not just the ones +/* Define to 1 if all of the C89 standard headers exist (not just the ones required in a freestanding environment). This macro is provided for backward compatibility; new code need not use it. */ #undef STDC_HEADERS @@ -343,8 +340,8 @@ /* Define to 1 if the X Window System is missing or not being used. */ #undef X_DISPLAY_MISSING -/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a - `char[]'. */ +/* Define to 1 if 'lex' declares 'yytext' as a 'char *' by default, not a + 'char[]'. */ #undef YYTEXT_POINTER /* Number of bits in a file offset, on hosts where this is settable. */ @@ -362,80 +359,11 @@ /* Define to 1 for _REENTRANT flag (for SunOS). */ #undef _REENTRANT -/* Define to `int' if doesn't define. */ +/* Define as 'int' if doesn't define. */ #undef gid_t -/* Define to `long int' if does not define. */ +/* Define to 'long int' if does not define. */ #undef off_t -/* Define to `int' if doesn't define. */ +/* Define as 'int' if doesn't define. */ #undef uid_t - -/* - * configuration information solely dependent on the above - * nothing below this point should need changing - */ - -#if defined(HAVE_VALUES_H) && !defined(HAVE_LIMITS_H) -#define INT_MIN -MAXINT -#endif - - - -/* - * Defines needed to get large file support - from cdrtools-2.01 - */ - -/* MINGW32 LFS */ - -/* define if we have LFS */ -#undef HAVE_LARGEFILES - -#ifdef HAVE_LARGEFILES /* If we have working largefiles at all */ - /* This is not defined with glibc-2.1.3 */ - -#if 0 - -/* what to do with these four? configure comments these out */ - -#undef _LARGEFILE_SOURCE /* To make ftello() visible (HP-UX 10.20). */ -#undef _LARGE_FILES /* Large file defined on AIX-style hosts. */ -#undef _XOPEN_SOURCE /* To make ftello() visible (glibc 2.1.3). */ -#undef _XOPEN_SOURCE_EXTENDED - /* XXX We don't use this because glibc2.1.3*/ - /* XXX is bad anyway. If we define */ - /* XXX _XOPEN_SOURCE we will loose caddr_t */ - -#endif - -#if defined(__MINGW32__) && (!defined(_FILE_OFFSET_BITS) || (_FILE_OFFSET_BITS != 64)) - -/* add/remove as needed */ -/* redefine off_t */ -#include -#define off_t off64_t -/* fseeko and ftello are safe because not defined by MINGW */ -#define HAVE_FSEEKO -#define fseeko fseeko64 -#define ftello ftello64 -/* redefine lseek */ -#include -#define lseek lseek64 -/* redefine stat and fstat */ -/* use _stati64 compatible with MSVCRT < 6.1 */ -#include -#define stat _stati64 -#define fstat _fstati64 - -#endif /* MINGW32 LFS */ - -#endif /* HAVE_LARGEFILES */ - - -/* define if langinfo.h exists */ -#undef HAVE_LANGINFO_H - -/* Use framebuffer objects for off-screen OpenGL rendering */ -#define OPENGL_FBO 1 - -#endif /* _config_h */ From 6287fb17ed7516da7ef14a60c98eb03c5e4b6c67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C4=81ris=20Narti=C5=A1s?= Date: Wed, 15 Oct 2025 10:51:58 +0300 Subject: [PATCH 2/3] build: put back #ifndef guard for config.h.in --- configure | 3 +++ configure.ac | 4 ++++ include/grass/config.h.in | 5 +++++ 3 files changed, 12 insertions(+) diff --git a/configure b/configure index 39e178677b8..34800627129 100755 --- a/configure +++ b/configure @@ -4318,6 +4318,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + # Enable C++ option diff --git a/configure.ac b/configure.ac index 9724c99899f..b4472141677 100644 --- a/configure.ac +++ b/configure.ac @@ -36,6 +36,10 @@ AC_CONFIG_HEADERS([include/grass/config.h]) AC_CANONICAL_HOST AC_PROG_CC +AH_TOP([#ifndef _config_h +#define _config_h]) +AH_BOTTOM([#endif /* _config_h */]) + # Enable C++ option LOC_ARG_WITH(cxx, C++) diff --git a/include/grass/config.h.in b/include/grass/config.h.in index 878d9c70fd6..d7663c6a81d 100644 --- a/include/grass/config.h.in +++ b/include/grass/config.h.in @@ -1,5 +1,8 @@ /* include/grass/config.h.in. Generated from configure.ac by autoheader. */ +#ifndef _config_h +#define _config_h + /* Define GDEBUG to 1 for historic reasons */ #undef GDEBUG @@ -367,3 +370,5 @@ /* Define as 'int' if doesn't define. */ #undef uid_t + +#endif /* _config_h */ From 1235eef70088b601c6edb7c6fc1885f0143d2221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C4=81ris=20Narti=C5=A1s?= Date: Wed, 15 Oct 2025 11:01:14 +0300 Subject: [PATCH 3/3] build: add back missing LFS_CFLAGS --- configure | 2 ++ configure.ac | 1 + 2 files changed, 3 insertions(+) diff --git a/configure b/configure index 34800627129..47d50362327 100755 --- a/configure +++ b/configure @@ -643,6 +643,7 @@ LIBOBJS GRASS_HOME STRIPFLAG USE_TERMIO +LFS_CFLAGS USE_OPENCL OCLLIB OCLLIBPATH @@ -16228,6 +16229,7 @@ printf "%s\n" "#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source" >>confdefs fi + USE_TERMIO= diff --git a/configure.ac b/configure.ac index b4472141677..e2ccdcc6b96 100644 --- a/configure.ac +++ b/configure.ac @@ -2003,6 +2003,7 @@ AC_SUBST(USE_OPENCL) # way to handle this. It sets the appropriate CFLAGS and defines necessary # preprocessor macros (e.g., _FILE_OFFSET_BITS=64) for the compiler. AC_SYS_LARGEFILE +AC_SUBST(LFS_CFLAGS) USE_TERMIO= AC_SUBST(USE_TERMIO)