music: Migrate to GOB2.

[upkg.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 16e4c65599e432046beda0fa29a972ced41bfcc3..951c546afa5a03bd7b30aafbd2ecbd672e002212 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,3 +1,9 @@
+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.
+
 AC_PREREQ(2.62)
 AC_INIT([upkg],[0.1],[nbowler@draconx.ca])
 AC_CONFIG_SRCDIR([src/libupkg.c])
@@ -18,8 +24,7 @@ AM_CONDITIONAL([BUNDLED_LIBLTDL], [test x$LTDLDEPS != x])
 
 gl_INIT
 
-CHECK_GLIB_2([],[gobject], [have_gobject=yes], [have_gobject=no])
-AM_CONDITIONAL([BUILD_UPKG], [test x$have_gobject = xyes])
+CHECK_GLIB_2([], [gobject])
 
 AC_ARG_WITH([modlib],
        [AS_HELP_STRING([--with-modlib],
@@ -28,23 +33,16 @@ AC_ARG_WITH([modlib],
        [with_modlib=$withval],
        [with_modlib=auto])
 
-CHECK_LIBMODPLUG([have_libmodplug=yes], [have_libmodplug=no])
-AC_MSG_CHECKING([which module library to use])
 case $with_modlib in
-none)
-       use_modlib=none
-;;
-no)
+no|none)
        use_modlib=none
 ;;
 modplug)
-       if test x$have_libmodplug = xyes; then
-               use_modlib=modplug
-       else
-               use_modlib=none
-       fi
+       DX_CHECK_LIBMODPLUG([use_modlib=modplug], [])
 ;;
 auto)
+       DX_CHECK_LIBMODPLUG([have_libmodplug=yes], [have_libmodplug=no])
+
        if test x$have_libmodplug = xyes; then
                use_modlib=modplug
        else
@@ -55,15 +53,19 @@ auto)
        AC_MSG_ERROR([Invalid argument to --with-modlib: $with_modlib])
 ;;
 esac
+AC_MSG_CHECKING([which module library to use])
 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