X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/38fac18bf81df672821ebbac4130ce41f0a6c61f..4d534c82fb65897999ade6867534ab952a9bc019:/configure.in

diff --git a/configure.in b/configure.in
index 52fc523..c551624 100644
--- a/configure.in
+++ b/configure.in
@@ -2,29 +2,32 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.2)
 AC_INIT(src/treefuncs.h)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(gob2,1.99.2)
+AM_INIT_AUTOMAKE(gob2,2.0.13)
 AM_MAINTAINER_MODE
 
-GLIB_REQUIRED=1.3.12
+GLIB_REQUIRED=2.0.0
 
 dnl
 dnl  An utter hack to allow embedding of gob inside other packages.
 dnl  if a file is found in the parent directory named NOINST_GOB, then
 dnl  gob is not installed
 dnl
+
+AM_CONDITIONAL(NOINSTGOB, test -f ../NOINST_GOB)
+
+dnl Is there a way to test NOINSTGOB here ?
 if test -f ../NOINST_GOB ; then
-  DOINSTGOB=
-  NOINSTGOB=gob2
   AC_MSG_RESULT([*** NOT Going to install GOB ***])
   SUBDIRS="src examples"
-  AC_SUBST(SUBDIRS)
+  INSTGOB=""
+  NOINSTGOB="gob2"
 else
-  DOINSTGOB=gob2
-  NOINSTGOB=
   SUBDIRS="src examples doc"
-  AC_SUBST(SUBDIRS)
+  INSTGOB="gob2"
+  NOINSTGOB=""
 fi
-AC_SUBST(DOINSTGOB)
+AC_SUBST(SUBDIRS)
+AC_SUBST(INSTGOB)
 AC_SUBST(NOINSTGOB)
 
 dnl Checks for programs.