support the compilation with gtk2.

diff --git a/rmedigicontrol/Makefile.am b/rmedigicontrol/Makefile.am
index 62508797affcc7950c181c3a481dea06e9cfae64..90e94aa718fd6d3956954c3e1e00adfe0d36b7cc 100644 (file)
--- a/rmedigicontrol/Makefile.am
+++ b/rmedigicontrol/Makefile.am
@@ -1,10 +1,10 @@
-AM_CFLAGS = @GTK_CFLAGS@
+AM_CFLAGS = @RMEDIGICONTROL_CFLAGS@
 bin_PROGRAMS = rmedigicontrol
 rmedigicontrol_SOURCES = rmedigicontrol.c rmedigicontrol.h level.c loopback.c
 
-rmedigicontrol_LDFLAGS = @GTK_LIBS@
+rmedigicontrol_LDFLAGS = @RMEDIGICONTROL_LIBS@
 
-EXTRA_DIST = depcomp
+EXTRA_DIST = depcomp configure.in-gtk2
 AUTOMAKE_OPTIONS = foreign
 
 alsa-dist: distdir

diff --git a/rmedigicontrol/configure.in b/rmedigicontrol/configure.in
index 4dd39794b2d8715ce649f52f5d982db9cca82454..e7a49cb1b88c22e38c1b68980f2dd8d4a3160767 100644 (file)
--- a/rmedigicontrol/configure.in
+++ b/rmedigicontrol/configure.in
@@ -5,5 +5,9 @@ AC_PROG_INSTALL
 AC_HEADER_STDC
 AM_PATH_GTK(1.0.1)
 AM_PATH_ALSA(1.0.0)
+RMEDIGICONTROL_CFLAGS="$CFLAGS $ALSA_CFLAGS $GTK_CFLAGS"
+RMEDIGICONTROL_LIBS="$LIBS $ALSA_LIBS $GTK_LIBS"
+AC_SUBST(RMEDIGICONTROL_CFLAGS)
+AC_SUBST(RMEDIGICONTROL_LIBS)
 
 AC_OUTPUT(Makefile)

diff --git a/rmedigicontrol/configure.in-gtk2 b/rmedigicontrol/configure.in-gtk2
new file mode 100644 (file)
index 0000000..bc4c605
--- /dev/null
+++ b/rmedigicontrol/configure.in-gtk2
@@ -0,0 +1,8 @@
+AC_INIT(rmedigicontrol.c)
+AM_INIT_AUTOMAKE(rmedigicontrol, 0.3.5a)
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_HEADER_STDC
+PKG_CHECK_MODULES(RMEDIGICONTROL, gtk+-2.0 alsa >= 1.0.0)
+
+AC_OUTPUT(Makefile)

diff --git a/rmedigicontrol/rmedigicontrol.c b/rmedigicontrol/rmedigicontrol.c
index 831c7f049397688e77063fc866b018bba7674905..327b73d7bd814922063195f1c0566dc3ebbefb38 100644 (file)
--- a/rmedigicontrol/rmedigicontrol.c
+++ b/rmedigicontrol/rmedigicontrol.c
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
        if(card<0)
                err="No RME Digi Soundcard found...";
        gtk_init(&argc, &argv); 
-       window=gtk_window_new(GTK_WINDOW_DIALOG);
+       window=gtk_window_new(GTK_WINDOW_TOPLEVEL);
        gtk_signal_connect(GTK_OBJECT(window),"destroy",GTK_SIGNAL_FUNC(destroy),NULL);
        if(err)
        {