summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorreggaemanu <reggaemanu@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-11-07 21:57:09 +0000
committerreggaemanu <reggaemanu@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-11-07 21:57:09 +0000
commitac2a12125db72bc52240ac8bad498fd3ece5cc3b (patch)
treedf298769caace8513ac41d9baca49b2c20fab802
parenta835d9c8e1752495aefc47ca81ba19298a967615 (diff)
downloadmarex-dev-ac2a12125db72bc52240ac8bad498fd3ece5cc3b.tar.gz
marex-dev-ac2a12125db72bc52240ac8bad498fd3ece5cc3b.tar.bz2
all: revert 1059 + cleanup
git-svn-id: file:///beryl/trunk@1072 d7aaf104-2d23-0410-ae22-9d23157bf5a3
-rw-r--r--bdock/configure.ac2
-rw-r--r--beryl-core/configure.ac2
-rw-r--r--beryl-dbus/configure.ac2
-rw-r--r--beryl-manager/configure.ac2
-rw-r--r--beryl-plugins/configure.ac2
-rw-r--r--beryl-settings/configure.ac7
-rw-r--r--emerald-themes/configure.ac2
-rw-r--r--emerald/configure.ac6
-rw-r--r--heliodor/configure.ac2
9 files changed, 10 insertions, 17 deletions
diff --git a/bdock/configure.ac b/bdock/configure.ac
index 2865007..6a22eca 100644
--- a/bdock/configure.ac
+++ b/bdock/configure.ac
@@ -7,7 +7,7 @@ AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version])
AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE([1.9])
+AM_INIT_AUTOMAKE([dist-bzip2])
AC_CONFIG_HEADER([config.h])
AC_ISC_POSIX
diff --git a/beryl-core/configure.ac b/beryl-core/configure.ac
index fefc3de..528b4ee 100644
--- a/beryl-core/configure.ac
+++ b/beryl-core/configure.ac
@@ -6,7 +6,7 @@ AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version])
#AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE([1.9])
+AM_INIT_AUTOMAKE([dist-bzip2])
AC_CONFIG_HEADER([config.h])
AM_MAINTAINER_MODE
diff --git a/beryl-dbus/configure.ac b/beryl-dbus/configure.ac
index 05f57fc..60e432e 100644
--- a/beryl-dbus/configure.ac
+++ b/beryl-dbus/configure.ac
@@ -7,7 +7,7 @@ AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version])
AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE([1.9])
+AM_INIT_AUTOMAKE([dist-bzip2])
AC_CONFIG_HEADER([config.h])
AM_MAINTAINER_MODE
diff --git a/beryl-manager/configure.ac b/beryl-manager/configure.ac
index 89c622e..5181ca1 100644
--- a/beryl-manager/configure.ac
+++ b/beryl-manager/configure.ac
@@ -6,7 +6,7 @@ AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version])
#AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE([1.9])
+AM_INIT_AUTOMAKE([dist-bzip2])
AC_CONFIG_HEADER([config.h])
AM_MAINTAINER_MODE
diff --git a/beryl-plugins/configure.ac b/beryl-plugins/configure.ac
index 08fd77d..6e926ab 100644
--- a/beryl-plugins/configure.ac
+++ b/beryl-plugins/configure.ac
@@ -6,7 +6,7 @@ AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version])
#AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE([1.9])
+AM_INIT_AUTOMAKE([dist-bzip2])
AC_CONFIG_HEADER([config.h])
AM_MAINTAINER_MODE
diff --git a/beryl-settings/configure.ac b/beryl-settings/configure.ac
index 3783558..b58c052 100644
--- a/beryl-settings/configure.ac
+++ b/beryl-settings/configure.ac
@@ -6,7 +6,7 @@ AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version])
#AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE([1.9])
+AM_INIT_AUTOMAKE([dist-bzip2])
AC_CONFIG_HEADER([config.h])
AM_MAINTAINER_MODE
@@ -26,11 +26,6 @@ BERYL_SETTINGS_REQUIRES="\
gtk+-2.0 >= 2.8.0 \
berylsettings \
beryl"
-# \
-# dbus-1 \
-# dbus-glib-1 \
-# gthread-2.0"
-#dbus no longer needed, using SIGUSR1 instead
PKG_CHECK_MODULES(BERYL_SETTINGS, $BERYL_SETTINGS_REQUIRES)
AC_SUBST(BERYL_SETTINGS_REQUIRES)
diff --git a/emerald-themes/configure.ac b/emerald-themes/configure.ac
index a315b93..e378eba 100644
--- a/emerald-themes/configure.ac
+++ b/emerald-themes/configure.ac
@@ -7,7 +7,7 @@ AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version])
AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE([1.9])
+AM_INIT_AUTOMAKE([dist-bzip2])
AC_CONFIG_HEADER([config.h])
AM_MAINTAINER_MODE
diff --git a/emerald/configure.ac b/emerald/configure.ac
index a91f3ab..01050f9 100644
--- a/emerald/configure.ac
+++ b/emerald/configure.ac
@@ -4,7 +4,7 @@ AC_INIT([emerald],esyscmd(. ./VERSION;echo -n $VERSION), [livinglatexkali@gmail.
AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version])
-AM_INIT_AUTOMAKE([1.9])
+AM_INIT_AUTOMAKE([dist-bzip2])
AC_CONFIG_HEADER([config.h])
AC_ISC_POSIX
@@ -29,9 +29,7 @@ EMERALD_REQUIRES=" xrender >= 0.8.4 \
libwnck-1.0 \
beryl \
pangocairo "
- #dbus-1 \
- #dbus-glib-1 \
- #gthread-2.0 \
+
PKG_CHECK_MODULES(EMERALD, $EMERALD_REQUIRES)
AC_SUBST(EMERALD_REQUIRES)
CFLAGS="$CFLAGS $EMERALD_CFLAGS"
diff --git a/heliodor/configure.ac b/heliodor/configure.ac
index c40baa7..dbcdc1c 100644
--- a/heliodor/configure.ac
+++ b/heliodor/configure.ac
@@ -4,7 +4,7 @@ AC_INIT([heliodor],esyscmd(. ./VERSION;echo -n $VERSION), [livinglatexkali@gmail
AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version])
-AM_INIT_AUTOMAKE([1.9])
+AM_INIT_AUTOMAKE([dist-bzip2])
AC_CONFIG_HEADER([config.h])
AC_ISC_POSIX