Permalink
Browse files

Request libtool 2.2.6, and modernize configure.ac

Maybe this fixes Jonner's build problems.

Signed-off-by: Mathias Hasselmann <hasselmm@gnome.org>
  • Loading branch information...
1 parent 26cf0c3 commit 878ef96151e48295e0806d87b66e444181454a98 @hasselmm committed Feb 22, 2009
Showing with 11 additions and 6 deletions.
  1. +11 −6 configure.ac
View
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ([2.59])
+AC_PREREQ(2.61)
AC_INIT([giggle],[0.4.91],
[http://bugzilla.gnome.org/enter_bug.cgi?product=giggle])
@@ -11,16 +11,19 @@ AC_CONFIG_SRCDIR([src/giggle-main.c])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([-Wall -Werror])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
+
+AC_DISABLE_STATIC
-AM_DISABLE_STATIC
CXX=no
F77=no
-AM_PROG_LIBTOOL
+
+LT_PREREQ([2.2.6])
+LT_INIT
AC_ISC_POSIX
+
AC_PROG_CC
-AM_PROG_CC_STDC
AC_HEADER_STDC
AM_PATH_GLIB_2_0
@@ -165,7 +168,7 @@ AC_SUBST(ACLOCAL_AMFLAGS)
SHAVE_INIT([.])
-AC_OUTPUT([
+AC_CONFIG_FILES([
shave
shave-libtool
Makefile
@@ -179,6 +182,8 @@ AC_OUTPUT([
test/Makefile
])
+AC_OUTPUT
+
echo
echo "Prefix: $prefix"
echo "GIT command path: $GIT_COMMAND"

0 comments on commit 878ef96

Please sign in to comment.