From 6810a85e35b332e3c17149dbd0104cdd42d2db13 Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <rem@videolan.org>
Date: Tue, 12 Sep 2006 18:03:45 +0000
Subject: [PATCH] Revert lame revert from [16628]. Provide trivial work-around
 for users of obsolete autoconf

---
 bootstrap                | 14 ++++++++++++++
 configure.ac             |  2 +-
 extras/m4/autoconf260.m4 |  7 +++++++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 extras/m4/autoconf260.m4

diff --git a/bootstrap b/bootstrap
index 4d271f6ae9..6dc6ac62eb 100755
--- a/bootstrap
+++ b/bootstrap
@@ -48,6 +48,20 @@ if test -d extras/contrib/bin; then
   fi
 fi
 
+# Check for autoconf
+rm -f m4/autoconf260.m4
+case "$(autoconf --version|head -1)" in
+  *2.5[012345678]*)
+    echo "Hey, your autoconf is quite old. Update it." >&2
+    exit 1
+    ;;
+
+  *2.59*)
+    echo "Enabling provisional autoconf 2.59 work-around. Update autoconf ASAP."
+    cp -f extras/m4/autoconf260.m4 m4/
+    ;;
+esac
+
 # Check for automake
 amvers="no"
 for v in "-1.9" "19" "-1.8" "18" "-1.7" "17"; do
diff --git a/configure.ac b/configure.ac
index 276a0b3dee..c27cb7f5c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,8 +37,8 @@ VLC_SAVE_FLAGS
 dnl
 dnl Check for tools
 dnl
+AC_PROG_CC_C99
 AM_PROG_CC_C_O
-AC_PROG_CPP
 AC_PROG_CXX
 eval "${CXX} --version" >/dev/null 2>&1 || CXX=""
 if test "${CXX}" != ""; then
diff --git a/extras/m4/autoconf260.m4 b/extras/m4/autoconf260.m4
new file mode 100644
index 0000000000..e7f48e2d41
--- /dev/null
+++ b/extras/m4/autoconf260.m4
@@ -0,0 +1,7 @@
+# Replacements for autoconf 2.59 and older
+# Please make official source tarballs with recent autoconf only.
+
+AC_DEFUN([AC_PROG_CC_C00],
+[ AC_REQUIRE([AC_PROG_CC])dnl
+  CC="$CC -std=c99"
+])
-- 
2.39.2