diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2009-03-06 10:30:28 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2009-03-06 10:31:07 +0000 |
| commit | aecf35b00b430780e3836b416115efadd0a8f9e8 (patch) | |
| tree | 0e79874f04c0b0aed37042ad81122d90e8a14364 | |
| parent | 112aac3bdec618d1a071a89829e8e0a481d60cf7 (diff) | |
win32: fix configure logic for GST_INSTALL_PLUGINS_HELPER define
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | win32/common/config.h | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 2546d4d49..af482a65c 100644 --- a/configure.ac +++ b/configure.ac @@ -808,7 +808,8 @@ m4/Makefile dnl Create the config.h file for Visual Studio builds dnl Beware of spaces and /'s in some of the shell variable contents. sed \ - -e 's/.*config.h.in.*autoheader.*/\/* Autogenerated config.h created for win32 Visual Studio builds *\/\n\n\/* PREFIX -- specifically added for Windows for easier moving *\/\n#define PREFIX "C:\\\\gstreamer"\n\n#define GST_INSTALL_PLUGINS_HELPER PREFIX "\\\\libexec\\\\gst-install-plugins-helper.exe"/' \ + -e 's/.*config.h.in.*autoheader.*/\/* Autogenerated config.h created for win32 Visual Studio builds *\/\n\n\/* PREFIX -- specifically added for Windows for easier moving *\/\n#define PREFIX "C:\\\\gstreamer"/' \ + -e 's/.* GST_INSTALL_PLUGINS_HELPER/#define GST_INSTALL_PLUGINS_HELPER PREFIX "\\\\libexec\\\\gst-install-plugins-helper.exe"/' \ -e 's/.* GETTEXT_PACKAGE$/#define GETTEXT_PACKAGE "'$GETTEXT_PACKAGE'"/' \ -e 's/.* GST_DATADIR$/#define GST_DATADIR PREFIX "\\\\share"/' \ -e 's/.* GST_LEVEL_DEFAULT$/#define GST_LEVEL_DEFAULT GST_LEVEL_ERROR/' \ diff --git a/win32/common/config.h b/win32/common/config.h index 9c68bba15..1311f0dbf 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -3,8 +3,6 @@ /* PREFIX -- specifically added for Windows for easier moving */ #define PREFIX "C:\\gstreamer" -#define GST_INSTALL_PLUGINS_HELPER PREFIX "\\libexec\\gst-install-plugins-helper.exe" - /* The implementation that should be used for integer audio resampling witll be benchmarked at runtime */ #undef AUDIORESAMPLE_FORMAT_AUTO @@ -56,7 +54,7 @@ #undef GST_GCOV_ENABLED /* plugin install helper script */ -#undef GST_INSTALL_PLUGINS_HELPER +#define GST_INSTALL_PLUGINS_HELPER PREFIX "\\libexec\\gst-install-plugins-helper.exe" /* Default errorlevel to use */ #define GST_LEVEL_DEFAULT GST_LEVEL_ERROR |