Adding --with-mapcache to configure

diff --git a/ChangeLog b/ChangeLog
index e5a0866516934cb46dd9d0a212124dc466b6abaf..9f708a7ed945c51afa47f27e91e839723789544c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-28  Guilhem BONNEFILLE  <guilhem.bonnefille@gmail.com>
+       * configure.ac: Adding --with-mapcache configure option
+       * src/config.h: Removed because no more used (generated)
+
 2005-10-18
 Alex Foobarian <foobarian@gmail.com>:
         * Fix ruler declination in UTM mode

diff --git a/configure.ac b/configure.ac
index 89cad9ff333cd36864e36b6fe7e4b74a949e4fe9..babee912775f3e352a2363df47b20cdd6eaaacd8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_PREREQ(2.59)
 AC_INIT(viking, 0.1.1pre2)
 AM_INIT_AUTOMAKE()
 dnl AC_CONFIG_SRCDIR([src/main.c])
-dnl AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_HEADERS([config.h])
 
 # Checks for programs.
 AC_PROG_CC
@@ -48,6 +48,20 @@ case $ac_cv_enable_alpha_trw in
     ;;
 esac
 
+AC_ARG_WITH(mapcache,
+            [AC_HELP_STRING([--with-mapcache],
+                            [specify the size of the map cache (default is 50331648)])],
+            [if test "x$withval" = "xno"; then
+                VIK_CONFIG_MAPCACHE_SIZE=0;
+             elif test "x$withval" = "xyes"; then
+                AC_MSG_ERROR([Please, set a value for size of the map cache])
+             else
+                VIK_CONFIG_MAPCACHE_SIZE=${withval}
+             fi],
+             [VIK_CONFIG_MAPCACHE_SIZE=50331648])
+AC_DEFINE_UNQUOTED(VIK_CONFIG_MAPCACHE_SIZE, ${VIK_CONFIG_MAPCACHE_SIZE},
+                   [Size of the map cache])
+
 # Configuration
 AC_CONFIG_FILES([Makefile
                  src/Makefile

diff --git a/src/config.h b/src/config.h
deleted file mode 100644 (file)
index f461583..0000000
--- a/src/config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef VIK_CONFIG_H
-#define VIK_CONFIG_H
-
-#define VIK_CONFIG_MAPCACHE_SIZE 50331648 /* 48 meggerbytes */
-
-
-/* suggestions for what else you want here? */
-/* how about waypoint drawing -- fast or slow? */
-
-#endif