diff -r c0f13b16964f -r 2394aa79ef69 gmyth-dbus/configure.ac
--- a/gmyth-dbus/configure.ac	Fri Feb 08 00:03:03 2008 +0000
+++ b/gmyth-dbus/configure.ac	Tue Mar 04 13:57:55 2008 +0000
@@ -1,48 +1,22 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
+AC_INIT(gmyth-dbus,0.7.0)
+AC_PREREQ(2.52)
+AC_CONFIG_SRCDIR(configure.ac)
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
+AC_ISC_POSIX
 
-AC_PREREQ(2.50)
+AM_INIT_AUTOMAKE(1.6 dist-bzip2)
+AM_CONFIG_HEADER(config.h)
 
-AC_INIT([gmyth-dbus],[0.7])
-
-AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_HEADER(config.h)
-
-dnl AM_MAINTAINER_MODE provides the option to enable maintainer mode
-AM_MAINTAINER_MODE
 dnl make aclocal work in maintainer mode
 AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
 
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
-
-# Checks for programs.
-# check for tools
-# Make sure CFLAGS is defined to stop AC_PROC_CC adding -g
-CFLAGS="$CFLAGS -Wall"
+C_PROG_CXX
 AC_PROG_CC
-AC_PROG_LIBTOOL
-
-# Checks for libraries.
-
-# Checks for header files.
+AM_PROG_CC_STDC
 AC_HEADER_STDC
-
-#Test if --disable-debug given
-AC_ARG_ENABLE(debug,
-    AC_HELP_STRING([--disable-debug], [enable debugging mode]))
-if test x"$enable_debug" != xno; then
-    CFLAGS="$CFLAGS -g -DMYTH_STREAM_USE_DEBUG"
-else
-    CFLAGS="$CFLAGS -O2 -DG_DISABLE_CHECKS"
-fi
-
-
-AS_AC_EXPAND(DATADIR, $datadir)
-
-DBUS_SERVICES_DIR="$DATADIR/dbus-1/services"
-AC_SUBST(DBUS_SERVICES_DIR)
-AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir for DBUS is])
-
+AC_C_BIGENDIAN
+AC_C_CONST
 
 # Checks required packages ####################################################
 ###############################################################################
@@ -76,15 +50,9 @@
 AC_SUBST(LDFLAGS)
 AC_SUBST(LIBS)
 
-AC_OUTPUT([
+AC_OUTPUT(
 Makefile
 src/Makefile
 data/Makefile
 data/br.org.indt.GMyth.service
-])
-
-if test "x$enable_debug" != "xno"; then
-    AC_MSG_NOTICE([Debug: Enabled])
-else
-    AC_MSG_NOTICE([Debug: Disabled])
-fi
+)