fixed for compilation with gtk2

diff --git a/envy24control/Makefile.am b/envy24control/Makefile.am
index 28b9d04e1c88f43fb74a0b9f5f309d8472570968..b6cc23ace36306927a5fef401ab33f346a43642d 100644 (file)
--- a/envy24control/Makefile.am
+++ b/envy24control/Makefile.am
@@ -1,9 +1,9 @@
-AM_CFLAGS = @GTK_CFLAGS@
+AM_CFLAGS = @ENVY24CONTROL_CFLAGS@
 bin_PROGRAMS = envy24control
 man_MANS = envy24control.1
 envy24control_SOURCES = envy24control.c envy24control.h levelmeters.c \
                         mixer.c patchbay.c hardware.c driverevents.c volume.c
-envy24control_LDFLAGS = @GTK_LIBS@
+envy24control_LDFLAGS = @ENVY24CONTROL_LIBS@
 EXTRA_DIST = cvscompile envy24control.1 depcomp
 
 alsa-dist: distdir

diff --git a/envy24control/configure.in b/envy24control/configure.in
index 79eda1b05bbfb49f3b87454156d757b26b64c6c8..566423295c81a312c938fd7f44ee2877f35a0972 100644 (file)
--- a/envy24control/configure.in
+++ b/envy24control/configure.in
@@ -3,7 +3,12 @@ AM_INIT_AUTOMAKE(envy24control, 0.1.0)
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_HEADER_STDC
+
 AM_PATH_GTK(1.0.1)
 AM_PATH_ALSA(0.9.0)
+ENVY24CONTROL_CFLAGS="$CFLAGS $ALSA_CFLAGS $GTK_CFLAGS"
+ENVY24CONTROL_LIBS="$LIBS $ALSA_LIBS $GTK_LIBS"
+AC_SUBST(ENVY24CONTROL_CFLAGS)
+AC_SUBST(ENVY24CONTROL_LIBS)
 
 AC_OUTPUT(Makefile)