summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2009-05-22 20:50:02 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2009-05-22 20:50:02 +0000
commitd4857daaabc2b315db05ed1ca267f7186871aaa7 (patch)
treedc19574cc74fed540e12eede6ddd6c68fc64aeeb /app-cdr/cdrdao/files
parentRe-instate. Needed by mono-tools-1.2.1. Kudos to Mr. Bones for noticing. (diff)
downloadgentoo-2-d4857daaabc2b315db05ed1ca267f7186871aaa7.tar.gz
gentoo-2-d4857daaabc2b315db05ed1ca267f7186871aaa7.tar.bz2
gentoo-2-d4857daaabc2b315db05ed1ca267f7186871aaa7.zip
Fix bug 270807 by Duncan <1i5t5.duncan@cox.net>. autoreconf needs the gconf-2 macro file even with USE=-gcdmaster. Patched into acinclude.m4.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'app-cdr/cdrdao/files')
-rw-r--r--app-cdr/cdrdao/files/cdrdao-1.2.3-autoconf-update.patch52
1 files changed, 52 insertions, 0 deletions
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.3-autoconf-update.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-autoconf-update.patch
new file mode 100644
index 000000000000..4eb1ade7e71e
--- /dev/null
+++ b/app-cdr/cdrdao/files/cdrdao-1.2.3-autoconf-update.patch
@@ -0,0 +1,52 @@
+--- cdrdao-1.2.3rc2/acinclude.m4.orig 2009-02-21 11:30:02.000000000 +0100
++++ cdrdao-1.2.3rc2/acinclude.m4 2009-05-22 22:38:15.448770972 +0200
+@@ -1,5 +1,49 @@
++dnl AM_GCONF_SOURCE_2
++dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
++dnl (i.e. pass to gconftool-2
++dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
++dnl you should install foo.schemas files
++dnl
++
++AC_DEFUN([AM_GCONF_SOURCE_2],
++[
++ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
++ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
++ else
++ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
++ fi
++
++ AC_ARG_WITH([gconf-source],
++ AC_HELP_STRING([--with-gconf-source=sourceaddress],
++ [Config database for installing schema files.]),
++ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
++
++ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
++ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
++
++ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
++ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
++ fi
++
++ AC_ARG_WITH([gconf-schema-file-dir],
++ AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
++ [Directory for installing schema files.]),
++ [GCONF_SCHEMA_FILE_DIR="$withval"],)
++
++ AC_SUBST(GCONF_SCHEMA_FILE_DIR)
++ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
++
++ AC_ARG_ENABLE(schemas-install,
++ AC_HELP_STRING([--disable-schemas-install],
++ [Disable the schemas installation]),
++ [case ${enableval} in
++ yes|no) ;;
++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
++ esac])
++ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
++])
+ # Configure paths for GTK--
+ # Erik Andersen 30 May 1998
+ # Modified by Tero Pulkkinen (added the compiler checks... I hope they work..)
+
+ dnl Check and configure include and link paths for lame library