diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rwxr-xr-x | autogen.sh | 10 | ||||
| -rw-r--r-- | configure.ac | 14 |
3 files changed, 9 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am index 98c2e83d9..c04c1447a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,9 +1,7 @@ ## Process this file with automake to produce Makefile.in include $(top_srcdir)/Makefile.decl -AUTOMAKE_OPTIONS = 1.7 - -ACLOCAL_AMFLAGS = -I m4macros +ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS} SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs DIST_SUBDIRS = $(SUBDIRS) build diff --git a/autogen.sh b/autogen.sh index 238cb0dfc..0c4f23196 100755 --- a/autogen.sh +++ b/autogen.sh @@ -19,14 +19,14 @@ if libtoolize --version < /dev/null > /dev/null 2>&1 ; then sed -e 's/^\(.*\)([^)]*)\(.*\)$/\1\2/g' \ -e 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` case $libtool_version in - 1.4*|1.5*|2.2*) + 2.2*) have_libtool=true ;; esac fi if $have_libtool ; then : ; else echo - echo "You must have libtool 1.4 installed to compile $PROJECT." + echo "You must have libtool >= 2.2 installed to compile $PROJECT." echo "Install the appropriate package for your distribution," echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/" DIE=1 @@ -54,18 +54,14 @@ if automake-1.11 --version < /dev/null > /dev/null 2>&1 ; then else if automake-1.10 --version < /dev/null > /dev/null 2>&1 ; then AUTOMAKE=automake-1.10 ACLOCAL=aclocal-1.10 -else if automake-1.9 --version < /dev/null > /dev/null 2>&1 ; then - AUTOMAKE=automake-1.9 - ACLOCAL=aclocal-1.9 else echo - echo "You must have automake 1.9.x, 1.10.x or 1.11.x installed to compile $PROJECT." + echo "You must have automake 1.10.x or 1.11.x installed to compile $PROJECT." echo "Install the appropriate package for your distribution," echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/" DIE=1 fi fi -fi if test "$DIE" -eq 1; then exit 1 diff --git a/configure.ac b/configure.ac index f25ae42e6..4e1dc7c58 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,5 @@ # Process this file with autoconf to produce a configure script. -# require autoconf 2.54 -AC_PREREQ(2.54) +AC_PREREQ([2.62]) dnl *********************************** dnl *** include special GLib macros *** @@ -48,15 +47,13 @@ m4_define([glib_debug_default], AC_INIT(glib, [glib_version], [http://bugzilla.gnome.org/enter_bug.cgi?product=glib]) +AC_CONFIG_HEADER([config.h]) AC_CONFIG_SRCDIR([glib/glib.h]) # Save this value here, since automake will set cflags later cflags_set=${CFLAGS+set} -AM_INIT_AUTOMAKE([no-define]) - -# Specify a configuration file -AM_CONFIG_HEADER([config.h]) +AM_INIT_AUTOMAKE([1.10 no-define]) # Support silent build rules, requires at least automake-1.11. Enable # by either passing --enable-silent-rules to configure or passing V=0 @@ -518,9 +515,8 @@ case $with_libiconv in esac dnl Initialize libtool -AM_DISABLE_STATIC -AC_LIBTOOL_WIN32_DLL -AM_PROG_LIBTOOL +LT_PREREQ([2.2]) +LT_INIT([disable-static win32-dll]) dnl when using libtool 2.x create libtool early, because it's used in configure m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) |