Revert "Declare the need of C99 compliant compiler"

[andy/viking.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 726cca3c052a4a4a681f55f24b878a048925d91e..eeff0354f4789ac96966e89bf9e3f0b7d4712dc4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)

-AC_INIT(viking, 0.9.2)
+AC_INIT(viking, 0.9.4)

 AM_INIT_AUTOMAKE()
 dnl AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_HEADERS([src/config.h])
 AM_INIT_AUTOMAKE()
 dnl AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_HEADERS([src/config.h])


@@ -10,6 +10,24 @@ AC_CONFIG_HEADERS([src/config.h])
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_MAKE_SET
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_MAKE_SET

+AC_PROG_RANLIB
+
+# I18N
+GETTEXT_PACKAGE=viking
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package name])
+
+AM_GLIB_DEFINE_LOCALEDIR(LOCALEDIR)
+
+AM_GLIB_GNU_GETTEXT
+IT_PROG_INTLTOOL([0.35.0])
+
+AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
+
+dnl This will cause the automake generated makefiles to pass the
+dnl correct flags to aclocal.
+ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
+AC_SUBST(ACLOCAL_AMFLAGS)

 
 # Checks for header files.
 AC_HEADER_STDC
 
 # Checks for header files.
 AC_HEADER_STDC


@@ -22,7 +40,7 @@ AC_TYPE_MODE_T
 # Checks for library functions.
 AC_FUNC_STAT
 AC_FUNC_STRTOD
 # Checks for library functions.
 AC_FUNC_STAT
 AC_FUNC_STRTOD

-AC_CHECK_FUNCS([bzero floor gethostbyname memset mkdir pow realpath socket sqrt strcasecmp strchr strdup strncasecmp strtol strtoul])
+AC_CHECK_FUNCS([bzero floor gethostbyname memset mkdir mkdtemp pow realpath socket sqrt strcasecmp strchr strdup strncasecmp strtol strtoul])

 
 # Expat
 AM_WITH_EXPAT
 
 # Expat
 AM_WITH_EXPAT


@@ -67,11 +85,11 @@ AM_CONDITIONAL([GOOGLE], [test x$ac_cv_enable_google = xyes])
 
 AC_ARG_ENABLE(oldgoogle, AC_HELP_STRING([--enable-old-google],
               [enable old Google stuff (default is disable)]),
 
 AC_ARG_ENABLE(oldgoogle, AC_HELP_STRING([--enable-old-google],
               [enable old Google stuff (default is disable)]),

-              [ac_cv_enable_google=$enableval],
-              [ac_cv_enable_google=no])
+              [ac_cv_enable_old_google=$enableval],
+              [ac_cv_enable_old_google=no])

 AC_CACHE_CHECK([whether to enable Old Google stuff],
                [ac_cv_enable_old_google], [ac_cv_enable_old_google=yes])
 AC_CACHE_CHECK([whether to enable Old Google stuff],
                [ac_cv_enable_old_google], [ac_cv_enable_old_google=yes])

-case $ac_cv_enable_google in
+case $ac_cv_enable_old_google in

   yes)
     AC_DEFINE(VIK_CONFIG_OLD_GOOGLE, [], [OLD GOOGLE STUFF])
     ;;
   yes)
     AC_DEFINE(VIK_CONFIG_OLD_GOOGLE, [], [OLD GOOGLE STUFF])
     ;;


