Fix a couple of formatting errors in idiottest, and add plugin-srcdir warning to...

Original commit message from CVS:
Fix a couple of formatting errors in idiottest, and add plugin-srcdir
warning to configure.base.

diff --git a/configure.base b/configure.base
index 2e16d2c..fef760f 100644 (file)
--- a/configure.base
+++ b/configure.base
@@ -1006,6 +1006,24 @@ dnl #############################
 dnl AC_CONFIG_SUBDIRS(gist)
 dnl AC_CONFIG_SUBDIRS(plugins/mp3decode/xing/libxing)
 
+dnl ##################################################
+dnl # Prepare informative messages to display at end #
+dnl ##################################################
+
+infomessages=
+
+if test "x$PLUGINS_USE_SRCDIR" = xyes; then
+  infomessages="$infomessages
+*** Warning: You have configured using the --enable-plugin-srcdir option.
+
+This option is for development purposes only: binaries built with
+it should be used with code in the build tree only.  To build an
+installable version, use ./configure without the --enable-plugin-srcdir
+option.  Note that the autogen.sh script supplies the plugin srcdir
+option automatically - it cannot be used to configure installable builds.
+
+"
+fi
 
 dnl #########################
 dnl # Make the output files #
@@ -1159,7 +1177,9 @@ gstreamer-config
 gstreamer.pc
 gstreamer-uninstalled.pc
 SUBSTFOR configure.in:gstreamer.spec])
-SUBSTFOR configure.in:AC_OUTPUT_COMMANDS([chmod +x gstreamer-config])
+SUBSTFOR configure.in:AC_OUTPUT_COMMANDS([chmod +x gstreamer-config;
+SUBSTFOR configure.in:echo "$infomessages"])
 SUBSTFOR configure.ac:gstreamer.spec,
 SUBSTFOR configure.ac:chmod +x gstreamer-config
+SUBSTFOR configure.ac:echo "$infomessages"
 SUBSTFOR configure.ac:)

diff --git a/idiottest.mak b/idiottest.mak
index 444a5f3..1d86733 100644 (file)
--- a/idiottest.mak
+++ b/idiottest.mak
@@ -1,14 +1,14 @@
 # Idiot test to stop the installing of versions with plugin srcdir enabled
 install-exec-local:
 if PLUGINS_USE_SRCDIR
-       @echo "*** ERROR: Cannot install:" 2>&1
-       @echo "GStreamer was configured using the --enable-plugin-srcdir option." 2>&1
+       @echo "*** ERROR: Cannot install:"
+       @echo "GStreamer was configured using the --enable-plugin-srcdir option."
        @echo
-       @echo "This option is for development purposes only: binaries built with" 2>&1
+       @echo "This option is for development purposes only: binaries built with"
        @echo "it should be used with code in the build tree only.  To build an"
        @echo "installable version, use ./configure without the --enable-plugin-srcdir"
        @echo "option.  Note that the autogen.sh script supplies the plugin srcdir"
-       @echo "option automatically - it cannot be used to configure installable builds"
+       @echo "option automatically - it cannot be used to configure installable builds."
        @echo
        @/bin/false
 endif