Build system overhaul and spring cleaning.

[xtoys] / configure.ac

diff --git a/configure.in b/configure.ac
similarity index 62%
rename from configure.in
rename to configure.ac
index b1a381e..8e580c9 100644 (file)
--- a/configure.in
+++ b/configure.ac
@@ -1,6 +1,4 @@
-dnl -*-m4-*-
-dnl
-dnl $Id: configure.in,v 1.16 2004/04/08 01:36:29 mdw Exp $
+dnl -*-autoconf-*-
 dnl
 dnl Configuration script for X tools
 dnl
@@ -25,25 +23,31 @@ 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.
 
-AC_INIT(xwait.c)
-AM_INIT_AUTOMAKE(xtoys, 1.3.0)
-AC_PROG_CC
-mdw_GCC_FLAGS
+dnl--------------------------------------------------------------------------
+dnl Initialization.
 
-mdw_MLIB(1.6.0)
-mdw_MGLIB(1.1.0, mgLib=yes, mgLib=no)
+mdw_AUTO_VERSION
+AC_INIT([xtoys], AUTO_VERSION, [mdw@distorted.org.uk])
+AC_CONFIG_SRCDIR([xscsize.c])
+AC_CONFIG_AUX_DIR([config])
+AM_INIT_AUTOMAKE([foreign])
 
-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
+dnl--------------------------------------------------------------------------
+dnl C programming environment.
 
-AC_SUBST(GTK_PROGS)
+AC_PROG_CC
+AX_CFLAGS_WARN_ALL
 AC_PATH_XTRA
-CFLAGS="$CFLAGS $X_CFLAGS"
 
-AC_OUTPUT(Makefile)
+PKG_CHECK_MODULES([mLib], [mLib >= 2.0.4])
+CFLAGS="$CFLAGS $mLib_CFLAGS"
+LIBS="$LIBS $mLib_LIBS"
+
+dnl--------------------------------------------------------------------------
+dnl Output.
+
+AC_CONFIG_FILES(
+  [Makefile])
+AC_OUTPUT
 
 dnl ----- That's all, folks -------------------------------------------------