From: Brendan Cully <brendan@kublai.com>
Date: Tue, 15 Jul 2003 11:39:30 +0000 (+0000)
Subject: autoconf 2.5 compatibility.
X-Git-Tag: pre-type-punning-patch~47
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=07155e5b20ad4d2edaee50e7e09dc195bd89f6b9;p=mutt

autoconf 2.5 compatibility.
---

diff --git a/.cvsignore b/.cvsignore
index 1ab2205f..baa2fa45 100644
--- 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 1d696ce6..a435d578 100644
--- 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