build: Use a non-recursive makefile.

[liblbx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9d6b209ac7fd054f5cfced57b8f92ac1ebd8f304..8e519e3e06ec15560675c41d9ef18530017c538f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,32 +4,19 @@ 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])
 
 AC_PROG_CC_C99
 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
 
-# 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)
-
+CHECK_LIBPNG([1.2], [have_libpng=yes], [have_libpng=no])
 AM_CONDITIONAL([BUILD_LBXIMG], [test x"$have_libpng" = x"yes"])
 
 AC_CONFIG_FILES([
        Makefile
-       src/Makefile
-       doc/man/Makefile
 ])
 
 AC_OUTPUT