X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/3e740e95c0f5988019092303d650cce4bae290f0..8c95a9e8b7ae0e2a480d7a6de0bf4ca933799c7e:/configure.ac

diff --git a/configure.ac b/configure.ac
index fa51318..030e9fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl Copyright © 2009-2011 Nick Bowler
+dnl Copyright © 2009-2012, 2015 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,20 +10,21 @@ 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
 
 LT_CONFIG_LTDL_DIR([libltdl])
 LT_INIT([dlopen])
-LTDL_INIT([recursive])
-
-AM_CONDITIONAL([BUNDLED_LIBLTDL], [test x$LTDLDEPS != x])
+LTDL_INIT([nonrecursive])
 
 gl_INIT
 
+m4_include([lib/gnulib.mk])
+
 CHECK_GLIB_2([], [gobject])
 
 AC_ARG_WITH([modlib],
@@ -63,9 +64,6 @@ GOB2_CHECK([2.0.0])
 
 AC_CONFIG_FILES([
 	Makefile
-	libltdl/Makefile
-	lib/Makefile
-	src/Makefile
 	libuobject.pc
 ])
 AC_OUTPUT