1.1 --- a/gmyth-dbus/configure.ac	Fri Feb 08 00:03:03 2008 +0000
     1.2 +++ b/gmyth-dbus/configure.ac	Tue Feb 26 14:10:22 2008 +0000
     1.3 @@ -1,48 +1,22 @@
     1.4 -#                                               -*- Autoconf -*-
     1.5 -# Process this file with autoconf to produce a configure script.
     1.6 +AC_INIT(gmyth-dbus,0.7.0)
     1.7 +AC_PREREQ(2.52)
     1.8 +AC_CONFIG_SRCDIR(configure.ac)
     1.9 +AC_CANONICAL_BUILD
    1.10 +AC_CANONICAL_HOST
    1.11 +AC_ISC_POSIX
    1.12  
    1.13 -AC_PREREQ(2.50)
    1.14 +AM_INIT_AUTOMAKE(1.6 dist-bzip2)
    1.15 +AM_CONFIG_HEADER(config.h)
    1.16  
    1.17 -AC_INIT([gmyth-dbus],[0.7])
    1.18 -
    1.19 -AC_CONFIG_MACRO_DIR([m4])
    1.20 -AC_CONFIG_HEADER(config.h)
    1.21 -
    1.22 -dnl AM_MAINTAINER_MODE provides the option to enable maintainer mode
    1.23 -AM_MAINTAINER_MODE
    1.24  dnl make aclocal work in maintainer mode
    1.25  AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
    1.26  
    1.27 -AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
    1.28 -
    1.29 -# Checks for programs.
    1.30 -# check for tools
    1.31 -# Make sure CFLAGS is defined to stop AC_PROC_CC adding -g
    1.32 -CFLAGS="$CFLAGS -Wall"
    1.33 +C_PROG_CXX
    1.34  AC_PROG_CC
    1.35 -AC_PROG_LIBTOOL
    1.36 -
    1.37 -# Checks for libraries.
    1.38 -
    1.39 -# Checks for header files.
    1.40 +AM_PROG_CC_STDC
    1.41  AC_HEADER_STDC
    1.42 -
    1.43 -#Test if --disable-debug given
    1.44 -AC_ARG_ENABLE(debug,
    1.45 -    AC_HELP_STRING([--disable-debug], [enable debugging mode]))
    1.46 -if test x"$enable_debug" != xno; then
    1.47 -    CFLAGS="$CFLAGS -g -DMYTH_STREAM_USE_DEBUG"
    1.48 -else
    1.49 -    CFLAGS="$CFLAGS -O2 -DG_DISABLE_CHECKS"
    1.50 -fi
    1.51 -
    1.52 -
    1.53 -AS_AC_EXPAND(DATADIR, $datadir)
    1.54 -
    1.55 -DBUS_SERVICES_DIR="$DATADIR/dbus-1/services"
    1.56 -AC_SUBST(DBUS_SERVICES_DIR)
    1.57 -AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir for DBUS is])
    1.58 -
    1.59 +AC_C_BIGENDIAN
    1.60 +AC_C_CONST
    1.61  
    1.62  # Checks required packages ####################################################
    1.63  ###############################################################################
    1.64 @@ -76,15 +50,9 @@
    1.65  AC_SUBST(LDFLAGS)
    1.66  AC_SUBST(LIBS)
    1.67  
    1.68 -AC_OUTPUT([
    1.69 +AC_OUTPUT(
    1.70  Makefile
    1.71  src/Makefile
    1.72  data/Makefile
    1.73  data/br.org.indt.GMyth.service
    1.74 -])
    1.75 -
    1.76 -if test "x$enable_debug" != "xno"; then
    1.77 -    AC_MSG_NOTICE([Debug: Enabled])
    1.78 -else
    1.79 -    AC_MSG_NOTICE([Debug: Disabled])
    1.80 -fi
    1.81 +)