From e792de8a73c7de5e1d02305a8245b2c8da1ccc9f Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Tue, 3 Jan 2006 17:25:29 +0000 Subject: [PATCH] remove unused --enable-gconf-source option - it sets the 2006-01-03 Mark McLoughlin * configure.in: remove unused --enable-gconf-source option - it sets the GCONF_CONFIG_SOURCE variable which isn't used and AM_GCONF_SOURCE_2 does the job it's trying to do --- ChangeLog | 7 +++++++ configure.in | 14 -------------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 145bc6e1b..112b23388 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-01-03 Mark McLoughlin + + * configure.in: remove unused --enable-gconf-source + option - it sets the GCONF_CONFIG_SOURCE variable + which isn't used and AM_GCONF_SOURCE_2 does the job + it's trying to do + 2006-01-03 Jens Granseuer Fixes #321779 diff --git a/configure.in b/configure.in index a1ef71986..693d2060a 100644 --- a/configure.in +++ b/configure.in @@ -523,20 +523,6 @@ dnl ============================================== dnl End: Define the main variables dnl ============================================== -GCONF_CONFIG_SOURCE= -AC_ARG_ENABLE(gconf-source, - AC_HELP_STRING([--enable-gconf-source=sourceaddress], - [Where to install schema files.]), - GCONF_CONFIG_SOURCE=$enable_gconf_source,) - -if test "x$GCONF_CONFIG_SOURCE" = "x"; then - GCONF_CONFIG_SOURCE="xml::\${DESTDIR}\${sysconfdir}/gconf/gconf.xml.defaults" -fi - -AC_SUBST(GCONF_CONFIG_SOURCE) -AC_SUBST(INSTALL_GCONF_CONFIG_SOURCE) - - ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`" AC_SUBST(ORBIT_IDL)