[mousetweaks] Disable panel applets by default for GNOME 3

[Gerd Kohlberger <gerdk src gnome org>]

commit 3a06c11165df4cc5db6302a27280d4fd323adf99
Author: Gerd Kohlberger <gerdk src gnome org>
Date:   Sun Oct 10 16:07:19 2010 +0200

    Disable panel applets by default for GNOME 3
    
    The applets can be built with the --enable-dwell-click and
    --enable-pointer-capture configure flags.

 configure.ac    |   14 ++++++++------
 src/Makefile.am |   20 +++++++++-----------
 2 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1f61427..6e07d14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,11 +40,13 @@ GNOME_DOC_INIT
 dnl *** dependencies ***
 
 GIO_REQUIRED=2.25.9
+GTK_REQUIRED=2.91.0
+GCONF_REQUIRED=2.16.0
 
 PKG_CHECK_MODULES(DEPENDENCIES,
     gio-2.0 >= $GIO_REQUIRED
-	gtk+-3.0 >= 2.91.0
-	gconf-2.0 >= 2.16.0
+    gtk+-3.0 >= $GTK_REQUIRED
+	gconf-2.0 >= $GCONF_REQUIRED
 	x11
 	xcursor
 	xfixes
@@ -56,8 +58,8 @@ AC_SUBST(DEPENDENCIES_LIBS)
 dnl *** arguments ***
 
 AC_ARG_ENABLE(pointer-capture,
-  [  --disable-pointer-capture     Disable pointer-capture applet],
-  [build_pca=$enableval], [build_pca=yes])
+  [  --enable-pointer-capture     Enable pointer-capture applet],
+  [build_pca=$enableval], [build_pca=no])
 
 AM_CONDITIONAL(BUILD_PCA, test "x$build_pca" = "xyes")
 if test "$build_pca" = yes; then
@@ -65,8 +67,8 @@ if test "$build_pca" = yes; then
 fi
 
 AC_ARG_ENABLE(dwell-click,
-  [  --disable-dwell-click         Disable dwell-click applet],
-  [build_dca=$enableval], [build_dca=yes])
+  [  --enable-dwell-click         Enable dwell-click applet],
+  [build_dca=$enableval], [build_dca=no])
 
 AM_CONDITIONAL(BUILD_DCA, test "x$build_dca" = "xyes")
 if test "$build_dca" = yes; then
diff --git a/src/Makefile.am b/src/Makefile.am
index bd36f8f..a9ae75e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,4 @@
-AM_CFLAGS =                                 \
-    $(DEPENDENCIES_CFLAGS)                  \
+AM_CPPFLAGS =                               \
     $(WARN_CFLAGS)                          \
     -DDATADIR=\"$(datadir)/mousetweaks\"    \
     -DLOCALEDIR=\"$(datadir)/locale\"
@@ -37,7 +36,8 @@ mousetweaks_SOURCES =       \
     mt-sig-handler.h
 
 mousetweaks_CFLAGS =        \
-    $(AM_CFLAGS)
+    $(AM_CPPFLAGS)          \
+    $(DEPENDENCIES_CFLAGS)
 
 mousetweaks_LDADD =         \
     $(DEPENDENCIES_LIBS)
@@ -48,12 +48,11 @@ dwell_click_applet_SOURCES =    \
     mt-common.h
 
 dwell_click_applet_CFLAGS =     \
-    $(PANELAPPLET_CFLAGS)       \
-    $(AM_CFLAGS)
+    $(AM_CPPFLAGS)              \
+    $(PANELAPPLET_CFLAGS)
 
 dwell_click_applet_LDADD =      \
-    $(PANELAPPLET_LIBS)         \
-    $(DEPENDENCIES_LIBS)
+    $(PANELAPPLET_LIBS)
 
 pointer_capture_applet_SOURCES =    \
     pointer-capture-applet.c        \
@@ -61,11 +60,10 @@ pointer_capture_applet_SOURCES =    \
     mt-common.h
 
 pointer_capture_applet_CFLAGS =     \
-    $(PANELAPPLET_CFLAGS)           \
-    $(AM_CFLAGS)
+    $(AM_CPPFLAGS)                  \
+    $(PANELAPPLET_CFLAGS)
 
 pointer_capture_applet_LDADD =      \
-    $(PANELAPPLET_LIBS)             \
-    $(DEPENDENCIES_LIBS)
+    $(PANELAPPLET_LIBS)
 
 -include $(top_srcdir)/git.mk