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

diff --git a/configure.in b/configure.in
index 4445dbe..c551624 100644
--- a/configure.in
+++ b/configure.in
@@ -1,25 +1,37 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.2)
-AC_INIT(src/tree.h)
+AC_INIT(src/treefuncs.h)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(gob,0.92.0)
+AM_INIT_AUTOMAKE(gob2,2.0.13)
+AM_MAINTAINER_MODE
+
+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=gob
   AC_MSG_RESULT([*** NOT Going to install GOB ***])
   SUBDIRS="src examples"
-  AC_SUBST(SUBDIRS)
+  INSTGOB=""
+  NOINSTGOB="gob2"
 else
-  DOINSTGOB=gob
-  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.
+AC_ISC_POSIX
 AC_PROG_CC
 AC_STDC_HEADERS
 AC_PROG_YACC
@@ -29,7 +41,9 @@ AC_PROG_CPP
 AC_PATH_PROG(RM, rm, /bin/rm)
 AC_PATH_PROG(MV, mv, /bin/mv)
 AC_PATH_PROG(TAR, tar, /bin/tar)
-AM_PATH_GLIB(1.2.0,,,)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
 dnl We don't check popt since we're not using it at the moment, but
 dnl We just might use it later
 dnl AC_CHECK_LIB(popt,poptGetContext, [POPT_LIB="-lpopt"],
@@ -39,16 +53,15 @@ dnl AC_SUBST(POPT_LIB)
 
 dnl AM_PROG_LIBTOOL
 
-AM_MAINTAINER_MODE
-
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)
+AC_SUBST(YFLAGS)
 
 AC_OUTPUT([
-gob.spec
+gob2.spec
 Makefile
 src/Makefile
 doc/Makefile
 examples/Makefile
-doc/gob.1])
+doc/gob2.1])