autoconf 2.5 compatibility.

diff --git a/.cvsignore b/.cvsignore
index 1ab2205fa77cd8f925abfae9b7cccb4a97345e0e..baa2fa45ba2b4f02043653f0e0ad5e92e4a80fa3 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -4,6 +4,7 @@ Makefile.in
 Muttrc
 Muttrc.head
 aclocal.m4
+autom4te.cache
 config.h
 config.h.in
 configure

diff --git a/configure.in b/configure.in
index 1d696ce6183375ed6805c71e1a82d1a40a88ddc2..a435d5788b40e5c1c96f6b0a6e3adbfb49940824 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -12,6 +12,7 @@ mutt_cv_version=`cat $srcdir/VERSION`
 
 AM_INIT_AUTOMAKE(mutt, $mutt_cv_version)
 
+ifdef([AC_LIBOBJ], , [define([AC_LIBOBJ], [LIB[]OBJS="$LIBOBJS $1.o"])])
 
 ALL_LINGUAS="de ru it es uk fr pl nl cs id sk ko el zh_TW zh_CN pt_BR eo gl sv da lt tr ja hu et ca"
 
@@ -339,8 +340,7 @@ SNPRINTFOBJS=""
 AC_CHECK_FUNCS(snprintf, , [mutt_cv_snprintf=yes])
 AC_CHECK_FUNCS(vsnprintf, , [mutt_cv_snprintf=yes])
 if test $mutt_cv_snprintf = yes; then
-#        AC_LIBOBJ(snprintf)
-        LIBOBJS="$LIBOBJS snprintf.o"
+        AC_LIBOBJ(snprintf)
 fi
 
 dnl SCO uses chsize() instead of ftruncate()
@@ -372,8 +372,7 @@ fi
 
 if test $mutt_cv_regex = yes; then
         AC_DEFINE(USE_GNU_REGEX,1,[ Define if you want to use the included regex.c. ])
-###     AC_LIBOBJ(regex)
-        LIBOBJS="$LIBOBJS regex.o"
+        AC_LIBOBJ(regex)
 fi