Fix bootstrapping with recent bits.

[upkg.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5de7569569d2b24d1b6166f172bfeb279bfbf237..21069aa1d3a92aa1fcb453978bf50c5b7d5d56a5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
-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-2011 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_INIT([upkg],[0.1],[nbowler@draconx.ca])
@@ -10,7 +10,7 @@ AC_CONFIG_SRCDIR([src/libupkg.c])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
+AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign subdir-objects])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AC_PROG_CC_C99
@@ -18,12 +18,12 @@ 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],
@@ -59,11 +59,10 @@ AC_MSG_RESULT([$use_modlib])
 AM_CONDITIONAL([USE_LIBMODPLUG], [test x$use_modlib = xmodplug])
 AM_CONDITIONAL([USE_DUMMYMOD],   [test x$use_modlib = xnone])
 
+GOB2_CHECK([2.0.0])
+
 AC_CONFIG_FILES([
        Makefile
-       libltdl/Makefile
-       lib/Makefile
-       src/Makefile
        libuobject.pc
 ])
 AC_OUTPUT