From b54cb637ba628ded9a721517ebdb87a1a6df559e Mon Sep 17 00:00:00 2001 From: Christopher Lansdown Date: Thu, 3 Jun 1999 20:28:05 +0000 Subject: [PATCH] Attempting to integrate XAmixer2 into the alsa-utils autoconf system. --- Makefile.am | 2 +- configure.in | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 3523bdc..c8fd5f3 100644 --- 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 3d92545..5f76415 100644 --- 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