[GRASS-SVN] r61296 - grass/trunk
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Jul 21 06:45:57 PDT 2014
Author: neteler
Date: 2014-07-21 06:45:57 -0700 (Mon, 21 Jul 2014)
New Revision: 61296
Modified:
grass/trunk/configure
grass/trunk/configure.in
Log:
configure: use standard system directory for PROJSHARE (--with-proj-share)
Modified: grass/trunk/configure
===================================================================
--- grass/trunk/configure 2014-07-21 13:34:31 UTC (rev 61295)
+++ grass/trunk/configure 2014-07-21 13:45:57 UTC (rev 61296)
@@ -5479,7 +5479,7 @@
if test -z "$PROJSHARE" ; then
echo "configure: warning: *** External PROJ.4 directory not specified; default will be used" 1>&2
- PROJSHARE=/usr/local/share/proj
+ PROJSHARE=/usr/share/proj
fi
# LOC_CHECK_SHARE does not work when cross compiling
@@ -12367,7 +12367,58 @@
fi
fi
+for ac_declaration in \
+ ''\
+ '#include <stdlib.h>' \
+ 'extern "C" void std::exit (int) throw (); using std::exit;' \
+ 'extern "C" void std::exit (int); using std::exit;' \
+ 'extern "C" void exit (int) throw ();' \
+ 'extern "C" void exit (int);' \
+ 'void exit (int);'
+do
+ cat > conftest.$ac_ext <<EOF
+#line 12381 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+$ac_declaration
+int main() {
+exit (42);
+; return 0; }
+EOF
+if { (eval echo configure:12389: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ :
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ continue
+fi
+rm -f conftest*
+ cat > conftest.$ac_ext <<EOF
+#line 12399 "configure"
+#include "confdefs.h"
+$ac_declaration
+int main() {
+exit (42);
+; return 0; }
+EOF
+if { (eval echo configure:12406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ break
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+done
+if test -n "$ac_declaration"; then
+ echo '#ifdef __cplusplus' >>confdefs.h
+ echo $ac_declaration >>confdefs.h
+ echo '#endif' >>confdefs.h
+fi
+
+
+else
CXX=
CXXFLAGS=
@@ -12380,7 +12431,7 @@
echo $ac_n "checking whether to use openDWG""... $ac_c" 1>&6
-echo "configure:12384: checking whether to use openDWG" >&5
+echo "configure:12435: checking whether to use openDWG" >&5
echo "$ac_t"""$with_opendwg"" 1>&6
case "$with_opendwg" in
"no") USE_OPENDWG= ;;
@@ -12400,7 +12451,7 @@
echo $ac_n "checking for location of openDGW includes""... $ac_c" 1>&6
-echo "configure:12404: checking for location of openDGW includes" >&5
+echo "configure:12455: 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; }
@@ -12426,15 +12477,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12430: checking for $ac_hdr" >&5
+echo "configure:12481: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12433 "configure"
+#line 12484 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12438: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12489: \"$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*
@@ -12468,7 +12519,7 @@
echo $ac_n "checking for location of openDWG library""... $ac_c" 1>&6
-echo "configure:12472: checking for location of openDWG library" >&5
+echo "configure:12523: 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; }
@@ -12509,7 +12560,7 @@
echo $ac_n "checking whether to use POSIX threads""... $ac_c" 1>&6
-echo "configure:12513: checking whether to use POSIX threads" >&5
+echo "configure:12564: checking whether to use POSIX threads" >&5
echo "$ac_t"""$with_pthread"" 1>&6
case "$with_pthread" in
"no") USE_PTHREAD= ;;
@@ -12529,7 +12580,7 @@
echo $ac_n "checking for location of POSIX threads includes""... $ac_c" 1>&6
-echo "configure:12533: checking for location of POSIX threads includes" >&5
+echo "configure:12584: 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; }
@@ -12555,15 +12606,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12559: checking for $ac_hdr" >&5
+echo "configure:12610: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12562 "configure"
+#line 12613 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12618: \"$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*
@@ -12597,7 +12648,7 @@
echo $ac_n "checking for location of POSIX threads library""... $ac_c" 1>&6
-echo "configure:12601: checking for location of POSIX threads library" >&5
+echo "configure:12652: 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; }
@@ -12622,10 +12673,10 @@
LIBS=" $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
-echo "configure:12626: checking for pthread_create" >&5
+echo "configure:12677: checking for pthread_create" >&5
cat > conftest.$ac_ext <<EOF
-#line 12629 "configure"
+#line 12680 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char pthread_create(); below. */
@@ -12648,7 +12699,7 @@
; return 0; }
EOF
-if { (eval echo configure:12652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12703: \"$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
@@ -12675,13 +12726,13 @@
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:12679: checking for pthread_create in -lpthread" >&5
+echo "configure:12730: 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 <<EOF
-#line 12685 "configure"
+#line 12736 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12692,7 +12743,7 @@
pthread_create()
; return 0; }
EOF
-if { (eval echo configure:12696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12747: \"$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
@@ -12742,7 +12793,7 @@
echo $ac_n "checking whether to use OpenMP""... $ac_c" 1>&6
-echo "configure:12746: checking whether to use OpenMP" >&5
+echo "configure:12797: checking whether to use OpenMP" >&5
echo "$ac_t"""$with_openmp"" 1>&6
case "$with_openmp" in
"no") USE_OPENMP= ;;
@@ -12763,7 +12814,7 @@
echo $ac_n "checking for location of OpenMP includes""... $ac_c" 1>&6
-echo "configure:12767: checking for location of OpenMP includes" >&5
+echo "configure:12818: 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; }
@@ -12789,15 +12840,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12793: checking for $ac_hdr" >&5
+echo "configure:12844: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12796 "configure"
+#line 12847 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12801: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12852: \"$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*
@@ -12835,7 +12886,7 @@
echo $ac_n "checking for location of OpenMP library""... $ac_c" 1>&6
-echo "configure:12839: checking for location of OpenMP library" >&5
+echo "configure:12890: 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; }
@@ -12860,10 +12911,10 @@
LIBS=" $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for GOMP_parallel_start""... $ac_c" 1>&6
-echo "configure:12864: checking for GOMP_parallel_start" >&5
+echo "configure:12915: checking for GOMP_parallel_start" >&5
cat > conftest.$ac_ext <<EOF
-#line 12867 "configure"
+#line 12918 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char GOMP_parallel_start(); below. */
@@ -12886,7 +12937,7 @@
; return 0; }
EOF
-if { (eval echo configure:12890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12941: \"$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
@@ -12913,13 +12964,13 @@
echo $ac_n "checking for GOMP_parallel_start in -lgomp""... $ac_c" 1>&6
-echo "configure:12917: checking for GOMP_parallel_start in -lgomp" >&5
+echo "configure:12968: 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 <<EOF
-#line 12923 "configure"
+#line 12974 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12930,7 +12981,7 @@
GOMP_parallel_start()
; return 0; }
EOF
-if { (eval echo configure:12934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12985: \"$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
@@ -13003,7 +13054,7 @@
echo $ac_n "checking whether to use OpenCL""... $ac_c" 1>&6
-echo "configure:13007: checking whether to use OpenCL" >&5
+echo "configure:13058: checking whether to use OpenCL" >&5
echo "$ac_t"""$with_opencl"" 1>&6
case "$with_opencl" in
"no") USE_OPENCL= ;;
@@ -13023,7 +13074,7 @@
echo $ac_n "checking for location of OpenCL includes""... $ac_c" 1>&6
-echo "configure:13027: checking for location of OpenCL includes" >&5
+echo "configure:13078: 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; }
@@ -13050,15 +13101,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13054: checking for $ac_hdr" >&5
+echo "configure:13105: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 13057 "configure"
+#line 13108 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13062: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13113: \"$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*
@@ -13098,10 +13149,10 @@
LIBS="-framework OpenCL $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for clGetPlatformInfo""... $ac_c" 1>&6
-echo "configure:13102: checking for clGetPlatformInfo" >&5
+echo "configure:13153: checking for clGetPlatformInfo" >&5
cat > conftest.$ac_ext <<EOF
-#line 13105 "configure"
+#line 13156 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char clGetPlatformInfo(); below. */
@@ -13124,7 +13175,7 @@
; return 0; }
EOF
-if { (eval echo configure:13128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13179: \"$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
@@ -13163,15 +13214,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13167: checking for $ac_hdr" >&5
+echo "configure:13218: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 13170 "configure"
+#line 13221 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13175: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13226: \"$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*
@@ -13204,7 +13255,7 @@
# With OpenCL library directory
echo $ac_n "checking for location of OpenCL library""... $ac_c" 1>&6
-echo "configure:13208: checking for location of OpenCL library" >&5
+echo "configure:13259: 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; }
@@ -13228,13 +13279,13 @@
echo $ac_n "checking for clGetPlatformInfo in -lOpenCL""... $ac_c" 1>&6
-echo "configure:13232: checking for clGetPlatformInfo in -lOpenCL" >&5
+echo "configure:13283: 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 <<EOF
-#line 13238 "configure"
+#line 13289 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13245,7 +13296,7 @@
clGetPlatformInfo()
; return 0; }
EOF
-if { (eval echo configure:13249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13300: \"$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
@@ -13305,7 +13356,7 @@
fi
echo $ac_n "checking for special C compiler options needed for large files""... $ac_c" 1>&6
-echo "configure:13309: checking for special C compiler options needed for large files" >&5
+echo "configure:13360: checking for special C compiler options needed for large files" >&5
ac_cv_sys_largefile_CC=no
largefile_cc_opt=""
@@ -13313,7 +13364,7 @@
# 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 <<EOF
-#line 13317 "configure"
+#line 13368 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -13329,7 +13380,7 @@
; return 0; }
EOF
-if { (eval echo configure:13333: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13384: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -13338,7 +13389,7 @@
ac_save_CC="${CC-cc}"
CC="$CC -n32"
cat > conftest.$ac_ext <<EOF
-#line 13342 "configure"
+#line 13393 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -13354,7 +13405,7 @@
; return 0; }
EOF
-if { (eval echo configure:13358: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_largefile_CC=' -n32'
else
@@ -13381,11 +13432,11 @@
fi
echo $ac_n "checking for _FILE_OFFSET_BITS value needed for large files""... $ac_c" 1>&6
-echo "configure:13385: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+echo "configure:13436: checking for _FILE_OFFSET_BITS value needed for large files" >&5
ac_cv_sys_file_offset_bits=no
cat > conftest.$ac_ext <<EOF
-#line 13389 "configure"
+#line 13440 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -13401,14 +13452,14 @@
; return 0; }
EOF
-if { (eval echo configure:13405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13456: \"$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 <<EOF
-#line 13412 "configure"
+#line 13463 "configure"
#include "confdefs.h"
#define _FILE_OFFSET_BITS 64
#include <sys/types.h>
@@ -13426,7 +13477,7 @@
; return 0; }
EOF
-if { (eval echo configure:13430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_file_offset_bits=64
else
@@ -13452,11 +13503,11 @@
fi
echo $ac_n "checking for _LARGE_FILES value needed for large files""... $ac_c" 1>&6
-echo "configure:13456: checking for _LARGE_FILES value needed for large files" >&5
+echo "configure:13507: checking for _LARGE_FILES value needed for large files" >&5
ac_cv_sys_large_files=no
cat > conftest.$ac_ext <<EOF
-#line 13460 "configure"
+#line 13511 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -13472,14 +13523,14 @@
; return 0; }
EOF
-if { (eval echo configure:13476: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13527: \"$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 <<EOF
-#line 13483 "configure"
+#line 13534 "configure"
#include "confdefs.h"
#define _LARGE_FILES 1
#include <sys/types.h>
@@ -13497,7 +13548,7 @@
; return 0; }
EOF
-if { (eval echo configure:13501: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_large_files=1
else
@@ -13523,25 +13574,25 @@
fi
echo $ac_n "checking for _LARGEFILE_SOURCE value needed for large files""... $ac_c" 1>&6
-echo "configure:13527: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+echo "configure:13578: checking for _LARGEFILE_SOURCE value needed for large files" >&5
ac_cv_sys_largefile_source=no
cat > conftest.$ac_ext <<EOF
-#line 13531 "configure"
+#line 13582 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:13538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13589: \"$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 <<EOF
-#line 13545 "configure"
+#line 13596 "configure"
#include "confdefs.h"
#define _LARGEFILE_SOURCE 1
#include <stdio.h>
@@ -13550,7 +13601,7 @@
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:13554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_largefile_source=1
else
@@ -13582,25 +13633,25 @@
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:13586: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+echo "configure:13637: checking for _LARGEFILE_SOURCE value needed for large files" >&5
ac_cv_sys_largefile_source=no
cat > conftest.$ac_ext <<EOF
-#line 13590 "configure"
+#line 13641 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:13597: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13648: \"$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 <<EOF
-#line 13604 "configure"
+#line 13655 "configure"
#include "confdefs.h"
#define _LARGEFILE_SOURCE 1
#include <stdio.h>
@@ -13609,7 +13660,7 @@
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:13613: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13664: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_largefile_source=1
else
@@ -13639,18 +13690,18 @@
# 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:13643: checking for fseeko" >&5
+echo "configure:13694: checking for fseeko" >&5
ac_cv_func_fseeko=no
cat > conftest.$ac_ext <<EOF
-#line 13647 "configure"
+#line 13698 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
return fseeko && fseeko (stdin, 0, 0);
; return 0; }
EOF
-if { (eval echo configure:13654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_func_fseeko=yes
else
@@ -13667,10 +13718,10 @@
fi
echo $ac_n "checking if system supports Large Files at all""... $ac_c" 1>&6
-echo "configure:13671: checking if system supports Large Files at all" >&5
+echo "configure:13722: checking if system supports Large Files at all" >&5
cat > conftest.$ac_ext <<EOF
-#line 13674 "configure"
+#line 13725 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/types.h>
@@ -13702,7 +13753,7 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:13706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_largefiles=yes
else
@@ -13733,7 +13784,7 @@
# Enable wxWidgets support (for wxGUI)
echo $ac_n "checking whether to use wxWidgets""... $ac_c" 1>&6
-echo "configure:13737: checking whether to use wxWidgets" >&5
+echo "configure:13788: checking whether to use wxWidgets" >&5
WXVERSION=
WXWIDGETSCXXFLAGS=
@@ -13754,7 +13805,7 @@
# Extract the first word of "wx-config", so it can be a program name with args.
set dummy wx-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:13758: checking for $ac_word" >&5
+echo "configure:13809: checking for $ac_word" >&5
case "$WX_CONFIG" in
/*)
@@ -13802,7 +13853,7 @@
REQWX="2.8.1"
echo $ac_n "checking wxWidgets version""... $ac_c" 1>&6
-echo "configure:13806: checking wxWidgets version" >&5
+echo "configure:13857: checking wxWidgets version" >&5
if WXVERSION=`"$WX_CONFIG" --version`; then
echo "$ac_t""$WXVERSION" 1>&6
else
@@ -13825,15 +13876,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13829: checking for $ac_hdr" >&5
+echo "configure:13880: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 13832 "configure"
+#line 13883 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13888: \"$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*
Modified: grass/trunk/configure.in
===================================================================
--- grass/trunk/configure.in 2014-07-21 13:34:31 UTC (rev 61295)
+++ grass/trunk/configure.in 2014-07-21 13:45:57 UTC (rev 61296)
@@ -625,7 +625,7 @@
LOC_CHECK_SHARE_PATH(proj,External PROJ.4,PROJSHARE)
if test -z "$PROJSHARE" ; then
AC_MSG_WARN([*** External PROJ.4 directory not specified; default will be used])
- PROJSHARE=/usr/local/share/proj
+ PROJSHARE=/usr/share/proj
fi
# LOC_CHECK_SHARE does not work when cross compiling
More information about the grass-commit
mailing list