X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/382855dd3f69cdce3e3b4eb6da392f881e7825da..291e78f75bc8cc49c7191e4d69ad5843dc810ddd:/configure.ac

diff --git a/configure.ac b/configure.ac
index f86b8dd..d17e17f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,22 +5,10 @@ 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
-
-AC_ARG_WITH([gobject],
-	[AS_HELP_STRING([--with-gobject],
-		[build tools requiring libgobject [default=yes]]
-	)],
-	[],
-	[with_gobject=yes])
-
-have_gobject=no
-if test x$with_gobject = xyes; then
-AM_PATH_GLIB_2_0(, [have_gobject=yes], [have_gobject=no], [gobject])
-fi
-
-AM_CONDITIONAL([BUILD_UPKG], [test x$have_gobject = xyes])
+gl_EARLY
 
 LT_CONFIG_LTDL_DIR([libltdl])
 LT_INIT([dlopen])
@@ -28,9 +16,53 @@ LTDL_INIT([recursive])
 
 AM_CONDITIONAL([BUNDLED_LIBLTDL], [test x$LTDLDEPS != x])
 
+gl_INIT
+
+CHECK_GLIB_2([], [gobject])
+
+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])
+
+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
 	libltdl/Makefile
+	lib/Makefile
 	src/Makefile
 ])
 AC_OUTPUT