build: Import the libpng check from marksim.

[liblbx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5494e25b4914d79a4636a1496df82b7005ff01e4..bbc14fbcd2f1b3957c0bccd41543f539add91160 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,8 @@
-AC_PREREQ(2.60)
+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])
 
@@ -9,24 +10,9 @@ 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
-
-dnl Dirty hack to disable useless C++/Fortran checks
-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [:])
-AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [:])
-
-AC_PROG_LIBTOOL
-
-# 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)
+LT_INIT
 
+CHECK_LIBPNG([1.2], [have_libpng=yes], [have_libpng=no])
 AM_CONDITIONAL([BUILD_LBXIMG], [test x"$have_libpng" = x"yes"])
 
 AC_CONFIG_FILES([