@@ -119,7 +137,7 @@ esac
 AM_CONDITIONAL([OPENSTREETMAP], [test x$ac_cv_enable_openstreetmap = xyes])
 
 AC_ARG_ENABLE(geocaches, AC_HELP_STRING([--enable-geocaches],
 AM_CONDITIONAL([OPENSTREETMAP], [test x$ac_cv_enable_openstreetmap = xyes])
 
 AC_ARG_ENABLE(geocaches, AC_HELP_STRING([--enable-geocaches],

-             [enable Geocaches Acquire (default is disable). WARNING: Broken, do not enable]),
+             [enable Geocaches Acquire (default is disable).]),

               [ac_cv_enable_geocaches=$enableval],
               [ac_cv_enable_geocaches=no])
 AC_CACHE_CHECK([whether to enable Geocaches Acquire],
               [ac_cv_enable_geocaches=$enableval],
               [ac_cv_enable_geocaches=no])
 AC_CACHE_CHECK([whether to enable Geocaches Acquire],


@@ -131,6 +149,35 @@ case $ac_cv_enable_geocaches in
 esac
 AM_CONDITIONAL([GEOCACHES], [test x$ac_cv_enable_geocaches = xyes])
 
 esac
 AM_CONDITIONAL([GEOCACHES], [test x$ac_cv_enable_geocaches = xyes])
 

+
+AC_ARG_ENABLE(dem24k, AC_HELP_STRING([--enable-dem24k],
+             [enable USGS 24k DEM (default is disable) download source. Requires dem24k.pl script in path.]),
+              [ac_cv_enable_dem24k=$enableval],
+              [ac_cv_enable_dem24k=no])
+AC_CACHE_CHECK([whether to enable USGS DEM 24k download source],
+               [ac_cv_enable_dem24k], [ac_cv_enable_dem24k=yes])
+case $ac_cv_enable_dem24k in
+  yes)
+    AC_DEFINE(VIK_CONFIG_DEM24K, [], [DEM24K STUFF])
+    ;;
+esac
+AM_CONDITIONAL([DEM24K], [test x$ac_cv_enable_dem24k = xyes])
+
+# Realtime GPS tracking
+AC_ARG_ENABLE(realtime-gps-tracking, AC_HELP_STRING([--enable-realtime-gps-tracking],
+              [enable realtime GPS tracking (default is enable)]),
+              [ac_cv_enable_realtimegpstracking=$enableval],
+              [ac_cv_enable_realtimegpstracking=yes])
+AC_CACHE_CHECK([whether to enable Realtime GPS Tracking stuff],
+               [ac_cv_enable_realtimegpstracking], [ac_cv_enable_realtimegpstracking=yes])
+case $ac_cv_enable_realtimegpstracking in
+  yes)
+    AC_CHECK_LIB(gps,gps_poll,,AC_MSG_ERROR([libgps is needed for Realtime GPS Tracking feature[,] but not found. The feature can be disable with --disable-realtime-gps-tracking]))
+    AC_DEFINE(VIK_CONFIG_REALTIME_GPS_TRACKING, [], [REALTIME GPS TRACKING STUFF])
+    ;;
+esac
+AM_CONDITIONAL([REALTIME_GPS_TRACKING], [test x$ac_cv_enable_realtimegpstracking = xyes])
+

 AC_ARG_WITH(mapcache,
             [AC_HELP_STRING([--with-mapcache],
                             [specify the size of the map cache (default is 50331648)])],
 AC_ARG_WITH(mapcache,
             [AC_HELP_STRING([--with-mapcache],
                             [specify the size of the map cache (default is 50331648)])],


@@ -145,13 +192,39 @@ AC_ARG_WITH(mapcache,
 AC_DEFINE_UNQUOTED(VIK_CONFIG_MAPCACHE_SIZE, ${VIK_CONFIG_MAPCACHE_SIZE},
                    [Size of the map cache])
 
 AC_DEFINE_UNQUOTED(VIK_CONFIG_MAPCACHE_SIZE, ${VIK_CONFIG_MAPCACHE_SIZE},
                    [Size of the map cache])
 

+dnl This will cause the automake generated makefiles to pass the
+dnl correct flags to aclocal.
+ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
+AC_SUBST(ACLOCAL_AMFLAGS)
+

 # Configuration
 AC_CONFIG_FILES([Makefile
                  src/Makefile
                  src/icons/Makefile
 # Configuration
 AC_CONFIG_FILES([Makefile
                  src/Makefile
                  src/icons/Makefile

+                po/Makefile.in

                  test/Makefile
                  doc/Makefile
                  doc/dev/Makefile])
 AC_OUTPUT([
           viking.spec
           ])
                  test/Makefile
                  doc/Makefile
                  doc/dev/Makefile])
 AC_OUTPUT([
           viking.spec
           ])

+
+dnl Output the configuration summary
+echo ""
+echo "==========================================="
+echo "$PACKAGE $VERSION"
+echo "-------------------------------------------"
+echo "Alphabetized track & waypoints   : $ac_cv_enable_alpha_trw"
+echo "Google Maps                      : $ac_cv_enable_google"
+#echo "Old Google Maps                  : $ac_cv_enable_old_google"
+echo "Terraserver Maps                 : $ac_cv_enable_terraserver"
+#echo "Expedia Maps                     : $ac_cv_enable_expedia"
+echo "Open Street Map                  : $ac_cv_enable_openstreetmap"
+#echo "Geocaches Acquire                : $ac_cv_enable_geocaches"
+echo "USGS 24k DEM                     : $ac_cv_enable_dem24k"
+echo "Realtime GPS Tracking            : $ac_cv_enable_realtimegpstracking"
+echo "Size of map cache (in memory)    : ${VIK_CONFIG_MAPCACHE_SIZE}"
+echo "-------------------------------------------"
+echo ""
+echo "Configure finished, type 'make' to build."
+