From 114c4af942868fb89d9123934656b394cd6ae80d Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Sat, 19 Dec 2009 20:20:28 +0200 Subject: [PATCH] configure.ac: modernize a bit Signed-off-by: Felipe Contreras --- configure.ac | 32 +++++++++++++------------------- 1 files changed, 13 insertions(+), 19 deletions(-) diff --git a/configure.ac b/configure.ac index f598918..130fbde 100644 --- a/configure.ac +++ b/configure.ac @@ -23,8 +23,19 @@ AC_INIT([telepathy-haze], [haze_version], AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([1.9 -Wno-portability]) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADER([config.h]) +AC_CONFIG_FILES([Makefile + src/Makefile + data/Makefile + m4/Makefile + tests/Makefile + tests/twisted/Makefile + tools/Makefile + shave + shave-libtool + ]) AC_PROG_CC AC_PROG_CC_STDC @@ -54,16 +65,8 @@ AC_ARG_ENABLE(leaky-request-stubs, AC_SUBST(ENABLE_LEAKY_REQUEST_STUBS) PKG_CHECK_MODULES(PURPLE,[purple >= 2.1.1]) -AC_SUBST(PURPLE_CFLAGS) -AC_SUBST(PURPLE_LIBS) - PKG_CHECK_MODULES(TP_GLIB,[telepathy-glib >= 0.7.36]) -AC_SUBST(TP_GLIB_CFLAGS) -AC_SUBST(TP_GLIB_LIBS) - PKG_CHECK_MODULES(DBUS_GLIB,[dbus-glib-1 >= 0.73]) -AC_SUBST(DBUS_GLIB_CFLAGS) -AC_SUBST(DBUS_GLIB_LIBS) AC_CHECK_LIB(purple, purple_dbus_uninit, [ AC_DEFINE(HAVE_PURPLE_DBUS_UNINIT, [], @@ -93,13 +96,4 @@ AM_CONDITIONAL([WANT_TWISTED_TESTS], test false != "$TEST_PYTHON") SHAVE_INIT(.) -AC_OUTPUT([Makefile - src/Makefile - data/Makefile - m4/Makefile - tests/Makefile - tests/twisted/Makefile - tools/Makefile - shave - shave-libtool - ]) +AC_OUTPUT -- 1.6.6