support the compilation with gtk2.

This commit is contained in:
Takashi Iwai 2004-02-26 17:56:12 +00:00
parent 4b57479284
commit 63d29906c0
4 changed files with 16 additions and 4 deletions

View file

@ -1,10 +1,10 @@
AM_CFLAGS = @GTK_CFLAGS@ AM_CFLAGS = @RMEDIGICONTROL_CFLAGS@
bin_PROGRAMS = rmedigicontrol bin_PROGRAMS = rmedigicontrol
rmedigicontrol_SOURCES = rmedigicontrol.c rmedigicontrol.h level.c loopback.c 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 AUTOMAKE_OPTIONS = foreign
alsa-dist: distdir alsa-dist: distdir

View file

@ -5,5 +5,9 @@ AC_PROG_INSTALL
AC_HEADER_STDC AC_HEADER_STDC
AM_PATH_GTK(1.0.1) AM_PATH_GTK(1.0.1)
AM_PATH_ALSA(1.0.0) 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) AC_OUTPUT(Makefile)

View file

@ -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)

View file

@ -77,7 +77,7 @@ int main(int argc, char *argv[])
if(card<0) if(card<0)
err="No RME Digi Soundcard found..."; err="No RME Digi Soundcard found...";
gtk_init(&argc, &argv); 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); gtk_signal_connect(GTK_OBJECT(window),"destroy",GTK_SIGNAL_FUNC(destroy),NULL);
if(err) if(err)
{ {