X-Git-Url: http://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/af13a143c8bfcd713216b1382448174e21b9f278..b54180ad4297cf2d3fd943bf78976f8d34d5eea9:/configure.ac

diff --git a/configure.ac b/configure.ac
index 9ba3d42..224469a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
-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.
+dnl Copyright © 2009, 2013 Nick Bowler
+dnl
+dnl License WTFPL2: Do What The Fuck You Want To Public License, version 2.
+dnl This is free software: you are free to do what the fuck you want to.
+dnl There is NO WARRANTY, to the extent permitted by law.
 
-AC_PREREQ([2.62])
+AC_PREREQ([2.68])
 AC_INIT([liblbx], [0.1], [toom-devel@lists.sourceforge.net])
 AC_CONFIG_SRCDIR([src/lbx.c])
 AC_CONFIG_HEADER([config.h])
@@ -23,22 +23,20 @@ gl_INIT
 
 m4_include([lib/gnulib.mk])
 
-PKG_PROG_PKG_CONFIG
+AC_ARG_WITH([libpng],
+	[AS_HELP_STRING([--with-libpng],
+		[build support for PNG output using libpng. [default=auto]])],
+	[with_libpng=$withval],
+	[with_libpng=auto])
 
-AC_ARG_ENABLE([lbximg],
-	[AS_HELP_STRING([--enable-lbximg],
-		[build the lbximg tool (requires libpng) [default=auto]])],
-	[enable_lbximg=$enableval],
-	[enable_lbximg=auto])
+AS_CASE([$with_libpng],
+	[no], [have_libpng=false],
+	[yes], [DX_CHECK_LIBPNG([1.5], [have_libpng=true])],
+	[DX_CHECK_LIBPNG([1.5], [have_libpng=true], [have_libpng=false])])
 
-have_libpng=no
-if test x"$enable_lbximg" = x"auto"; then
-DX_CHECK_LIBPNG([1.5], [have_libpng=yes], [have_libpng=no])
-fi
-if test x"$enable_lbximg" = x"yes"; then
-DX_CHECK_LIBPNG([1.5], [have_libpng=yes])
-fi
-AM_CONDITIONAL([BUILD_LBXIMG], [test x"$have_libpng" = x"yes"])
+AM_CONDITIONAL([HAVE_LIBPNG], [$have_libpng])
+AS_IF([$have_libpng], [AC_DEFINE([HAVE_LIBPNG], [1],
+	[Define to 1 if libpng support is available])])
 
 AC_ARG_ENABLE([lbxgui],
 	[AS_HELP_STRING([--enable-lbxgui],
@@ -46,14 +44,12 @@ AC_ARG_ENABLE([lbxgui],
 	[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"])
+AS_CASE([$enable_lbxgui],
+	[no], [have_gtk=false],
+	[yes], [DX_CHECK_GTK2([2.16], [have_gtk=true])],
+	[DX_CHECK_GTK2([2.16], [have_gtk=true], [have_gtk=false])])
+
+AM_CONDITIONAL([BUILD_LBXGUI], [$have_gtk])
 
 AC_CONFIG_FILES([
 	Makefile