X-Git-Url: https://git.distorted.org.uk/~mdw/xtoys/blobdiff_plain/6930fe78c92035ff7edb59104c70cd822316beef..47747dbe04f28a3f2d4748780a088f8309fc2990:/configure.in

diff --git a/configure.in b/configure.in
index d7d13d9..b1a381e 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
-dnl -*-fundamental-*-
+dnl -*-m4-*-
 dnl
-dnl $Id: configure.in,v 1.6 1998/12/11 09:50:38 mdw Exp $
+dnl $Id: configure.in,v 1.16 2004/04/08 01:36:29 mdw Exp $
 dnl
 dnl Configuration script for X tools
 dnl
@@ -25,43 +25,22 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with X tools; if not, write to the Free Software Foundation,
 dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-dnl ----- Revision history --------------------------------------------------
-dnl
-dnl $Log: configure.in,v $
-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.1.0)
+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="xgetline xshutdown"],
-  [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"