X-Git-Url: http://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/338bf2293883f7022818ad5130c148e019127f85..30e3dd045f61a8a2e0a237074e6706461c6dd2fd:/configure.ac diff --git a/configure.ac b/configure.ac index bb9334f..22e7cee 100644 --- a/configure.ac +++ b/configure.ac @@ -24,48 +24,42 @@ gl_INIT m4_include([lib/gnulib.mk]) AC_ARG_WITH([libpng], - [AS_HELP_STRING([--with-libpng], - [build support for PNG output using libpng. [default=auto]])], - [with_libpng=$withval], - [with_libpng=auto]) + [AS_HELP_STRING([--with-libpng], + [build support for PNG output using libpng. [default=auto]])], + [with_libpng=$withval], [with_libpng=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])]) + [no], [have_libpng=false], + [yes], [DX_LIB_LIBPNG([1.5], [have_libpng=true])], + [DX_LIB_LIBPNG([1.5], [have_libpng=true], [have_libpng=false])]) AM_CONDITIONAL([HAVE_LIBPNG], [$have_libpng]) AS_IF([$have_libpng], [AC_DEFINE([HAVE_LIBPNG], [1], - [Define to 1 if libpng support is available])]) + [Define to 1 if libpng support is available])]) AC_ARG_ENABLE([lbxgui], - [AS_HELP_STRING([--enable-lbxgui], - [build the lbxgui tool (requires GTK+) [default=auto]])], - [enable_lbxgui=$enableval], - [enable_lbxgui=auto]) + [AS_HELP_STRING([--enable-lbxgui], + [build the lbxgui tool (requires GTK+) [default=auto]])], + [enable_lbxgui=$enableval], + [enable_lbxgui=auto]) 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])]) + [no], [have_gtk=false], + [yes], [DX_LIB_GTK2([2.16], [have_gtk=true])], + [DX_LIB_GTK2([2.16], [have_gtk=true], [have_gtk=false])]) AM_CONDITIONAL([BUILD_LBXGUI], [$have_gtk]) # Check for utilities used by the test suite. DX_PROG_MD5SUM AS_IF([test x"$dx_cv_md5sum_works" = x"yes"], - [AC_SUBST([HAVE_MD5SUM], [true])], - [AC_SUBST([HAVE_MD5SUM], [false])]) -AC_SUBST([MD5SUM]) + [HAVE_MD5SUM=true], [HAVE_MD5SUM=false]) +AC_SUBST([HAVE_MD5SUM]) AC_CHECK_PROGS([PAMARITH], [pamarith], [false]) AC_CHECK_PROGS([PAMCHANNEL], [pamchannel], [false]) AC_SUBST([PAMCHANNEL]) AC_SUBST([PAMARITH]) -AC_CONFIG_FILES([ - tests/util/test-defs.sh - Makefile -]) - +AC_CONFIG_FILES([tests/util/test-defs.sh Makefile]) AC_OUTPUT