control-center-macros.patch

   1 diff -urN control-center-1.4.0.1.org/macros/xml-i18n-tools.m4 control-center-1.4.0.1/macros/xml-i18n-tools.m4
   2 --- control-center-1.4.0.1.org/macros/xml-i18n-tools.m4 Thu Jan  1 01:00:00 1970
   3 +++ control-center-1.4.0.1/macros/xml-i18n-tools.m4     Sun Mar 25 13:28:11 2001
   4 @@ -0,0 +1,113 @@
   5 +## xml-i18n-tools.m4 - Configure xml-i18n-tools for the target system. -*-Shell-script-*-
   6 +## Copyright (C) 2001 Eazel, Inc.
   7 +## Author: Maciej Stachowiak <mjs@eazel.com>
   8 +##
   9 +## This program is free software; you can redistribute it and/or modify
  10 +## it under the terms of the GNU General Public License as published by
  11 +## the Free Software Foundation; either version 2 of the License, or
  12 +## (at your option) any later version.
  13 +##
  14 +## This program is distributed in the hope that it will be useful, but
  15 +## WITHOUT ANY WARRANTY; without even the implied warranty of
  16 +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  17 +## General Public License for more details.
  18 +##
  19 +## You should have received a copy of the GNU General Public License
  20 +## along with this program; if not, write to the Free Software
  21 +## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  22 +##
  23 +## As a special exception to the GNU General Public License, if you
  24 +## distribute this file as part of a program that contains a
  25 +## configuration script generated by Autoconf, you may include it under
  26 +## the same distribution terms that you use for the rest of that program.
  27 +
  28 +# serial 1 AC_PROG_XML_I18N_TOOLS
  29 +AC_DEFUN(AC_PROG_XML_I18N_TOOLS,
  30 +[
  31 +
  32 +dnl This is a hack - we use the expansion of AC_SUBST instead of
  33 +dnl AC_SUBST itself to avoid automake putting
  34 +dnl XML_I18N_MERGE_OAF_RULE = @XML_I18N_MERGE_OAF_RULE@
  35 +dnl in all the Makefile.in's
  36 +XML_I18N_MERGE_OAF_RULE='\%.oaf : \%.oaf.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
  37 +       $(top_builddir)/xml-i18n-merge -o $(top_srcdir)/po $< [$]*.oaf'
  38 +AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
  39 +s%@XML_I18N_MERGE_OAF_RULE@%[$]XML_I18N_MERGE_OAF_RULE%g
  40 +AC_DIVERT_POP()dnl
  41 +
  42 +dnl same deal
  43 +XML_I18N_MERGE_KEYS_RULE='\%.keys : \%.keys.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
  44 +       $(top_builddir)/xml-i18n-merge -k $(top_srcdir)/po $< [$]*.keys'
  45 +AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
  46 +s%@XML_I18N_MERGE_KEYS_RULE@%[$]XML_I18N_MERGE_KEYS_RULE%g
  47 +AC_DIVERT_POP()dnl
  48 +
  49 +dnl same deal
  50 +XML_I18N_MERGE_DESKTOP_RULE='\%.desktop : \%.desktop.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
  51 +       $(top_builddir)/xml-i18n-merge -d $(top_srcdir)/po $< [$]*.desktop'
  52 +AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
  53 +s%@XML_I18N_MERGE_DESKTOP_RULE@%[$]XML_I18N_MERGE_DESKTOP_RULE%g
  54 +AC_DIVERT_POP()dnl
  55 +
  56 +dnl same deal
  57 +XML_I18N_MERGE_DIRECTORY_RULE='\%.directory : \%.directory.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
  58 +       $(top_builddir)/xml-i18n-merge -d $(top_srcdir)/po $< [$]*.directory'
  59 +AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
  60 +s%@XML_I18N_MERGE_DIRECTORY_RULE@%[$]XML_I18N_MERGE_DIRECTORY_RULE%g
  61 +AC_DIVERT_POP()dnl
  62 +
  63 +dnl same deal
  64 +XML_I18N_MERGE_SOUNDLIST_RULE='\%.soundlist : \%.soundlist.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
  65 +       $(top_builddir)/xml-i18n-merge -d $(top_srcdir)/po $< [$]*.soundlist'
  66 +AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
  67 +s%@XML_I18N_MERGE_SOUNDLIST_RULE@%[$]XML_I18N_MERGE_SOUNDLIST_RULE%g
  68 +AC_DIVERT_POP()dnl
  69 +
  70 +dnl same deal
  71 +XML_I18N_MERGE_PONG_RULE='\%.pong : \%.pong.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
  72 +       $(top_builddir)/xml-i18n-merge -x $(top_srcdir)/po $< [$]*.pong'
  73 +AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
  74 +s%@XML_I18N_MERGE_PONG_RULE@%[$]XML_I18N_MERGE_PONG_RULE%g
  75 +AC_DIVERT_POP()dnl
  76 +
  77 +# Always use our own xml-i18n-tools.
  78 +XML_I18N_EXTRACT='$(top_builddir)/xml-i18n-extract'
  79 +AC_SUBST(XML_I18N_EXTRACT)dnl
  80 +
  81 +XML_I18N_MERGE='$(top_builddir)/xml-i18n-merge'
  82 +AC_SUBST(XML_I18N_MERGE)dnl
  83 +
  84 +XML_I18N_UPDATE='$(top_builddir)/xml-i18n-update'
  85 +AC_SUBST(XML_I18N_UPDATE)dnl
  86 +
  87 +AC_PATH_PROG(XML_I18N_TOOLS_PERL, perl)
  88 +if test -z "$XML_I18N_TOOLS_PERL"; then
  89 +   AC_MSG_ERROR([perl not found; required for xml-i18n-tools])
  90 +fi
  91 +if test -z "`$XML_I18N_TOOLS_PERL -v | fgrep '5.' 2> /dev/null`"; then
  92 +   AC_MSG_ERROR([perl 5.x required for xml-i18n-tools])
  93 +fi
  94 +
  95 +dnl  manually sed perl in so people don't have to put the xml-i18n-tools scripts in their
  96 +dnl  AC_OUTPUT
  97 +AC_OUTPUT_COMMANDS([
  98 +sed -e "s:@XML_I18N_TOOLS_PERL@:${XML_I18N_TOOLS_PERL}:;" < ${ac_given_srcdir}/xml-i18n-extract.in > xml-i18n-extract;
  99 +chmod ugo+x xml-i18n-extract;
 100 +chmod u+w xml-i18n-extract;
 101 +
 102 +sed -e "s:@XML_I18N_TOOLS_PERL@:${XML_I18N_TOOLS_PERL}:;" < ${ac_given_srcdir}/xml-i18n-merge.in > xml-i18n-merge;
 103 +chmod ugo+x xml-i18n-merge;
 104 +chmod u+w xml-i18n-merge;
 105 +
 106 +sed -e "s:@XML_I18N_TOOLS_PERL@:${XML_I18N_TOOLS_PERL}:;" < ${ac_given_srcdir}/xml-i18n-update.in > xml-i18n-update;
 107 +chmod ugo+x xml-i18n-update;
 108 +chmod u+w xml-i18n-update;
 109 +], XML_I18N_TOOLS_PERL=${XML_I18N_TOOLS_PERL})
 110 +
 111 +# Redirect the config.log output again, so that the ltconfig log is not
 112 +# clobbered by the next message.
 113 +exec 5>>./config.log
 114 +])
 115 +
 116 +dnl old names
 117 +AC_DEFUN(AM_PROG_XML_I18N_TOOLS, [indir([AC_PROG_XML_I18N_TOOLS])])dnl
 118 diff -urN control-center-1.4.0.1.org/sgmldocs.make control-center-1.4.0.1/sgmldocs.make
 119 --- control-center-1.4.0.1.org/sgmldocs.make    Sun Apr  1 18:49:13 2001
 120 +++ control-center-1.4.0.1/sgmldocs.make        Sun Apr  1 19:51:31 2001
 121 @@ -58,7 +58,7 @@
 122         -cp $(docname)/index.html .
 123
 124  $(docname).sgml: $(sgml_ents)
 125 -        -ourdir=`pwd`;  \
 126 +        ourdir=`pwd`;  \
 127          cd $(srcdir);   \
 128          cp $(sgml_ents) $$ourdir
 129