Merge branch 'uobject' of git://git.draconx.ca/upkg into uobject

[upkg.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 468147bb73354dadcebf99d49e45ba5ea7bba2c9..d17e17fb620df711a8167e3bbb6eb6de7ed4de61 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,6 +5,7 @@ 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])])
 
 AC_PROG_CC_C99
 gl_EARLY
@@ -17,20 +18,46 @@ AM_CONDITIONAL([BUNDLED_LIBLTDL], [test x$LTDLDEPS != x])
 
 gl_INIT
 
-AC_ARG_WITH([gobject],
-       [AS_HELP_STRING([--with-gobject],
-               [build tools requiring libgobject [default=yes]]
-       )],
-       [],
-       [with_gobject=yes])
+CHECK_GLIB_2([], [gobject])
 
-have_gobject=no
-if test x$with_gobject = xyes; then
-AM_PATH_GLIB_2_0(, [have_gobject=yes], [have_gobject=no], [gobject])
-fi
+AC_ARG_WITH([modlib],
+       [AS_HELP_STRING([--with-modlib],
+               [specify which module decoding library to use - one of modplug, none or auto. [default=auto]]
+       )],
+       [with_modlib=$withval],
+       [with_modlib=auto])
 
-AM_CONDITIONAL([BUILD_UPKG], [test x$have_gobject = xyes])
+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)
+       use_modlib=none
+;;
+modplug)
+       if test x$have_libmodplug = xyes; then
+               use_modlib=modplug
+       else
+               use_modlib=none
+       fi
+;;
+auto)
+       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_RESULT([$use_modlib])
 
+AM_CONDITIONAL([USE_LIBMODPLUG], [test x$use_modlib = xmodplug])
+AM_CONDITIONAL([USE_DUMMYMOD],   [test x$use_modlib = xnone])
 
 AC_CONFIG_FILES([
        Makefile