X-Git-Url: https://git.distorted.org.uk/~mdw/xtoys/blobdiff_plain/de0472883a3cf7659dec392123ea1b150a89011b..refs/tags/1.3.0:/configure.in

diff --git a/configure.in b/configure.in
index 02e16e7..ebb870d 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl -*-fundamental-*-
 dnl
-dnl $Id: configure.in,v 1.9 1998/12/20 17:18:53 mdw Exp $
+dnl $Id: configure.in,v 1.14 1999/11/11 19:50:13 mdw Exp $
 dnl
 dnl Configuration script for X tools
 dnl
@@ -28,11 +28,20 @@ dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 dnl ----- Revision history --------------------------------------------------
 dnl
 dnl $Log: configure.in,v $
-dnl Revision 1.9  1998/12/20 17:18:53  mdw
-dnl Yet another patchlevel.
+dnl Revision 1.14  1999/11/11 19:50:13  mdw
+dnl Build separately from libraries.
 dnl
-dnl Revision 1.8  1998/12/16 19:58:03  mdw
-dnl Fiddle version number.
+dnl Revision 1.13  1999/08/20 07:32:00  mdw
+dnl Version bump.
+dnl
+dnl Revision 1.12  1999/05/19 20:41:15  mdw
+dnl Track gratuitous change in mdwopt interface.
+dnl
+dnl Revision 1.11  1999/03/25 23:37:21  mdw
+dnl Remove absolute dependence on GTK.
+dnl
+dnl Revision 1.10  1999/03/24 22:23:00  mdw
+dnl Remove redundant call to AC_PROG_INSTALL.
 dnl
 dnl Revision 1.7  1998/12/15 23:46:24  mdw
 dnl Add `xcatch', and rearrange so that the GTK-based programs are only
@@ -41,37 +50,32 @@ dnl
 dnl Revision 1.6  1998/12/11 09:50:38  mdw
 dnl Recursively build and configure mLib and mgLib.
 dnl
-dnl Revision 1.5  1998/12/03 00:39:07  mdw
-dnl Another version increment.
-dnl
 dnl Revision 1.4  1998/11/21 22:27:42  mdw
 dnl Support library building in Makefile.  Bump patchlevel.
 dnl
 dnl Revision 1.3  1998/11/19 12:48:19  mdw
 dnl Don't bother with AC_ARG_PROGRAM any more.
 dnl
-dnl Revision 1.2  1998/11/18 21:25:39  mdw
-dnl Change version number.
-dnl
 dnl Revision 1.1  1998/11/16 23:00:49  mdw
 dnl Initial versions.
 dnl
 
 AC_INIT(xwait.c)
-AC_CONFIG_SUBDIRS(mLib mgLib)
-AM_INIT_AUTOMAKE(xtoys, 1.2.2)
+AM_INIT_AUTOMAKE(xtoys, 1.3.0)
 AC_PROG_CC
 mdw_GCC_FLAGS
-AC_PROG_INSTALL
-AC_PROG_RANLIB
 
-AM_PATH_GTK(1.0.0,
-  [CFLAGS="$CFLAGS $GTK_CFLAGS"
-  GTK_PROGS='$(GTK_PROGS)'],
-  [AC_MSG_WARN([You appear not to have GTK.])
-  GTK_PROGS=""])
-AC_SUBST(GTK_PROGS)
+mdw_MLIB(1.6.0)
+mdw_MGLIB(1.1.0, mgLib=yes, mgLib=no)
 
+if test $mgLib = yes; then
+  AM_PATH_GTK(1.0.0,
+    [CFLAGS="$CFLAGS $MGLIB_CFLAGS $GTK_CFLAGS"
+    GTK_PROGS='$(GTK_PROGS)'],
+    [AC_MSG_ERROR([GTK not found or too old.])])
+fi
+
+AC_SUBST(GTK_PROGS)
 AC_PATH_XTRA
 CFLAGS="$CFLAGS $X_CFLAGS"