* configure.ac:

[scdataviz] / configure.ac

diff --git a/configure.ac b/configure.ac
index dd62150..b5df70c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_CC
 AM_PROG_CC_C_O
 
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.6, have_glib=true, have_glib=false)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.18, have_glib=true, have_glib=false)
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
@@ -15,7 +15,7 @@ PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.18, have_gio=true, have_gio=false)
 AC_SUBST(GIO_CFLAGS)
 AC_SUBST(GIO_LIBS)
 
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 3.1, have_gtk=true, have_gtk=false)
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.18, have_gtk=true, have_gtk=false)
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
@@ -28,6 +28,11 @@ AC_ARG_ENABLE([debug],
 esac],[debug=false])
 AM_CONDITIONAL([DEBUG], [test x$debug = xtrue])
 
+AC_ARG_ENABLE([matdbfile],
+[  --enable-matdbfile=location Specify matdb location],
+[CFLAGS="$CFLAGS -DMATDBFILE=${enableval}"],
+[CFLAGS="$CFLAGS -DMATDBFILE=matdb.txt"])
+
 AC_ARG_ENABLE([maemo],
 [  --enable-maemo=device Enable maemo build],
 [case "${enableval}" in
@@ -37,7 +42,7 @@ AC_ARG_ENABLE([maemo],
       n900) CFLAGS="$CFLAGS -mfpu=vfp -mfloat-abi=softfp" ;;
       *) CFLAGS="$CFLAGS -mfpu=vfp -mfloat-abi=softfp" ;;
 esac],[maemo=false])
-dnl AM_CONDITIONAL([MAEMO], [test x$maemo != xfalse])
+AM_CONDITIONAL([MAEMO], [test x$maemo != xfalse])
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT