X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/6e77e91bbb048a0ee1a072715c0ce808c169ab38..7231d76fbf4ae0b501af648e1216b88714aa7353:/configure.in

diff --git a/configure.in b/configure.in
index 1dc72a0..caebd1b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,28 @@
 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.2)
+AM_INIT_AUTOMAKE(gob2,1.99.1)
+
+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=gob2
+  AC_MSG_RESULT([*** NOT Going to install GOB ***])
+  SUBDIRS="src examples"
+  AC_SUBST(SUBDIRS)
+else
+  DOINSTGOB=gob2
+  NOINSTGOB=
+  SUBDIRS="src examples doc"
+  AC_SUBST(SUBDIRS)
+fi
+AC_SUBST(DOINSTGOB)
+AC_SUBST(NOINSTGOB)
 
 dnl Checks for programs.
 AC_PROG_CC
@@ -14,13 +34,15 @@ 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,,,)
-AC_CHECK_LIB(popt,poptGetContext, [POPT_LIB="-lpopt"],
-	     AC_MSG_ERROR(Popt library not found))
-AC_SUBST(POPT_LIB)
+AM_PATH_GLIB_2_0(1.3.3,,,)
+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"],
+dnl 	     AC_MSG_ERROR(Popt library not found, find it on ftp://ftp.redhat.com/pub/redhat/code/))
+dnl AC_SUBST(POPT_LIB)
 
 
-#AM_PROG_LIBTOOL
+dnl AM_PROG_LIBTOOL
 
 AM_MAINTAINER_MODE
 
@@ -29,8 +51,9 @@ AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)
 
 AC_OUTPUT([
-gob.spec
+gob2.spec
 Makefile
 src/Makefile
 doc/Makefile
-doc/gob.1])
+examples/Makefile
+doc/gob2.1])