mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-04-23 09:04:15 +00:00
Fix a couple of formatting errors in idiottest, and add plugin-srcdir warning to configure.base.
Original commit message from CVS: Fix a couple of formatting errors in idiottest, and add plugin-srcdir warning to configure.base.
This commit is contained in:
parent
c3086c42aa
commit
7dfeffc2a5
2 changed files with 25 additions and 5 deletions
|
@ -1006,6 +1006,24 @@ dnl #############################
|
||||||
dnl AC_CONFIG_SUBDIRS(gist)
|
dnl AC_CONFIG_SUBDIRS(gist)
|
||||||
dnl AC_CONFIG_SUBDIRS(plugins/mp3decode/xing/libxing)
|
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 #########################
|
||||||
dnl # Make the output files #
|
dnl # Make the output files #
|
||||||
|
@ -1159,7 +1177,9 @@ gstreamer-config
|
||||||
gstreamer.pc
|
gstreamer.pc
|
||||||
gstreamer-uninstalled.pc
|
gstreamer-uninstalled.pc
|
||||||
SUBSTFOR configure.in:gstreamer.spec])
|
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:gstreamer.spec,
|
||||||
SUBSTFOR configure.ac:chmod +x gstreamer-config
|
SUBSTFOR configure.ac:chmod +x gstreamer-config
|
||||||
|
SUBSTFOR configure.ac:echo "$infomessages"
|
||||||
SUBSTFOR configure.ac:)
|
SUBSTFOR configure.ac:)
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
# Idiot test to stop the installing of versions with plugin srcdir enabled
|
# Idiot test to stop the installing of versions with plugin srcdir enabled
|
||||||
install-exec-local:
|
install-exec-local:
|
||||||
if PLUGINS_USE_SRCDIR
|
if PLUGINS_USE_SRCDIR
|
||||||
@echo "*** ERROR: Cannot install:" 2>&1
|
@echo "*** ERROR: Cannot install:"
|
||||||
@echo "GStreamer was configured using the --enable-plugin-srcdir option." 2>&1
|
@echo "GStreamer was configured using the --enable-plugin-srcdir option."
|
||||||
@echo
|
@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 "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 "installable version, use ./configure without the --enable-plugin-srcdir"
|
||||||
@echo "option. Note that the autogen.sh script supplies the 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
|
@echo
|
||||||
@/bin/false
|
@/bin/false
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in a new issue