build: Fixes for newer tools.

[liblbx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index bf0a5f417e7ff9be122e784ec83bb042dd2e220a..0403ca170e78789a944461efd9aec7574865f0ec 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -10,21 +10,48 @@ AC_CONFIG_SRCDIR([src/lbx.c])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign subdir-objects])
+AM_SILENT_RULES([yes])
 
 AC_PROG_CC_C99
+AM_PROG_CC_C_O
 gl_EARLY
 
 AC_HEADER_ASSERT
-
 LT_INIT
-
 gl_INIT
-
-CHECK_LIBPNG([1.2], [have_libpng=yes], [have_libpng=no])
+PKG_PROG_PKG_CONFIG
+
+AC_ARG_ENABLE([lbximg],
+       [AS_HELP_STRING([--enable-lbximg],
+               [build the lbximg tool (requires libpng) [default=auto]])],
+       [enable_lbximg=$enableval],
+       [enable_lbximg=auto])
+
+have_libpng=no
+if test x"$enable_lbximg" = x"auto"; then
+DX_CHECK_LIBPNG([1.2], [have_libpng=yes], [have_libpng=no])
+fi
+if test x"$enable_lbximg" = x"yes"; then
+DX_CHECK_LIBPNG([1.2], [have_libpng=yes])
+fi
 AM_CONDITIONAL([BUILD_LBXIMG], [test x"$have_libpng" = x"yes"])
 
+AC_ARG_ENABLE([lbxgui],
+       [AS_HELP_STRING([--enable-lbxgui],
+               [build the lbxgui tool (requires GTK+) [default=auto]])],
+       [enable_lbxgui=$enableval],
+       [enable_lbxgui=auto])
+
+have_gtk=no
+if test x"$enable_lbxgui" = x"auto"; then
+DX_CHECK_GTK2([2.16], [have_gtk=yes], [have_gtk=no])
+fi
+if test x"$enable_lbxgui" = x"yes"; then
+DX_CHECK_GTK2([2.16], [have_gtk=yes])
+fi
+AM_CONDITIONAL([BUILD_LBXGUI], [test x"$have_gtk" = x"yes"])
+
 AC_CONFIG_FILES([
        Makefile
        lib/Makefile