From: <tho...@fr...> - 2004-12-09 11:53:29
|
CVS Root: /cvs//gstreamer Module: gst-plugins Changes by: thomasvs Date: Thu Dec 09 2004 03:54:23 PST Log message: 2004-12-09 Thomas Vander Stichele <thomas at apestaart dot org> * configure.ac: move GCONF macro outside conditional for the am conditional. Fixes #160439 Modified files: . : ChangeLog configure.ac Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ChangeLog.diff?r1=1.1370&r2=1.1371 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/configure.ac.diff?r1=1.495&r2=1.496 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs//gstreamer/gst-plugins/ChangeLog,v retrieving revision 1.1370 retrieving revision 1.1371 diff -u -d -r1.1370 -r1.1371 --- ChangeLog 8 Dec 2004 22:43:08 -0000 1.1370 +++ ChangeLog 9 Dec 2004 11:54:10 -0000 1.1371 @@ -1,3 +1,8 @@ +2004-12-09 Thomas Vander Stichele <thomas at apestaart dot org> + + * configure.ac: move GCONF macro outside conditional for the am + conditional. Fixes #160439 2004-12-08 David Schleef <ds...@sc...> * tools/gst-visualise-m.m: Switch to elements that currently Index: configure.ac RCS file: /cvs//gstreamer/gst-plugins/configure.ac,v retrieving revision 1.495 retrieving revision 1.496 diff -u -d -r1.495 -r1.496 --- configure.ac 28 Nov 2004 19:08:44 -0000 1.495 +++ configure.ac 9 Dec 2004 11:54:10 -0000 1.496 @@ -157,6 +157,10 @@ GST_ARCH() dnl check for gconftool-2 +dnl this macro defines an am conditional, so it needs to be run always +AM_GCONF_SOURCE_2 translit(dnm, m, l) AM_CONDITIONAL(USE_GCONFTOOL, true) GST_CHECK_FEATURE(GCONFTOOL, [GConf schemas], , [ AC_PATH_PROG(GCONFTOOL, gconftool-2, no) @@ -164,7 +168,6 @@ AC_MSG_WARN(Not installing GConf schemas) HAVE_GCONFTOOL="no" else - AM_GCONF_SOURCE_2 HAVE_GCONFTOOL="yes" fi AC_SUBST(HAVE_GCONFTOOL) |