From 4498dccbec3a6637783b9146333176ba91985196 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 26 Jun 2001 22:15:20 +0000 Subject: [PATCH] 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. --- configure.base | 4 ++-- gst/Makefile.am | 2 +- tools/Makefile.am | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configure.base b/configure.base index 5e4500fca8..cefa9de1c4 100644 --- a/configure.base +++ b/configure.base @@ -796,7 +796,7 @@ esac], [USE_PROFILING=no]) dnl Default value dnl Default value -GST_CONFIG_DIR="${sysconfdir}/gstreamer" +GST_CONFIG_DIR=${sysconfdir}/gstreamer AC_ARG_WITH(configdir, [ --with-configdir specify path to use for configdir], [case "${withval}" in @@ -1041,7 +1041,7 @@ dnl # Set up some more defines # dnl ############################ 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) dnl Set location of windows dll dir. diff --git a/gst/Makefile.am b/gst/Makefile.am index 3a04ef037e..6e42ccd25a 100644 --- a/gst/Makefile.am +++ b/gst/Makefile.am @@ -181,7 +181,7 @@ noinst_HEADERS = \ gstsparc.h \ gstpropsprivate.h -CFLAGS = $(LIBGST_CFLAGS) -D_GNU_SOURCE +CFLAGS = $(LIBGST_CFLAGS) -D_GNU_SOURCE -DGST_CONFIG_DIR=\""@sysconfdir@/gstreamer"\" LIBS = $(LIBGST_LIBS) libgst_la_LDFLAGS = -version-info $(GST_LIBVERSION) diff --git a/tools/Makefile.am b/tools/Makefile.am index d3cc4c210c..45351f2a8c 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -5,5 +5,6 @@ man_MANS = gstreamer-launch.1 gstreamer-register.1 gstreamer-inspect.1 \ gstreamer-complete.1 gstreamer-compprep.1 LDADD = $(GST_LIBS) +CFLAGS = $(LIBGST_CFLAGS) -DGST_CONFIG_DIR=\""@sysconfdir@/gstreamer"\" EXTRA_DIST = $(man_MANS)