GTK build fixed...

This commit is contained in:
Jaroslav Kysela 1999-06-04 14:53:01 +00:00
parent 8cf3fb154c
commit 7970fd23bc
2 changed files with 10 additions and 9 deletions

View file

@ -1,5 +1,10 @@
INCLUDES=-I$(top_srcdir)/include INCLUDES=-I$(top_srcdir)/include
SUBDIRS=include alsactl alsamixer amixer aplay utils xamixer2 SUBDIRS1=include alsactl alsamixer amixer aplay utils
if COND_XAMIXER2
SUBDIRS=$(SUBDIRS1) xamixer2
else
SUBDIRS=$(SUBDIRS1)
endif
EXTRA_DIST=ChangeLog INSTALL README configure cvscompile EXTRA_DIST=ChangeLog INSTALL README configure cvscompile
rpm: dist rpm: dist

View file

@ -41,13 +41,9 @@ AC_PROG_GCC_TRADITIONAL
SAVE_UTIL_VERSION SAVE_UTIL_VERSION
if test "$GTK_LIBS" != ""; then AM_CONDITIONAL(COND_XAMIXER2, test "x$GTK_LIBS" != "x")
if test "x$GTK_LIBS" = "x"; then
AC_MSG_RESULT(Not building XAmixer2 as Gtk+ was not found.)
fi
AC_OUTPUT(Makefile alsactl/Makefile alsamixer/Makefile amixer/Makefile aplay/Makefile \ AC_OUTPUT(Makefile alsactl/Makefile alsamixer/Makefile amixer/Makefile aplay/Makefile \
include/Makefile utils/Makefile utils/alsa-utils.spec xamixer2/Makefile) include/Makefile utils/Makefile utils/alsa-utils.spec xamixer2/Makefile)
else
AC_MSG_RESULT(Not building XAmixer2 as Gtk+ was not found.)
AC_OUTPUT(Makefile alsactl/Makefile alsamixer/Makefile amixer/Makefile aplay/Makefile \
include/Makefile utils/Makefile utils/alsa-utils.spec)
fi