Attempting to integrate XAmixer2 into the alsa-utils autoconf system.

diff --git a/Makefile.am b/Makefile.am
index 3523bdc8c86ed95142dc08b4d59d9a294a9aff2e..c8fd5f3dad020bd9feca28a9585fb4547cfe8e50 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 INCLUDES=-I$(top_srcdir)/include
-SUBDIRS=include alsactl alsamixer amixer aplay utils
+SUBDIRS=include alsactl alsamixer amixer aplay utils xamixer2
 EXTRA_DIST=ChangeLog INSTALL README configure cvscompile
 
 rpm: dist

diff --git a/configure.in b/configure.in
index 3d92545a2dd7eca3f66dcb84ba8ce41f191b24f3..5f764158d3530103db10bf278fc553cebb92105a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -23,6 +23,11 @@ AC_CHECK_LIB(ncurses, initscr,
 AC_SUBST(CURSESINC)
 AC_SUBST(CURSESLIB)
 
+dnl Check for Gtk+
+AM_PATH_GTK(1.0.1)
+CFLAGS="$CFLAGS $GTK_CFLAGS"
+LDFALGS="$LDFLAGS $GTK_LIBS"
+
 AM_CONFIG_HEADER(include/aconfig.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
@@ -35,5 +40,11 @@ AC_PROG_GCC_TRADITIONAL
 
 SAVE_UTIL_VERSION
 
+if test "$GTK_LIBS" != "" then 
+AC_OUTPUT(Makefile alsactl/Makefile alsamixer/Makefile amixer/Makefile aplay/Makefile \
+          include/Makefile utils/Makefile utils/alsa-utils.spec xamixer2/Makefile)
+else
 AC_OUTPUT(Makefile alsactl/Makefile alsamixer/Makefile amixer/Makefile aplay/Makefile \
           include/Makefile utils/Makefile utils/alsa-utils.spec)
+AM_MSG_RESULT(Not building XAmixer2 since Gtk+ was not found.)
+fi
\ No newline at end of file