X-Git-Url: http://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/fba9c8ad290c71471cdb8b52d1c5f0e4eb1fb83e..716dc53086e5b9494038a22f4b6eb776d9b03d0d:/configure.ac

diff --git a/configure.ac b/configure.ac
index 48c392c..c03b931 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,37 +1,39 @@
-AC_PREREQ(2.60)
+dnl Copyright (C) 2009 Nick Bowler
+dnl Copying and distribution of this file, with or without modification,
+dnl are permitted in any medium without royalty provided the copyright
+dnl notice and this notice are preserved.  This file is offered as-is,
+dnl without any warranty.
+
+AC_PREREQ([2.62])
 AC_INIT([liblbx], [0.1], [toom-devel@lists.sourceforge.net])
 AC_CONFIG_SRCDIR([src/lbx.c])
 AC_CONFIG_HEADER([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AC_PROG_CC_C99
+gl_EARLY
+
 AC_HEADER_ASSERT
-AC_C_BIGENDIAN
 
-# pkg-config
-PKG_INIT
-if test x"$PKG_CONFIG" = x""; then
-	AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-fi
+LT_INIT
 
-dnl Dirty hack to disable useless C++/Fortran checks
-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [:])
-AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [:])
+gl_INIT
 
-AC_PROG_LIBTOOL
+CHECK_LIBPNG([1.2], [have_libpng=yes], [have_libpng=no])
+AM_CONDITIONAL([BUILD_LBXIMG], [test x"$have_libpng" = x"yes"])
 
-# libpng
-PKG_CHECK(libpng, yes, [PNG], [libpng-config], [png.h], png,
-          png_create_write_struct, libpng, [http://www.libpng.org/])
-AC_SUBST(PNG_CFLAGS)
-AC_SUBST(PNG_LIBS)
+# A horrible combination of bugs makes this necessary for GTK+ detection.
+unset POSIXLY_CORRECT
 
-AM_CONDITIONAL([BUILD_LBXIMG], [test x"$have_libpng" = x"yes"])
+AM_PATH_GTK_2_0([2.16.0], [have_gtk=yes], [have_gtk=no])
+AM_CONDITIONAL([BUILD_LBXGUI], [test x"$have_gtk" = x"yes"])
 
 AC_CONFIG_FILES([
 	Makefile
-	src/Makefile
+	lib/Makefile
 ])
 
 AC_OUTPUT