From: Takashi Iwai Date: Wed, 29 Mar 2006 11:33:02 +0000 (+0000) Subject: Support both GTK+1.2 and GTK+2.x X-Git-Tag: v1.0.11rc5~3 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=5341e4ece03e13674de69a19cdedce5e95be1201;p=alsa-tools.git Support both GTK+1.2 and GTK+2.x Support both GTK+ 1.2 and GTK+ 2.x in single configure scripts. GTK+ 2.x is used unless --with-gtk2=no is given. If you have no gtk1 or gtk2 devel packages, use configure.in-gtk1 or -gtk2 and do autoreconf. --- diff --git a/echomixer/Makefile.am b/echomixer/Makefile.am index 92e6117..266fc8f 100644 --- a/echomixer/Makefile.am +++ b/echomixer/Makefile.am @@ -3,7 +3,7 @@ bin_PROGRAMS = echomixer man_MANS = echomixer_SOURCES = echomixer.c echomixer_LDFLAGS = @ECHOMIXER_LIBS@ -EXTRA_DIST = configure.in-gtk2 +EXTRA_DIST = configure.in-gtk1 configure.in-gtk2 AUTOMAKE_OPTIONS = foreign alsa-dist: distdir diff --git a/echomixer/README b/echomixer/README index de9ac8e..7362acd 100644 --- a/echomixer/README +++ b/echomixer/README @@ -13,7 +13,8 @@ master, PCM and monitors gains separately and it provides emulation of master vo for cards that don't support it in hardware (all non-Vmixer cards). Furthermore it has a matrix mixer which is more easy to use than the Echoaudio console interface. -Emixer requires GTK+ 1.2 or above. +Emixer requires GTK+ 1.2 or GTK+ 2.x. +To build with GTK+-1.2, pass --with-gtk2=no configure option. For more informations: http://xoomer.virgilio.it/g_pochini/ea-emixer.html diff --git a/echomixer/configure.in b/echomixer/configure.in index 2e10d4a..2aca4ef 100644 --- a/echomixer/configure.in +++ b/echomixer/configure.in @@ -5,39 +5,23 @@ AC_PROG_CC AC_PROG_INSTALL AC_HEADER_STDC +AC_ARG_WITH(gtk2, + [ --with-gtk2=yes,no Build with GTK+2 (default = yes)], + with_gtk2="$withval", with_gtk2="yes") + +if test "$with_gtk2" = "yes"; then + +PKG_CHECK_MODULES(ECHOMIXER, gtk+-2.0 alsa >= 1.0.0) + +else + AM_PATH_GTK(1.2.0) AM_PATH_ALSA(1.0.0) ECHOMIXER_CFLAGS="$CFLAGS $ALSA_CFLAGS $GTK_CFLAGS" ECHOMIXER_LIBS="$LIBS $ALSA_LIBS $GTK_LIBS" AC_SUBST(ECHOMIXER_CFLAGS) AC_SUBST(ECHOMIXER_LIBS) -#AC_SUBST(ALSACTL) -dnl add the mkdir program -AC_ARG_WITH(mkdir-prog, -[ --with-mkdir-prog=PROG Complete path and name from mkdir(optional)], -[mkdir_prog="$withval"], [mkdir_prog=""]) -AC_MSG_CHECKING(for MKDIR) -if test "$mkdir_prog" != "" ; then - MKDIR="$mkdir_prog" -else - if test -x "/bin/mkdir" ; then - MKDIR="/bin/mkdir" - elif test -x "${bindir}/mkdir" ; then - MKDIR="${bindir}/mkdir" - elif test -x "${sbindir}/mkdir" ; then - MKDIR="${sbindir}/mkdir" - elif test -x "/sbin/mkdir" ; then - MKDIR="/sbin/mkdir" - elif test -x "/usr/bin/mkdir" ; then - MKDIR="/usr/bin/mkdir" - elif test -x "/usr/sbin/mkdir" ; then - MKDIR="/usr/sbin/mkdir" - else - MKDIR="not found." - fi fi -AC_MSG_RESULT($MKDIR) -AC_SUBST(MKDIR) AC_OUTPUT(Makefile) diff --git a/echomixer/configure.in-gtk1 b/echomixer/configure.in-gtk1 new file mode 100644 index 0000000..cef8d82 --- /dev/null +++ b/echomixer/configure.in-gtk1 @@ -0,0 +1,14 @@ +AC_INIT(echomixer.c) +AM_INIT_AUTOMAKE(echomixer, 1.0.5) +AC_PROG_CC +AC_PROG_INSTALL +AC_HEADER_STDC + +AM_PATH_GTK(1.2.0) +AM_PATH_ALSA(1.0.0) +ECHOMIXER_CFLAGS="$CFLAGS $ALSA_CFLAGS $GTK_CFLAGS" +ECHOMIXER_LIBS="$LIBS $ALSA_LIBS $GTK_LIBS" +AC_SUBST(ECHOMIXER_CFLAGS) +AC_SUBST(ECHOMIXER_LIBS) + +AC_OUTPUT(Makefile) diff --git a/envy24control/Makefile.am b/envy24control/Makefile.am index 38e1b3d..96cbad4 100644 --- a/envy24control/Makefile.am +++ b/envy24control/Makefile.am @@ -5,7 +5,7 @@ envy24control_SOURCES = envy24control.c envy24control.h levelmeters.c midi.c \ mixer.c patchbay.c hardware.c driverevents.c volume.c \ profiles.c profiles.h midi.h config.c config.h envy24control_LDFLAGS = @ENVY24CONTROL_LIBS@ -EXTRA_DIST = envy24control.1 depcomp configure.in-gtk2 \ +EXTRA_DIST = envy24control.1 depcomp configure.in-gtk1 configure.in-gtk2 \ strstr_icase_blank.c new_process.c README.profiles AUTOMAKE_OPTIONS = foreign diff --git a/envy24control/README b/envy24control/README index b6dbea5..1337d3f 100644 --- a/envy24control/README +++ b/envy24control/README @@ -5,6 +5,8 @@ Needs: To build (from unpacked tarball): ./configure +If you use GTK+-1.2, pass --with-gtk2=no + make su -c 'make install' diff --git a/envy24control/configure.in b/envy24control/configure.in index 496f326..30dc8a8 100644 --- a/envy24control/configure.in +++ b/envy24control/configure.in @@ -4,39 +4,23 @@ AC_PROG_CC AC_PROG_INSTALL AC_HEADER_STDC +AC_ARG_WITH(gtk2, + [ --with-gtk2=yes,no Build with GTK+2 (default = yes)], + with_gtk2="$withval", with_gtk2="yes") + +if test "$with_gtk2" = "yes"; then + +PKG_CHECK_MODULES(ENVY24CONTROL, gtk+-2.0 alsa >= 0.9.0) + +else + AM_PATH_GTK(1.0.1) AM_PATH_ALSA(1.0.0) ENVY24CONTROL_CFLAGS="$CFLAGS $ALSA_CFLAGS $GTK_CFLAGS" ENVY24CONTROL_LIBS="$LIBS $ALSA_LIBS $GTK_LIBS" AC_SUBST(ENVY24CONTROL_CFLAGS) AC_SUBST(ENVY24CONTROL_LIBS) -#AC_SUBST(ALSACTL) -dnl add the mkdir program -AC_ARG_WITH(mkdir-prog, -[ --with-mkdir-prog=PROG Complete path and name from mkdir(optional)], -[mkdir_prog="$withval"], [mkdir_prog=""]) -AC_MSG_CHECKING(for MKDIR) -if test "$mkdir_prog" != "" ; then - MKDIR="$mkdir_prog" -else - if test -x "/bin/mkdir" ; then - MKDIR="/bin/mkdir" - elif test -x "${bindir}/mkdir" ; then - MKDIR="${bindir}/mkdir" - elif test -x "${sbindir}/mkdir" ; then - MKDIR="${sbindir}/mkdir" - elif test -x "/sbin/mkdir" ; then - MKDIR="/sbin/mkdir" - elif test -x "/usr/bin/mkdir" ; then - MKDIR="/usr/bin/mkdir" - elif test -x "/usr/sbin/mkdir" ; then - MKDIR="/usr/sbin/mkdir" - else - MKDIR="not found." - fi fi -AC_MSG_RESULT($MKDIR) -AC_SUBST(MKDIR) AC_OUTPUT(Makefile) diff --git a/envy24control/configure.in-gtk1 b/envy24control/configure.in-gtk1 new file mode 100644 index 0000000..496f326 --- /dev/null +++ b/envy24control/configure.in-gtk1 @@ -0,0 +1,42 @@ +AC_INIT(envy24control.c) +AM_INIT_AUTOMAKE(envy24control, 0.6.0) +AC_PROG_CC +AC_PROG_INSTALL +AC_HEADER_STDC + +AM_PATH_GTK(1.0.1) +AM_PATH_ALSA(1.0.0) +ENVY24CONTROL_CFLAGS="$CFLAGS $ALSA_CFLAGS $GTK_CFLAGS" +ENVY24CONTROL_LIBS="$LIBS $ALSA_LIBS $GTK_LIBS" +AC_SUBST(ENVY24CONTROL_CFLAGS) +AC_SUBST(ENVY24CONTROL_LIBS) +#AC_SUBST(ALSACTL) + +dnl add the mkdir program +AC_ARG_WITH(mkdir-prog, +[ --with-mkdir-prog=PROG Complete path and name from mkdir(optional)], +[mkdir_prog="$withval"], [mkdir_prog=""]) +AC_MSG_CHECKING(for MKDIR) +if test "$mkdir_prog" != "" ; then + MKDIR="$mkdir_prog" +else + if test -x "/bin/mkdir" ; then + MKDIR="/bin/mkdir" + elif test -x "${bindir}/mkdir" ; then + MKDIR="${bindir}/mkdir" + elif test -x "${sbindir}/mkdir" ; then + MKDIR="${sbindir}/mkdir" + elif test -x "/sbin/mkdir" ; then + MKDIR="/sbin/mkdir" + elif test -x "/usr/bin/mkdir" ; then + MKDIR="/usr/bin/mkdir" + elif test -x "/usr/sbin/mkdir" ; then + MKDIR="/usr/sbin/mkdir" + else + MKDIR="not found." + fi +fi +AC_MSG_RESULT($MKDIR) +AC_SUBST(MKDIR) + +AC_OUTPUT(Makefile) diff --git a/rmedigicontrol/Makefile.am b/rmedigicontrol/Makefile.am index 90e94aa..293fe6a 100644 --- a/rmedigicontrol/Makefile.am +++ b/rmedigicontrol/Makefile.am @@ -4,7 +4,7 @@ rmedigicontrol_SOURCES = rmedigicontrol.c rmedigicontrol.h level.c loopback.c rmedigicontrol_LDFLAGS = @RMEDIGICONTROL_LIBS@ -EXTRA_DIST = depcomp configure.in-gtk2 +EXTRA_DIST = depcomp configure.in-gtk1 configure.in-gtk2 AUTOMAKE_OPTIONS = foreign alsa-dist: distdir diff --git a/rmedigicontrol/README b/rmedigicontrol/README index 8ef983a..684d52b 100644 --- a/rmedigicontrol/README +++ b/rmedigicontrol/README @@ -39,6 +39,11 @@ INSTALL: -------- ./cvscompile +or + ./configure + +If you use GTK+-1.2, pass --with-gtk2=no. + make install diff --git a/rmedigicontrol/configure.in b/rmedigicontrol/configure.in index e7a49cb..1bb1986 100644 --- a/rmedigicontrol/configure.in +++ b/rmedigicontrol/configure.in @@ -3,6 +3,17 @@ AM_INIT_AUTOMAKE(rmedigicontrol, 0.3.5a) AC_PROG_CC AC_PROG_INSTALL AC_HEADER_STDC + +AC_ARG_WITH(gtk2, + [ --with-gtk2=yes,no Build with GTK+2 (default = yes)], + with_gtk2="$withval", with_gtk2="yes") + +if test "$with_gtk2" = "yes"; then + +PKG_CHECK_MODULES(RMEDIGICONTROL, gtk+-2.0 alsa >= 1.0.0) + +else + AM_PATH_GTK(1.0.1) AM_PATH_ALSA(1.0.0) RMEDIGICONTROL_CFLAGS="$CFLAGS $ALSA_CFLAGS $GTK_CFLAGS" @@ -10,4 +21,6 @@ RMEDIGICONTROL_LIBS="$LIBS $ALSA_LIBS $GTK_LIBS" AC_SUBST(RMEDIGICONTROL_CFLAGS) AC_SUBST(RMEDIGICONTROL_LIBS) +fi + AC_OUTPUT(Makefile) diff --git a/rmedigicontrol/configure.in-gtk1 b/rmedigicontrol/configure.in-gtk1 new file mode 100644 index 0000000..e7a49cb --- /dev/null +++ b/rmedigicontrol/configure.in-gtk1 @@ -0,0 +1,13 @@ +AC_INIT(rmedigicontrol.c) +AM_INIT_AUTOMAKE(rmedigicontrol, 0.3.5a) +AC_PROG_CC +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)