) and optionally
Graphviz dot ().
@@ -71,17 +71,20 @@ source code):
docker build -t grassgis79 .
```
-A test run (assuming you have existing GRASS GIS location; it can be downloaded from
+A test run (assuming you have existing GRASS GIS location; it can be
+downloaded from
[here](https://grass.osgeo.org/sampledata/north_carolina/nc_basic_spm_grass7.zip))
```
# case 1: launching in the grassdata directory in which the location is stored:
-docker run -it --rm --user=$(id -u):$(id -g) --volume $(pwd):/data --env HOME=/data/ grassgis79 \
- grass --text nc_basic_spm_grass7/user1 --exec g.region -p
+docker run -it --rm --user=$(id -u):$(id -g) --volume $(pwd):/data \
+ --env HOME=/data/ grassgis79 grass --text nc_basic_spm_grass7/user1 \
+ --exec g.region -p
# case 2: launching anywhere
-docker run -it --rm --user=$(id -u):$(id -g) --volume /your/test/grassdata/:/data --env HOME=/data/ grassgis79 \
- grass /data/nc_basic_spm_grass7/PERMANENT --exec g.region -p
+docker run -it --rm --user=$(id -u):$(id -g) \
+ --volume /your/test/grassdata/:/data --env HOME=/data/ grassgis79 \
+ grass /data/nc_basic_spm_grass7/PERMANENT --exec g.region -p
```
Note that the first `grassgis79` is the name of the image while the second
@@ -90,10 +93,11 @@ Note that the first `grassgis79` is the name of the image while the second
To run the tests (again assuming local location):
```
-docker run -it --rm --user=$(id -u):$(id -g) --volume /your/test/grassdata/:/data --env HOME=/data/ -w /code/grass \
- grassgis79 grass /data/nc_basic_spm_grass7/PERMANENT --exec \
- python -m grass.gunittest.main \
- --location nc_basic_spm_grass7 --location-type nc
+docker run -it --rm --user=$(id -u):$(id -g) \
+ --volume /your/test/grassdata/:/data --env HOME=/data/ -w /code/grass \
+ grassgis79 grass /data/nc_basic_spm_grass7/PERMANENT --exec \
+ python -m grass.gunittest.main \
+ --location nc_basic_spm_grass7 --location-type nc
```
Note: If you compiled locally before building the Docker image, you may
diff --git a/REQUIREMENTS.html b/REQUIREMENTS.html
index 069f81e4bcc..214a59822e2 100644
--- a/REQUIREMENTS.html
+++ b/REQUIREMENTS.html
@@ -233,7 +233,7 @@ Note:
-© GRASS Development Team 1997-2019
+© GRASS Development Team 1997-2020
Please report bugs here:
https://grass.osgeo.org/development/bug-tracking/
diff --git a/aclocal.m4 b/aclocal.m4
index b9f2487ee2a..1e08f34718c 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -510,7 +510,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
*-apple-darwin*)
SHLIB_CFLAGS="-fno-common"
SHLIB_SUFFIX=".dylib"
- SHLIB_LD="cc -dynamiclib -compatibility_version \${GRASS_VERSION_MAJOR}.\${GRASS_VERSION_MINOR} -current_version \${GRASS_VERSION_MAJOR}.\${GRASS_VERSION_MINOR} -install_name \${INST_DIR}/lib/lib\${LIB_NAME}\${SHLIB_SUFFIX}"
+ SHLIB_LD="${CC} -dynamiclib -compatibility_version \${GRASS_VERSION_MAJOR}.\${GRASS_VERSION_MINOR} -current_version \${GRASS_VERSION_MAJOR}.\${GRASS_VERSION_MINOR} -install_name \${INST_DIR}/lib/lib\${LIB_NAME}\${SHLIB_SUFFIX}"
LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH"
;;
*-sun-solaris*)
@@ -561,6 +561,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
SHLIB_CFLAGS="-fPIC"
#SHLIB_LD="ld -Bshareable -x"
SHLIB_LD="${CC} -shared"
+ SHLIB_LD_FLAGS="-Wl,-soname,\$(notdir \$[@])"
SHLIB_SUFFIX=".so"
LDFLAGS="-export-dynamic"
#LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
diff --git a/configure b/configure
index 2a5f8af1703..0b5f1e97c24 100755
--- a/configure
+++ b/configure
@@ -1311,10 +1311,14 @@ LIB_VER=`echo ${GRASS_VERSION_NUMBER} | sed 's/^\([0-9.]*\).*$/\1/'`
GRASS_VERSION_GIT="exported"
+# get git short hash + date of last change in GRASS headers
+# (and anything else in include)
+GRASS_HEADERS_GIT_HASH=`date -u +%FT%T%z | sed 's/\(..\)$/:\1/'`
+GRASS_HEADERS_GIT_DATE=`date -u +%FT%T%z | sed 's/\(..\)$/:\1/'`
# Extract the first word of "git", so it can be a program name with args.
set dummy git; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1318: checking for $ac_word" >&5
+echo "configure:1322: checking for $ac_word" >&5
case "$GIT" in
/*)
@@ -1349,6 +1353,14 @@ if test "$GIT" != "no" ; then
if test -z "$GRASS_VERSION_GIT"; then
GRASS_VERSION_GIT="exported"
fi
+ GRASS_HEADERS_GIT_HASH=`$GIT log -1 --pretty=format:"%h" -- "${SRCDIR}/include" 2>/dev/null`
+ if test -z "$GRASS_HEADERS_GIT_HASH"; then
+ GRASS_HEADERS_GIT_HASH=`date -u +%FT%T%z | sed 's/\(..\)$/:\1/'`
+ fi
+ GRASS_HEADERS_GIT_DATE=`date -d $($GIT log -1 --pretty=format:"%cI" -- "${SRCDIR}/include") -u +%FT%T%z | sed 's/\(..\)$/:\1/'` 2>/dev/null
+ if test -z "$GRASS_HEADERS_GIT_DATE"; then
+ GRASS_HEADERS_GIT_DATE=`date -u +%FT%T%z | sed 's/\(..\)$/:\1/'`
+ fi
fi
@@ -1361,6 +1373,8 @@ fi
+
+
# Check for MacOSX App
# Check whether --enable-macosx-app or --disable-macosx-app was given.
@@ -1373,7 +1387,7 @@ fi
echo $ac_n "checking for MacOSX App""... $ac_c" 1>&6
-echo "configure:1377: checking for MacOSX App" >&5
+echo "configure:1391: checking for MacOSX App" >&5
case "$enable_macosx_app" in
yes) MACOSX_APP=1 ;;
no) MACOSX_APP= ;;
@@ -1385,7 +1399,7 @@ echo "$ac_t"""$enable_macosx_app"" 1>&6
# Check for MacOSX archs
echo $ac_n "checking for MacOSX architectures""... $ac_c" 1>&6
-echo "configure:1389: checking for MacOSX architectures" >&5
+echo "configure:1403: checking for MacOSX architectures" >&5
MACOSX_ARCHS=
@@ -1414,7 +1428,7 @@ fi
# Check for MacOSX SDK
echo $ac_n "checking for MacOSX SDK""... $ac_c" 1>&6
-echo "configure:1418: checking for MacOSX SDK" >&5
+echo "configure:1432: checking for MacOSX SDK" >&5
MACOSX_SDK=
@@ -1424,7 +1438,7 @@ else
ac_safe=`echo "$with_macosx_sdk/SDKSettings.plist" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $with_macosx_sdk/SDKSettings.plist""... $ac_c" 1>&6
-echo "configure:1428: checking for $with_macosx_sdk/SDKSettings.plist" >&5
+echo "configure:1442: checking for $with_macosx_sdk/SDKSettings.plist" >&5
if test "$cross_compiling" = yes; then
{ echo "configure: error: Cannot check for file existence when cross compiling" 1>&2; exit 1; }
@@ -1468,7 +1482,7 @@ fi
echo $ac_n "checking how to build libraries""... $ac_c" 1>&6
-echo "configure:1472: checking how to build libraries" >&5
+echo "configure:1486: checking how to build libraries" >&5
# Check whether --enable-shared or --disable-shared was given.
if test "${enable_shared+set}" = set; then
enableval="$enable_shared"
@@ -1540,7 +1554,7 @@ ac_save_ldflags="$LDFLAGS"
*-apple-darwin*)
SHLIB_CFLAGS="-fno-common"
SHLIB_SUFFIX=".dylib"
- SHLIB_LD="cc -dynamiclib -compatibility_version \${GRASS_VERSION_MAJOR}.\${GRASS_VERSION_MINOR} -current_version \${GRASS_VERSION_MAJOR}.\${GRASS_VERSION_MINOR} -install_name \${INST_DIR}/lib/lib\${LIB_NAME}\${SHLIB_SUFFIX}"
+ SHLIB_LD="${CC} -dynamiclib -compatibility_version \${GRASS_VERSION_MAJOR}.\${GRASS_VERSION_MINOR} -current_version \${GRASS_VERSION_MAJOR}.\${GRASS_VERSION_MINOR} -install_name \${INST_DIR}/lib/lib\${LIB_NAME}\${SHLIB_SUFFIX}"
LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH"
;;
*-sun-solaris*)
@@ -1603,6 +1617,7 @@ EOF
SHLIB_CFLAGS="-fPIC"
#SHLIB_LD="ld -Bshareable -x"
SHLIB_LD="${CC} -shared"
+ SHLIB_LD_FLAGS="-Wl,-soname,\$(notdir \$@)"
SHLIB_SUFFIX=".so"
LDFLAGS="-export-dynamic"
#LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
@@ -2401,7 +2416,7 @@ fi
# Done checking fortran
echo $ac_n "checking for additional include dirs""... $ac_c" 1>&6
-echo "configure:2405: checking for additional include dirs" >&5
+echo "configure:2420: checking for additional include dirs" >&5
case "$with_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to list --with-includes." 1>&2; exit 1; }
@@ -2424,7 +2439,7 @@ fi
# With libs option
echo $ac_n "checking for additional library dirs""... $ac_c" 1>&6
-echo "configure:2428: checking for additional library dirs" >&5
+echo "configure:2443: checking for additional library dirs" >&5
case "$with_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory list to --with-libs." 1>&2; exit 1; }
@@ -2458,7 +2473,7 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:2462: checking for a BSD compatible install" >&5
+echo "configure:2477: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
@@ -2511,7 +2526,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
# Extract the first word of "flex", so it can be a program name with args.
set dummy flex; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2515: checking for $ac_word" >&5
+echo "configure:2530: checking for $ac_word" >&5
if test -n "$LEX"; then
ac_cv_prog_LEX="$LEX" # Let the user override the test.
@@ -2542,13 +2557,13 @@ then
*) ac_lib=l ;;
esac
echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:2546: checking for yywrap in -l$ac_lib" >&5
+echo "configure:2561: checking for yywrap in -l$ac_lib" >&5
ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-l$ac_lib $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2584,7 +2599,7 @@ if test "$LEX" = "lex"; then
# Extract the first word of "lex", so it can be a program name with args.
set dummy lex; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2588: checking for $ac_word" >&5
+echo "configure:2603: checking for $ac_word" >&5
case "$LEXPATH" in
/*)
@@ -2624,7 +2639,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2628: checking for $ac_word" >&5
+echo "configure:2643: checking for $ac_word" >&5
if test -n "$YACC"; then
ac_cv_prog_YACC="$YACC" # Let the user override the test.
@@ -2655,7 +2670,7 @@ if test "$YACC" = "yacc"; then
# Extract the first word of "yacc", so it can be a program name with args.
set dummy yacc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2659: checking for $ac_word" >&5
+echo "configure:2674: checking for $ac_word" >&5
case "$YACCPATH" in
/*)
@@ -2693,7 +2708,7 @@ fi
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2697: checking for $ac_word" >&5
+echo "configure:2712: checking for $ac_word" >&5
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -2722,7 +2737,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2726: checking for $ac_word" >&5
+echo "configure:2741: checking for $ac_word" >&5
if test -n "$AR"; then
ac_cv_prog_AR="$AR" # Let the user override the test.
@@ -2753,7 +2768,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2757: checking for $ac_word" >&5
+echo "configure:2772: checking for $ac_word" >&5
if test -n "$ENV"; then
ac_cv_prog_ENV="$ENV" # Let the user override the test.
@@ -2782,7 +2797,7 @@ done
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2786: checking for $ac_word" >&5
+echo "configure:2801: checking for $ac_word" >&5
case "$PERL" in
/*)
@@ -2813,7 +2828,7 @@ else
fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2817: checking how to run the C preprocessor" >&5
+echo "configure:2832: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -2826,13 +2841,13 @@ if test -z "$CPP"; then
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2836: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -2843,13 +2858,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2853: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2868: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -2860,13 +2875,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2870: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2885: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -2890,10 +2905,10 @@ fi
echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2894: checking for ANSI C header files" >&5
+echo "configure:2909: checking for ANSI C header files" >&5
cat > conftest.$ac_ext <
#include
@@ -2901,7 +2916,7 @@ cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2905: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2920: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2918,7 +2933,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <
EOF
@@ -2936,7 +2951,7 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <
EOF
@@ -2957,7 +2972,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2968,7 +2983,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:2972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -2995,15 +3010,15 @@ for ac_hdr in limits.h termio.h termios.h unistd.h values.h f2c.h g2c.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2999: checking for $ac_hdr" >&5
+echo "configure:3014: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3022: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3032,15 +3047,15 @@ for ac_hdr in sys/ioctl.h sys/mtio.h sys/resource.h sys/time.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3036: checking for $ac_hdr" >&5
+echo "configure:3051: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3044: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3059: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3069,15 +3084,15 @@ for ac_hdr in sys/timeb.h sys/types.h sys/utsname.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3073: checking for $ac_hdr" >&5
+echo "configure:3088: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3081: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3096: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3106,15 +3121,15 @@ for ac_hdr in libintl.h iconv.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3110: checking for $ac_hdr" >&5
+echo "configure:3125: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3118: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3133: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3143,15 +3158,15 @@ for ac_hdr in langinfo.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3147: checking for $ac_hdr" >&5
+echo "configure:3162: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3155: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3177,10 +3192,10 @@ fi
done
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3181: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:3196: checking whether time.h and sys/time.h may both be included" >&5
cat > conftest.$ac_ext <
#include
@@ -3189,7 +3204,7 @@ int main() {
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:3193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
@@ -3209,10 +3224,10 @@ EOF
fi
echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:3213: checking for off_t" >&5
+echo "configure:3228: checking for off_t" >&5
cat > conftest.$ac_ext <
#if STDC_HEADERS
@@ -3239,10 +3254,10 @@ EOF
fi
echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:3243: checking for uid_t in sys/types.h" >&5
+echo "configure:3258: checking for uid_t in sys/types.h" >&5
cat > conftest.$ac_ext <
EOF
@@ -3270,10 +3285,10 @@ EOF
fi
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3274: checking return type of signal handlers" >&5
+echo "configure:3289: checking return type of signal handlers" >&5
cat > conftest.$ac_ext <
#include
@@ -3290,7 +3305,7 @@ int main() {
int i;
; return 0; }
EOF
-if { (eval echo configure:3294: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3309: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@@ -3308,10 +3323,10 @@ EOF
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:3312: checking for Cygwin environment" >&5
+echo "configure:3327: checking for Cygwin environment" >&5
cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3341: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cygwin=yes
else
@@ -3340,10 +3355,10 @@ test "$ac_cv_cygwin" = yes && CYGWIN=yes
for ac_func in ftime gethostname gettimeofday lseek nice time uname
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3344: checking for $ac_func" >&5
+echo "configure:3359: checking for $ac_func" >&5
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3392,10 +3407,10 @@ done
for ac_func in seteuid setpriority setreuid setruid
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3396: checking for $ac_func" >&5
+echo "configure:3411: checking for $ac_func" >&5
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3444,10 +3459,10 @@ done
for ac_func in drand48
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3448: checking for $ac_func" >&5
+echo "configure:3463: checking for $ac_func" >&5
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3496,10 +3511,10 @@ done
for ac_func in putenv setenv
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3500: checking for $ac_func" >&5
+echo "configure:3515: checking for $ac_func" >&5
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3548,10 +3563,10 @@ done
for ac_func in nanosleep
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3552: checking for $ac_func" >&5
+echo "configure:3567: checking for $ac_func" >&5
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3599,13 +3614,13 @@ done
if test "$cross_compiling" != "yes" ; then
echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:3603: checking whether setpgrp takes no argument" >&5
+echo "configure:3618: checking whether setpgrp takes no argument" >&5
if test "$cross_compiling" = yes; then
{ echo "configure: error: cannot check setpgrp if cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_setpgrp_void=no
else
@@ -3653,16 +3668,16 @@ CROSS_COMPILING=1
fi
echo $ac_n "checking for long long int""... $ac_c" 1>&6
-echo "configure:3657: checking for long long int" >&5
+echo "configure:3672: checking for long long int" >&5
cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
@@ -3682,16 +3697,16 @@ fi
rm -f conftest*
echo $ac_n "checking for int64_t""... $ac_c" 1>&6
-echo "configure:3686: checking for int64_t" >&5
+echo "configure:3701: checking for int64_t" >&5
cat > conftest.$ac_ext <
int main() {
int64_t x;
; return 0; }
EOF
-if { (eval echo configure:3695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
@@ -3711,7 +3726,7 @@ fi
rm -f conftest*
echo $ac_n "checking for W11""... $ac_c" 1>&6
-echo "configure:3715: checking for W11" >&5
+echo "configure:3730: checking for W11" >&5
case "$enable_w11" in
yes|no) echo "$ac_t"""$enable_w11"" 1>&6 ;;
*) { echo "configure: error: *** You must answer yes or no." 1>&2; exit 1; } ;;
@@ -3739,7 +3754,7 @@ else
# Uses ac_ vars as temps to allow command line to override cache and checks.
# --without-x overrides everything else, but does not touch the cache.
echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:3743: checking for X" >&5
+echo "configure:3758: checking for X" >&5
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
@@ -3799,12 +3814,12 @@ if test "$ac_x_includes" = NO; then
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3823: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3873,14 +3888,14 @@ if test "$ac_x_libraries" = NO; then
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
LIBS="$ac_save_LIBS"
# We can link X programs with no special library path.
@@ -3985,17 +4000,17 @@ else
case "`(uname -sr) 2>/dev/null`" in
"SunOS 5"*)
echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:3989: checking whether -R must be followed by a space" >&5
+echo "configure:4004: checking whether -R must be followed by a space" >&5
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_nospace=yes
else
@@ -4011,14 +4026,14 @@ rm -f conftest*
else
LIBS="$ac_xsave_LIBS -R $x_libraries"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_space=yes
else
@@ -4050,13 +4065,13 @@ rm -f conftest*
# libraries were built with DECnet support. And karl@cs.umb.edu says
# the Alpha needs dnet_stub (dnet does not exist).
echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:4054: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:4069: checking for dnet_ntoa in -ldnet" >&5
ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ldnet $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4088,13 +4103,13 @@ fi
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:4092: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:4107: checking for dnet_ntoa in -ldnet_stub" >&5
ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ldnet_stub $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4133,10 +4148,10 @@ fi
# The nsl library prevents programs from opening the X display
# on Irix 5.2, according to dickey@clark.net.
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:4137: checking for gethostbyname" >&5
+echo "configure:4152: checking for gethostbyname" >&5
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gethostbyname=yes"
else
@@ -4179,13 +4194,13 @@ fi
if test $ac_cv_func_gethostbyname = no; then
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:4183: checking for gethostbyname in -lnsl" >&5
+echo "configure:4198: checking for gethostbyname in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4225,10 +4240,10 @@ fi
# -lsocket must be given before -lnsl if both are needed.
# We assume that if connect needs -lnsl, so does gethostbyname.
echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:4229: checking for connect" >&5
+echo "configure:4244: checking for connect" >&5
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_connect=yes"
else
@@ -4271,13 +4286,13 @@ fi
if test $ac_cv_func_connect = no; then
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:4275: checking for connect in -lsocket" >&5
+echo "configure:4290: checking for connect in -lsocket" >&5
ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4311,10 +4326,10 @@ fi
# gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:4315: checking for remove" >&5
+echo "configure:4330: checking for remove" >&5
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_remove=yes"
else
@@ -4357,13 +4372,13 @@ fi
if test $ac_cv_func_remove = no; then
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:4361: checking for remove in -lposix" >&5
+echo "configure:4376: checking for remove in -lposix" >&5
ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lposix $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4397,10 +4412,10 @@ fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:4401: checking for shmat" >&5
+echo "configure:4416: checking for shmat" >&5
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_shmat=yes"
else
@@ -4443,13 +4458,13 @@ fi
if test $ac_cv_func_shmat = no; then
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:4447: checking for shmat in -lipc" >&5
+echo "configure:4462: checking for shmat in -lipc" >&5
ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lipc $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4492,13 +4507,13 @@ fi
# libraries we check for below, so use a different variable.
# --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:4496: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:4511: checking for IceConnectionNumber in -lICE" >&5
ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4549,12 +4564,12 @@ ac_save_libs="$LIBS"
LIBS=""
echo $ac_n "checking for library containing cuserid""... $ac_c" 1>&6
-echo "configure:4553: checking for library containing cuserid" >&5
+echo "configure:4568: checking for library containing cuserid" >&5
ac_func_search_save_LIBS="$LIBS"
ac_cv_search_cuserid="no"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_search_cuserid="none required"
else
@@ -4576,7 +4591,7 @@ rm -f conftest*
test "$ac_cv_search_cuserid" = "no" && for i in compat; do
LIBS="-l$i $ac_func_search_save_LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_search_cuserid="-l$i"
break
@@ -4613,10 +4628,10 @@ LIBS="$ac_save_libs"
for ac_func in asprintf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4617: checking for $ac_func" >&5
+echo "configure:4632: checking for $ac_func" >&5
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -4666,10 +4681,10 @@ done
# Test if mathlib needs -lm flag or is included with libc
echo $ac_n "checking for atan""... $ac_c" 1>&6
-echo "configure:4670: checking for atan" >&5
+echo "configure:4685: checking for atan" >&5
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_atan=yes"
else
@@ -4710,13 +4725,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6
-echo "configure:4714: checking for atan in -lm" >&5
+echo "configure:4729: checking for atan in -lm" >&5
ac_lib_var=`echo m'_'atan | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4754,10 +4769,10 @@ fi
echo $ac_n "checking for dlsym""... $ac_c" 1>&6
-echo "configure:4758: checking for dlsym" >&5
+echo "configure:4773: checking for dlsym" >&5
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_dlsym=yes"
else
@@ -4798,13 +4813,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlsym in -ldl""... $ac_c" 1>&6
-echo "configure:4802: checking for dlsym in -ldl" >&5
+echo "configure:4817: checking for dlsym in -ldl" >&5
ac_lib_var=`echo dl'_'dlsym | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4842,10 +4857,10 @@ fi
echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:4846: checking for iconv" >&5
+echo "configure:4861: checking for iconv" >&5
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_iconv=yes"
else
@@ -4886,13 +4901,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
-echo "configure:4890: checking for iconv in -liconv" >&5
+echo "configure:4905: checking for iconv in -liconv" >&5
ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-liconv $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4922,13 +4937,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for iconv in -lgiconv""... $ac_c" 1>&6
-echo "configure:4926: checking for iconv in -lgiconv" >&5
+echo "configure:4941: checking for iconv in -lgiconv" >&5
ac_lib_var=`echo giconv'_'iconv | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lgiconv $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4958,10 +4973,10 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for libiconv""... $ac_c" 1>&6
-echo "configure:4962: checking for libiconv" >&5
+echo "configure:4977: checking for libiconv" >&5
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_libiconv=yes"
else
@@ -5002,13 +5017,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
-echo "configure:5006: checking for libiconv in -liconv" >&5
+echo "configure:5021: checking for libiconv in -liconv" >&5
ac_lib_var=`echo iconv'_'libiconv | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-liconv $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5038,13 +5053,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for libiconv in -lgiconv""... $ac_c" 1>&6
-echo "configure:5042: checking for libiconv in -lgiconv" >&5
+echo "configure:5057: checking for libiconv in -lgiconv" >&5
ac_lib_var=`echo giconv'_'libiconv | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lgiconv $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5092,10 +5107,10 @@ fi
have_socket=1
echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:5096: checking for socket" >&5
+echo "configure:5111: checking for socket" >&5
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_socket=yes"
else
@@ -5136,13 +5151,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:5140: checking for socket in -lsocket" >&5
+echo "configure:5155: checking for socket in -lsocket" >&5
ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5201,7 +5216,7 @@ ZLIB=
echo $ac_n "checking for location of zlib includes""... $ac_c" 1>&6
-echo "configure:5205: checking for location of zlib includes" >&5
+echo "configure:5220: checking for location of zlib includes" >&5
case "$with_zlib_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-zlib-includes." 1>&2; exit 1; }
@@ -5227,15 +5242,15 @@ for ac_hdr in zlib.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5231: checking for $ac_hdr" >&5
+echo "configure:5246: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5239: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5254: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -5269,7 +5284,7 @@ CPPFLAGS=$ac_save_cppflags
echo $ac_n "checking for location of zlib library""... $ac_c" 1>&6
-echo "configure:5273: checking for location of zlib library" >&5
+echo "configure:5288: checking for location of zlib library" >&5
case "$with_zlib_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-zlib-libs." 1>&2; exit 1; }
@@ -5294,13 +5309,13 @@ LDFLAGS="$ZLIBLIBPATH $LDFLAGS"
echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
-echo "configure:5298: checking for deflate in -lz" >&5
+echo "configure:5313: checking for deflate in -lz" >&5
ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lz $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5357,7 +5372,7 @@ BZIP2LIB=
echo $ac_n "checking whether to use bzlib""... $ac_c" 1>&6
-echo "configure:5361: checking whether to use bzlib" >&5
+echo "configure:5376: checking whether to use bzlib" >&5
echo "$ac_t"""$with_bzlib"" 1>&6
case "$with_bzlib" in
"no") USE_BZIP2= ;;
@@ -5373,7 +5388,7 @@ if test -n "$USE_BZIP2"; then
echo $ac_n "checking for location of bzlib includes""... $ac_c" 1>&6
-echo "configure:5377: checking for location of bzlib includes" >&5
+echo "configure:5392: checking for location of bzlib includes" >&5
case "$with_bzlib_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-bzlib-includes." 1>&2; exit 1; }
@@ -5399,15 +5414,15 @@ for ac_hdr in bzlib.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5403: checking for $ac_hdr" >&5
+echo "configure:5418: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5411: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5426: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -5441,7 +5456,7 @@ CPPFLAGS=$ac_save_cppflags
echo $ac_n "checking for location of bzlib library""... $ac_c" 1>&6
-echo "configure:5445: checking for location of bzlib library" >&5
+echo "configure:5460: checking for location of bzlib library" >&5
case "$with_bzlib_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-bzlib-libs." 1>&2; exit 1; }
@@ -5466,13 +5481,13 @@ LDFLAGS="$BZIP2LIBPATH $LDFLAGS"
echo $ac_n "checking for BZ2_bzBuffToBuffCompress in -lbz2""... $ac_c" 1>&6
-echo "configure:5470: checking for BZ2_bzBuffToBuffCompress in -lbz2" >&5
+echo "configure:5485: checking for BZ2_bzBuffToBuffCompress in -lbz2" >&5
ac_lib_var=`echo bz2'_'BZ2_bzBuffToBuffCompress | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lbz2 $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5531,7 +5546,7 @@ ZSTDLIB=
echo $ac_n "checking whether to use zstd""... $ac_c" 1>&6
-echo "configure:5535: checking whether to use zstd" >&5
+echo "configure:5550: checking whether to use zstd" >&5
echo "$ac_t"""$with_zstd"" 1>&6
case "$with_zstd" in
"no") USE_ZSTD= ;;
@@ -5547,7 +5562,7 @@ if test -n "$USE_ZSTD"; then
echo $ac_n "checking for location of zstd includes""... $ac_c" 1>&6
-echo "configure:5551: checking for location of zstd includes" >&5
+echo "configure:5566: checking for location of zstd includes" >&5
case "$with_zstd_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-zstd-includes." 1>&2; exit 1; }
@@ -5572,15 +5587,15 @@ for ac_hdr in zstd.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5576: checking for $ac_hdr" >&5
+echo "configure:5591: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5584: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5599: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -5614,7 +5629,7 @@ CPPFLAGS=$ac_save_cppflags
echo $ac_n "checking for location of zstd library""... $ac_c" 1>&6
-echo "configure:5618: checking for location of zstd library" >&5
+echo "configure:5633: checking for location of zstd library" >&5
case "$with_zstd_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-zstd-libs." 1>&2; exit 1; }
@@ -5639,13 +5654,13 @@ LDFLAGS="$ZSTDLIBPATH $LDFLAGS"
echo $ac_n "checking for ZSTD_compress in -lzstd""... $ac_c" 1>&6
-echo "configure:5643: checking for ZSTD_compress in -lzstd" >&5
+echo "configure:5658: checking for ZSTD_compress in -lzstd" >&5
ac_lib_var=`echo zstd'_'ZSTD_compress | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lzstd $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5708,7 +5723,7 @@ PROJMAJOR=4
echo $ac_n "checking for location of External PROJ includes""... $ac_c" 1>&6
-echo "configure:5712: checking for location of External PROJ includes" >&5
+echo "configure:5727: checking for location of External PROJ includes" >&5
case "$with_proj_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-proj-includes." 1>&2; exit 1; }
@@ -5735,15 +5750,15 @@ for ac_hdr in proj.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5739: checking for $ac_hdr" >&5
+echo "configure:5754: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5762: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -5775,7 +5790,7 @@ CPPFLAGS=$ac_save_cppflags
if test $PROJ4API = 0 ; then
echo $ac_n "checking External PROJ major version""... $ac_c" 1>&6
-echo "configure:5779: checking External PROJ major version" >&5
+echo "configure:5794: checking External PROJ major version" >&5
ac_save_cppflags="$CPPFLAGS"
CPPFLAGS="$PROJINC $CPPFLAGS"
if test "$cross_compiling" = yes; then
@@ -5783,7 +5798,7 @@ if test "$cross_compiling" = yes; then
echo "$ac_t""unknown (cross-compiling)" 1>&6
else
cat > conftest.$ac_ext <
@@ -5795,7 +5810,7 @@ int main(void) {
}
EOF
-if { (eval echo configure:5799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
proj_ver_major=`cat conftestdata`
echo "$ac_t""$proj_ver_major" 1>&6
@@ -5812,7 +5827,7 @@ CPPFLAGS=$ac_save_cppflags
echo $ac_n "checking External PROJ minor version""... $ac_c" 1>&6
-echo "configure:5816: checking External PROJ minor version" >&5
+echo "configure:5831: checking External PROJ minor version" >&5
ac_save_cppflags="$CPPFLAGS"
CPPFLAGS="$PROJINC $CPPFLAGS"
if test "$cross_compiling" = yes; then
@@ -5820,7 +5835,7 @@ if test "$cross_compiling" = yes; then
echo "$ac_t""unknown (cross-compiling)" 1>&6
else
cat > conftest.$ac_ext <
@@ -5832,7 +5847,7 @@ int main(void) {
}
EOF
-if { (eval echo configure:5836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
proj_ver_minor=`cat conftestdata`
echo "$ac_t""$proj_ver_minor" 1>&6
@@ -5849,7 +5864,7 @@ CPPFLAGS=$ac_save_cppflags
echo $ac_n "checking External PROJ patch version""... $ac_c" 1>&6
-echo "configure:5853: checking External PROJ patch version" >&5
+echo "configure:5868: checking External PROJ patch version" >&5
ac_save_cppflags="$CPPFLAGS"
CPPFLAGS="$PROJINC $CPPFLAGS"
if test "$cross_compiling" = yes; then
@@ -5857,7 +5872,7 @@ if test "$cross_compiling" = yes; then
echo "$ac_t""unknown (cross-compiling)" 1>&6
else
cat > conftest.$ac_ext <
@@ -5869,7 +5884,7 @@ int main(void) {
}
EOF
-if { (eval echo configure:5873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
proj_ver_patch=`cat conftestdata`
echo "$ac_t""$proj_ver_patch" 1>&6
@@ -5894,7 +5909,7 @@ CPPFLAGS=$ac_save_cppflags
else
echo $ac_n "checking External PROJ.4 version""... $ac_c" 1>&6
-echo "configure:5898: checking External PROJ.4 version" >&5
+echo "configure:5913: checking External PROJ.4 version" >&5
ac_save_cppflags="$CPPFLAGS"
CPPFLAGS="$PROJINC $CPPFLAGS"
if test "$cross_compiling" = yes; then
@@ -5902,7 +5917,7 @@ if test "$cross_compiling" = yes; then
echo "$ac_t""unknown (cross-compiling)" 1>&6
else
cat > conftest.$ac_ext <
@@ -5914,7 +5929,7 @@ int main(void) {
}
EOF
-if { (eval echo configure:5918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
proj_ver=`cat conftestdata`
echo "$ac_t""$proj_ver" 1>&6
@@ -5946,7 +5961,7 @@ if test $PROJ4API = 0 ; then
echo $ac_n "checking for location of External PROJ library""... $ac_c" 1>&6
-echo "configure:5950: checking for location of External PROJ library" >&5
+echo "configure:5965: checking for location of External PROJ library" >&5
case "$with_proj_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-proj-libs." 1>&2; exit 1; }
@@ -5970,13 +5985,13 @@ LDFLAGS="$PROJLIB $LDFLAGS"
echo $ac_n "checking for proj_pj_info in -lproj""... $ac_c" 1>&6
-echo "configure:5974: checking for proj_pj_info in -lproj" >&5
+echo "configure:5989: checking for proj_pj_info in -lproj" >&5
ac_lib_var=`echo proj'_'proj_pj_info | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lproj $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6030,15 +6045,15 @@ for ac_hdr in proj_api.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6034: checking for $ac_hdr" >&5
+echo "configure:6049: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6042: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6057: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -6074,7 +6089,7 @@ CPPFLAGS=$ac_save_cppflags
else
echo $ac_n "checking External PROJ.4 version""... $ac_c" 1>&6
-echo "configure:6078: checking External PROJ.4 version" >&5
+echo "configure:6093: checking External PROJ.4 version" >&5
ac_save_cppflags="$CPPFLAGS"
CPPFLAGS="$PROJINC $CPPFLAGS"
if test "$cross_compiling" = yes; then
@@ -6082,7 +6097,7 @@ if test "$cross_compiling" = yes; then
echo "$ac_t""unknown (cross-compiling)" 1>&6
else
cat > conftest.$ac_ext <
@@ -6094,7 +6109,7 @@ int main(void) {
}
EOF
-if { (eval echo configure:6098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
proj_ver=`cat conftestdata`
echo "$ac_t""$proj_ver" 1>&6
@@ -6119,7 +6134,7 @@ CPPFLAGS=$ac_save_cppflags
echo $ac_n "checking for location of External PROJ.4 library""... $ac_c" 1>&6
-echo "configure:6123: checking for location of External PROJ.4 library" >&5
+echo "configure:6138: checking for location of External PROJ.4 library" >&5
case "$with_proj_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-proj-libs." 1>&2; exit 1; }
@@ -6143,13 +6158,13 @@ LDFLAGS="$PROJLIB $LDFLAGS"
echo $ac_n "checking for pj_get_def in -lproj""... $ac_c" 1>&6
-echo "configure:6147: checking for pj_get_def in -lproj" >&5
+echo "configure:6162: checking for pj_get_def in -lproj" >&5
ac_lib_var=`echo proj'_'pj_get_def | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lproj $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6195,7 +6210,7 @@ fi
echo $ac_n "checking for location of External PROJ data files""... $ac_c" 1>&6
-echo "configure:6199: checking for location of External PROJ data files" >&5
+echo "configure:6214: checking for location of External PROJ data files" >&5
case "$with_proj_share" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-proj-share." 1>&2; exit 1; }
@@ -6221,14 +6236,14 @@ if test `expr ${PROJMAJOR} \< 6` = 1 ; then
# LOC_CHECK_SHARE does not work when cross compiling
if test "$cross_compiling" = "yes" ; then
echo $ac_n "checking for epsg""... $ac_c" 1>&6
-echo "configure:6225: checking for epsg" >&5
+echo "configure:6240: checking for epsg" >&5
echo "$ac_t""unknown (cross-compiling)" 1>&6
else
ac_safe=`echo "$PROJSHARE/epsg" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $PROJSHARE/epsg""... $ac_c" 1>&6
-echo "configure:6232: checking for $PROJSHARE/epsg" >&5
+echo "configure:6247: checking for $PROJSHARE/epsg" >&5
if test "$cross_compiling" = yes; then
{ echo "configure: error: Cannot check for file existence when cross compiling" 1>&2; exit 1; }
@@ -6262,7 +6277,7 @@ fi
echo $ac_n "checking whether to use regex""... $ac_c" 1>&6
-echo "configure:6266: checking whether to use regex" >&5
+echo "configure:6281: checking whether to use regex" >&5
echo "$ac_t"""$with_regex"" 1>&6
case "$with_regex" in
"no") USE_REGEX= ;;
@@ -6282,7 +6297,7 @@ if test -n "$USE_REGEX"; then
echo $ac_n "checking for location of regex includes""... $ac_c" 1>&6
-echo "configure:6286: checking for location of regex includes" >&5
+echo "configure:6301: checking for location of regex includes" >&5
case "$with_regex_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-regex-includes." 1>&2; exit 1; }
@@ -6308,15 +6323,15 @@ for ac_hdr in regex.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6312: checking for $ac_hdr" >&5
+echo "configure:6327: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6320: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6335: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -6350,7 +6365,7 @@ CPPFLAGS=$ac_save_cppflags
echo $ac_n "checking for location of regex library""... $ac_c" 1>&6
-echo "configure:6354: checking for location of regex library" >&5
+echo "configure:6369: checking for location of regex library" >&5
case "$with_regex_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-regex-libs." 1>&2; exit 1; }
@@ -6375,10 +6390,10 @@ ac_save_ldflags="$LDFLAGS"
LIBS=" $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for regcomp""... $ac_c" 1>&6
-echo "configure:6379: checking for regcomp" >&5
+echo "configure:6394: checking for regcomp" >&5
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_regcomp=yes"
else
@@ -6428,13 +6443,13 @@ LDFLAGS="$REGEXLIBPATH $LDFLAGS"
echo $ac_n "checking for regcomp in -lregex""... $ac_c" 1>&6
-echo "configure:6432: checking for regcomp in -lregex" >&5
+echo "configure:6447: checking for regcomp in -lregex" >&5
ac_lib_var=`echo regex'_'regcomp | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lregex $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6495,7 +6510,7 @@ fi # $USE_REGEX
echo $ac_n "checking whether to use Readline""... $ac_c" 1>&6
-echo "configure:6499: checking whether to use Readline" >&5
+echo "configure:6514: checking whether to use Readline" >&5
echo "$ac_t"""$with_readline"" 1>&6
case "$with_readline" in
"no") USE_READLINE= ;;
@@ -6516,7 +6531,7 @@ if test -n "$USE_READLINE"; then
echo $ac_n "checking for location of Readline includes""... $ac_c" 1>&6
-echo "configure:6520: checking for location of Readline includes" >&5
+echo "configure:6535: checking for location of Readline includes" >&5
case "$with_readline_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-readline-includes." 1>&2; exit 1; }
@@ -6542,15 +6557,15 @@ for ac_hdr in readline/readline.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6546: checking for $ac_hdr" >&5
+echo "configure:6561: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6554: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6569: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -6586,15 +6601,15 @@ for ac_hdr in readline/history.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6590: checking for $ac_hdr" >&5
+echo "configure:6605: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6598: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6613: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -6628,7 +6643,7 @@ CPPFLAGS=$ac_save_cppflags
echo $ac_n "checking for location of Readline library""... $ac_c" 1>&6
-echo "configure:6632: checking for location of Readline library" >&5
+echo "configure:6647: checking for location of Readline library" >&5
case "$with_readline_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-readline-libs." 1>&2; exit 1; }
@@ -6653,13 +6668,13 @@ LDFLAGS="$READLINELIBPATH $LDFLAGS"
echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
-echo "configure:6657: checking for readline in -lreadline" >&5
+echo "configure:6672: checking for readline in -lreadline" >&5
ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lreadline $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6705,13 +6720,13 @@ LDFLAGS="$READLINELIBPATH $LDFLAGS"
echo $ac_n "checking for add_history in -lhistory""... $ac_c" 1>&6
-echo "configure:6709: checking for add_history in -lhistory" >&5
+echo "configure:6724: checking for add_history in -lhistory" >&5
ac_lib_var=`echo history'_'add_history | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lhistory $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6764,7 +6779,7 @@ fi # $USE_READLINE
# GDAL option
echo $ac_n "checking whether to use GDAL""... $ac_c" 1>&6
-echo "configure:6768: checking whether to use GDAL" >&5
+echo "configure:6783: checking whether to use GDAL" >&5
GDAL_LIBS=
GDAL_CFLAGS=
@@ -6782,7 +6797,7 @@ else
# Extract the first word of "gdal-config", so it can be a program name with args.
set dummy gdal-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6786: checking for $ac_word" >&5
+echo "configure:6801: checking for $ac_word" >&5
case "$GDAL_CONFIG" in
/*)
@@ -6837,14 +6852,14 @@ EOF
LIBS="$LIBS $GDAL_LIBS"
CFLAGS="$CFLAGS $GDAL_CFLAGS"
cat > conftest.$ac_ext <
int main() {
GDALOpen("foo", GA_ReadOnly);
; return 0; }
EOF
-if { (eval echo configure:6848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
:
else
echo "configure: failed program was:" >&5
@@ -6853,14 +6868,14 @@ else
LIBS="$LIBS $GDAL_DEP_LIBS"
cat > conftest.$ac_ext <
int main() {
GDALOpen("foo", GA_ReadOnly);
; return 0; }
EOF
-if { (eval echo configure:6864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
GDAL_LIBS="$GDAL_LIBS $GDAL_DEP_LIBS"
else
@@ -6892,7 +6907,7 @@ fi
# libLAS option
echo $ac_n "checking whether to use libLAS""... $ac_c" 1>&6
-echo "configure:6896: checking whether to use libLAS" >&5
+echo "configure:6911: checking whether to use libLAS" >&5
LIBLAS_LIBS=
LIBLAS_CFLAGS=
@@ -6909,7 +6924,7 @@ else
# Extract the first word of "liblas-config", so it can be a program name with args.
set dummy liblas-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6913: checking for $ac_word" >&5
+echo "configure:6928: checking for $ac_word" >&5
case "$LIBLAS_CONFIG" in
/*)
@@ -6962,15 +6977,15 @@ fi
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6966: checking for $ac_hdr" >&5
+echo "configure:6981: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6974: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6989: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -6996,14 +7011,14 @@ fi
done
cat > conftest.$ac_ext <
int main() {
LASReader_Create("foo");
; return 0; }
EOF
-if { (eval echo configure:7007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
:
else
echo "configure: failed program was:" >&5
@@ -7011,14 +7026,14 @@ else
rm -rf conftest*
cat > conftest.$ac_ext <
int main() {
LASReader_Create("foo");
; return 0; }
EOF
-if { (eval echo configure:7022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
LAS_LIBS="$LAS_LIBS"
else
@@ -7051,7 +7066,7 @@ fi
# PDAL option
echo $ac_n "checking whether to use PDAL""... $ac_c" 1>&6
-echo "configure:7055: checking whether to use PDAL" >&5
+echo "configure:7070: checking whether to use PDAL" >&5
# new and currently used way to switch language to C++
# AC_LANG_PUSH(C++)
@@ -7079,7 +7094,7 @@ else
# Extract the first word of "pdal-config", so it can be a program name with args.
set dummy pdal-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7083: checking for $ac_word" >&5
+echo "configure:7098: checking for $ac_word" >&5
case "$PDAL_CONFIG" in
/*)
@@ -7129,14 +7144,14 @@ fi
CFLAGS="$CFLAGS $PDAL_CFLAGS"
CPPFLAGS="$CPPFLAGS $PDAL_CPPFLAGS $PDAL_INC"
cat > conftest.$ac_ext <
int main() {
pdal::PointTable table;
; return 0; }
EOF
-if { (eval echo configure:7140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
:
else
echo "configure: failed program was:" >&5
@@ -7144,14 +7159,14 @@ else
rm -rf conftest*
cat > conftest.$ac_ext <
int main() {
pdal::PointTable table;
; return 0; }
EOF
-if { (eval echo configure:7155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
PDAL_LIBS="$PDAL_LIBS"
else
@@ -7201,7 +7216,7 @@ cross_compiling=$ac_cv_prog_cc_cross
# NetCDF option
echo $ac_n "checking whether to use NetCDF""... $ac_c" 1>&6
-echo "configure:7205: checking whether to use NetCDF" >&5
+echo "configure:7220: checking whether to use NetCDF" >&5
NETCDF_LIBS=
NETCDF_CFLAGS=
@@ -7218,7 +7233,7 @@ else
# Extract the first word of "nc-config", so it can be a program name with args.
set dummy nc-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7222: checking for $ac_word" >&5
+echo "configure:7237: checking for $ac_word" >&5
case "$NETCDF_CONFIG" in
/*)
@@ -7265,14 +7280,14 @@ fi
LIBS="$LIBS $NETCDF_LIBS"
CFLAGS="$CFLAGS $NETCDF_CFLAGS"
cat > conftest.$ac_ext <
int main() {
nc_create("foo", NC_CLOBBER, NULL);
; return 0; }
EOF
-if { (eval echo configure:7276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
:
else
echo "configure: failed program was:" >&5
@@ -7280,14 +7295,14 @@ else
rm -rf conftest*
cat > conftest.$ac_ext <
int main() {
nc_create("foo", NC_CLOBBER, NULL);
; return 0; }
EOF
-if { (eval echo configure:7291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
NETCDF_LIBS="$NETCDF_LIBS"
else
@@ -7318,7 +7333,7 @@ fi
# GEOS option
echo $ac_n "checking whether to use GEOS""... $ac_c" 1>&6
-echo "configure:7322: checking whether to use GEOS" >&5
+echo "configure:7337: checking whether to use GEOS" >&5
GEOS_LIBS=
GEOS_CFLAGS=
@@ -7336,7 +7351,7 @@ else
# Extract the first word of "geos-config", so it can be a program name with args.
set dummy geos-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7340: checking for $ac_word" >&5
+echo "configure:7355: checking for $ac_word" >&5
case "$GEOS_CONFIG" in
/*)
@@ -7384,15 +7399,15 @@ for ac_hdr in geos_c.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7388: checking for $ac_hdr" >&5
+echo "configure:7403: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7396: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7411: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -7431,13 +7446,13 @@ LDFLAGS="$GEOS_LIBS $LDFLAGS"
echo $ac_n "checking for initGEOS in -lgeos_c""... $ac_c" 1>&6
-echo "configure:7435: checking for initGEOS in -lgeos_c" >&5
+echo "configure:7450: checking for initGEOS in -lgeos_c" >&5
ac_lib_var=`echo geos_c'_'initGEOS | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lgeos_c $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7492,7 +7507,7 @@ fi
echo $ac_n "checking whether to use TIFF""... $ac_c" 1>&6
-echo "configure:7496: checking whether to use TIFF" >&5
+echo "configure:7511: checking whether to use TIFF" >&5
echo "$ac_t"""$with_tiff"" 1>&6
case "$with_tiff" in
"no") USE_TIFF= ;;
@@ -7512,7 +7527,7 @@ if test -n "$USE_TIFF"; then
echo $ac_n "checking for location of TIFF includes""... $ac_c" 1>&6
-echo "configure:7516: checking for location of TIFF includes" >&5
+echo "configure:7531: checking for location of TIFF includes" >&5
case "$with_tiff_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-tiff-includes." 1>&2; exit 1; }
@@ -7538,15 +7553,15 @@ for ac_hdr in tiffio.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7542: checking for $ac_hdr" >&5
+echo "configure:7557: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7550: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -7580,7 +7595,7 @@ CPPFLAGS=$ac_save_cppflags
echo $ac_n "checking for location of TIFF library""... $ac_c" 1>&6
-echo "configure:7584: checking for location of TIFF library" >&5
+echo "configure:7599: checking for location of TIFF library" >&5
case "$with_tiff_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-tiff-libs." 1>&2; exit 1; }
@@ -7611,13 +7626,13 @@ LDFLAGS="$TIFF_LIBRARY_DIRS $LDFLAGS"
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7615: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7630: checking for TIFFOpen in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltiff $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7647,13 +7662,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7651: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7666: checking for TIFFOpen in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltiff $MATHLIB $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7683,13 +7698,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7687: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7702: checking for TIFFOpen in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltiff $ZLIB $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7719,13 +7734,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7723: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7738: checking for TIFFOpen in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltiff $ZLIB $MATHLIB $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7755,13 +7770,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7759: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7774: checking for TIFFOpen in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltiff -ljpeg $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7791,13 +7806,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7795: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7810: checking for TIFFOpen in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltiff -ljpeg $MATHLIB $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7827,13 +7842,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7831: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7846: checking for TIFFOpen in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltiff -ljpeg $ZLIB $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7863,13 +7878,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7867: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7882: checking for TIFFOpen in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltiff -ljpeg $ZLIB $MATHLIB $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7978,7 +7993,7 @@ fi # $USE_TIFF
echo $ac_n "checking whether to use PNG""... $ac_c" 1>&6
-echo "configure:7982: checking whether to use PNG" >&5
+echo "configure:7997: checking whether to use PNG" >&5
echo "$ac_t"""$with_png"" 1>&6
case "$with_png" in
"no") USE_PNG= ;;
@@ -7997,7 +8012,7 @@ if test -n "$USE_PNG"; then
echo $ac_n "checking for location of PNG includes""... $ac_c" 1>&6
-echo "configure:8001: checking for location of PNG includes" >&5
+echo "configure:8016: checking for location of PNG includes" >&5
case "$with_png_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-png-includes." 1>&2; exit 1; }
@@ -8023,15 +8038,15 @@ for ac_hdr in png.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8027: checking for $ac_hdr" >&5
+echo "configure:8042: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8035: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8050: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -8065,7 +8080,7 @@ CPPFLAGS=$ac_save_cppflags
echo $ac_n "checking for location of PNG library""... $ac_c" 1>&6
-echo "configure:8069: checking for location of PNG library" >&5
+echo "configure:8084: checking for location of PNG library" >&5
case "$with_png_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-png-libs." 1>&2; exit 1; }
@@ -8090,13 +8105,13 @@ LDFLAGS="$PNGLIB $LDFLAGS"
echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:8094: checking for png_read_image in -lpng" >&5
+echo "configure:8109: checking for png_read_image in -lpng" >&5
ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lpng $ZLIB $MATHLIB $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8149,7 +8164,7 @@ fi # $USE_PNG
echo $ac_n "checking whether to use PostgreSQL""... $ac_c" 1>&6
-echo "configure:8153: checking whether to use PostgreSQL" >&5
+echo "configure:8168: checking whether to use PostgreSQL" >&5
echo "$ac_t"""$with_postgres"" 1>&6
case "$with_postgres" in
"no") USE_POSTGRES= ;;
@@ -8176,7 +8191,7 @@ if test -n "$USE_POSTGRES"; then
echo $ac_n "checking for location of PostgreSQL includes""... $ac_c" 1>&6
-echo "configure:8180: checking for location of PostgreSQL includes" >&5
+echo "configure:8195: checking for location of PostgreSQL includes" >&5
case "$with_postgres_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-postgres-includes." 1>&2; exit 1; }
@@ -8202,15 +8217,15 @@ for ac_hdr in libpq-fe.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8206: checking for $ac_hdr" >&5
+echo "configure:8221: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8214: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -8248,7 +8263,7 @@ if test -n "$USE_POSTGRES"; then
echo $ac_n "checking for location of PostgreSQL library""... $ac_c" 1>&6
-echo "configure:8252: checking for location of PostgreSQL library" >&5
+echo "configure:8267: checking for location of PostgreSQL library" >&5
case "$with_postgres_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-postgres-libs." 1>&2; exit 1; }
@@ -8277,13 +8292,13 @@ LDFLAGS="$PQLIBPATH $LDFLAGS"
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:8281: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:8296: checking for PQsetdbLogin in -lpq" >&5
ac_lib_var=`echo pq'_'PQsetdbLogin | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8313,13 +8328,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:8317: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:8332: checking for PQsetdbLogin in -lpq" >&5
ac_lib_var=`echo pq'_'PQsetdbLogin | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lpq -lssl -lcrypto $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8349,13 +8364,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:8353: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:8368: checking for PQsetdbLogin in -lpq" >&5
ac_lib_var=`echo pq'_'PQsetdbLogin | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lpq -lcrypt $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8385,13 +8400,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:8389: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:8404: checking for PQsetdbLogin in -lpq" >&5
ac_lib_var=`echo pq'_'PQsetdbLogin | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lpq -lcrypt -lssl -lcrypto $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8459,13 +8474,13 @@ LDFLAGS=${ac_save_ldflags}
ac_save_ldflags="$LDFLAGS"
LDFLAGS="$LDFLAGS $PQLIBPATH"
echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
-echo "configure:8463: checking for PQcmdTuples in -lpq" >&5
+echo "configure:8478: checking for PQcmdTuples in -lpq" >&5
ac_lib_var=`echo pq'_'PQcmdTuples | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8498,13 +8513,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
-echo "configure:8502: checking for PQcmdTuples in -lpq" >&5
+echo "configure:8517: checking for PQcmdTuples in -lpq" >&5
ac_lib_var=`echo pq'_'PQcmdTuples | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lpq -lcrypt $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8558,7 +8573,7 @@ fi # $USE_POSTGRES
echo $ac_n "checking whether to use MySQL""... $ac_c" 1>&6
-echo "configure:8562: checking whether to use MySQL" >&5
+echo "configure:8577: checking whether to use MySQL" >&5
echo "$ac_t"""$with_mysql"" 1>&6
case "$with_mysql" in
"no") USE_MYSQL= ;;
@@ -8578,7 +8593,7 @@ if test -n "$USE_MYSQL"; then
echo $ac_n "checking for location of MySQL includes""... $ac_c" 1>&6
-echo "configure:8582: checking for location of MySQL includes" >&5
+echo "configure:8597: checking for location of MySQL includes" >&5
case "$with_mysql_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-mysql-includes." 1>&2; exit 1; }
@@ -8604,15 +8619,15 @@ for ac_hdr in mysql.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8608: checking for $ac_hdr" >&5
+echo "configure:8623: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8616: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8631: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -8649,7 +8664,7 @@ if test -n "$USE_MYSQL"; then
echo $ac_n "checking for location of MySQL library""... $ac_c" 1>&6
-echo "configure:8653: checking for location of MySQL library" >&5
+echo "configure:8668: checking for location of MySQL library" >&5
case "$with_mysql_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-mysql-libs." 1>&2; exit 1; }
@@ -8680,13 +8695,13 @@ LDFLAGS="$MYSQLLIBPATH $LDFLAGS"
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:8684: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:8699: checking for mysql_query in -lmysqlclient" >&5
ac_lib_var=`echo mysqlclient'_'mysql_query | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lmysqlclient $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8716,13 +8731,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:8720: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:8735: checking for mysql_query in -lmysqlclient" >&5
ac_lib_var=`echo mysqlclient'_'mysql_query | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lmysqlclient $MATHLIB $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8752,13 +8767,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:8756: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:8771: checking for mysql_query in -lmysqlclient" >&5
ac_lib_var=`echo mysqlclient'_'mysql_query | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lmysqlclient $SOCKLIB $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8788,13 +8803,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:8792: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:8807: checking for mysql_query in -lmysqlclient" >&5
ac_lib_var=`echo mysqlclient'_'mysql_query | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lmysqlclient $SOCKLIB $MATHLIB $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8824,13 +8839,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:8828: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:8843: checking for mysql_query in -lmysqlclient" >&5
ac_lib_var=`echo mysqlclient'_'mysql_query | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lmysqlclient $ZLIB $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8860,13 +8875,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:8864: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:8879: checking for mysql_query in -lmysqlclient" >&5
ac_lib_var=`echo mysqlclient'_'mysql_query | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lmysqlclient $ZLIB $MATHLIB $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8896,13 +8911,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:8900: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:8915: checking for mysql_query in -lmysqlclient" >&5
ac_lib_var=`echo mysqlclient'_'mysql_query | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lmysqlclient $ZLIB $SOCKLIB $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8932,13 +8947,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:8936: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:8951: checking for mysql_query in -lmysqlclient" >&5
ac_lib_var=`echo mysqlclient'_'mysql_query | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lmysqlclient $ZLIB $SOCKLIB $MATHLIB $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9039,7 +9054,7 @@ LDFLAGS=${ac_save_ldflags}
# Extract the first word of "mysql_config", so it can be a program name with args.
set dummy mysql_config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9043: checking for $ac_word" >&5
+echo "configure:9058: checking for $ac_word" >&5
case "$MYSQLD_CONFIG" in
/*)
@@ -9088,10 +9103,10 @@ cross_compiling=$ac_cv_prog_cxx_cross
LIBS="$MYSQLDLIB $LIBS"
echo $ac_n "checking for mysql_server_init""... $ac_c" 1>&6
-echo "configure:9092: checking for mysql_server_init" >&5
+echo "configure:9107: checking for mysql_server_init" >&5
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_mysql_server_init=yes"
else
@@ -9169,7 +9184,7 @@ fi # $USE_MYSQL
echo $ac_n "checking whether to use SQLite""... $ac_c" 1>&6
-echo "configure:9173: checking whether to use SQLite" >&5
+echo "configure:9188: checking whether to use SQLite" >&5
echo "$ac_t"""$with_sqlite"" 1>&6
case "$with_sqlite" in
"no") USE_SQLITE= ;;
@@ -9189,7 +9204,7 @@ if test -n "$USE_SQLITE"; then
echo $ac_n "checking for location of SQLite includes""... $ac_c" 1>&6
-echo "configure:9193: checking for location of SQLite includes" >&5
+echo "configure:9208: checking for location of SQLite includes" >&5
case "$with_sqlite_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-sqlite-includes." 1>&2; exit 1; }
@@ -9215,15 +9230,15 @@ for ac_hdr in sqlite3.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9219: checking for $ac_hdr" >&5
+echo "configure:9234: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9227: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -9266,7 +9281,7 @@ if test -n "$USE_SQLITE"; then
echo $ac_n "checking for location of SQLite library""... $ac_c" 1>&6
-echo "configure:9270: checking for location of SQLite library" >&5
+echo "configure:9285: checking for location of SQLite library" >&5
case "$with_sqlite_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-sqlite-libs." 1>&2; exit 1; }
@@ -9295,13 +9310,13 @@ LDFLAGS="$SQLITELIBPATH $LDFLAGS"
echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:9299: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:9314: checking for sqlite3_open in -lsqlite3" >&5
ac_lib_var=`echo sqlite3'_'sqlite3_open | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lsqlite3 $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9331,13 +9346,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:9335: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:9350: checking for sqlite3_open in -lsqlite3" >&5
ac_lib_var=`echo sqlite3'_'sqlite3_open | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lsqlite3 $DLLIB $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9367,13 +9382,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:9371: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:9386: checking for sqlite3_open in -lsqlite3" >&5
ac_lib_var=`echo sqlite3'_'sqlite3_open | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lsqlite3 $MATHLIB $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9403,13 +9418,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:9407: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:9422: checking for sqlite3_open in -lsqlite3" >&5
ac_lib_var=`echo sqlite3'_'sqlite3_open | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lsqlite3 $MATHLIB $DLLIB $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9495,7 +9510,7 @@ OPENGL_AQUA=
OPENGL_WINDOWS=
echo $ac_n "checking whether to use OpenGL""... $ac_c" 1>&6
-echo "configure:9499: checking whether to use OpenGL" >&5
+echo "configure:9514: checking whether to use OpenGL" >&5
echo "$ac_t"""$with_opengl"" 1>&6
case "$with_opengl" in
n|no)
@@ -9529,7 +9544,7 @@ if test "$OPENGL_X11" = 1 ; then
echo $ac_n "checking for location of OpenGL includes""... $ac_c" 1>&6
-echo "configure:9533: checking for location of OpenGL includes" >&5
+echo "configure:9548: checking for location of OpenGL includes" >&5
case "$with_opengl_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-opengl-includes." 1>&2; exit 1; }
@@ -9555,15 +9570,15 @@ for ac_hdr in GL/gl.h GL/glu.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9559: checking for $ac_hdr" >&5
+echo "configure:9574: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9582: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -9597,7 +9612,7 @@ CPPFLAGS=$ac_save_cppflags
echo $ac_n "checking for location of OpenGL library""... $ac_c" 1>&6
-echo "configure:9601: checking for location of OpenGL library" >&5
+echo "configure:9616: checking for location of OpenGL library" >&5
case "$with_opengl_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-opengl-libs." 1>&2; exit 1; }
@@ -9626,13 +9641,13 @@ LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS"
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:9630: checking for glBegin in -lGL" >&5
+echo "configure:9645: checking for glBegin in -lGL" >&5
ac_lib_var=`echo GL'_'glBegin | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lGL $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9662,13 +9677,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:9666: checking for glBegin in -lGL" >&5
+echo "configure:9681: checking for glBegin in -lGL" >&5
ac_lib_var=`echo GL'_'glBegin | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lGL $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB -lXext $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9698,13 +9713,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:9702: checking for glBegin in -lGL" >&5
+echo "configure:9717: checking for glBegin in -lGL" >&5
ac_lib_var=`echo GL'_'glBegin | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lGL $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB -lpthread $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9734,13 +9749,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:9738: checking for glBegin in -lGL" >&5
+echo "configure:9753: checking for glBegin in -lGL" >&5
ac_lib_var=`echo GL'_'glBegin | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lGL $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB -lpthread -lXext $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9813,13 +9828,13 @@ LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS"
echo $ac_n "checking for gluBeginCurve in -lGLU""... $ac_c" 1>&6
-echo "configure:9817: checking for gluBeginCurve in -lGLU" >&5
+echo "configure:9832: checking for gluBeginCurve in -lGLU" >&5
ac_lib_var=`echo GLU'_'gluBeginCurve | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lGLU $OPENGLLIB $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9849,13 +9864,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gluBeginCurve in -lGLU""... $ac_c" 1>&6
-echo "configure:9853: checking for gluBeginCurve in -lGLU" >&5
+echo "configure:9868: checking for gluBeginCurve in -lGLU" >&5
ac_lib_var=`echo GLU'_'gluBeginCurve | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lGLU $OPENGLLIB $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB -lstdc++ $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9913,10 +9928,10 @@ ac_save_ldflags="$LDFLAGS"
LIBS=" $OPENGLLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for glXCreatePbuffer""... $ac_c" 1>&6
-echo "configure:9917: checking for glXCreatePbuffer" >&5
+echo "configure:9932: checking for glXCreatePbuffer" >&5
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_glXCreatePbuffer=yes"
else
@@ -9976,10 +9991,10 @@ ac_save_ldflags="$LDFLAGS"
LIBS=" $OPENGLLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for glXCreateGLXPixmap""... $ac_c" 1>&6
-echo "configure:9980: checking for glXCreateGLXPixmap" >&5
+echo "configure:9995: checking for glXCreateGLXPixmap" >&5
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_glXCreateGLXPixmap=yes"
else
@@ -10045,7 +10060,7 @@ if test "$OPENGL_AQUA" = 1 ; then
echo $ac_n "checking for location of OpenGL framework""... $ac_c" 1>&6
-echo "configure:10049: checking for location of OpenGL framework" >&5
+echo "configure:10064: checking for location of OpenGL framework" >&5
case "$with_opengl_framework" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-opengl-framework." 1>&2; exit 1; }
@@ -10069,15 +10084,15 @@ for ac_hdr in OpenGL/gl.h OpenGL/glu.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10073: checking for $ac_hdr" >&5
+echo "configure:10088: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10081: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10096: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -10113,10 +10128,10 @@ ac_save_ldflags="$LDFLAGS"
LIBS="-framework OpenGL -framework AGL -framework ApplicationServices $LIBS"
LDFLAGS="$OPENGLPATH $LDFLAGS"
echo $ac_n "checking for glBegin""... $ac_c" 1>&6
-echo "configure:10117: checking for glBegin" >&5
+echo "configure:10132: checking for glBegin" >&5
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_glBegin=yes"
else
@@ -10176,10 +10191,10 @@ ac_save_ldflags="$LDFLAGS"
LIBS=" $OPENGLLIB $LIBS"
LDFLAGS="$OPENGLPATH $LDFLAGS"
echo $ac_n "checking for gluBeginCurve""... $ac_c" 1>&6
-echo "configure:10180: checking for gluBeginCurve" >&5
+echo "configure:10195: checking for gluBeginCurve" >&5
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gluBeginCurve=yes"
else
@@ -10250,7 +10265,7 @@ if test "$OPENGL_WINDOWS" = 1 ; then
echo $ac_n "checking for location of OpenGL includes""... $ac_c" 1>&6
-echo "configure:10254: checking for location of OpenGL includes" >&5
+echo "configure:10269: checking for location of OpenGL includes" >&5
case "$with_opengl_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-opengl-includes." 1>&2; exit 1; }
@@ -10276,15 +10291,15 @@ for ac_hdr in GL/gl.h GL/glu.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10280: checking for $ac_hdr" >&5
+echo "configure:10295: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10288: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10303: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -10318,7 +10333,7 @@ CPPFLAGS=$ac_save_cppflags
echo $ac_n "checking for location of OpenGL library""... $ac_c" 1>&6
-echo "configure:10322: checking for location of OpenGL library" >&5
+echo "configure:10337: checking for location of OpenGL library" >&5
case "$with_opengl_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-opengl-libs." 1>&2; exit 1; }
@@ -10343,18 +10358,18 @@ CFLAGS="$CFLAGS $OPENGLINC"
ac_save_ldflags="$LDFLAGS"
ac_save_libs="$LIBS"
echo $ac_n "checking for OpenGL library""... $ac_c" 1>&6
-echo "configure:10347: checking for OpenGL library" >&5
+echo "configure:10362: checking for OpenGL library" >&5
LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS"
LIBS="-lopengl32 "
cat > conftest.$ac_ext <
int main() {
glEnd();
; return 0; }
EOF
-if { (eval echo configure:10358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""found" 1>&6
@@ -10378,18 +10393,18 @@ LDFLAGS=${ac_save_ldflags}
ac_save_ldflags="$LDFLAGS"
ac_save_libs="$LIBS"
echo $ac_n "checking for GLU library""... $ac_c" 1>&6
-echo "configure:10382: checking for GLU library" >&5
+echo "configure:10397: checking for GLU library" >&5
LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS"
LIBS="-lglu32 $OPENGLLIB "
cat > conftest.$ac_ext <
int main() {
gluNewQuadric();
; return 0; }
EOF
-if { (eval echo configure:10393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""found" 1>&6
@@ -10438,7 +10453,7 @@ fi # $USE_OPENGL
echo $ac_n "checking whether to use ODBC""... $ac_c" 1>&6
-echo "configure:10442: checking whether to use ODBC" >&5
+echo "configure:10457: checking whether to use ODBC" >&5
echo "$ac_t"""$with_odbc"" 1>&6
case "$with_odbc" in
"no") USE_ODBC= ;;
@@ -10457,7 +10472,7 @@ if test -n "$USE_ODBC"; then
echo $ac_n "checking for location of ODBC includes""... $ac_c" 1>&6
-echo "configure:10461: checking for location of ODBC includes" >&5
+echo "configure:10476: checking for location of ODBC includes" >&5
case "$with_odbc_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-odbc-includes." 1>&2; exit 1; }
@@ -10483,15 +10498,15 @@ for ac_hdr in sql.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10487: checking for $ac_hdr" >&5
+echo "configure:10502: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10495: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10510: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -10525,7 +10540,7 @@ CPPFLAGS=$ac_save_cppflags
echo $ac_n "checking for location of ODBC library""... $ac_c" 1>&6
-echo "configure:10529: checking for location of ODBC library" >&5
+echo "configure:10544: checking for location of ODBC library" >&5
case "$with_odbc_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-odbc-libs." 1>&2; exit 1; }
@@ -10550,13 +10565,13 @@ LDFLAGS="$ODBCLIB $LDFLAGS"
echo $ac_n "checking for SQLConnect in -lodbc""... $ac_c" 1>&6
-echo "configure:10554: checking for SQLConnect in -lodbc" >&5
+echo "configure:10569: checking for SQLConnect in -lodbc" >&5
ac_lib_var=`echo odbc'_'SQLConnect | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lodbc $ICONVLIB $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10592,13 +10607,13 @@ LDFLAGS="$ODBCLIB $LDFLAGS"
echo $ac_n "checking for SQLConnect in -liodbc""... $ac_c" 1>&6
-echo "configure:10596: checking for SQLConnect in -liodbc" >&5
+echo "configure:10611: checking for SQLConnect in -liodbc" >&5
ac_lib_var=`echo iodbc'_'SQLConnect | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-liodbc $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10634,11 +10649,11 @@ CFLAGS="$CFLAGS $ODBCINC"
ac_save_ldflags="$LDFLAGS"
ac_save_libs="$LIBS"
echo $ac_n "checking for ODBC library""... $ac_c" 1>&6
-echo "configure:10638: checking for ODBC library" >&5
+echo "configure:10653: checking for ODBC library" >&5
LDFLAGS="$ODBCLIB $LDFLAGS"
LIBS="-lodbc32 "
cat > conftest.$ac_ext <
#include
@@ -10646,7 +10661,7 @@ int main() {
SQLAllocEnv((SQLHENV *)0);
; return 0; }
EOF
-if { (eval echo configure:10650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""found" 1>&6
@@ -10695,7 +10710,7 @@ fi # $USE_ODBC
echo $ac_n "checking whether to use FFTW""... $ac_c" 1>&6
-echo "configure:10699: checking whether to use FFTW" >&5
+echo "configure:10714: checking whether to use FFTW" >&5
echo "$ac_t"""$with_fftw"" 1>&6
case "$with_fftw" in
"no") USE_FFTW= ;;
@@ -10714,7 +10729,7 @@ if test -n "$USE_FFTW"; then
echo $ac_n "checking for location of FFTW includes""... $ac_c" 1>&6
-echo "configure:10718: checking for location of FFTW includes" >&5
+echo "configure:10733: checking for location of FFTW includes" >&5
case "$with_fftw_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-fftw-includes." 1>&2; exit 1; }
@@ -10740,15 +10755,15 @@ for ac_hdr in fftw3.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10744: checking for $ac_hdr" >&5
+echo "configure:10759: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10752: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10767: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -10776,15 +10791,15 @@ for ac_hdr in fftw.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10780: checking for $ac_hdr" >&5
+echo "configure:10795: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10803: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -10812,15 +10827,15 @@ for ac_hdr in dfftw.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10816: checking for $ac_hdr" >&5
+echo "configure:10831: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -10866,7 +10881,7 @@ CPPFLAGS=$ac_save_cppflags
echo $ac_n "checking for location of FFTW library""... $ac_c" 1>&6
-echo "configure:10870: checking for location of FFTW library" >&5
+echo "configure:10885: checking for location of FFTW library" >&5
case "$with_fftw_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-fftw-libs." 1>&2; exit 1; }
@@ -10891,13 +10906,13 @@ LDFLAGS="$FFTWLIB $LDFLAGS"
echo $ac_n "checking for fftw_execute in -lfftw3""... $ac_c" 1>&6
-echo "configure:10895: checking for fftw_execute in -lfftw3" >&5
+echo "configure:10910: checking for fftw_execute in -lfftw3" >&5
ac_lib_var=`echo fftw3'_'fftw_execute | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lfftw3 $MATHLIB $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10933,13 +10948,13 @@ LDFLAGS="$FFTWLIB $LDFLAGS"
echo $ac_n "checking for fftwnd_one in -lfftw""... $ac_c" 1>&6
-echo "configure:10937: checking for fftwnd_one in -lfftw" >&5
+echo "configure:10952: checking for fftwnd_one in -lfftw" >&5
ac_lib_var=`echo fftw'_'fftwnd_one | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lfftw $MATHLIB $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10975,13 +10990,13 @@ LDFLAGS="$FFTWLIB $LDFLAGS"
echo $ac_n "checking for fftwnd_one in -ldfftw""... $ac_c" 1>&6
-echo "configure:10979: checking for fftwnd_one in -ldfftw" >&5
+echo "configure:10994: checking for fftwnd_one in -ldfftw" >&5
ac_lib_var=`echo dfftw'_'fftwnd_one | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ldfftw $MATHLIB $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11049,7 +11064,7 @@ fi # $USE_FFTW
echo $ac_n "checking whether to use BLAS""... $ac_c" 1>&6
-echo "configure:11053: checking whether to use BLAS" >&5
+echo "configure:11068: checking whether to use BLAS" >&5
echo "$ac_t"""$with_blas"" 1>&6
case "$with_blas" in
"no") USE_BLAS= ;;
@@ -11070,7 +11085,7 @@ if test -n "$USE_BLAS"; then
echo $ac_n "checking for location of BLAS includes""... $ac_c" 1>&6
-echo "configure:11074: checking for location of BLAS includes" >&5
+echo "configure:11089: checking for location of BLAS includes" >&5
case "$with_blas_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-blas-includes." 1>&2; exit 1; }
@@ -11090,7 +11105,7 @@ fi
echo $ac_n "checking for location of BLAS library""... $ac_c" 1>&6
-echo "configure:11094: checking for location of BLAS library" >&5
+echo "configure:11109: checking for location of BLAS library" >&5
case "$with_blas_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-blas-libs." 1>&2; exit 1; }
@@ -11116,15 +11131,15 @@ for ac_hdr in cblas.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11120: checking for $ac_hdr" >&5
+echo "configure:11135: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11128: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11143: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -11159,13 +11174,13 @@ LDFLAGS="$BLASLIB $LDFLAGS"
echo $ac_n "checking for dnrm2_ in -lblas""... $ac_c" 1>&6
-echo "configure:11163: checking for dnrm2_ in -lblas" >&5
+echo "configure:11178: checking for dnrm2_ in -lblas" >&5
ac_lib_var=`echo blas'_'dnrm2_ | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lblas $MATHLIB $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11195,13 +11210,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dnrm2_ in -lblas""... $ac_c" 1>&6
-echo "configure:11199: checking for dnrm2_ in -lblas" >&5
+echo "configure:11214: checking for dnrm2_ in -lblas" >&5
ac_lib_var=`echo blas'_'dnrm2_ | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lblas $MATHLIB -lg2c $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11256,13 +11271,13 @@ blas_ok=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$BLASLIB $LDFLAGS"
echo $ac_n "checking for ATL_xerbla in -latlas""... $ac_c" 1>&6
-echo "configure:11260: checking for ATL_xerbla in -latlas" >&5
+echo "configure:11275: checking for ATL_xerbla in -latlas" >&5
ac_lib_var=`echo atlas'_'ATL_xerbla | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-latlas $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11288,13 +11303,13 @@ LIBS="$ac_save_LIBS"
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for sgemm_ in -lf77blas""... $ac_c" 1>&6
-echo "configure:11292: checking for sgemm_ in -lf77blas" >&5
+echo "configure:11307: checking for sgemm_ in -lf77blas" >&5
ac_lib_var=`echo f77blas'_'sgemm_ | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lf77blas -latlas $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11320,13 +11335,13 @@ LIBS="$ac_save_LIBS"
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for cblas_dgemm in -lcblas""... $ac_c" 1>&6
-echo "configure:11324: checking for cblas_dgemm in -lcblas" >&5
+echo "configure:11339: checking for cblas_dgemm in -lcblas" >&5
ac_lib_var=`echo cblas'_'cblas_dgemm | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lcblas -lf77blas -latlas $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11383,16 +11398,16 @@ if test $blas_ok = no; then
save_LIBS="$LIBS"
LIBS="$vlib_flags $LIBS"
echo $ac_n "checking for sgemm in $vlib_flags""... $ac_c" 1>&6
-echo "configure:11387: checking for sgemm in $vlib_flags" >&5
+echo "configure:11402: checking for sgemm in $vlib_flags" >&5
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
blas_ok=yes; BLASLIB="$vlib_flags"
else
@@ -11410,13 +11425,13 @@ fi
# BLAS in PhiPACK libraries? (requires generic BLAS, too)
if test $blas_ok = no; then
echo $ac_n "checking for sgemm_ in -lblas""... $ac_c" 1>&6
-echo "configure:11414: checking for sgemm_ in -lblas" >&5
+echo "configure:11429: checking for sgemm_ in -lblas" >&5
ac_lib_var=`echo blas'_'sgemm_ | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lblas $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11442,13 +11457,13 @@ LIBS="$ac_save_LIBS"
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for dgemm_ in -ldgemm""... $ac_c" 1>&6
-echo "configure:11446: checking for dgemm_ in -ldgemm" >&5
+echo "configure:11461: checking for dgemm_ in -ldgemm" >&5
ac_lib_var=`echo dgemm'_'dgemm_ | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ldgemm -lblas $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11474,13 +11489,13 @@ LIBS="$ac_save_LIBS"
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for sgemm_ in -lsgemm""... $ac_c" 1>&6
-echo "configure:11478: checking for sgemm_ in -lsgemm" >&5
+echo "configure:11493: checking for sgemm_ in -lsgemm" >&5
ac_lib_var=`echo sgemm'_'sgemm_ | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lsgemm -lblas $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11525,13 +11540,13 @@ fi
if test $blas_ok = no; then
if test "x$GCC" != xyes; then # only works with Sun CC
echo $ac_n "checking for acosp in -lsunmath""... $ac_c" 1>&6
-echo "configure:11529: checking for acosp in -lsunmath" >&5
+echo "configure:11544: checking for acosp in -lsunmath" >&5
ac_lib_var=`echo sunmath'_'acosp | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lsunmath $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11557,13 +11572,13 @@ LIBS="$ac_save_LIBS"
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for sgemm_ in -lsunperf""... $ac_c" 1>&6
-echo "configure:11561: checking for sgemm_ in -lsunperf" >&5
+echo "configure:11576: checking for sgemm_ in -lsunperf" >&5
ac_lib_var=`echo sunperf'_'sgemm_ | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lsunperf -lsunmath $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11604,13 +11619,13 @@ fi
# Generic BLAS library
if test $blas_ok = no; then
echo $ac_n "checking for sgemm_ in -lblas""... $ac_c" 1>&6
-echo "configure:11608: checking for sgemm_ in -lblas" >&5
+echo "configure:11623: checking for sgemm_ in -lblas" >&5
ac_lib_var=`echo blas'_'sgemm_ | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lblas $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11660,7 +11675,7 @@ fi # $USE_BLAS
echo $ac_n "checking whether to use LAPACK""... $ac_c" 1>&6
-echo "configure:11664: checking whether to use LAPACK" >&5
+echo "configure:11679: checking whether to use LAPACK" >&5
echo "$ac_t"""$with_lapack"" 1>&6
case "$with_lapack" in
"no") USE_LAPACK= ;;
@@ -11685,7 +11700,7 @@ lapack_ok=no
echo $ac_n "checking for location of LAPACK includes""... $ac_c" 1>&6
-echo "configure:11689: checking for location of LAPACK includes" >&5
+echo "configure:11704: checking for location of LAPACK includes" >&5
case "$with_lapack_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-lapack-includes." 1>&2; exit 1; }
@@ -11705,7 +11720,7 @@ fi
echo $ac_n "checking for location of LAPACK library""... $ac_c" 1>&6
-echo "configure:11709: checking for location of LAPACK library" >&5
+echo "configure:11724: checking for location of LAPACK library" >&5
case "$with_lapack_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-lapack-libs." 1>&2; exit 1; }
@@ -11731,15 +11746,15 @@ for ac_hdr in clapack.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11735: checking for $ac_hdr" >&5
+echo "configure:11750: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11743: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11758: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -11771,10 +11786,10 @@ if test lapack_ok=no; then
save_LIBS="$LIBS"; LIBS="$LIBS $BLASLIB $MATHLIB $FLIBS"
save_LDFLAGS="$LDFLAGS"; LDFLAGS="$LAPACKLIB $LDFLAGS"
echo $ac_n "checking for dsegv_""... $ac_c" 1>&6
-echo "configure:11775: checking for dsegv_" >&5
+echo "configure:11790: checking for dsegv_" >&5
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_dsegv_=yes"
else
@@ -11824,13 +11839,13 @@ if test $lapack_ok = no; then
save_libs="$LIBS"; LIBS="$BLASLIB $MATHLIB $LIBS"
save_LDFLAGS="$LDFLAGS"; LDFLAGS="$LAPACKLIB $LDFLAGS"
echo $ac_n "checking for desgv_ in -llapack""... $ac_c" 1>&6
-echo "configure:11828: checking for desgv_ in -llapack" >&5
+echo "configure:11843: checking for desgv_ in -llapack" >&5
ac_lib_var=`echo lapack'_'desgv_ | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-llapack $FLIBS $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11873,13 +11888,13 @@ LDFLAGS="$LAPACKLIB $LDFLAGS"
echo $ac_n "checking for dgesv_ in -llapack""... $ac_c" 1>&6
-echo "configure:11877: checking for dgesv_ in -llapack" >&5
+echo "configure:11892: checking for dgesv_ in -llapack" >&5
ac_lib_var=`echo lapack'_'dgesv_ | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-llapack $BLASLIB $MATHLIB $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11909,13 +11924,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dgesv_ in -llapack""... $ac_c" 1>&6
-echo "configure:11913: checking for dgesv_ in -llapack" >&5
+echo "configure:11928: checking for dgesv_ in -llapack" >&5
ac_lib_var=`echo lapack'_'dgesv_ | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-llapack $BLASLIB $MATHLIB -lg2c $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11982,7 +11997,7 @@ fi # $USE_BLAS
echo $ac_n "checking whether to use Cairo""... $ac_c" 1>&6
-echo "configure:11986: checking whether to use Cairo" >&5
+echo "configure:12001: checking whether to use Cairo" >&5
echo "$ac_t"""$with_cairo"" 1>&6
case "$with_cairo" in
"no") USE_CAIRO= ;;
@@ -12014,7 +12029,7 @@ CAIROINC=`$PKG_CONFIG --cflags $cairo`
echo $ac_n "checking for location of cairo includes""... $ac_c" 1>&6
-echo "configure:12018: checking for location of cairo includes" >&5
+echo "configure:12033: checking for location of cairo includes" >&5
case "$with_cairo_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-cairo-includes." 1>&2; exit 1; }
@@ -12040,15 +12055,15 @@ for ac_hdr in cairo.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12044: checking for $ac_hdr" >&5
+echo "configure:12059: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12052: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12067: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -12084,7 +12099,7 @@ CAIROLIB=`$PKG_CONFIG --libs $cairo`
echo $ac_n "checking for location of cairo library""... $ac_c" 1>&6
-echo "configure:12088: checking for location of cairo library" >&5
+echo "configure:12103: checking for location of cairo library" >&5
case "$with_cairo_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-cairo-libs." 1>&2; exit 1; }
@@ -12104,7 +12119,7 @@ fi
echo $ac_n "checking for cairo linking flags""... $ac_c" 1>&6
-echo "configure:12108: checking for cairo linking flags" >&5
+echo "configure:12123: checking for cairo linking flags" >&5
case "$with_cairo_ldflags" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-cairo-ldflags." 1>&2; exit 1; }
@@ -12120,10 +12135,10 @@ ac_save_ldflags="$LDFLAGS"
LIBS=" $CAIROLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for cairo_create""... $ac_c" 1>&6
-echo "configure:12124: checking for cairo_create" >&5
+echo "configure:12139: checking for cairo_create" >&5
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_cairo_create=yes"
else
@@ -12180,10 +12195,10 @@ ac_save_ldflags="$LDFLAGS"
LIBS=" $CAIROLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for cairo_xlib_surface_create_with_xrender_format""... $ac_c" 1>&6
-echo "configure:12184: checking for cairo_xlib_surface_create_with_xrender_format" >&5
+echo "configure:12199: checking for cairo_xlib_surface_create_with_xrender_format" >&5
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_cairo_xlib_surface_create_with_xrender_format=yes"
else
@@ -12239,10 +12254,10 @@ ac_save_ldflags="$LDFLAGS"
LIBS=" $CAIROLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for cairo_xlib_surface_get_xrender_format""... $ac_c" 1>&6
-echo "configure:12243: checking for cairo_xlib_surface_get_xrender_format" >&5
+echo "configure:12258: checking for cairo_xlib_surface_get_xrender_format" >&5
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_cairo_xlib_surface_get_xrender_format=yes"
else
@@ -12307,7 +12322,7 @@ fi # $USE_CAIRO
echo $ac_n "checking whether to use FreeType""... $ac_c" 1>&6
-echo "configure:12311: checking whether to use FreeType" >&5
+echo "configure:12326: checking whether to use FreeType" >&5
echo "$ac_t"""$with_freetype"" 1>&6
case "$with_freetype" in
"no") USE_FREETYPE= ;;
@@ -12326,7 +12341,7 @@ if test -n "$USE_FREETYPE"; then
echo $ac_n "checking for location of FreeType includes""... $ac_c" 1>&6
-echo "configure:12330: checking for location of FreeType includes" >&5
+echo "configure:12345: checking for location of FreeType includes" >&5
case "$with_freetype_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-freetype-includes." 1>&2; exit 1; }
@@ -12352,15 +12367,15 @@ for ac_hdr in ft2build.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12356: checking for $ac_hdr" >&5
+echo "configure:12371: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12364: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12379: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -12394,7 +12409,7 @@ CPPFLAGS=$ac_save_cppflags
echo $ac_n "checking for location of FreeType library""... $ac_c" 1>&6
-echo "configure:12398: checking for location of FreeType library" >&5
+echo "configure:12413: checking for location of FreeType library" >&5
case "$with_freetype_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-freetype-libs." 1>&2; exit 1; }
@@ -12419,13 +12434,13 @@ LDFLAGS="$FTLIB $LDFLAGS"
echo $ac_n "checking for FT_Init_FreeType in -lfreetype""... $ac_c" 1>&6
-echo "configure:12423: checking for FT_Init_FreeType in -lfreetype" >&5
+echo "configure:12438: checking for FT_Init_FreeType in -lfreetype" >&5
ac_lib_var=`echo freetype'_'FT_Init_FreeType | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lfreetype $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12477,7 +12492,7 @@ fi # $USE_FREETYPE
echo $ac_n "checking whether to use NLS""... $ac_c" 1>&6
-echo "configure:12481: checking whether to use NLS" >&5
+echo "configure:12496: checking whether to use NLS" >&5
echo "$ac_t"""$with_nls"" 1>&6
case "$with_nls" in
"no") USE_NLS= ;;
@@ -12497,10 +12512,10 @@ EOF
echo $ac_n "checking for gettext""... $ac_c" 1>&6
-echo "configure:12501: checking for gettext" >&5
+echo "configure:12516: checking for gettext" >&5
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gettext=yes"
else
@@ -12541,13 +12556,13 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
-echo "configure:12545: checking for gettext in -lintl" >&5
+echo "configure:12560: checking for gettext in -lintl" >&5
ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lintl $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12593,7 +12608,7 @@ fi
echo $ac_n "checking whether to use C++""... $ac_c" 1>&6
-echo "configure:12597: checking whether to use C++" >&5
+echo "configure:12612: checking whether to use C++" >&5
echo "$ac_t"""$with_cxx"" 1>&6
case "$with_cxx" in
"no") USE_CXX= ;;
@@ -12609,7 +12624,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:12613: checking for $ac_word" >&5
+echo "configure:12628: checking for $ac_word" >&5
if test -n "$CXX"; then
ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -12638,7 +12653,7 @@ test -n "$CXX" || CXX="gcc"
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:12642: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:12657: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -12649,12 +12664,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext << EOF
-#line 12653 "configure"
+#line 12668 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:12658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cxx_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -12680,19 +12695,19 @@ if test $ac_cv_prog_cxx_works = no; then
{ echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:12684: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:12699: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:12689: checking whether we are using GNU C++" >&5
+echo "configure:12704: checking whether we are using GNU C++" >&5
cat > conftest.C <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:12711: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gxx=yes
else
ac_cv_prog_gxx=no
@@ -12710,7 +12725,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:12714: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:12729: checking whether ${CXX-g++} accepts -g" >&5
echo 'void f(){}' > conftest.cc
if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
@@ -12751,7 +12766,7 @@ fi
echo $ac_n "checking whether to use openDWG""... $ac_c" 1>&6
-echo "configure:12755: checking whether to use openDWG" >&5
+echo "configure:12770: checking whether to use openDWG" >&5
echo "$ac_t"""$with_opendwg"" 1>&6
case "$with_opendwg" in
"no") USE_OPENDWG= ;;
@@ -12771,7 +12786,7 @@ if test -n "${USE_OPENDWG}"; then
echo $ac_n "checking for location of openDGW includes""... $ac_c" 1>&6
-echo "configure:12775: checking for location of openDGW includes" >&5
+echo "configure:12790: checking for location of openDGW includes" >&5
case "$with_opendwg_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-opendwg-includes." 1>&2; exit 1; }
@@ -12797,15 +12812,15 @@ for ac_hdr in ad2.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12801: checking for $ac_hdr" >&5
+echo "configure:12816: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12809: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -12839,7 +12854,7 @@ CPPFLAGS=$ac_save_cppflags
echo $ac_n "checking for location of openDWG library""... $ac_c" 1>&6
-echo "configure:12843: checking for location of openDWG library" >&5
+echo "configure:12858: checking for location of openDWG library" >&5
case "$with_opendwg_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-opendwg-libs." 1>&2; exit 1; }
@@ -12880,7 +12895,7 @@ fi # $USE_OPENDWG
echo $ac_n "checking whether to use POSIX threads""... $ac_c" 1>&6
-echo "configure:12884: checking whether to use POSIX threads" >&5
+echo "configure:12899: checking whether to use POSIX threads" >&5
echo "$ac_t"""$with_pthread"" 1>&6
case "$with_pthread" in
"no") USE_PTHREAD= ;;
@@ -12900,7 +12915,7 @@ if test -n "$USE_PTHREAD"; then
echo $ac_n "checking for location of POSIX threads includes""... $ac_c" 1>&6
-echo "configure:12904: checking for location of POSIX threads includes" >&5
+echo "configure:12919: checking for location of POSIX threads includes" >&5
case "$with_pthread_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-pthread-includes." 1>&2; exit 1; }
@@ -12926,15 +12941,15 @@ for ac_hdr in pthread.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12930: checking for $ac_hdr" >&5
+echo "configure:12945: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12953: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -12968,7 +12983,7 @@ CPPFLAGS=$ac_save_cppflags
echo $ac_n "checking for location of POSIX threads library""... $ac_c" 1>&6
-echo "configure:12972: checking for location of POSIX threads library" >&5
+echo "configure:12987: checking for location of POSIX threads library" >&5
case "$with_pthread_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-pthread-libs." 1>&2; exit 1; }
@@ -12993,10 +13008,10 @@ ac_save_ldflags="$LDFLAGS"
LIBS=" $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
-echo "configure:12997: checking for pthread_create" >&5
+echo "configure:13012: checking for pthread_create" >&5
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_pthread_create=yes"
else
@@ -13046,13 +13061,13 @@ LDFLAGS="$PTHREADLIBPATH $LDFLAGS"
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:13050: checking for pthread_create in -lpthread" >&5
+echo "configure:13065: checking for pthread_create in -lpthread" >&5
ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lpthread $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13113,7 +13128,7 @@ fi # $USE_PTHREAD
echo $ac_n "checking whether to use OpenMP""... $ac_c" 1>&6
-echo "configure:13117: checking whether to use OpenMP" >&5
+echo "configure:13132: checking whether to use OpenMP" >&5
echo "$ac_t"""$with_openmp"" 1>&6
case "$with_openmp" in
"no") USE_OPENMP= ;;
@@ -13134,7 +13149,7 @@ if test -n "$USE_OPENMP"; then
echo $ac_n "checking for location of OpenMP includes""... $ac_c" 1>&6
-echo "configure:13138: checking for location of OpenMP includes" >&5
+echo "configure:13153: checking for location of OpenMP includes" >&5
case "$with_openmp_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-openmp-includes." 1>&2; exit 1; }
@@ -13160,15 +13175,15 @@ for ac_hdr in omp.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13164: checking for $ac_hdr" >&5
+echo "configure:13179: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -13206,7 +13221,7 @@ CPPFLAGS=$ac_save_cppflags
echo $ac_n "checking for location of OpenMP library""... $ac_c" 1>&6
-echo "configure:13210: checking for location of OpenMP library" >&5
+echo "configure:13225: checking for location of OpenMP library" >&5
case "$with_openmp_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-openmp-libs." 1>&2; exit 1; }
@@ -13231,10 +13246,10 @@ ac_save_ldflags="$LDFLAGS"
LIBS=" $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for GOMP_parallel_start""... $ac_c" 1>&6
-echo "configure:13235: checking for GOMP_parallel_start" >&5
+echo "configure:13250: checking for GOMP_parallel_start" >&5
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_GOMP_parallel_start=yes"
else
@@ -13284,13 +13299,13 @@ LDFLAGS="$OMPLIBPATH $LDFLAGS"
echo $ac_n "checking for GOMP_parallel_start in -lgomp""... $ac_c" 1>&6
-echo "configure:13288: checking for GOMP_parallel_start in -lgomp" >&5
+echo "configure:13303: checking for GOMP_parallel_start in -lgomp" >&5
ac_lib_var=`echo gomp'_'GOMP_parallel_start | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lgomp $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13374,7 +13389,7 @@ fi # $USE_OPENMP
echo $ac_n "checking whether to use OpenCL""... $ac_c" 1>&6
-echo "configure:13378: checking whether to use OpenCL" >&5
+echo "configure:13393: checking whether to use OpenCL" >&5
echo "$ac_t"""$with_opencl"" 1>&6
case "$with_opencl" in
"no") USE_OPENCL= ;;
@@ -13394,7 +13409,7 @@ if test -n "$USE_OPENCL"; then
echo $ac_n "checking for location of OpenCL includes""... $ac_c" 1>&6
-echo "configure:13398: checking for location of OpenCL includes" >&5
+echo "configure:13413: checking for location of OpenCL includes" >&5
case "$with_opencl_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-opencl-includes." 1>&2; exit 1; }
@@ -13421,15 +13436,15 @@ for ac_hdr in OpenCL/opencl.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13425: checking for $ac_hdr" >&5
+echo "configure:13440: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13433: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13448: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -13469,10 +13484,10 @@ ac_save_ldflags="$LDFLAGS"
LIBS="-framework OpenCL $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for clGetPlatformInfo""... $ac_c" 1>&6
-echo "configure:13473: checking for clGetPlatformInfo" >&5
+echo "configure:13488: checking for clGetPlatformInfo" >&5
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_clGetPlatformInfo=yes"
else
@@ -13534,15 +13549,15 @@ for ac_hdr in CL/cl.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13538: checking for $ac_hdr" >&5
+echo "configure:13553: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13546: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13561: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -13575,7 +13590,7 @@ CPPFLAGS=$ac_save_cppflags
# With OpenCL library directory
echo $ac_n "checking for location of OpenCL library""... $ac_c" 1>&6
-echo "configure:13579: checking for location of OpenCL library" >&5
+echo "configure:13594: checking for location of OpenCL library" >&5
case "$with_opencl_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-opencl-libs." 1>&2; exit 1; }
@@ -13599,13 +13614,13 @@ LDFLAGS="$OCLLIBPATH $LDFLAGS"
echo $ac_n "checking for clGetPlatformInfo in -lOpenCL""... $ac_c" 1>&6
-echo "configure:13603: checking for clGetPlatformInfo in -lOpenCL" >&5
+echo "configure:13618: checking for clGetPlatformInfo in -lOpenCL" >&5
ac_lib_var=`echo OpenCL'_'clGetPlatformInfo | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lOpenCL $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13676,7 +13691,7 @@ fi
fi
echo $ac_n "checking for special C compiler options needed for large files""... $ac_c" 1>&6
-echo "configure:13680: checking for special C compiler options needed for large files" >&5
+echo "configure:13695: checking for special C compiler options needed for large files" >&5
ac_cv_sys_largefile_CC=no
largefile_cc_opt=""
@@ -13684,7 +13699,7 @@ ac_cv_sys_largefile_CC=no
# IRIX 6.2 and later do not support large files by default,
# so use the C compiler's -n32 option if that helps.
cat > conftest.$ac_ext <
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -13700,7 +13715,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:13704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -13709,7 +13724,7 @@ else
ac_save_CC="${CC-cc}"
CC="$CC -n32"
cat > conftest.$ac_ext <
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -13725,7 +13740,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:13729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_largefile_CC=' -n32'
else
@@ -13752,11 +13767,11 @@ echo "$ac_t""$ac_cv_sys_largefile_CC" 1>&6
fi
echo $ac_n "checking for _FILE_OFFSET_BITS value needed for large files""... $ac_c" 1>&6
-echo "configure:13756: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+echo "configure:13771: checking for _FILE_OFFSET_BITS value needed for large files" >&5
ac_cv_sys_file_offset_bits=no
cat > conftest.$ac_ext <
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -13772,14 +13787,14 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:13776: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13791: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <
@@ -13797,7 +13812,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:13801: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_file_offset_bits=64
else
@@ -13823,11 +13838,11 @@ EOF
fi
echo $ac_n "checking for _LARGE_FILES value needed for large files""... $ac_c" 1>&6
-echo "configure:13827: checking for _LARGE_FILES value needed for large files" >&5
+echo "configure:13842: checking for _LARGE_FILES value needed for large files" >&5
ac_cv_sys_large_files=no
cat > conftest.$ac_ext <
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -13843,14 +13858,14 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:13847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13862: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <
@@ -13868,7 +13883,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:13872: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13887: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_large_files=1
else
@@ -13894,25 +13909,25 @@ EOF
fi
echo $ac_n "checking for _LARGEFILE_SOURCE value needed for large files""... $ac_c" 1>&6
-echo "configure:13898: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+echo "configure:13913: checking for _LARGEFILE_SOURCE value needed for large files" >&5
ac_cv_sys_largefile_source=no
cat > conftest.$ac_ext <
int main() {
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:13909: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <
@@ -13921,7 +13936,7 @@ int main() {
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:13925: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_largefile_source=1
else
@@ -13953,25 +13968,25 @@ EOF
ac_save_cflags=${CFLAGS}
CFLAGS="$LFS_CFLAGS ${ac_save_cflags}"
echo $ac_n "checking for _LARGEFILE_SOURCE value needed for large files""... $ac_c" 1>&6
-echo "configure:13957: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+echo "configure:13972: checking for _LARGEFILE_SOURCE value needed for large files" >&5
ac_cv_sys_largefile_source=no
cat > conftest.$ac_ext <
int main() {
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:13968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <
@@ -13980,7 +13995,7 @@ int main() {
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:13984: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_largefile_source=1
else
@@ -14010,18 +14025,18 @@ EOF
# If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
echo $ac_n "checking for fseeko""... $ac_c" 1>&6
-echo "configure:14014: checking for fseeko" >&5
+echo "configure:14029: checking for fseeko" >&5
ac_cv_func_fseeko=no
cat > conftest.$ac_ext <
int main() {
return fseeko && fseeko (stdin, 0, 0);
; return 0; }
EOF
-if { (eval echo configure:14025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_func_fseeko=yes
else
@@ -14038,10 +14053,10 @@ EOF
fi
echo $ac_n "checking if system supports Large Files at all""... $ac_c" 1>&6
-echo "configure:14042: checking if system supports Large Files at all" >&5
+echo "configure:14057: checking if system supports Large Files at all" >&5
cat > conftest.$ac_ext <
#include
@@ -14073,7 +14088,7 @@ return !ftello;
#endif
; return 0; }
EOF
-if { (eval echo configure:14077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14092: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_largefiles=yes
else
@@ -14221,6 +14236,8 @@ s%@GRASS_VERSION_RELEASE@%$GRASS_VERSION_RELEASE%g
s%@GRASS_VERSION_NUMBER@%$GRASS_VERSION_NUMBER%g
s%@GRASS_VERSION_DATE@%$GRASS_VERSION_DATE%g
s%@GRASS_VERSION_GIT@%$GRASS_VERSION_GIT%g
+s%@GRASS_HEADERS_GIT_HASH@%$GRASS_HEADERS_GIT_HASH%g
+s%@GRASS_HEADERS_GIT_DATE@%$GRASS_HEADERS_GIT_DATE%g
s%@NAME_VER@%$NAME_VER%g
s%@LIB_VER@%$LIB_VER%g
s%@MACOSX_APP@%$MACOSX_APP%g
diff --git a/configure.in b/configure.in
index e71b7ae44bf..0beae19767f 100644
--- a/configure.in
+++ b/configure.in
@@ -140,12 +140,24 @@ LIB_VER=`echo ${GRASS_VERSION_NUMBER} | sed 's/^\([0-9.]*\).*$/\1/'`
changequote([,])
GRASS_VERSION_GIT="exported"
+# get git short hash + date of last change in GRASS headers
+# (and anything else in include)
+GRASS_HEADERS_GIT_HASH=`date -u +%FT%T%z | sed 's/\(..\)$/:\1/'`
+GRASS_HEADERS_GIT_DATE=`date -u +%FT%T%z | sed 's/\(..\)$/:\1/'`
AC_PATH_PROG(GIT, git, no)
if test "$GIT" != "no" ; then
GRASS_VERSION_GIT=`$GIT rev-parse --short HEAD 2>/dev/null`
if test -z "$GRASS_VERSION_GIT"; then
GRASS_VERSION_GIT="exported"
fi
+ GRASS_HEADERS_GIT_HASH=`$GIT log -1 --pretty=format:"%h" -- "${SRCDIR}/include" 2>/dev/null`
+ if test -z "$GRASS_HEADERS_GIT_HASH"; then
+ GRASS_HEADERS_GIT_HASH=`date -u +%FT%T%z | sed 's/\(..\)$/:\1/'`
+ fi
+ GRASS_HEADERS_GIT_DATE=`date -d $($GIT log -1 --pretty=format:"%cI" -- "${SRCDIR}/include") -u +%FT%T%z | sed 's/\(..\)$/:\1/'` 2>/dev/null
+ if test -z "$GRASS_HEADERS_GIT_DATE"; then
+ GRASS_HEADERS_GIT_DATE=`date -u +%FT%T%z | sed 's/\(..\)$/:\1/'`
+ fi
fi
AC_SUBST(GRASS_VERSION_FILE)
@@ -155,6 +167,8 @@ AC_SUBST(GRASS_VERSION_RELEASE)
AC_SUBST(GRASS_VERSION_NUMBER)
AC_SUBST(GRASS_VERSION_DATE)
AC_SUBST(GRASS_VERSION_GIT)
+AC_SUBST(GRASS_HEADERS_GIT_HASH)
+AC_SUBST(GRASS_HEADERS_GIT_DATE)
AC_SUBST(NAME_VER)
AC_SUBST(LIB_VER)
diff --git a/db/databaseintro.html b/db/databaseintro.html
index 141febaba9f..3657d7dfdbb 100644
--- a/db/databaseintro.html
+++ b/db/databaseintro.html
@@ -42,7 +42,7 @@ Attribute data import and export
SQL commands
-GRASS supports to main SQL operations, execution of an SQL statement
+GRASS supports two main SQL operations, execution of an SQL statement
(db.execute) and selection
of data from a table (db.select).
See the SQL help page for examples.
diff --git a/db/drivers/postgres/describe.c b/db/drivers/postgres/describe.c
index 86878eaa2c7..558d3d4c97f 100644
--- a/db/drivers/postgres/describe.c
+++ b/db/drivers/postgres/describe.c
@@ -207,6 +207,7 @@ int get_column_info(PGresult * res, int col, int *pgtype, int *gpgtype,
case PG_TYPE_TEXT:
*sqltype = DB_SQL_TYPE_TEXT;
+ *size = 1000;
break;
case PG_TYPE_FLOAT4:
diff --git a/doc/howto_release.md b/doc/howto_release.md
index 54bbe550564..4213bcd594a 100644
--- a/doc/howto_release.md
+++ b/doc/howto_release.md
@@ -1,6 +1,7 @@
# How to release GRASS GIS binaries and source code
-*Note: Some steps in this text are to be done by the development coordinator (currently Markus Neteler, PSC Chair) due to needed logins.*
+*Note: Some steps in this text are to be done by the development coordinator
+(currently Markus Neteler, PSC Chair) due to needed logins.*
## HOWTO create a release
@@ -20,9 +21,11 @@ tools/fix_typos.sh
```
### i18N: sync from Transifex
-See https://www.transifex.com/grass-gis/grass7/dashboard/
-Exception Latvian as Latvian is directly edited in git and then sync'ed from master .po files
+See
+
+Exception Latvian as Latvian is directly edited in git and then sync'ed from
+master .po files
```bash
cd locale
@@ -42,6 +45,7 @@ make verify
*Only allowed in RC cycle, not for final release!*
Check that autoconf scripts are up-to-date:
+
```bash
rm -f config.guess config.sub
wget http://git.savannah.gnu.org/cgit/config.git/plain/config.guess
@@ -49,9 +53,11 @@ wget http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
git diff config.guess config.sub
autoconf-2.13
```
+
Now check if configure still works.
If yes, submit to git:
+
```bash
git add config.guess config.sub configure
git checkout -b config_sub_update_r78
@@ -78,11 +84,13 @@ find . -name '*.o' | xargs rm
find . -name '*.pyc' | xargs rm
find . -name 'OBJ.*' | xargs rm -r
find . -name '__pycache__' | xargs rm -r
-rm -f gui/wxpython/menustrings.py gui/wxpython/build_ext.pyc gui/wxpython/xml/menudata.xml gui/wxpython/xml/module_tree_menudata.xml
+rm -f gui/wxpython/menustrings.py gui/wxpython/build_ext.pyc \
+ gui/wxpython/xml/menudata.xml gui/wxpython/xml/module_tree_menudata.xml
chmod -R a+r *
```
Double check:
+
```bash
git status
```
@@ -95,7 +103,7 @@ git status
Directly edit VERSION file in GH interface:
-https://github.com/OSGeo/grass/blob/releasebranch_7_8/include/VERSION
+
Example:
@@ -113,7 +121,7 @@ Example:
### Create release tag
-(see https://help.github.com/en/articles/creating-releases)
+(see )
Preparation:
@@ -148,43 +156,25 @@ echo "$VERSION"
To be done in GH interface:
-https://github.com/OSGeo/grass/releases/new
+
Tag version | target (examples):
7.8.1RC1 | releasebranch_7_8
-Add release desciption (re-use existing texts as possible)
+Add release desciption (re-use existing texts as possible, from
+)
If RC, then check
[x] This is a pre-release
### Packaging of source code tarball
-TODO: add checkout of code via release tag (?)
-
```bash
-# update again from GH to fetch tag
-# assumptions:
-# - own fork as "origin"
-# - remote repo as "upstream"
-git fetch --all --prune && git checkout releasebranch_7_8 && \
- git merge upstream/releasebranch_7_8 && git push origin releasebranch_7_8
-
-# create source package (in the source directory):
-echo grass-${VERSION}
-
-mkdir grass-${VERSION}
-mv * grass-${VERSION}/
-# create the package:
-tar cvfzh grass-${VERSION}.tar.gz --exclude-vcs grass-${VERSION}/*
-# restore src code location:
-mv ./grass-${VERSION}/* .
-rmdir ./grass-${VERSION}
-# Calculating MD5 sum:
+# fetch tarball from GitHub
+wget https://github.com/OSGeo/grass/archive/${VERSION}.tar.gz -O grass-${VERSION}.tar.gz
md5sum grass-${VERSION}.tar.gz > grass-${VERSION}.md5sum
```
-
Create Changelog file on release branch:
```bash
@@ -194,11 +184,11 @@ head ChangeLog_$VERSION
gzip ChangeLog_$VERSION
```
-### Reset include/VERSION file to git version:
+### Reset include/VERSION file to git version
Directly edit VERSION file in GH interface:
-https://github.com/OSGeo/grass/blob/releasebranch_7_8/include/VERSION
+
Example:
@@ -212,6 +202,7 @@ Example:
Commit as "back to dev"
Reset local copy to GH:
+
```bash
# update from GH
# assumptions:
@@ -243,6 +234,8 @@ scp -p grass-$VERSION.* AUTHORS COPYING ChangeLog_$VERSION.gz \
# generate link to "latest" source code
ssh neteler@$SERVER1 "cd $SERVER1DIR ; rm -f grass-$MAJOR.$MINOR-latest.tar.gz"
ssh neteler@$SERVER1 "cd $SERVER1DIR ; ln -s grass-$VERSION.tar.gz grass-$MAJOR.$MINOR-latest.tar.gz"
+ssh neteler@$SERVER1 "cd $SERVER1DIR ; rm -f grass-$MAJOR.$MINOR-latest.md5sum"
+ssh neteler@$SERVER1 "cd $SERVER1DIR ; ln -s grass-$VERSION.tar.gz grass-$MAJOR.$MINOR-latest.md5sum"
# verify
echo "https://$SERVER1/grass$MAJOR$MINOR/source/"
@@ -266,65 +259,84 @@ Release is done.
#### Update CMS web site to show new version
- News section
-- https://grass.osgeo.org/download/software/
-- https://grass.osgeo.org/download/software/sources/
-- https://grass.osgeo.org/download/software/linux/
-- https://grass.osgeo.org/home/history/releases/
+-
+-
+-
+-
TODO: git tags
-- https://grass.osgeo.org/development/svn/svn-tags/ (add tag): echo $RELEASETAG
+
+- (add tag): echo $RELEASETAG
#### Write announcement and publish it
+
- store in trac:
- - https://trac.osgeo.org/grass/wiki/Release/7.8.x-News
- - https://trac.osgeo.org/grass/wiki/Grass7/NewFeatures78 <- add content of major changes only
-- update version in https://grasswiki.osgeo.org/wiki/GRASS-Wiki
-- ~~store in Web as announces/announce_grass$MAJOR$MINOR$RELEASE.html <- how? with protected PHP upload page?~~ (dropped since CMS)
+ -
+ - <- add content
+ of major changes only
+- update version in
+- ~~store in Web as announces/announce_grass$MAJOR$MINOR$RELEASE.html <- how?
+ with protected PHP upload page?~~ (dropped since CMS)
#### Only when new major release
-- update cronjob 'cron_grass_HEAD_src_snapshot.sh' on grass.osgeo.org to next but one release tag for the differences
+
+- update cronjob 'cron_grass_HEAD_src_snapshot.sh' on grass.osgeo.org to next
+ but one release tag for the differences
- wiki updates, only when new major release:
- - {{cmd|xxxx}} macro: https://grasswiki.osgeo.org/wiki/Template:Cmd
+ - {{cmd|xxxx}} macro:
- update last version on main page
- trac updates, only when new major release:
- - Set "complete" flag in https://trac.osgeo.org/grass/milestone/7.8.x --> Edit Milestone
+ - Set "complete" flag in -->
+ Edit Milestone
- also: Retarget associated open tickets to milestone 7.8.x
- - Batch modify tickets, set to next milestone (update this query accordingly: two entries to change):
- - https://trac.osgeo.org/grass/query?status=assigned&status=new&status=reopened&milestone=7.8.0&milestone=7.8.1&group=status&col=id&col=summary&col=owner&col=type&col=priority&col=component&col=version&order=priority
- - Set max items to 1000, then select all shown tickets via Status: assigned/new/reopened sections
- - Scroll down to "Batch modify": under the "Comment" section, add Field "Milestone" and set to next version
- - then use "Change ticket" button, done.
- - Only in case of new release branch being created:
+ - Batch modify tickets, set to next milestone (update this query
+ accordingly: two entries to change):
+ -
+ - Set max items to 1000, then select all shown tickets via Status:
+ assigned/new/reopened sections
+ - Scroll down to "Batch modify": under the "Comment" section, add Field
+ "Milestone" and set to next version
+ - then use "Change ticket" button, done.
+ - Only in case of new release branch being created:
- Add Wiki Macro definitions for manual pages G7X:modulename
- - Edit: https://trac.osgeo.org/grass/wiki/InterMapTxt
+ - Edit:
#### WinGRASS notes
+
- Update grass_packager_release.bat, eg.
+
```
set MAJOR=7
set MINOR=8
set PATCH=0RC1
```
+
- Update addons (grass_addons.sh) rules, eg.
+
```
compile $GIT_PATH/grass7 $GISBASE_PATH/grass780RC1 $ADDON_PATH/grass780RC1/addons
```
+
- Modify grass_copy_wwwroot.sh accordingly, eg.
+
```
copy_addon 781RC1 7.8.1RC1
```
-#### Launchpad notes:
-- Create milestone and release: https://launchpad.net/grass/+series
+#### Launchpad notes
+
+- Create milestone and release:
- Upload tarball for created release
-- Update daily recipe contents: https://code.launchpad.net/~grass/+recipe/grass-trunk
+- Update daily recipe contents:
+
+#### Packaging notes
-#### Packaging notes:
-- https://trac.osgeo.org/grass/wiki/BuildHints
- - https://trac.osgeo.org/grass/wiki/DebianUbuntuPackaging
- - https://trac.osgeo.org/grass/wiki/CompileOnWindows
+-
+ -
+ -
+
+#### Marketing - tell others about release
-#### Marketing - tell others about release:
- Notify all packagers (MN has email list)
- If release candidate:
-
@@ -334,32 +346,34 @@ TODO: git tags
- Our GRASS web site: /announces/
- Note: DON'T use relative links there
- Our main mailing lists:
- - http://lists.osgeo.org/mailman/listinfo/grass-announce |
- - http://lists.osgeo.org/mailman/listinfo/grass-dev |
- - http://lists.osgeo.org/mailman/listinfo/grass-user |
-- DebianGIS: - send only small note
-- FreeGIS:
-- Geowanking:
-- OSGeo.org:
+ - |
+ - |
+ - |
+- DebianGIS: - send only small note
+- FreeGIS:
+- Geowanking:
+- OSGeo.org:
Via Email:
+
- info@osgeo.org
-- http://www.gis-news.de/ (franz-josef.behr@gismngt.de)
-- http://spatialnews.geocomm.com/submitnews.html (not free any more, convince editor@geocomm.com)
+- (franz-josef.behr@gismngt.de)
- mfeilner@linuxnewmedia.de
- info@harzer.de
- editor-geo@geoconnexion.com
Via Web:
-- https://plus.google.com/u/0/communities/111147786674687562495 (G+ GRASS GIS community)
-- http://linuxtoday.com/contribute.php3
-- https://joinup.ec.europa.eu/software/grassgis/home (submit news, MN)
-- http://www.macnn.com/contact/newstips/1
-- http://www10.giscafe.com/submit_material/submit_options.php#Press (MN) --> Press releases
-- http://www.directionsmag.com/pressreleases/ (News -> Submit Press Release)
-- http://directory.fsf.org/wiki/GRASS_%28Geographic_Resources_Analysis_Support_System%29
-- https://www.linux-apps.com/p/1128004/edit/ (MN)
-- https://news.eoportal.org/web/eoportal/share-your-news (MN) -> Share your news with the EO community
-- https://www.heise.de/download/product/grass-gis-7105 (update, MN)
-- See also: https://grass.osgeo.org/wiki/Contact_Databases
+
+-
+- (submit news, MN)
+-
+- (MN) -->
+ Press releases
+- (News -> Submit Press Release)
+-
+- (MN)
+- (MN) -> Share your
+ news with the EO community
+- (update, MN)
+- See also:
- ... anywhere else? Please add here.
diff --git a/doc/infrastructure.txt b/doc/infrastructure.txt
index 2128d13e8f4..602d7004e3b 100644
--- a/doc/infrastructure.txt
+++ b/doc/infrastructure.txt
@@ -1,12 +1,13 @@
How the GRASS Webserver and related infrastructure works
written by M. Neteler
-Last changed: Oct 2019
+Last changed: May 2020
Related Wiki documents:
* https://grass.osgeo.org/wiki/GRASS_Migration_to_OSGeo (historical document)
+
== GRASS Source code repository ==
Maintainer: Markus Neteler, Martin Landa, OSGeo-SAC, http://wiki.osgeo.org/wiki/SAC
@@ -36,13 +37,15 @@ downloadable_paths = /grass-addons/grass7/*/*,/sandbox/*/*
Statistics:
https://trac.osgeo.org/grass/stats/code
+
== GRASS Web server ==
Maintainer: M. Neteler
-* https://grass.osgeo.org
+* https://grass.osgeo.org (to be replaced in 2020, see https://staging.grass.osgeo.org/)
** Shared virtual OSGeo machine (osgeo6) hosted at Oregon State University Open Source Lab
(server: osgeo6.osgeo.osuosl.org)
+** new server 2020: LXD container on osgeo7
** OSGeo SAC page: http://wiki.osgeo.org/wiki/SAC_Service_Status
http://wiki.osgeo.org/index.php/SAC
** Login: via OSGeo LDAP, there is a "grass" LDAP group
@@ -53,10 +56,11 @@ Maintainer: M. Neteler
* Backup:
** VERIFY 2010: grass.osgeo.org is backup'ed by OSGeo SAC: http://wiki.osgeo.org/wiki/SAC:Backups
** Wiki backup, via rsync to http://josef.fsv.cvut.cz/WIKI/grass-osgeo/index.php/Main_Page
+** new server 2020: LXD container on osgeo7 backup'ed
* Web pages:
-** CMSMS: https://grass.osgeo.org/home/imprint/
-** mirrored from Wroclav university via httrack (tier-1),
+** CMSMS: https://grass.osgeo.org/home/imprint/ (to be phased out in 2020 with hugo solution)
+** OLD mirrored from Wroclav university via httrack (tier-1),
then offered as rsync mirror (tier-2) to other mirror sites
** RSS feed: offered by CMSMS
@@ -105,6 +109,12 @@ Maintainer: M. Neteler
Summary: The system should run almost autonomously.
+
+== WinGRASS maintenance scripts ==
+
+* https://github.com/landam/wingrass-maintenance-scripts
+
+
== GRASS Mailing lists ==
Maintainer: Markus Neteler
@@ -154,6 +164,7 @@ Summary: The system should run almost autonomous. An eye must be
Macro for manual pages: https://grasswiki.osgeo.org/wiki/Template:Cmd
+
== GRASS IRC ==
Channel: irc://irc.freenode.net/grass
@@ -169,16 +180,15 @@ Web based client: See http://grasswiki.osgeo.org/wiki/IRC
== GRASS Bugtracker ==
-Future bugtracker
- * https://github.com/OSGeo/grass
+Current bugtracker (Jan 2020 - today):
+ * https://github.com/OSGeo/grass/issues
-Current bugtracker (Jan 2008 - today):
+Current bugtracker (Jan 2008 - Jan 2020):
* https://trac.osgeo.org/grass/report
- * Trac
* posts new bugs and comments to grass-dev list
* Settings:
-tracsvn (OSGeo server) (Dec 2007 - 2019)
+Old tracsvn (OSGeo server) (Dec 2007 - Mai 2019)
/var/www/trac/env/grass/conf/trac.ini
downloadable_paths = /grass-addons/grass7/*/*,/sandbox/*/*
path = /var/www/grass/htdocs
@@ -191,13 +201,13 @@ tracsvn (OSGeo server) (Dec 2007 - 2019)
base_url = https://trac.osgeo.org/grass/
database = postgres://postgres@/trac_grass
-Old bugtracker (Jan 2007 - Dec 2008):
+Very old bugtracker (Jan 2007 - Dec 2008):
* http://wald.intevation.org/tracker/?group_id=21
* gforce, sponsored by Intevation GmbH, Germany
* spamassasin spamfilter locally, bogofilter at grass-dev list
* needs 'noreply*wald.intevation.org' to be enabled as alias in Mailman
-Very old bugtracker (Dec 2000 - Dec 2006):
+Very very old bugtracker (Dec 2000 - Dec 2006):
* https://intevation.de/rt/webrt?q_queue=grass
* webRT, sponsored by Intevation GmbH, Germany
* spamassasin spamfilter locally, bogofilter at grass-dev list
@@ -215,13 +225,16 @@ Details:
Installed with g.extension
Manuals: https://grass.osgeo.org/grass7/manuals/addons/
-The redirect to the latest directory is defined on grass.osgeo.org:
+The redirect to the latest grass7x directory is defined on grass.osgeo.org:
/etc/apache2/includes/grass.osgeo.org.inc
Procedure building of binaries (Windows):
Addons module are compiled on build server, currently at the CTU in Prague)
and publishing their manual pages on publishing server, i.e. grass.osgeo.org.
A new compilation is triggered everytime when a commit is done in the Addons-SVN.
+ Logs:
+ * Linux log files: https://grass.osgeo.org/addons/grass7/logs
+ * Windows log files: http://wingrass.fsv.cvut.cz/grass78/x86_64/addons/latest/logs/
Procedure of granting write access to Addons repo:
* Request procedure: https://trac.osgeo.org/grass/wiki/HowToContribute#WriteaccesstotheGRASS-Addons-SVNrepository
@@ -252,6 +265,26 @@ Maintenance script:
The github update is run as a cronjob on server "geo102" (CTU, CZ).
+
+== GRASS CI: GitHub Actions ==
+
+Started Apr. 2020
+
+Maintainer: Vaclav Petras
+
+* https://github.com/OSGeo/grass/actions
+* Details: https://github.com/OSGeo/grass/pull/525
+
+- CI workflow with:
+ - A build job which is not parallelized and is meant for clear & relatively fast check of compilation and building in general. (Duplicating what is running on Travis)
+ - A test job which of course needs to build, but the main focus is to run tests, so the compilation is parallelized (depending on nproc) and thus potentially less readable. This runs the whole test suite. (You need to run it locally to see the actual error, but you can see which tests are failing.)
+- Static code analysis/Code quality check using Flake8 with separate tests for lib/python, gui/wxpython, scripts and temporal directories.
+ - lib/python uses configuration which ignores code in testsuite directories and ignores a lot of errors.
+ - The other directories use the default settings and the failure is ignored. (Neither is an ideal solution, but we can see and change it based on whatever is more advantageous for getting it fixed.)
+
+Helper files placed to .github/workflows
+
+
== GRASS Coverity Scan ==
Maintainer: Markus Neteler
diff --git a/doc/projectionintro.html b/doc/projectionintro.html
index f9b889a8e8c..77a79562630 100644
--- a/doc/projectionintro.html
+++ b/doc/projectionintro.html
@@ -58,8 +58,9 @@ Vector map transformation
References
diff --git a/doc/python/m.distance.py b/doc/python/m.distance.py
index 298f03b01d2..7680149745d 100755
--- a/doc/python/m.distance.py
+++ b/doc/python/m.distance.py
@@ -119,11 +119,11 @@ def main():
segment_distance = G_distance(x[i-1], y[i-1], x[i], y[i])
overall_distance += segment_distance
- print "segment %d distance is %.2f meters" % (i, segment_distance)
+ print("segment %d distance is %.2f meters" % (i, segment_distance))
# add to the area array
- print "\ntotal distance is %.2f meters\n" % overall_distance
+ print("\ntotal distance is %.2f meters\n" % overall_distance)
# calc area
if len(coords) < 3:
@@ -136,7 +136,7 @@ def main():
# do not need to close polygon (but it doesn't hurt if you do)
area = G_area_of_polygon(x, y, len(coords))
- print "area is %.2f square meters\n" % area
+ print("area is %.2f square meters\n" % area)
# we don't need this, but just to have a look
if proj_type == 1:
diff --git a/doc/python/raster_example_ctypes.py b/doc/python/raster_example_ctypes.py
index 1b28e6e191d..d56c33384c0 100644
--- a/doc/python/raster_example_ctypes.py
+++ b/doc/python/raster_example_ctypes.py
@@ -52,7 +52,7 @@
ptype = POINTER(c_double)
type_name = 'DCELL'
-print "Raster map <%s> contains data type %s." % (input, type_name)
+print("Raster map <%s> contains data type %s." % (input, type_name))
in_fd = Rast_open_old(input, mapset)
in_rast = Rast_allocate_buf(data_type)
@@ -60,14 +60,14 @@
rows = Rast_window_rows()
cols = Rast_window_cols()
-print "Current region is %d rows x %d columns" % (rows, cols)
+print("Current region is %d rows x %d columns" % (rows, cols))
# iterate through map rows
-print "Map data:"
+print("Map data:")
for row_n in range(rows):
# read a row of raster data into memory, then print it
Rast_get_row(in_fd, in_rast, row_n, data_type)
- print row_n, in_rast[0:cols]
+ print(row_n, in_rast[0:cols])
# TODO check for NULL
# closed map and cleanup memory allocation
diff --git a/doc/python/vector_example_ctypes.py b/doc/python/vector_example_ctypes.py
index 5f67b09ccd6..7d57e045e88 100644
--- a/doc/python/vector_example_ctypes.py
+++ b/doc/python/vector_example_ctypes.py
@@ -36,10 +36,10 @@
Vect_open_old(map_info, input, mapset)
# query
-print 'Vector map :', Vect_get_full_name(map_info)
-print 'Vector is 3D :', Vect_is_3d(map_info)
-print 'Vector DB links :', Vect_get_num_dblinks(map_info)
-print 'Map Scale : 1:%d' % Vect_get_scale(map_info)
+print('Vector map :', Vect_get_full_name(map_info))
+print('Vector is 3D :', Vect_is_3d(map_info))
+print('Vector DB links :', Vect_get_num_dblinks(map_info))
+print('Map Scale : 1:%d' % Vect_get_scale(map_info))
# vector box tests
box = bound_box()
@@ -48,13 +48,13 @@
c_easting2 = 4599505.0
Vect_get_map_box(map_info, byref(box))
-print 'Position 1 in box ?', Vect_point_in_box(c_easting1, c_northing, 0, byref(box))
-print 'Position 2 in box ?', Vect_point_in_box(c_easting2, c_northing, 0, byref(box))
+print('Position 1 in box ?', Vect_point_in_box(c_easting1, c_northing, 0, byref(box)))
+print('Position 2 in box ?', Vect_point_in_box(c_easting2, c_northing, 0, byref(box)))
-print 'Number of features:', Vect_get_num_lines(map_info)
-print 'Number of points :', Vect_get_num_primitives(map_info, GV_POINT)
-print 'Number of lines :', Vect_get_num_primitives(map_info, GV_LINE)
-print 'Number of areas :', Vect_get_num_areas(map_info)
+print('Number of features:', Vect_get_num_lines(map_info))
+print('Number of points :', Vect_get_num_primitives(map_info, GV_POINT))
+print('Number of lines :', Vect_get_num_primitives(map_info, GV_LINE))
+print('Number of areas :', Vect_get_num_areas(map_info))
# close map
Vect_close(map_info)
diff --git a/docker/README.md b/docker/README.md
new file mode 100644
index 00000000000..2ee2d9e3b28
--- /dev/null
+++ b/docker/README.md
@@ -0,0 +1,27 @@
+# GRASS GIS docker matrix
+
+| Base image | Docker tag | GRASS GIS | PROJ | GDAL | PDAL | Image size |
+|--------------|-----------------|------------|-------|-------|-------|------------|
+| Ubuntu 18.04 | latest-ubuntu | 7.9.dev | 4.9.3 | 2.2.3 | 1.8.0 | 1.04 GB |
+| Ubuntu 19.10 | latest-ubuntu19 | 7.9.dev | 5.2.0 | 2.4.2 | 1.9.1 | 850 MB |
+| Debian 10.1 | latest-debian | 7.9.dev | 5.2.0 | 2.4.0 | 1.8.0 | 1.14 GB |
+| Alpine 3.11 | latest-alpine | 7.9.dev | 6.2.1 | 3.0.3 | 1.8.0 | 385 MB |
+|--------------|-----------------|------------|-------|-------|-------|------------|
+| Ubuntu 18.04 | stable-ubuntu | 7.8 branch | 4.9.3 | 2.2.3 | 1.8.0 | 1.04 GB |
+| Ubuntu 19.10 | stable-ubuntu19 | 7.8 branch | 5.2.0 | 2.4.2 | 1.9.1 | 850 MB |
+| Debian 10.1 | stable-debian | 7.8 branch | 5.2.0 | 2.4.0 | 1.8.0 | 1.14 GB |
+| Alpine 3.11 | stable-alpine | 7.8 branch | 6.2.1 | 3.0.3 | 1.8.0 | 385 MB |
+
+Latest update: 10 May 2020
+
+# Requirements
+
+ * docker or podman
+
+# Installation
+
+To install a docker image, run (replace `` with the desired Docker tag from the table above):
+
+```
+docker pull mundialis/grass-py3-pdal:
+```
diff --git a/docker/alpine/Dockerfile_alpine b/docker/alpine/Dockerfile_alpine
index 8192795df63..c7ddca15668 100644
--- a/docker/alpine/Dockerfile_alpine
+++ b/docker/alpine/Dockerfile_alpine
@@ -1,4 +1,5 @@
-FROM alpine:edge
+FROM mundialis/docker-pdal:1.8.0 as pdal
+FROM alpine:3.11 as common
# Based on:
# https://github.com/mundialis/docker-grass-gis/blob/master/Dockerfile
@@ -8,6 +9,78 @@ LABEL maintainer="peter.zamb@gmail.com,neteler@osgeo.org"
# PACKAGES VERSIONS
ARG PYTHON_VERSION=3
+# List of packages to be installed
+ENV PACKAGES="\
+ attr \
+ bash \
+ bison \
+ bzip2 \
+ cairo \
+ curl \
+ fftw \
+ flex \
+ freetype \
+ gdal \
+ gettext \
+ geos \
+ gnutls \
+ jsoncpp \
+ libbz2 \
+ libexecinfo \
+ libjpeg-turbo \
+ libpng \
+ libunwind \
+ musl \
+ musl-utils \
+ ncurses \
+ openjpeg \
+ openblas \
+ py3-numpy \
+ py3-pillow \
+ py3-six \
+ postgresql \
+ proj-datumgrid \
+ proj-util \
+ sqlite \
+ sqlite-libs \
+ subversion \
+ tiff \
+ zstd \
+ zstd-libs \
+ "
+# ====================
+# INSTALL DEPENDENCIES
+# ====================
+
+WORKDIR /src
+
+ENV PYTHONBIN=python$PYTHON_VERSION
+
+RUN echo "Install Python";\
+ apk add --no-cache $PYTHONBIN && \
+ $PYTHONBIN -m ensurepip && \
+ rm -r /usr/lib/python*/ensurepip && \
+ pip$PYTHON_VERSION install --upgrade pip setuptools && \
+ if [ ! -e /usr/bin/pip ]; then ln -s pip$PYTHON_VERSION /usr/bin/pip ; fi && \
+ if [[ ! -e /usr/bin/python ]]; then ln -sf /usr/bin/$PYTHONBIN /usr/bin/python; fi && \
+ rm -r /root/.cache
+
+# Add the packages
+RUN echo "Install main packages";\
+ apk update; \
+ apk add --no-cache $PACKAGES
+
+COPY --from=pdal /usr/bin/pdal* /usr/bin/
+COPY --from=pdal /usr/lib/pdal /usr/lib/pdal
+COPY --from=pdal /usr/lib/libpdal* /usr/lib/
+COPY --from=pdal /usr/lib/pkgconfig/pdal.pc /usr/lib/pkgconfig/pdal.pc
+COPY --from=pdal /usr/include/pdal /usr/include/pdal
+COPY --from=pdal /usr/local/lib/liblaszip* /usr/local/lib/
+COPY --from=pdal /usr/local/include/laszip /usr/local/include/laszip
+
+
+FROM common as build
+
# ================
# CONFIG VARIABLES
# ================
@@ -47,46 +120,8 @@ ENV MYCFLAGS="-O2 -std=gnu99 -m64" \
CXXFLAGS="$MYCXXFLAGS" \
NUMTHREADS=2
-
-# List of packages to be installed
-ENV PACKAGES="\
- attr \
- bash \
- bison \
- bzip2 \
- cairo \
- fftw \
- flex \
- freetype \
- gdal \
- gettext \
- geos \
- gnutls \
- laszip \
- libbz2 \
- libjpeg-turbo \
- libpng \
- musl \
- musl-utils \
- ncurses \
- openjpeg \
- openblas \
- pdal \
- py3-numpy \
- py3-pillow \
- py3-six \
- postgresql \
- proj-datumgrid \
- proj-util \
- sqlite \
- sqlite-libs \
- subversion \
- tiff \
- zstd \
- zstd-libs \
- " \
- # These packages are required to compile GRASS GIS.
- GRASS_BUILD_PACKAGES="\
+# These packages are required to compile GRASS GIS.
+ENV GRASS_BUILD_PACKAGES="\
build-base \
bzip2-dev \
cairo-dev \
@@ -97,14 +132,12 @@ ENV PACKAGES="\
gdal-dev \
geos-dev \
gnutls-dev \
- laszip-dev \
libc6-compat \
libjpeg-turbo-dev \
libpng-dev \
make \
openjpeg-dev \
openblas-dev \
- pdal-dev \
postgresql-dev \
proj-dev \
python3-dev \
@@ -119,121 +152,85 @@ ENV PACKAGES="\
zstd-dev \
"
-# ====================
-# INSTALL DEPENDENCIES
-# ====================
-
-WORKDIR /src
-
-ENV PYTHONBIN=python$PYTHON_VERSION
-
-RUN echo "Install Python";\
- apk add --no-cache $PYTHONBIN && \
- $PYTHONBIN -m ensurepip && \
- rm -r /usr/lib/python*/ensurepip && \
- pip$PYTHON_VERSION install --upgrade pip setuptools && \
- if [ ! -e /usr/bin/pip ]; then ln -s pip$PYTHON_VERSION /usr/bin/pip ; fi && \
- if [[ ! -e /usr/bin/python ]]; then ln -sf /usr/bin/$PYTHONBIN /usr/bin/python; fi && \
- rm -r /root/.cache
-
# Add the packages
RUN echo "Install main packages";\
- apk update; \
- apk add --no-cache \
- --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing \
- --repository http://dl-cdn.alpinelinux.org/alpine/edge/main \
- $PACKAGES; \
# Add packages just for the GRASS build process
- apk add --no-cache \
- --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing \
- --repository http://dl-cdn.alpinelinux.org/alpine/edge/main \
- --virtual .build-deps $GRASS_BUILD_PACKAGES; \
+ apk add --no-cache --virtual .build-deps $GRASS_BUILD_PACKAGES
# echo LANG="en_US.UTF-8" > /etc/default/locale;
- #
- # Checkout and install GRASS GIS
- #
- echo "Install GRASS GIS";\
- echo " => Downloading grass"
+# Copy and install GRASS GIS
COPY . /src/grass_build/
+WORKDIR /src/grass_build/
# Configure compile and install GRASS GIS
-RUN echo " => Configure and compile grass";\
- cd /src/grass_build && \
+RUN echo " => Configure and compile grass" && \
/src/grass_build/configure $GRASS_CONFIG && \
make -j $NUMTHREADS && \
make install && \
- ldconfig /etc/ld.so.conf.d; \
- #
- # enable simple grass command regardless of version number
- #
- ln -s `find /usr/local/bin -name "grass*"` /usr/local/bin/grass; \
- #
- # Reduce the image size
- #
- rm -rf /src/*; \
- # remove build dependencies and any leftover apk cache
- apk del --no-cache --purge .build-deps; \
- rm -rf /var/cache/apk/*; \
- rm -rf /root/.cache; \
- # Remove unnecessary grass files
+ ldconfig /etc/ld.so.conf.d
+
+# enable simple grass command regardless of version number
+# also important for COPY cmd later
+RUN ln -s `find /usr/local/bin -name "grass*"` /usr/local/bin/grass
+
+# Reduce the image size - Remove unnecessary grass files
+RUN cp /usr/local/grass79/gui/wxpython/xml/module_items.xml module_items.xml; \
rm -rf /usr/local/grass79/demolocation; \
rm -rf /usr/local/grass79/fonts; \
rm -rf /usr/local/grass79/gui; \
- rm -rf /usr/local/grass79/share;
-
-
-# Unset environmental variables to avoid later compilation issues
-ENV INTEL="" \
- MYCFLAGS="" \
- MYLDFLAGS="" \
- MYCXXFLAGS="" \
- LD_LIBRARY_PATH="" \
- LDFLAGS="" \
- CFLAGS="" \
- CXXFLAGS="" \
- # set SHELL var to avoid /bin/sh fallback in interactive GRASS GIS sessions in docker
- SHELL="/bin/bash"
+ rm -rf /usr/local/grass79/share; \
+ mkdir -p /usr/local/grass79/gui/wxpython/xml/; \
+ mv module_items.xml /usr/local/grass79/gui/wxpython/xml/module_items.xml;
+
+FROM common as grass
-# =====================
-# INSTALL GRASS-SESSION
-# =====================
+ENV LC_ALL="en_US.UTF-8"
-# install external Python API
-RUN pip install grass-session
+# Copy GRASS GIS from build image
+COPY --from=build /usr/local/bin/grass /usr/local/bin/grass
+COPY --from=build /usr/local/grass* /usr/local/grass/
+# pip 20.0.0 fix
+RUN apk add curl && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python3 get-pip.py pip==20.0.2 && rm get-pip.py
+RUN pip3 install --upgrade pip six grass-session
-# set GRASSBIN
-ENV GRASSBIN="/usr/local/bin/grass"
+RUN ln -s /usr/local/grass /usr/local/grass7
+RUN ln -s /usr/local/grass `grass --config path`
+RUN grass --tmp-location EPSG:4326 --exec g.version -rge && \
+ pdal --version && \
+ python3 --version
-# ===========================
-# TEST grass-session and PDAL
-# ===========================
-WORKDIR /tmp
-COPY docker/testdata/simple.laz .
-WORKDIR /scripts
-COPY docker/testdata/test_grass_session.py .
-## just scan the LAZ file
-# TODO: fix test
-#RUN /usr/bin/python3 /scripts/test_grass_session.py
+FROM grass as test
-# ========
-# FINALIZE
-# ========
+RUN apk add make gcc
-# Data workdir
-WORKDIR /grassdb
-VOLUME /grassdb
+## run simple LAZ test
+COPY docker/testdata/simple.laz /tmp/simple.laz
+COPY docker/testdata/test_grass_session.py /scripts/test_grass_session.py
+ENV GRASSBIN=grass
+RUN grass --tmp-location EPSG:4326 --exec g.extension extension=r.in.pdal
+RUN /usr/bin/python3 /scripts/test_grass_session.py
+
+# Test addon installation
+RUN grass --tmp-location EPSG:4326 --exec g.extension extension=r.learn.ml
+
+
+FROM grass as final
# GRASS GIS specific
# allow work with MAPSETs that are not owned by current user
-ENV GRASS_SKIP_MAPSET_OWNER_CHECK=1 \
- LC_ALL="en_US.UTF-8"
+ENV GRASSBIN="/usr/local/bin/grass" \
+ GRASS_SKIP_MAPSET_OWNER_CHECK=1 \
+ SHELL="/bin/bash"
# show installed version
RUN grass --tmp-location EPSG:4326 --exec g.version -rge && \
pdal --version && \
python3 --version
-CMD [$GRASSBIN, "--version"]
+# Data workdir
+WORKDIR /grassdb
+VOLUME /grassdb
+
+CMD $GRASSBIN --version
diff --git a/docker/alpine/Dockerfile_alpine_latest b/docker/alpine/Dockerfile_alpine_latest
new file mode 100644
index 00000000000..947f54f9c24
--- /dev/null
+++ b/docker/alpine/Dockerfile_alpine_latest
@@ -0,0 +1,229 @@
+FROM alpine:latest
+
+# Based on:
+# https://github.com/mundialis/docker-grass-gis/blob/master/Dockerfile
+LABEL authors="Pietro Zambelli,Markus Neteler"
+LABEL maintainer="peter.zamb@gmail.com,neteler@osgeo.org"
+
+# PACKAGES VERSIONS
+ARG PYTHON_VERSION=3
+
+# ================
+# CONFIG VARIABLES
+# ================
+
+# set configuration options, without wxGUI
+ENV GRASS_CONFIG="\
+ --enable-largefile \
+ --with-cxx \
+ --with-proj --with-proj-share=/usr/share/proj \
+ --with-gdal \
+ --with-python \
+ --with-geos \
+ --with-sqlite \
+ --with-bzlib \
+ --with-zstd \
+ --with-cairo --with-cairo-ldflags=-lfontconfig \
+ --with-fftw \
+ --with-postgres --with-postgres-includes='/usr/include/postgresql' \
+ --without-freetype \
+ --without-pdal \
+ --without-openmp \
+ --without-opengl \
+ --without-nls \
+ --without-mysql \
+ --without-odbc \
+ --without-openmp \
+ --without-ffmpeg \
+ "
+
+# Set environmental variables for GRASS GIS compilation, without debug symbols
+ENV MYCFLAGS="-O2 -std=gnu99 -m64" \
+ MYLDFLAGS="-s -Wl,--no-undefined -lblas" \
+ # CXX stuff:
+ LD_LIBRARY_PATH="/usr/local/lib" \
+ LDFLAGS="$MYLDFLAGS" \
+ CFLAGS="$MYCFLAGS" \
+ CXXFLAGS="$MYCXXFLAGS" \
+ NUMTHREADS=2
+
+
+# List of packages to be installed
+ENV PACKAGES="\
+ attr \
+ bash \
+ bison \
+ bzip2 \
+ cairo \
+ fftw \
+ flex \
+ freetype \
+ gdal \
+ gettext \
+ geos \
+ gnutls \
+ libbz2 \
+ libjpeg-turbo \
+ libpng \
+ musl \
+ musl-utils \
+ ncurses \
+ openjpeg \
+ openblas \
+ py3-numpy \
+ py3-pillow \
+ py3-six \
+ postgresql \
+ proj-datumgrid \
+ proj-util \
+ sqlite \
+ sqlite-libs \
+ subversion \
+ tiff \
+ zstd \
+ zstd-libs \
+ " \
+ # These packages are required to compile GRASS GIS.
+ GRASS_BUILD_PACKAGES="\
+ build-base \
+ bzip2-dev \
+ cairo-dev \
+ fftw-dev \
+ freetype-dev \
+ g++ \
+ gcc \
+ gdal-dev \
+ geos-dev \
+ gnutls-dev \
+ libc6-compat \
+ libjpeg-turbo-dev \
+ libpng-dev \
+ make \
+ openjpeg-dev \
+ openblas-dev \
+ postgresql-dev \
+ proj-dev \
+ python3-dev \
+ py3-numpy-dev \
+ sqlite-dev \
+ tar \
+ tiff-dev \
+ unzip \
+ vim \
+ wget \
+ zip \
+ zstd-dev \
+ "
+
+# ====================
+# INSTALL DEPENDENCIES
+# ====================
+
+WORKDIR /src
+
+ENV PYTHONBIN=python$PYTHON_VERSION
+
+RUN echo "Install Python";\
+ apk add --no-cache $PYTHONBIN && \
+ $PYTHONBIN -m ensurepip && \
+ rm -r /usr/lib/python*/ensurepip && \
+ pip$PYTHON_VERSION install --upgrade pip setuptools && \
+ if [ ! -e /usr/bin/pip ]; then ln -s pip$PYTHON_VERSION /usr/bin/pip ; fi && \
+ if [[ ! -e /usr/bin/python ]]; then ln -sf /usr/bin/$PYTHONBIN /usr/bin/python; fi && \
+ rm -r /root/.cache
+
+# Add the packages
+RUN echo "Install main packages";\
+ apk update; \
+ apk add --no-cache \
+ --repository http://dl-cdn.alpinelinux.org/alpine/latest-stable/main \
+ $PACKAGES; \
+ # Add packages just for the GRASS build process
+ apk add --no-cache \
+ --repository http://dl-cdn.alpinelinux.org/alpine/latest-stable/main \
+ --virtual .build-deps $GRASS_BUILD_PACKAGES; \
+ # echo LANG="en_US.UTF-8" > /etc/default/locale;
+ #
+ # Checkout and install GRASS GIS
+ #
+ echo "Install GRASS GIS";\
+ echo " => Downloading grass"
+
+COPY . /src/grass_build/
+
+# Configure compile and install GRASS GIS
+RUN echo " => Configure and compile grass";\
+ cd /src/grass_build && \
+ /src/grass_build/configure $GRASS_CONFIG && \
+ make -j $NUMTHREADS && \
+ make install && \
+ ldconfig /etc/ld.so.conf.d; \
+ #
+ # enable simple grass command regardless of version number
+ #
+ ln -s `find /usr/local/bin -name "grass*"` /usr/local/bin/grass; \
+ #
+ # Reduce the image size
+ #
+ rm -rf /src/*; \
+ # remove build dependencies and any leftover apk cache
+ apk del --no-cache --purge .build-deps; \
+ rm -rf /var/cache/apk/*; \
+ rm -rf /root/.cache; \
+ # Remove unnecessary grass files
+ rm -rf /usr/local/grass79/demolocation; \
+ rm -rf /usr/local/grass79/fonts; \
+ rm -rf /usr/local/grass79/gui; \
+ rm -rf /usr/local/grass79/share;
+
+
+# Unset environmental variables to avoid later compilation issues
+ENV INTEL="" \
+ MYCFLAGS="" \
+ MYLDFLAGS="" \
+ MYCXXFLAGS="" \
+ LD_LIBRARY_PATH="" \
+ LDFLAGS="" \
+ CFLAGS="" \
+ CXXFLAGS="" \
+ # set SHELL var to avoid /bin/sh fallback in interactive GRASS GIS sessions in docker
+ SHELL="/bin/bash"
+
+
+# =====================
+# INSTALL GRASS-SESSION
+# =====================
+
+# install external Python API
+RUN pip install grass-session
+
+# set GRASSBIN
+ENV GRASSBIN="/usr/local/bin/grass"
+
+# ==================
+# TEST grass-session
+# ==================
+
+WORKDIR /scripts
+COPY docker/testdata/test_grass_session.py .
+# TODO: fix test
+#RUN /usr/bin/python3 /scripts/test_grass_session.py
+
+# ========
+# FINALIZE
+# ========
+
+# Data workdir
+WORKDIR /grassdb
+VOLUME /grassdb
+
+# GRASS GIS specific
+# allow work with MAPSETs that are not owned by current user
+ENV GRASS_SKIP_MAPSET_OWNER_CHECK=1 \
+ LC_ALL="en_US.UTF-8"
+
+# show installed version
+RUN grass --tmp-location EPSG:4326 --exec g.version -rge && \
+ python3 --version
+
+CMD [$GRASSBIN, "--version"]
diff --git a/docker/alpine/Dockerfile_alpine_wxgui b/docker/alpine/Dockerfile_alpine_wxgui
index 87157c7de2f..bddc93ab7af 100644
--- a/docker/alpine/Dockerfile_alpine_wxgui
+++ b/docker/alpine/Dockerfile_alpine_wxgui
@@ -18,7 +18,6 @@ ENV GRASS_CONFIG="\
--with-cxx \
--with-proj --with-proj-share=/usr/share/proj \
--with-gdal \
- --with-pdal \
--with-python \
--with-geos \
--with-sqlite \
@@ -29,6 +28,7 @@ ENV GRASS_CONFIG="\
--with-wxwidgets \
--with-postgres --with-postgres-includes='/usr/include/postgresql' \
--without-freetype \
+ --without-pdal \
--without-openmp \
--without-opengl \
--without-nls \
@@ -64,7 +64,6 @@ ENV PACKAGES="\
geos \
gnutls \
gtk+3.0 \
- laszip \
libbz2 \
libjpeg-turbo \
libpng \
@@ -73,7 +72,6 @@ ENV PACKAGES="\
ncurses \
openjpeg \
openblas \
- pdal \
py3-numpy \
py3-pillow \
py3-six \
@@ -102,14 +100,12 @@ ENV PACKAGES="\
geos-dev \
gnutls-dev \
gtk+3.0-dev \
- laszip-dev \
libc6-compat \
libjpeg-turbo-dev \
libpng-dev \
make \
openjpeg-dev \
openblas-dev \
- pdal-dev \
postgresql-dev \
proj-dev \
python3-dev \
@@ -216,15 +212,12 @@ RUN pip install grass-session
# set GRASSBIN
ENV GRASSBIN="/usr/local/bin/grass"
-# ===========================
-# TEST grass-session and PDAL
-# ===========================
+# ==================
+# TEST grass-session
+# ==================
-WORKDIR /tmp
-COPY docker/testdata/simple.laz .
WORKDIR /scripts
COPY docker/testdata/test_grass_session.py .
-## just scan the LAZ file
# TODO: fix test
#RUN /usr/bin/python3 /scripts/test_grass_session.py
@@ -243,7 +236,6 @@ ENV GRASS_SKIP_MAPSET_OWNER_CHECK=1 \
# show installed version
RUN grass --tmp-location EPSG:4326 --exec g.version -rge && \
- pdal --version && \
python3 --version
CMD [$GRASSBIN, "--version"]
diff --git a/docker/alpine/README_alpine.md b/docker/alpine/README_alpine.md
index 3d936ca5523..ff42a2ca7bc 100644
--- a/docker/alpine/README_alpine.md
+++ b/docker/alpine/README_alpine.md
@@ -1,25 +1,28 @@
# Docker GRASS GIS (alpine linux)
-Dockerfile with an [Alpine Linux](https://www.alpinelinux.org/) image with [GRASS GIS](https://grass.osgeo.org/), [PDAL](https://pdal.io) support and [grass-session](https://github.com/zarch/grass-session/).
+Dockerfile with an [Alpine Linux](https://www.alpinelinux.org/) image with
+[GRASS GIS](https://grass.osgeo.org/), [PDAL](https://pdal.io) support and
+[grass-session](https://github.com/zarch/grass-session/).
Download size of this image is only approximately 80 MB.
Clone this repository and change directory:
```bash
-$ git clone https://github.com/OSGeo/grass.git
-$ cd grass
+git clone https://github.com/OSGeo/grass.git
+cd grass
```
__Build the docker with__:
```bash
-$ docker build \
+docker build \
--file docker/alpine/Dockerfile_alpine \
--tag grass-py3-pdal:latest-alpine .
```
-View the images available using `sudo docker images` and open a bash terminal with:
+View the images available using `sudo docker images` and open a bash terminal
+with:
```bash
$ docker run -it grass-py3-pdal:latest-alpine /bin/bash
@@ -29,8 +32,9 @@ bash-5.0#
__To build a stable version__:
change to the releasebranch or tag you want to build:
+
```bash
-$ git checkout remotes/origin/releasebranch_7_8
+git checkout remotes/origin/releasebranch_7_8
```
and build and enter with:
diff --git a/docker/debian/README_debian.md b/docker/debian/README_debian.md
index 14521aefde5..0e7af60ca6d 100644
--- a/docker/debian/README_debian.md
+++ b/docker/debian/README_debian.md
@@ -1,20 +1,22 @@
# Docker GRASS GIS (Debian Linux)
-Dockerfile with an [Debian Linux](https://www.debian.org/) image with [GRASS GIS](https://grass.osgeo.org/), [PDAL](https://pdal.io) support and [grass-session](https://github.com/zarch/grass-session/).
+Dockerfile with an [Debian Linux](https://www.debian.org/) image with
+[GRASS GIS](https://grass.osgeo.org/), [PDAL](https://pdal.io) support and
+[grass-session](https://github.com/zarch/grass-session/).
Download size of this image is of approximately 2.6 GB.
Clone this repository and change directory:
```bash
-$ git clone https://github.com/OSGeo/grass.git
-$ cd grass
+git clone https://github.com/OSGeo/grass.git
+cd grass
```
__Build the docker with__:
```bash
-$ docker build \
+docker build \
--file docker/debian/Dockerfile_debian_pdal \
--tag grass-py3-pdal:latest-debian .
```
@@ -29,8 +31,9 @@ bash-5.0#
__To build a stable version__:
change to the releasebranch or tag you want to build:
+
```bash
-$ git checkout remotes/origin/releasebranch_7_8
+git checkout remotes/origin/releasebranch_7_8
```
and build and enter with:
diff --git a/docker/testdata/README.md b/docker/testdata/README.md
index a8d1d0e8b5d..1b9e9dca3ea 100644
--- a/docker/testdata/README.md
+++ b/docker/testdata/README.md
@@ -1 +1 @@
-Data source: https://github.com/PDAL/PDAL/tree/master/test/data/laz/
+Data source:
diff --git a/docker/ubuntu/README_ubuntu.md b/docker/ubuntu/README_ubuntu.md
index f53ecf03461..f63a8d5b3e0 100644
--- a/docker/ubuntu/README_ubuntu.md
+++ b/docker/ubuntu/README_ubuntu.md
@@ -1,14 +1,16 @@
# Docker GRASS GIS (Ubuntu Linux)
-Dockerfile with an [Ubuntu Linux](https://ubuntu.com/) image with [GRASS GIS](https://grass.osgeo.org/), [PDAL](https://pdal.io) support and [grass-session](https://github.com/zarch/grass-session/).
+Dockerfile with an [Ubuntu Linux](https://ubuntu.com/) image with
+[GRASS GIS](https://grass.osgeo.org/), [PDAL](https://pdal.io) support and
+[grass-session](https://github.com/zarch/grass-session/).
Download size of this image is of approximately 2.6 GB.
Clone this repository and change directory:
```bash
-$ git clone https://github.com/OSGeo/grass.git
-$ cd grass
+git clone https://github.com/OSGeo/grass.git
+cd grass
```
## Ubuntu stable
@@ -16,12 +18,13 @@ $ cd grass
__Build the docker with__:
```bash
-$ docker build \
+docker build \
--file docker/ubuntu/Dockerfile_ubuntu_pdal \
--tag grass-py3-pdal:stable-ubuntu .
```
-View the images available using `sudo docker images` and open a bash terminal with:
+View the images available using `sudo docker images` and open a bash terminal
+with:
```bash
$ docker run -it grass-py3-pdal:stable-ubuntu /bin/bash
@@ -31,8 +34,9 @@ bash-5.0#
__To build a stable version__:
change to the releasebranch or tag you want to build:
+
```bash
-$ git checkout remotes/origin/releasebranch_7_8
+git checkout remotes/origin/releasebranch_7_8
```
and build and enter with:
@@ -46,7 +50,6 @@ $ docker run -it grass-py3-pdal:stable-ubuntu /bin/bash
bash-5.0#
```
-
## Ubuntu latest
__Build the docker with__:
@@ -57,7 +60,8 @@ $ docker build \
--tag grass-py3-pdal:latest-ubuntu .
```
-View the images available using `sudo docker images` and open a bash terminal with:
+View the images available using `sudo docker images` and open a bash terminal
+with:
```bash
$ docker run -it grass-py3-pdal:latest-ubuntu /bin/bash
@@ -67,8 +71,9 @@ bash-5.0#
__To build a latest version__:
change to the releasebranch or tag you want to build:
+
```bash
-$ git checkout remotes/origin/releasebranch_7_8
+git checkout remotes/origin/releasebranch_7_8
```
and build and enter with:
diff --git a/general/g.proj/g.proj.html b/general/g.proj/g.proj.html
index 475d00a9690..606cec70ec8 100644
--- a/general/g.proj/g.proj.html
+++ b/general/g.proj/g.proj.html
@@ -2,11 +2,11 @@ DESCRIPTION
g.proj provides a means of converting a co-ordinate system
description (i.e. projection information) between various formats.
-If compiled without OGR present, the
+If compiled without OGR present, the
functionality is limited to:
- Reporting the projection information for the current location,
-either in conventional GRASS (-p flag) or PROJ.4 (-j flag) format
+either in conventional GRASS (-p flag) or PROJ (-j flag) format
- Changing the datum, or reporting and modifying the datum transformation
parameters, for the current location
@@ -33,9 +33,9 @@ DESCRIPTION
proj4=description or -
description should be a projection description in
-PROJ.4 format, enclosed in
+PROJ format, enclosed in
quotation marks if there are any spaces. If - is given for
-description, the PROJ.4 description will be read from stdin rather
+description, the PROJ description will be read from stdin rather
than as a directly-supplied command-line parameter.
epsg=number
@@ -48,7 +48,7 @@ DESCRIPTION
If datum information is incorrect or missing in the input
-co-ordinate system definition (e.g. PROJ.4 descriptions have very limited
+co-ordinate system definition (e.g. PROJ descriptions have very limited
support for specifying datum names), a GRASS datum abbreviation can instead be
supplied using the datum parameter. This will override any
datum contained in the input co-ordinate system, and discard
@@ -105,7 +105,7 @@
NOTES
WKT format shows the false eastings and northings in the projected unit
(e.g. meters, feet) but in PROJ format it should always be given in meters.
-
The maximum size of input WKT or PROJ.4 projection descriptions is
+
The maximum size of input WKT or PROJ projection descriptions is
limited to 8000 bytes.
EXAMPLES
@@ -135,14 +135,14 @@ Create projection (PRJ) file
Read projection from file
-Read the projection information from a GeoTIFF file and print it in PROJ.4
+Read the projection information from a GeoTIFF file and print it in PROJ
format:
g.proj -jf georef=ASTER_DEM20020508161837.tif
-Convert the PROJ.4 projection description contained in a text file to WKT
+
Convert the PROJ projection description contained in a text file to WKT
format: