[gnome-power-manager] trivial: remove some obsolete crap from configure

[Richard Hughes <rhughes src gnome org>]

commit c25d331120367ca856e65e878c200639559c622a
Author: Richard Hughes <richard hughsie com>
Date:   Fri Aug 5 10:09:47 2011 +0100

    trivial: remove some obsolete crap from configure

 autogen.sh   |    3 +-
 configure.ac |  106 +---------------------------------------------------------
 2 files changed, 2 insertions(+), 107 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 87abba6..e54a8c9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,8 +8,7 @@ PKG_NAME=gnome-power-manager
 
 (test -f $srcdir/configure.ac \
   && test -f $srcdir/autogen.sh \
-  && test -d $srcdir/src \
-  && test -f $srcdir/src/gpm-manager.c) || {
+  && test -d $srcdir/src) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level $PKG_NAME directory"
     exit 1
diff --git a/configure.ac b/configure.ac
index 1c9b3c8..5520226 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,13 +38,6 @@ AC_ARG_ENABLE([strict],
               [enable_strict=$enableval],
               [enable_strict=$default_strict])
 if test x$enable_strict != xno; then
-	CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
-	CPPFLAGS="$CPPFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED"
-# -DGTK_DISABLE_DEPRECATED removed until module has been ported to GtkStyleContext
-# -DGDK_DISABLE_DEPRECATED removed until module has been ported to gdk device API
-	CPPFLAGS="$CPPFLAGS -DG_DISABLE_DEPRECATED"
-	CPPFLAGS="$CPPFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE"
-	CPPFLAGS="$CPPFLAGS -DGSEAL_ENABLE"
 	if test "$GCC" = "yes"; then
 		WARNINGFLAGS="$WARNINGFLAGS -Werror"
 	fi
@@ -54,8 +47,6 @@ if test "$GCC" = "yes"; then
 	WARNINGFLAGS="$WARNINGFLAGS -Wall"
 	WARNINGFLAGS="$WARNINGFLAGS -Wcast-align -Wno-uninitialized"
 	WARNINGFLAGS="$WARNINGFLAGS -Wmissing-declarations"
-#	WARNINGFLAGS="$WARNINGFLAGS -Wredundant-decls"
-#	WARNINGFLAGS="$WARNINGFLAGS -Wmissing-noreturn"
 	WARNINGFLAGS="$WARNINGFLAGS -Wpointer-arith"
 	WARNINGFLAGS="$WARNINGFLAGS -Wcast-align"
 	WARNINGFLAGS="$WARNINGFLAGS -Wwrite-strings"
@@ -68,14 +59,10 @@ if test "$GCC" = "yes"; then
 	WARNINGFLAGS="$WARNINGFLAGS -Wclobbered"
 	WARNINGFLAGS="$WARNINGFLAGS -Wempty-body"
 	WARNINGFLAGS="$WARNINGFLAGS -Wignored-qualifiers"
-#	WARNINGFLAGS="$WARNINGFLAGS -Wsign-compare"
 	WARNINGFLAGS="$WARNINGFLAGS -Wtype-limits"
-#	WARNINGFLAGS="$WARNINGFLAGS -Wuninitialized"
-#	WARNINGFLAGS="$WARNINGFLAGS -Waggregate-return"
 	WARNINGFLAGS="$WARNINGFLAGS -Wdeclaration-after-statement"
 	WARNINGFLAGS="$WARNINGFLAGS -Wshadow"
 	WARNINGFLAGS="$WARNINGFLAGS -Winline"
-#	WARNINGFLAGS="$WARNINGFLAGS -Wswitch-enum"
 	WARNINGFLAGS="$WARNINGFLAGS -Wmissing-parameter-type"
 	WARNINGFLAGS="$WARNINGFLAGS -Woverride-init"
 	WARNINGFLAGS="$WARNINGFLAGS -Wno-strict-aliasing"
@@ -107,44 +94,11 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.13.0 gobject-2.0 gio-2.0 >= 2.25.9)
 
 PKG_CHECK_MODULES(GNOME, [
  gtk+-3.0 >= 2.91.0
- gnome-keyring-1 >= 0.6.0
+ gdk-3.0 >= 2.91.7
  cairo >= 1.0.0])
 
-PKG_CHECK_MODULES(GDK, [gdk-3.0 >= 2.91.7])
-
-PKG_CHECK_MODULES(X11, [
- xrandr >= 1.2.0
- xrender x11 xext xproto])
-
-PKG_CHECK_MODULES(X11, x11 xrender)
-
-PKG_CHECK_EXISTS(
- [xrandr >= 1.3],
- [AC_DEFINE(HAVE_XRANDR_13, 1, [xrandr 1.3 available])])
-
 PKG_CHECK_MODULES(UPOWER, upower-glib >= 0.9.1)
 
