envy24control: support gtk1 only in configure.in-gtk1

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/envy24control/Makefile.am b/envy24control/Makefile.am
index e29c40839e04b5ff40f8586a8cbb8ccc17dd9361..aaa50eef23a30f6f0690ef5aef6ff6c0e1731d02 100644 (file)
--- a/envy24control/Makefile.am
+++ b/envy24control/Makefile.am
@@ -6,7 +6,7 @@ envy24control_SOURCES = envy24control.c envy24control.h levelmeters.c midi.c \
                        profiles.c profiles.h midi.h config.c config.h
 envy24control_LDADD = @ENVY24CONTROL_LIBS@
 EXTRA_DIST = gitcompile envy24control.1 depcomp configure.in-gtk1 \
-            configure.in-gtk2 strstr_icase_blank.c new_process.c \
+            strstr_icase_blank.c new_process.c \
             README.profiles
 AUTOMAKE_OPTIONS = foreign
 

diff --git a/envy24control/configure.in b/envy24control/configure.in
index 30dc8a8a9e5570b71bd15f7dd3d6c49147f0effe..d42aee856aba75fd3d3a0f333af6f09231e107cd 100644 (file)
--- a/envy24control/configure.in
+++ b/envy24control/configure.in
@@ -4,23 +4,6 @@ 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)
-
-fi
-
 AC_OUTPUT(Makefile)

diff --git a/envy24control/configure.in-gtk2 b/envy24control/configure.in-gtk2
deleted file mode 100644 (file)
index d42aee8..0000000
--- a/envy24control/configure.in-gtk2
+++ /dev/null
@@ -1,9 +0,0 @@
-AC_INIT(envy24control.c)
-AM_INIT_AUTOMAKE(envy24control, 0.6.0)
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_HEADER_STDC
-
-PKG_CHECK_MODULES(ENVY24CONTROL, gtk+-2.0 alsa >= 0.9.0)
-
-AC_OUTPUT(Makefile)

diff --git a/envy24control/cvscompile b/envy24control/cvscompile
deleted file mode 100755 (executable)
index e8a1c45..0000000
--- a/envy24control/cvscompile
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-if test "x$AUTOMAKE_DIR" = "x"; then
-  if test -d /usr/local/share/automake; then
-    AUTOMAKE_DIR=/usr/local/share/automake
-  fi
-  if test -d /usr/share/automake; then
-    AUTOMAKE_DIR="/usr/share/automake"
-  fi
-fi
-
-for f in install-sh mkinstalldirs missing; do
-  cp -av $AUTOMAKE_DIR/$f .
-done
-
-aclocal $ACLOCAL_FLAGS
-automake --foreign --add-missing --copy
-touch depcomp
-autoconf
-export CFLAGS='-O2 -Wall -pipe -g'
-echo "CFLAGS=$CFLAGS"
-echo "./configure $@"
-./configure $@
-unset CFLAGS
-make