X-Git-Url: http://www.wagner.pp.ru/gitweb/?a=blobdiff_plain;f=configure.ac;h=d980cb1995b2baf365195a730d1b33149bb7e47b;hb=1f35ab5c1206d73757a0595833aeaf1180ca322c;hp=118885ee67ed0fd65d5ae82d8949c605ac11f006;hpb=ed514d6406b2a9110a2dcc043b4c6a1af755e081;p=oss%2Ffgis.git

diff --git a/configure.ac b/configure.ac
index 118885e..d980cb1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 AC_INIT(fGIS, 0.0.1, dron@remotesensing.org)
-# AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE
-# AC_CONFIG_SRCDIR([include/regex.h])
 AM_CONFIG_HEADER(include/config.h)
 
 dnl Checks for programs.
@@ -49,13 +47,32 @@ dnl ---------------------------------------------------------------------------
 dnl Handle global configuration file placement
 dnl ---------------------------------------------------------------------------
 
-AC_DEFINE_DIR(FGIS_CONFIG, "$sysconfdir", [Define this to the location of the global config file])
+dnl FIXME: won't works
+dnl AC_DEFINE_DIR(FGIS_CONFDIR, "$sysconfdir", [Define this to the location of the global config file])
+AC_SUBST_DIR(FGIS_CONFDIR,"$sysconfdir")
+AC_DEFINE_UNQUOTED(FGIS_CONFDIR,"$FGIS_CONFDIR",[Define this to the location of the global config file])
+AC_SUBST(FGIS_CONFDIR,$FGIS_CONFDIR)
 
 dnl ---------------------------------------------------------------------------
 dnl Handle placement of the engine module (fgis.so)
 dnl ---------------------------------------------------------------------------
 
 AC_SUBST_DIR(FGIS_LIBDIR,"$libdir")
+AC_SUBST(FGIS_LIBDIR,$FGIS_LIBDIR)
+
+dnl ---------------------------------------------------------------------------
+dnl Handle placement of the fGIS Tcl/Tk modules
+dnl ---------------------------------------------------------------------------
+
+AC_SUBST_DIR(FGIS_SCRIPTDIR,"$libdir/fgis/tcl")
+AC_SUBST(FGIS_SCRIPTDIR,$FGIS_SCRIPTDIR)
+
+dnl ---------------------------------------------------------------------------
+dnl Define path for EPPL7 library sources. Temporary hack, the whole this
+dnl library will be removed soon
+dnl ---------------------------------------------------------------------------
+
+AC_SUBST(LIBEPP,../lib/libepp.la)
 
 dnl ---------------------------------------------------------------------------
 dnl Check for Tcl/Tk installation
@@ -78,11 +95,13 @@ CY_AC_PATH_TKH
 CY_AC_PATH_TKCONFIG
 CY_AC_LOAD_TKCONFIG
 AC_SUBST(TK_INC_DIR,$TK_INC_DIR)
-if [[ $TK_VERSION < "8.4" ]]; then
-    AC_DEFINE([TK_84PREV], [0], [Define this variable if your Tk version less then 8.4])
+if [[[ $TK_VERSION < "8.4" ]]]; then
+    AC_DEFINE([TK_84PREV], , [Define this variable if your Tk version less then 8.4])
 fi
 
 AC_CONFIG_FILES([Makefile
+                 etc/Makefile
+                 etc/fgis.rc
                  dll/Makefile
                  epu/Makefile
                  include/Makefile
@@ -90,3 +109,4 @@ AC_CONFIG_FILES([Makefile
                  tcl/Makefile
 		 tcl/pkgIndex.tcl])
 AC_OUTPUT
+