From d9ec4cfedc5d542c7389cad31b33613de3882fd4 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Wed, 1 Jun 2011 15:32:49 -0400 Subject: some further automake magic for dual versioning --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index fc26c5b..4dfe223 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ AC_CONFIG_MACRO_DIR([build/autotools]) AM_CONFIG_HEADER([config.h]) -AM_INIT_AUTOMAKE([1.9]) +AM_INIT_AUTOMAKE([1.9 foreign]) IDO_MAJOR_VERSION=ido_major_version IDO_MINOR_VERSION=ido_minor_version @@ -52,9 +52,11 @@ dnl =========================================================================== # Checks for programs AC_PROG_CC +AM_PROG_CC_C_O AC_DISABLE_STATIC AC_PROG_LIBTOOL AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums]) +PKG_PROG_PKG_CONFIG # Checks for header files AC_HEADER_STDC @@ -68,8 +70,6 @@ AC_FUNC_MALLOC AC_FUNC_MMAP AC_CHECK_FUNCS([memset munmap strcasecmp strdup]) -PKG_PROG_PKG_CONFIG - AC_ARG_WITH([gtk], [AS_HELP_STRING([--with-gtk], [Which version of gtk to use @<:@default=3@:>@])], -- cgit v1.2.3