create a configure.base file, containing the contents of configure.{in,ac}, with those lines specific to one file pre...

Original commit message from CVS:
* create a configure.base file, containing the contents of
configure.{in,ac}, with those lines specific to one file prepended by
"SUBSTFOR configure.in:" or "SUBSTFOR configure.ac:" appropriately.

* Add lines to autogen.sh to generate configure.in and configure.ac
automatically from this file. (Very simple sed scripts)

* Remove configure.in and configure.ac

This shouldn't cause any problems to anyone, and should make it easy to do
work on configure scripts by just working on configure.base.

autogen.sh

@@ -137,6 +137,11 @@ if test -z "$*"; then
         echo "to pass any to it, please specify them on the $0 command line."
 fi
 
+
+# Generate configure.in and configure.ac
+sed <configure.base >configure.in '/^SUBSTFOR configure.ac:.*/d;s/^SUBSTFOR configure.in://g'
+sed <configure.base >configure.ac '/^SUBSTFOR configure.in:.*/d;s/^SUBSTFOR configure.ac://g'
+
 libtoolize --copy --force
 aclocal $ACLOCAL_FLAGS || {
 	echo

configure.base

@@ -1,7 +1,10 @@
-AC_INIT
-AC_CONFIG_SRCDIR([gst/gstobject.h])
+dnl Note: this file is generated from configure.base by autogen.sh
+SUBSTFOR configure.ac:AC_INIT
+SUBSTFOR configure.ac:AC_CONFIG_SRCDIR([gst/gstobject.h])
+SUBSTFOR configure.in:AC_INIT(gst/gstobject.h)
 
-AC_CANONICAL_TARGET([])
+SUBSTFOR configure.ac:AC_CANONICAL_TARGET([])
+SUBSTFOR configure.in:AC_CANONICAL_SYSTEM
 
 AM_CONFIG_HEADER(config.h)
 
@@ -46,7 +49,8 @@ AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_CXXCPP
 AC_ISC_POSIX
-AC_HEADER_STDC([])
+SUBSTFOR configure.ac:AC_HEADER_STDC([])
+SUBSTFOR configure.in:AC_STDC_HEADERS
 AC_ARG_PROGRAM
 
 dnl We disable static building for development, for time savings
@@ -523,14 +527,17 @@ AC_CHECK_HEADER(rtp/rtcp-packet.h, :, HAVE_LIBRTP=no)
 AC_CHECK_HEADER(rtp/rtp-audio.h, :, HAVE_LIBRTP=no)
 
 dnl Check for arts
-AC_DIAGNOSE([obsolete],[instead of using `AC_LANG', `AC_LANG_SAVE',
-and `AC_LANG_RESTORE', you should use `AC_LANG_PUSH' and `AC_LANG_POP'.])
-
-AC_LANG_PUSH(C++)
+SUBSTFOR configure.ac:AC_DIAGNOSE([obsolete],[instead of using `AC_LANG', `AC_LANG_SAVE',
+SUBSTFOR configure.ac:and `AC_LANG_RESTORE', you should use `AC_LANG_PUSH' and `AC_LANG_POP'.])
+SUBSTFOR configure.ac:
+SUBSTFOR configure.ac:AC_LANG_PUSH(C++)
+SUBSTFOR configure.in:AC_LANG_SAVE
+SUBSTFOR configure.in:AC_LANG_CPLUSPLUS
 AC_MSG_CHECKING(arts library)
 dnl AC_CHECK_LIB(artsflow, convert_stereo_ifloat_2float, HAVE_ARTS=yes, HAVE_ARTS=no, -lmcop -lartsflow_idl)
 dnl AC_CHECK_HEADER(arts/artsflow.h, HAVE_ARTS=yes, HAVE_ARTS=no)
-AC_LANG_POP(C++)
+SUBSTFOR configure.ac:AC_LANG_POP(C++)
+SUBSTFOR configure.in:AC_LANG_RESTORE
 
 dnl Check for libraw1394
 AC_MSG_CHECKING(raw1394 library)
@@ -991,8 +998,9 @@ dnl #########################
 dnl # Make the output files #
 dnl #########################
 
-AC_OUTPUT(
-Makefile
+SUBSTFOR configure.ac:AC_OUTPUT(
+SUBSTFOR configure.ac:Makefile
+SUBSTFOR configure.in:AC_OUTPUT([Makefile
 include/Makefile
 include/wine/Makefile
 gst/Makefile
@@ -1137,6 +1145,8 @@ stamp.h
 gstreamer-config
 gstreamer.pc
 gstreamer-uninstalled.pc
-gstreamer.spec,
-chmod +x gstreamer-config
-)
+SUBSTFOR configure.in:gstreamer.spec])
+SUBSTFOR configure.in:AC_OUTPUT_COMMANDS([chmod +x gstreamer-config])
+SUBSTFOR configure.ac:gstreamer.spec,
+SUBSTFOR configure.ac:chmod +x gstreamer-config
+SUBSTFOR configure.ac:)