mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-15 22:01:27 +00:00
Removed the GST_CONFIG_DIR from config.h and made a -D CFLAG for it instead so that we can do full expansion on the s...
Original commit message from CVS: Removed the GST_CONFIG_DIR from config.h and made a -D CFLAG for it instead so that we can do full expansion on the sysconfdir.
This commit is contained in:
parent
7fcf8e668c
commit
4498dccbec
3 changed files with 4 additions and 3 deletions
|
@ -796,7 +796,7 @@ esac],
|
||||||
[USE_PROFILING=no]) dnl Default value
|
[USE_PROFILING=no]) dnl Default value
|
||||||
|
|
||||||
dnl Default value
|
dnl Default value
|
||||||
GST_CONFIG_DIR="${sysconfdir}/gstreamer"
|
GST_CONFIG_DIR=${sysconfdir}/gstreamer
|
||||||
AC_ARG_WITH(configdir,
|
AC_ARG_WITH(configdir,
|
||||||
[ --with-configdir specify path to use for configdir],
|
[ --with-configdir specify path to use for configdir],
|
||||||
[case "${withval}" in
|
[case "${withval}" in
|
||||||
|
@ -1041,7 +1041,7 @@ dnl # Set up some more defines #
|
||||||
dnl ############################
|
dnl ############################
|
||||||
|
|
||||||
dnl Set location of configuration dir.
|
dnl Set location of configuration dir.
|
||||||
AC_DEFINE_UNQUOTED(GST_CONFIG_DIR,"$GST_CONFIG_DIR")
|
dnl AC_DEFINE_UNQUOTED(GST_CONFIG_DIR,"$GST_CONFIG_DIR")
|
||||||
AC_SUBST(GST_CONFIG_DIR)
|
AC_SUBST(GST_CONFIG_DIR)
|
||||||
|
|
||||||
dnl Set location of windows dll dir.
|
dnl Set location of windows dll dir.
|
||||||
|
|
|
@ -181,7 +181,7 @@ noinst_HEADERS = \
|
||||||
gstsparc.h \
|
gstsparc.h \
|
||||||
gstpropsprivate.h
|
gstpropsprivate.h
|
||||||
|
|
||||||
CFLAGS = $(LIBGST_CFLAGS) -D_GNU_SOURCE
|
CFLAGS = $(LIBGST_CFLAGS) -D_GNU_SOURCE -DGST_CONFIG_DIR=\""@sysconfdir@/gstreamer"\"
|
||||||
LIBS = $(LIBGST_LIBS)
|
LIBS = $(LIBGST_LIBS)
|
||||||
libgst_la_LDFLAGS = -version-info $(GST_LIBVERSION)
|
libgst_la_LDFLAGS = -version-info $(GST_LIBVERSION)
|
||||||
|
|
||||||
|
|
|
@ -5,5 +5,6 @@ man_MANS = gstreamer-launch.1 gstreamer-register.1 gstreamer-inspect.1 \
|
||||||
gstreamer-complete.1 gstreamer-compprep.1
|
gstreamer-complete.1 gstreamer-compprep.1
|
||||||
|
|
||||||
LDADD = $(GST_LIBS)
|
LDADD = $(GST_LIBS)
|
||||||
|
CFLAGS = $(LIBGST_CFLAGS) -DGST_CONFIG_DIR=\""@sysconfdir@/gstreamer"\"
|
||||||
|
|
||||||
EXTRA_DIST = $(man_MANS)
|
EXTRA_DIST = $(man_MANS)
|
||||||
|
|
Loading…
Reference in a new issue