cdrdao/trunk/cdrdao-1.2.3-autoconf-update.patch

   1 --- cdrdao-1.2.3rc2/acinclude.m4.orig   2009-02-21 11:30:02.000000000 +0100
   2 +++ cdrdao-1.2.3rc2/acinclude.m4        2009-05-22 22:38:15.448770972 +0200
   3 @@ -1,5 +1,49 @@
   4 +dnl AM_GCONF_SOURCE_2
   5 +dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
   6 +dnl  (i.e. pass to gconftool-2
   7 +dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
   8 +dnl  you should install foo.schemas files
   9 +dnl
  10 +
  11 +AC_DEFUN([AM_GCONF_SOURCE_2],
  12 +[
  13 +  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
  14 +    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
  15 +  else
  16 +    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
  17 +  fi
  18 +
  19 +  AC_ARG_WITH([gconf-source],
  20 +             AC_HELP_STRING([--with-gconf-source=sourceaddress],
  21 +                            [Config database for installing schema files.]),
  22 +             [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
  23 +
  24 +  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
  25 +  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
  26 +
  27 +  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
  28 +    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
  29 +  fi
  30 +
  31 +  AC_ARG_WITH([gconf-schema-file-dir],
  32 +             AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
  33 +                            [Directory for installing schema files.]),
  34 +             [GCONF_SCHEMA_FILE_DIR="$withval"],)
  35 +
  36 +  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
  37 +  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
  38 +
  39 +  AC_ARG_ENABLE(schemas-install,
  40 +       AC_HELP_STRING([--disable-schemas-install],
  41 +                      [Disable the schemas installation]),
  42 +     [case ${enableval} in
  43 +       yes|no) ;;
  44 +       *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
  45 +      esac])
  46 +  AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
  47 +])
  48  # Configure paths for GTK--
  49  # Erik Andersen        30 May 1998
  50  # Modified by Tero Pulkkinen (added the compiler checks... I hope they work..)
  51
  52  dnl Check and configure include and link paths for lame library