X-Git-Url: http://www.wagner.pp.ru/gitweb/?a=blobdiff_plain;f=configure;h=8734f30d13b43ad367940e5e029f0e6a74720a9b;hb=a1bfd3dd109e10cb2be9931a3d032c4a5e808f93;hp=5019fd42897588ad2d56c091d753e864eb1f6a40;hpb=349ccc7f5d161a4d10ac72cf16ea5073fe071b4e;p=oss%2Ffgis.git

diff --git a/configure b/configure
index 5019fd4..8734f30 100755
--- a/configure
+++ b/configure
@@ -1383,7 +1383,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-# AC_CONFIG_HEADERS([config.h])
 am__api_version="1.6"
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
@@ -1764,7 +1763,6 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 
 
 
-# AC_CONFIG_SRCDIR([include/regex.h])
 # Add the stamp file to the list of files AC keeps track of,
 # along with our hook.
 ac_config_headers="$ac_config_headers include/config.h"
@@ -4176,7 +4174,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4179 "configure"' > conftest.$ac_ext
+  echo '#line 4177 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -4712,7 +4710,7 @@ chmod -w .
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:4715: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:4713: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
   # The compiler can only warn and ignore the option if not recognized
   # So say no if there are warnings
   if test -s out/conftest.err; then
@@ -6510,7 +6508,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6513 "configure"
+#line 6511 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -6608,7 +6606,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6611 "configure"
+#line 6609 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10379,15 +10377,19 @@ done
 
 
 
-  test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-  ac_define_dir=`eval echo $"$sysconfdir"`
-  ac_define_dir=`eval echo $ac_define_dir`
+        FGIS_CONFIG=$"$sysconfdir"
+        test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+        test "x$exec_prefix" = xNONE && exec_prefix="${prefix}"
+        FGIS_CONFIG=`eval echo $FGIS_CONFIG`
+	FGIS_CONFIG=`eval echo $FGIS_CONFIG`
+
+
 
 cat >>confdefs.h <<_ACEOF
-#define FGIS_CONFIG "$ac_define_dir"
+#define FGIS_CONFIG "$FGIS_CONFIG"
 _ACEOF
 
+FGIS_CONFIG=$FGIS_CONFIG
 
 
 
@@ -10399,6 +10401,24 @@ _ACEOF
 	FGIS_LIBDIR=`eval echo $FGIS_LIBDIR`
 
 
+FGIS_LIBDIR=$FGIS_LIBDIR
+
+
+
+
+        FGIS_SCRIPTS=$"$libdir/fgis/tcl"
+        test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+        test "x$exec_prefix" = xNONE && exec_prefix="${prefix}"
+        FGIS_SCRIPTS=`eval echo $FGIS_SCRIPTS`
+	FGIS_SCRIPTS=`eval echo $FGIS_SCRIPTS`
+
+
+FGIS_SCRIPTS=$FGIS_SCRIPTS
+
+
+
+LIBEPP=../lib/libepp.la
+
 
 
 
@@ -11315,8 +11335,15 @@ LIBS=$SAVELIBS
 
 TK_INC_DIR=$TK_INC_DIR
 
+if [[ $TK_VERSION < "8.4" ]]; then
 
-ac_config_files="$ac_config_files Makefile dll/Makefile epu/Makefile include/Makefile lib/Makefile tcl/Makefile tcl/pkgIndex.tcl"
+cat >>confdefs.h <<\_ACEOF
+#define TK_84PREV
+_ACEOF
+
+fi
+
+ac_config_files="$ac_config_files Makefile etc/Makefile etc/fgis.rc dll/Makefile epu/Makefile include/Makefile lib/Makefile tcl/Makefile tcl/pkgIndex.tcl"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -11807,6 +11834,8 @@ do
   case "$ac_config_target" in
   # Handling of arguments.
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+  "etc/Makefile" ) CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;;
+  "etc/fgis.rc" ) CONFIG_FILES="$CONFIG_FILES etc/fgis.rc" ;;
   "dll/Makefile" ) CONFIG_FILES="$CONFIG_FILES dll/Makefile" ;;
   "epu/Makefile" ) CONFIG_FILES="$CONFIG_FILES epu/Makefile" ;;
   "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
@@ -11946,7 +11975,10 @@ s,@YACC@,$YACC,;t t
 s,@ALLOCA@,$ALLOCA,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
 s,@POW_LIB@,$POW_LIB,;t t
+s,@FGIS_CONFIG@,$FGIS_CONFIG,;t t
 s,@FGIS_LIBDIR@,$FGIS_LIBDIR,;t t
+s,@FGIS_SCRIPTS@,$FGIS_SCRIPTS,;t t
+s,@LIBEPP@,$LIBEPP,;t t
 s,@TCLHDIR@,$TCLHDIR,;t t
 s,@TCLHDIRDASHI@,$TCLHDIRDASHI,;t t
 s,@TCL_LIBRARY@,$TCL_LIBRARY,;t t
@@ -12566,3 +12598,4 @@ if test "$no_create" != yes; then
   $ac_cs_success || { (exit 1); exit 1; }
 fi
 
+