src/jsdoc/PackerRun.vala

[roojspacker] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2ff51c7..17c07dc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,7 @@ dnl we need to check these exist, then it will generate a compile string for the
 PKG_CHECK_MODULES(ROOJSPACKER, [
                 glib-2.0 >= 2.24.0
                 gobject-2.0 >= 2.24.0
-                gee-1.0  
+                gee-0.8
                 gio-2.0  >= 2.24.0
                 gthread-2.0
                 
@@ -43,14 +43,25 @@ PKG_CHECK_MODULES(ROOJSPACKER, [
 
 dnl -- some old servers do not have json-glib...
 
-PKG_CHECK_MODULES(JAVASCRIPTCOREGTK, [json-glib-1.0],
+PKG_CHECK_MODULES(JSON_GLIB, [json-glib-1.0],
                                [json_glib_enabled=yes],
                                [json_glib_enabled=no])
 
 if test $json_glib_enabled = yes; then
                AC_DEFINE(HAVE_JSON_GLIB,1,[json-glib support])
 fi
-AM_CONDITIONAL(HAVE_JSON_GLIB, test "$json-glib support" = "yes")
+AM_CONDITIONAL(HAVE_JSON_GLIB, test "$json_glib_enabled" = "yes")
+
+
+AC_ARG_ENABLE([old_glib],
+[  --enable-old-glib    Enable old Glib support],
+[case "${enableval}" in
+  yes) old_glib=true ;;
+  no)  old_glib=false ;;
+  *) AC_MSG_ERROR([bad value ${enableval} for --enable-old-glib]) ;;
+esac],[old_glib=false])
+AM_CONDITIONAL([HAVE_OLD_GLIB], [test x$old_glib = xtrue])
+
 
 
 
@@ -79,7 +90,8 @@ AC_CONFIG_FILES([
        src/Makefile
 ])
 
-  
+AC_SUBST(JSON_GLIB_CFLAGS) 
+AC_SUBST(JSON_GLIB_LIBS) 
 AC_SUBST(ROOJSPACKER_CFLAGS)
 AC_SUBST(ROOJSPACKER_LIBS)