-dnl **** Check for NOTIFY ****
-PKG_CHECK_MODULES(NOTIFY, libnotify >= 0.7.0)
-
-dnl ---------------------------------------------------------------------------
-dnl - Make paths available for source files
-dnl ---------------------------------------------------------------------------
-AC_SUBST(SYSCONFDIR, $sysconfdir)
-AC_SUBST(DATADIR, $datadir)
-AC_SUBST(BINDIR, $bindir)
-AC_SUBST(SBINDIR, $sbindir)
-
-dnl ---------------------------------------------------------------------------
-dnl - Where should we put documentation ?
-dnl ---------------------------------------------------------------------------
-AC_ARG_WITH(doc-dir,
-            AS_HELP_STRING([--with-doc-dir=<dir>],
-                           [directory to install documentation]),
-            [DOCDIR="$with_doc_dir/gnome-power-manager-$VERSION"],
-            [DOCDIR="$DATADIR/doc/gnome-power-manager-$VERSION"])
-AC_SUBST(DOCDIR)
-
 dnl ---------------------------------------------------------------------------
 dnl - Build self tests
 dnl ---------------------------------------------------------------------------
@@ -165,50 +119,6 @@ fi
 AM_CONDITIONAL([HAVE_TESTS], [test $have_tests = yes])
 
 dnl ---------------------------------------------------------------------------
-dnl - DocBook Documentation
-dnl ---------------------------------------------------------------------------
-AC_ARG_ENABLE(docbook-docs,
-              AS_HELP_STRING([--enable-docbook-docs],
-                             [build documentation (requires xmlto)]),
-              enable_docbook_docs=$enableval,enable_docbook_docs=auto)
-
-AC_PATH_PROG(XMLTO, xmlto, no)
-AC_MSG_CHECKING([whether to build DocBook documentation])
-if test x$enable_docbook_docs = xauto ; then
-    if test x$XMLTO = xno ; then
-        enable_docbook_docs=no
-    else
-        enable_docbook_docs=yes
-    fi
-fi
-if test x$enable_docbook_docs = xyes -a x$XMLTO = xno; then
-	AC_MSG_ERROR([Building DocBook docs explicitly required, but DocBook not found])
-fi
-AM_CONDITIONAL(DOCBOOK_DOCS_ENABLED, test x$enable_docbook_docs = xyes)
-AC_MSG_RESULT(yes)
-
-dnl ---------------------------------------------------------------------------
-dnl - Are we specifying a different dbus root ?
-dnl ---------------------------------------------------------------------------
-AC_ARG_WITH(dbus-services,
-            AS_HELP_STRING([--with-dbus-services=<dir>],
-                           [where D-BUS services directory is]),
-            [DBUS_SERVICES_DIR="$with_dbus_services"],
-            [DBUS_SERVICES_DIR="$DATADIR/dbus-1/services"])
-AC_SUBST(DBUS_SERVICES_DIR)
-
-dnl ---------------------------------------------------------------------------
-dnl - Check for Solaris kstat support
-dnl ---------------------------------------------------------------------------
-AC_MSG_CHECKING(for Solaris kstat)
-AC_CHECK_LIB(kstat, kstat_open,
-	     [
-	       AC_DEFINE(HAVE_KSTAT, 1, [Define if Solaris kstat is support])
-	       GPM_EXTRA_LIBS="$GPM_EXTRA_LIBS -lkstat"
-	     ])
-AC_SUBST(GPM_EXTRA_LIBS)
-
-dnl ---------------------------------------------------------------------------
 dnl - Is docbook2man available?
 dnl ---------------------------------------------------------------------------
 AC_PATH_PROG(DOCBOOK2MAN, docbook2man, no)
@@ -260,18 +170,4 @@ echo "
         cflags:                    ${CFLAGS}
         cppflags:                  ${CPPFLAGS}
         Self test support:         ${have_tests}
-        Docbook support:           ${enable_docbook_docs}
-        documentation dir:         $DOCDIR
-        dbus-1 services dir:       $DBUS_SERVICES_DIR
 "
-if [[ "${prefix}" != "/usr" ]] ; then
-	echo '
-WARNING!!!  GNOME Power Manager uses the "pkexec" utility to provide root
-permissions necessary for the "gnome-power-backlight-helper" executable to run.
-
-A link should be provided from the file
-"/usr/share/polkit-1/actions/org.gnome.power.policy" to the installed version
-"${prefix}/share/polkit-1/actions/org.gnome.power.policy" after installation.
-'
-fi
-