[alsa-cvslog] CVS: alsa-tools/rmedigicontrol configure.in-gtk1,NONE,1.1 Makefile.am,1.5,1.6 README,1.1,1.2 configure.in,1.3,1.4

[Takashi I. <ti...@us...>]

Update of /cvsroot/alsa/alsa-tools/rmedigicontrol
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23913/rmedigicontrol

Modified Files:
	Makefile.am README configure.in 
Added Files:
	configure.in-gtk1 
Log Message:
Summary: 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.


--- NEW FILE: configure.in-gtk1 ---
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)

Index: Makefile.am
===================================================================
RCS file: /cvsroot/alsa/alsa-tools/rmedigicontrol/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.am	26 Feb 2004 17:56:12 -0000	1.5
+++ Makefile.am	29 Mar 2006 11:33:02 -0000	1.6
@@ -4,7 +4,7 @@
 
 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

Index: README
===================================================================
RCS file: /cvsroot/alsa/alsa-tools/rmedigicontrol/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README	2 Jul 2003 10:22:21 -0000	1.1
+++ README	29 Mar 2006 11:33:03 -0000	1.2
@@ -39,6 +39,11 @@
 --------
 
 	./cvscompile
+or
+	./configure
+
+If you use GTK+-1.2, pass --with-gtk2=no.
+
 	make install
 
 

Index: configure.in
===================================================================
RCS file: /cvsroot/alsa/alsa-tools/rmedigicontrol/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- configure.in	26 Feb 2004 17:56:12 -0000	1.3
+++ configure.in	29 Mar 2006 11:33:03 -0000	1.4
@@ -3,6 +3,17 @@
 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 @@
 AC_SUBST(RMEDIGICONTROL_CFLAGS)
 AC_SUBST(RMEDIGICONTROL_LIBS)
 
+fi
+
 AC_OUTPUT(Makefile)