X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/2310330e7d4d724bf6641339836be8523f95c916..928c6b8da5a3677aaaf33976a7d921a1498a61df:/configure.in

diff --git a/configure.in b/configure.in
index cc2e1eb..9a9008c 100644
--- a/configure.in
+++ b/configure.in
@@ -1,25 +1,34 @@
 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.90.4)
+AM_INIT_AUTOMAKE(gob2,2.0.2)
+AM_MAINTAINER_MODE
+
+GLIB_REQUIRED=1.3.12
 
+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
 if test -f ../NOINST_GOB ; then
   DOINSTGOB=
-  NOINSTGOB=gob
+  NOINSTGOB=gob2
   AC_MSG_RESULT([*** NOT Going to install GOB ***])
-  SUBDIRS="src"
+  SUBDIRS="src examples"
   AC_SUBST(SUBDIRS)
 else
-  DOINSTGOB=gob
+  DOINSTGOB=gob2
   NOINSTGOB=
-  SUBDIRS="src doc"
+  SUBDIRS="src examples doc"
   AC_SUBST(SUBDIRS)
 fi
 AC_SUBST(DOINSTGOB)
 AC_SUBST(NOINSTGOB)
 
 dnl Checks for programs.
+AC_ISC_POSIX
 AC_PROG_CC
 AC_STDC_HEADERS
 AC_PROG_YACC
@@ -29,7 +38,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,15 +50,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
-doc/gob.1])
+examples/Makefile
+doc/gob2.1])