aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorMichael Terry <mike@mterry.name>2011-06-01 15:32:49 -0400
committerMichael Terry <mike@mterry.name>2011-06-01 15:32:49 -0400
commitd9ec4cfedc5d542c7389cad31b33613de3882fd4 (patch)
tree442c710a60f9dc2749feba2be8db1f41c42ba737 /configure.ac
parent5ddcf6b51cdcb8d793748ff4a812f843a0d4f6e7 (diff)
downloadayatana-ido-d9ec4cfedc5d542c7389cad31b33613de3882fd4.tar.gz
ayatana-ido-d9ec4cfedc5d542c7389cad31b33613de3882fd4.tar.bz2
ayatana-ido-d9ec4cfedc5d542c7389cad31b33613de3882fd4.zip
some further automake magic for dual versioning
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac6
1 files changed, 3 insertions, 3 deletions
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@:>@])],