X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/b6681480afd85ed3914902a96b4d7bc4185e3391..6e7d67bed9f4d76943e2f1724acff1e16b8bf7ac:/configure.ac

diff --git a/configure.ac b/configure.ac
index 6dfc336..48ccbb2 100644
--- 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])
@@ -18,12 +18,14 @@ gl_EARLY
 
 LT_CONFIG_LTDL_DIR([libltdl])
 LT_INIT([dlopen])
-LTDL_INIT([recursive])
+LTDL_INIT([nonrecursive])
 
 AM_CONDITIONAL([BUNDLED_LIBLTDL], [test x$LTDLDEPS != x])
 
 gl_INIT
 
+m4_include([lib/gnulib.mk])
+
 CHECK_GLIB_2([], [gobject])
 
 AC_ARG_WITH([modlib],
@@ -38,10 +40,10 @@ no|none)
 	use_modlib=none
 ;;
 modplug)
-	CHECK_LIBMODPLUG([use_modlib=modplug], [])
+	DX_CHECK_LIBMODPLUG([use_modlib=modplug], [])
 ;;
 auto)
-	CHECK_LIBMODPLUG([have_libmodplug=yes], [have_libmodplug=no])
+	DX_CHECK_LIBMODPLUG([have_libmodplug=yes], [have_libmodplug=no])
 
 	if test x$have_libmodplug = xyes; then
 		use_modlib=modplug
@@ -59,11 +61,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