Fix build with more recent libmodplug.

[upkg.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 0a4b6f43d7d0b93dd0672fb2c4cefafee78e6e9a..752343f62616ae84dffb1c1b50c776cdbc143ee5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl Copyright © 2009-2011 Nick Bowler
+dnl Copyright © 2009-2012, 2015, 2019 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.
@@ -10,8 +10,9 @@ AC_CONFIG_SRCDIR([src/libupkg.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])
+DX_AUTOMAKE_COMPAT
 
 AC_PROG_CC_C99
 gl_EARLY
@@ -20,8 +21,6 @@ LT_CONFIG_LTDL_DIR([libltdl])
 LT_INIT([dlopen])
 LTDL_INIT([nonrecursive])
 
-AM_CONDITIONAL([BUNDLED_LIBLTDL], [test x$LTDLDEPS != x])
-
 gl_INIT
 
 m4_include([lib/gnulib.mk])
@@ -35,26 +34,13 @@ AC_ARG_WITH([modlib],
        [with_modlib=$withval],
        [with_modlib=auto])
 
-case $with_modlib in
-no|none)
-       use_modlib=none
-;;
-modplug)
-       DX_CHECK_LIBMODPLUG([use_modlib=modplug], [])
-;;
-auto)
-       DX_CHECK_LIBMODPLUG([have_libmodplug=yes], [have_libmodplug=no])
+use_modlib=none
+AS_CASE([$with_modlib],
+  [no|none], [:],
+  [modplug], [DX_LIB_LIBMODPLUG([use_modlib=modplug])],
+  [auto], [DX_LIB_LIBMODPLUG([use_modlib=modplug], [:])],
+  [AC_MSG_ERROR([Invalid argument to --with-modlib: $with_modlib])])
 
-       if test x$have_libmodplug = xyes; then
-               use_modlib=modplug
-       else
-               use_modlib=none
-       fi
-;;
-*)
-       AC_MSG_ERROR([Invalid argument to --with-modlib: $with_modlib])
-;;
-esac
 AC_MSG_CHECKING([which module library to use])
 AC_MSG_RESULT([$use_modlib])
 
@@ -65,7 +51,6 @@ GOB2_CHECK([2.0.0])
 
 AC_CONFIG_FILES([
        Makefile
-       src/Makefile
        libuobject.pc
 ])
 AC_OUTPUT