--- fontconfig-2.2.2.orig/debian/po/templates.pot +++ fontconfig-2.2.2/debian/po/templates.pot @@ -0,0 +1,66 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-10-09 23:59+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Description +#: ../fontconfig.templates:4 +msgid "Enable sub-pixel text rendering?" +msgstr "" + +#. Description +#: ../fontconfig.templates:4 +msgid "" +"If you have an LCD display, then you will want to enable this option. It " +"allows for higher-quality text rendering. For more information, please see " +"the fontconfig manual in /usr/share/doc/fontconfig/ on your Debian system." +msgstr "" + +#. Description +#: ../fontconfig.templates:13 +msgid "Enable the freetype autohinter module?" +msgstr "" + +#. Description +#: ../fontconfig.templates:13 +msgid "" +"Depending on your display and on which fonts you use, they can look better " +"or worse when using the autohinter module. Enable it if you happen to prefer " +"the look it gives to your fonts." +msgstr "" + +#. Description +#: ../fontconfig.templates:21 +msgid "Enable bitmapped fonts by default?" +msgstr "" + +#. Description +#: ../fontconfig.templates:21 +msgid "" +"By default, only outline fonts are used by applications which support " +"fontconfig. Outline fonts are fonts which scale well to various sizes. In " +"contrast, bitmapped fonts are often lower quality. Enabling this option will " +"affect the systemwide default; this and many other fontconfig options may be " +"enabled or disabled on a per-user basis." +msgstr "" --- fontconfig-2.2.2.orig/debian/po/da.po +++ fontconfig-2.2.2/debian/po/da.po @@ -0,0 +1,71 @@ +# translation of fontconfig debconf template to Danish +# Claus Hindsgaul , 2004. +# Reviewed by Ole Laursen, 2004 +# +# +msgid "" +msgstr "" +"Project-Id-Version: fontconfig_2.2.2-1_da\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-10-09 23:59+0200\n" +"PO-Revision-Date: 2004-03-30 10:51+0200\n" +"Last-Translator: Claus Hindsgaul \n" +"Language-Team: Danish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.3.1\n" + +#. Description +#: ../fontconfig.templates:4 +msgid "Enable sub-pixel text rendering?" +msgstr "Aktivér delpiksel-tekstoptegning?" + +#. Description +#: ../fontconfig.templates:4 +msgid "" +"If you have an LCD display, then you will want to enable this option. It " +"allows for higher-quality text rendering. For more information, please see " +"the fontconfig manual in /usr/share/doc/fontconfig/ on your Debian system." +msgstr "" +"Hvis du har en LCD-skærm, bør du aktivere denne funktion. Den tillader " +"tekstoptegning i højere kvalitet. Flere oplysninger finder du i fontconfigs " +"brugervejledning i /usr/share/doc/fontconfig/ pÃ¥ dit Debiansystem." + +#. Description +#: ../fontconfig.templates:13 +msgid "Enable the freetype autohinter module?" +msgstr "Aktivér freetype-autohinter-modul?" + +#. Description +#: ../fontconfig.templates:13 +msgid "" +"Depending on your display and on which fonts you use, they can look better " +"or worse when using the autohinter module. Enable it if you happen to prefer " +"the look it gives to your fonts." +msgstr "" +"Afhængig af din skærm og hvilke skrifttyper, du bruger, kan de se bedre " +"eller dÃ¥rligere ud, nÃ¥r du bruger autohinter-modulet. Aktivér det, hvis du " +"foretrækker det udseende, det giver dine skrifttyper." + +#. Description +#: ../fontconfig.templates:21 +msgid "Enable bitmapped fonts by default?" +msgstr "Aktivér billedbaserede skrifttyper som standard?" + +#. Description +#: ../fontconfig.templates:21 +msgid "" +"By default, only outline fonts are used by applications which support " +"fontconfig. Outline fonts are fonts which scale well to various sizes. In " +"contrast, bitmapped fonts are often lower quality. Enabling this option will " +"affect the systemwide default; this and many other fontconfig options may be " +"enabled or disabled on a per-user basis." +msgstr "" +"Som udgangspunkt bruges kun vektor-skrifttyper af programmer, der " +"understøtter fontconfig. Vektor-skrifttyper skalerer godt til " +"forskellige størrelser. Derimod er billedbaserede skrifttyper (\"bitmap " +"fonts\") ofte af dÃ¥rligere kvalitet. Aktivering af denne funktion vil " +"pÃ¥virke hele systemets standardindstilling. Denne og mange andre " +"fontconfig-tilvalg kan aktiveres eller deaktiveres for hver enkelt bruger." + --- fontconfig-2.2.2.orig/debian/po/cs.po +++ fontconfig-2.2.2/debian/po/cs.po @@ -0,0 +1,76 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: fontconfig\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-10-09 23:59+0200\n" +"PO-Revision-Date: 2004-03-04 19:51+0100\n" +"Last-Translator: Miroslav Kure \n" +"Language-Team: Czech \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Description +#: ../fontconfig.templates:4 +msgid "Enable sub-pixel text rendering?" +msgstr "Povolit podpixelové zobrazování textu?" + +#. Description +#: ../fontconfig.templates:4 +msgid "" +"If you have an LCD display, then you will want to enable this option. It " +"allows for higher-quality text rendering. For more information, please see " +"the fontconfig manual in /usr/share/doc/fontconfig/ on your Debian system." +msgstr "" +"Máte-li LCD monitor, pak urèitì budete chtít zapnout tuto volbu, proto¾e " +"zpùsobí kvalitnìj¹í zobrazování textu. Více informací naleznete v pøilo¾ené " +"dokumentaci v adresáøi /usr/share/doc/fontconfig/." + +#. Description +#: ../fontconfig.templates:13 +msgid "Enable the freetype autohinter module?" +msgstr "Povolit freetype modul autohinter?" + +#. Description +#: ../fontconfig.templates:13 +msgid "" +"Depending on your display and on which fonts you use, they can look better " +"or worse when using the autohinter module. Enable it if you happen to prefer " +"the look it gives to your fonts." +msgstr "" +"V závislosti na va¹em monitoru a pou¾itých fontech mohou tyto pøi zapnutí " +"modulu autohinter vypadat lépe nebo hùøe. Musíte vyzkou¹et, které nastavení " +"je pro vás pøíjemnìj¹í." + +#. Description +#: ../fontconfig.templates:21 +msgid "Enable bitmapped fonts by default?" +msgstr "Povolit implicitnì bitmapové fonty?" + +#. Description +#: ../fontconfig.templates:21 +msgid "" +"By default, only outline fonts are used by applications which support " +"fontconfig. Outline fonts are fonts which scale well to various sizes. In " +"contrast, bitmapped fonts are often lower quality. Enabling this option will " +"affect the systemwide default; this and many other fontconfig options may be " +"enabled or disabled on a per-user basis." +msgstr "" +"Standardnì jsou v aplikacích podporujících fontconfig pou¾ívány pouze " +"obrysové fonty. Tyto fonty se velmi dobøe zvìt¹ují a zmen¹ují. Oproti nim " +"mohou zvìt¹ované bitmapové fonty vypadat kostrbatì. Tato volba ovlivní " +"implicitní nastavení celého systému, nicménì u¾ivatelé si ji mohou zmìnit " +"ve svém osobním nastavení." --- fontconfig-2.2.2.orig/debian/po/es.po +++ fontconfig-2.2.2/debian/po/es.po @@ -0,0 +1,92 @@ +# fontconfig debconf translation to spanish +# Copyright (C) 2004 Software in the Public Interest +# This file is distributed under the same license as the fontconfig package. +# +# Changes: +# - Initial translation +# Fco. Javier Sánchez Castelo , 2004 +# - Revision: +# Javier Fernández-Sanguino Peña +# +# Traductores, si no conoce el formato PO, merece la pena leer la +# documentación de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Equipo de traducción al español, por favor lean antes de traducir +# los siguientes documentos: +# +# - El proyecto de traducción de Debian al español +# http://www.debian.org/intl/spanish/coordinacion +# especialmente las notas de traducción en +# http://www.debian.org/intl/spanish/notas +# +# - La guía de traducción de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans + +msgid "" +msgstr "" +"Project-Id-Version: fontconfig 2.2.1-13\n" +"POT-Creation-Date: 2004-02-01 13:16+100\n" +"PO-Revision-Date: 2004-02-10 10:32+100\n" +"Last-Translator: Fco. Javier Sánchez Castelo\n" +"Language-Team: Debian Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Description +#: ../fontconfig.templates:4 +msgid "Enable sub-pixel text rendering?" +msgstr "¿Activar el renderizado de sub-pixel de texto?" + +#. Description +#: ../fontconfig.templates:4 +msgid "" +"If you have an LCD display, then you will want to enable this option. It " +"allows for higher-quality text rendering. For more information, please see " +"the fontconfig manual in /usr/share/doc/fontconfig/ on your Debian system." +msgstr "" +"Si tiene un monitor LCD, entonces seguramente querrá activar esta opción. Esta " +"permite renderizar el texto con mejor calidad. Para más " +"información, por favor vea el manual de fontconfig en " +"«/usr/share/doc/fontconfig/» en su sistema Debian." + +#. Description +#: ../fontconfig.templates:13 +msgid "Enable the freetype autohinter module?" +msgstr "¿Activar el módulo «freetype autohinter»?" + +#. Description +#: ../fontconfig.templates:13 +msgid "" +"Depending on your display and on which fonts you use, they can look better " +"or worse when using the autohinter module. Enable it if you happen to prefer " +"the look it gives to your fonts." +msgstr "" +"Dependiendo de su monitor y del tipo de letra que utilice, podrá visualizarla " +"mejor o peor cuando use el módulo «autohinter». Actívelo " +"si prefiere el aspecto que le da a sus tipos de letra." + +#. Description +#: ../fontconfig.templates:21 +msgid "Enable bitmapped fonts by default?" +msgstr "¿Activar el tipo de letra «bitmapped» por omisión?" + +#. Description +#: ../fontconfig.templates:21 +msgid "" +"By default, only outline fonts are used by applications which support " +"fontconfig. Outline fonts are fonts which scale well to various sizes. In " +"contrast, bitmapped fonts are often lower quality. Enabling this option will " +"affect the systemwide default; this and many other fontconfig options may be " +"enabled or disabled on a per-user basis." +msgstr "" +"Por omisión, sólo las aplicaciones que admiten fontconfig usan " +"tipos de letra «outline». Estos tipos de letra escalan bastante bien " +"en distintos tamaños. Sin embargo, el tipo de letra bitmapped es habitualmente " +"de peor calidad. Activar esta opción afectará al valor por omisión " +"de todo el sistema; los usuarios podrán, de forma individual, activar " +"ésta y muchas otras opciones de fontconfig." --- fontconfig-2.2.2.orig/debian/po/fr.po +++ fontconfig-2.2.2/debian/po/fr.po @@ -0,0 +1,90 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: fontconfig 2.2.1-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-10-09 23:59+0200\n" +"PO-Revision-Date: 2003-10-30 13:47+0100\n" +"Last-Translator: Philippe Batailler \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Description +#: ../fontconfig.templates:4 +msgid "Enable sub-pixel text rendering?" +msgstr "Voulez-vous utiliser la méthode des sous-pixels ?" + +#. Description +#: ../fontconfig.templates:4 +msgid "" +"If you have an LCD display, then you will want to enable this option. It " +"allows for higher-quality text rendering. For more information, please see " +"the fontconfig manual in /usr/share/doc/fontconfig/ on your Debian system." +msgstr "" +"Si vous utilisez un écran LCD, cette option est pour vous. Elle donne une " +"plus grande qualité au rendu des textes. Pour davantage d'informations, " +"veuillez consulter le manuel de fontconfig dans /usr/share/doc/fontconfig/." + +#. Description +#: ../fontconfig.templates:13 +msgid "Enable the freetype autohinter module?" +msgstr "Voulez-vous utiliser le module autohinter ?" + +#. Description +#: ../fontconfig.templates:13 +msgid "" +"Depending on your display and on which fonts you use, they can look better " +"or worse when using the autohinter module. Enable it if you happen to prefer " +"the look it gives to your fonts." +msgstr "" +"Le module autohinter peut, ou non, améliorer l'affichage des polices que " +"vous utilisez. Utilisez-le si vous pensez qu'il améliore l'apparence de vos " +"polices." + +#. Description +#: ../fontconfig.templates:21 +msgid "Enable bitmapped fonts by default?" +msgstr "Voulez-vous des polices de type « bitmap » par défaut ?" + +#. Description +#: ../fontconfig.templates:21 +msgid "" +"By default, only outline fonts are used by applications which support " +"fontconfig. Outline fonts are fonts which scale well to various sizes. In " +"contrast, bitmapped fonts are often lower quality. Enabling this option will " +"affect the systemwide default; this and many other fontconfig options may be " +"enabled or disabled on a per-user basis." +msgstr "" +"Par défaut, seules les polices de type contour (« outline ») sont utilisées " +"par les applications qui utilisent fontconfig. Ces polices gardent toutes " +"leurs qualités dans les différentes tailles. Les polices de type « bitmap », " +"au contraire, ont souvent une qualité moindre. Cette option affectera la " +"valeur par défaut pour tout le système ; chaque utilisateur peut activer ou " +"désactiver cette option ainsi que d'autres options de fontconfig." + +#~ msgid "Overwrite existing /etc/fonts/local.conf?" +#~ msgstr "Faut-il modifier le fichier /etc/fonts/local.conf ?" + +#~ msgid "" +#~ "You appear to have an already existing /etc/fonts/local.conf. Choosing to " +#~ "continue at this point will overwrite any changes you have made in this " +#~ "file. The curent version will be backed up to /etc/fonts/local.conf.old." +#~ msgstr "" +#~ "Un fichier /etc/fonts/local.conf existe déjà. Si vous continuez " +#~ "l'installation, les modifications que vous avez apportées à ce fichier " +#~ "seront effacées. La version actuelle sera sauvegardée dans /etc/fonts/" +#~ "local.conf.old." --- fontconfig-2.2.2.orig/debian/po/ja.po +++ fontconfig-2.2.2/debian/po/ja.po @@ -0,0 +1,74 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-10-09 23:59+0200\n" +"PO-Revision-Date: 2003-10-24 23:18+0900\n" +"Last-Translator: Kenshi Muto \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=EUC-JP\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Description +#: ../fontconfig.templates:4 +msgid "Enable sub-pixel text rendering?" +msgstr "¥µ¥Ö¥Ô¥¯¥»¥ë¥Æ¥­¥¹¥È¥ì¥ó¥À¥ê¥ó¥°¤òÍ­¸ú¤Ë¤·¤Þ¤¹¤«?" + +#. Description +#: ../fontconfig.templates:4 +msgid "" +"If you have an LCD display, then you will want to enable this option. It " +"allows for higher-quality text rendering. For more information, please see " +"the fontconfig manual in /usr/share/doc/fontconfig/ on your Debian system." +msgstr "" +"LCD ¥Ç¥£¥¹¥×¥ì¥¤¤ò»È¤Ã¤Æ¤¤¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢¤³¤ÎÁªÂò»è¤òÍ­¸ú¤Ë¤¹¤ë¤Î¤¬¤è¤¤¤Ç¤·¤ç" +"¤¦¡£¹âÉʼÁ¤Î¥Æ¥­¥¹¥È¥ì¥ó¥À¥ê¥ó¥°¤¬¤Ç¤­¤Þ¤¹¡£¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¤¢¤Ê¤¿¤Î Debian ¥·" +"¥¹¥Æ¥à¤Î /usr/share/doc/fontconfig/ ¤Ë¤¢¤ë fontconfig ¤Î¥Þ¥Ë¥å¥¢¥ë¤ò»²¾È¤·¤Æ" +"¤¯¤À¤µ¤¤¡£" + +#. Description +#: ../fontconfig.templates:13 +msgid "Enable the freetype autohinter module?" +msgstr "freetype ¥ª¡¼¥È¥Ò¥ó¥È¥â¥¸¥å¡¼¥ë¤òÍ­¸ú¤Ë¤·¤Þ¤¹¤«?" + +#. Description +#: ../fontconfig.templates:13 +msgid "" +"Depending on your display and on which fonts you use, they can look better " +"or worse when using the autohinter module. Enable it if you happen to prefer " +"the look it gives to your fonts." +msgstr "¥ª¡¼¥È¥Ò¥ó¥È¥â¥¸¥å¡¼¥ë¤ò»È¤Ã¤¿¤È¤­¤Ë¤è¤êÎɤ¯¸«¤¨¤ë¤è¤¦¤Ë¤Ê¤ë¤«¤è¤ê°­¤¯¤Ê¤ë¤«¤Ï¡¢¤¢¤Ê¤¿¤Î¥Ç¥£¥¹¥×¥ì¥¤¤ÈÍøÍѤ¹¤ë¥Õ¥©¥ó¥È¤Ë°Í¸¤·¤Þ¤¹¡£¥Õ¥©¥ó¥È¤¬¤è¤êÎɤ¯¸«¤¨¤ë¤è¤¦¤Ç¤¢¤ì¤ÐÍ­¸ú¤Ë¤·¤Þ¤¹¡£" + +#. Description +#: ../fontconfig.templates:21 +msgid "Enable bitmapped fonts by default?" +msgstr "¥Ç¥Õ¥©¥ë¥È¤Ç¥Ó¥Ã¥È¥Þ¥Ã¥×¥Õ¥©¥ó¥È¤òÍ­¸ú¤Ë¤·¤Þ¤¹¤«?" + +#. Description +#: ../fontconfig.templates:21 +msgid "" +"By default, only outline fonts are used by applications which support " +"fontconfig. Outline fonts are fonts which scale well to various sizes. In " +"contrast, bitmapped fonts are often lower quality. Enabling this option will " +"affect the systemwide default; this and many other fontconfig options may be " +"enabled or disabled on a per-user basis." +msgstr "" +"¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢¥¢¥¦¥È¥é¥¤¥ó¥Õ¥©¥ó¥È¤Î¤ß¤¬ fontconfig ¤ò¥µ¥Ý¡¼¥È¤¹¤ë¥¢¥×¥ê" +"¥±¡¼¥·¥ç¥ó¤Ç»È¤ï¤ì¤Þ¤¹¡£¥¢¥¦¥È¥é¥¤¥ó¥Õ¥©¥ó¥È¤Ï¤µ¤Þ¤¶¤Þ¤Ê¥µ¥¤¥º¤Ë¹ç¤ï¤»¤ÆÂ礭" +"¤µ¤ÎÊѤï¤ë¥Õ¥©¥ó¥È¤Ç¤¹¡£ÂоÈŪ¤Ë¥Ó¥Ã¥È¥Þ¥Ã¥×¥Õ¥©¥ó¥È¤Ï¤¿¤¤¤Æ¤¤ÄãÉʼÁ¤Ç¤¹¡£¤³" +"¤ÎÁªÂò»è¤òÍ­¸ú¤Ë¤¹¤ë¤È¡¢¥·¥¹¥Æ¥àÁ´ÂΤΥǥե©¥ë¥È¤ËÇȵڤ·¤Þ¤¹¡£¤³¤ì¤È¤Û¤«¤Î¿" +"¤¯¤Î fontconfig ¤ÎÁªÂò»è¤Ï´ðËÜŪ¤Ë¥æ¡¼¥¶¤´¤È¤ËÍ­¸ú¡¢Ìµ¸ú¤Ë¤Ç¤­¤Þ¤¹¡£" --- fontconfig-2.2.2.orig/debian/po/nl.po +++ fontconfig-2.2.2/debian/po/nl.po @@ -0,0 +1,67 @@ +# translation of fontconfig_2.2.1-16_nl.po to Dutch +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# Frans Pop , 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: fontconfig_2.2.1-16_nl\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-10-09 23:59+0200\n" +"PO-Revision-Date: 2004-03-12 13:47+0100\n" +"Last-Translator: Frans Pop \n" +"Language-Team: Dutch \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.3\n" + +#. Description +#: ../fontconfig.templates:4 +msgid "Enable sub-pixel text rendering?" +msgstr "Sub-pixel tekstweergave activeren?" + +#. Description +#: ../fontconfig.templates:4 +msgid "" +"If you have an LCD display, then you will want to enable this option. It " +"allows for higher-quality text rendering. For more information, please see " +"the fontconfig manual in /usr/share/doc/fontconfig/ on your Debian system." +msgstr "Als u een LCD scherm heeft, dan zult u deze optie willen activeren. Het staat een hogere kwaliteit van tekstweergave toe. Voor meer informatie kunt u de fontconfig handleiding in /usr/share/doc/fontconfig/ op uw Debian systeem raadplegen." + +#. Description +#: ../fontconfig.templates:13 +msgid "Enable the freetype autohinter module?" +msgstr "De autohinter module van freetype activeren?" + +#. Description +#: ../fontconfig.templates:13 +msgid "" +"Depending on your display and on which fonts you use, they can look better " +"or worse when using the autohinter module. Enable it if you happen to prefer " +"the look it gives to your fonts." +msgstr "Afhankelijk van uw beeldscherm en welke lettertypen u gebruikt, kunnen deze er beter of slechter uitzien als u de autohinter module gebruikt. Activeer de module als u de voorkeur geeft aan de weergave van uw lettertypen met deze module." + +#. Description +#: ../fontconfig.templates:21 +msgid "Enable bitmapped fonts by default?" +msgstr "Bitmap-lettertypen standaard activeren?" + +#. Description +#: ../fontconfig.templates:21 +msgid "" +"By default, only outline fonts are used by applications which support " +"fontconfig. Outline fonts are fonts which scale well to various sizes. In " +"contrast, bitmapped fonts are often lower quality. Enabling this option will " +"affect the systemwide default; this and many other fontconfig options may be " +"enabled or disabled on a per-user basis." +msgstr "Standaard worden alleen 'outline' lettertypen gebruikt door applicaties die fontconfig ondersteunen. 'Outline' lettertypen zijn lettertypen die goed geschaald kunnen worden naar verschillende lettergroottes. Daarentegen zijn 'bitmapped' lettertypen vaak van een lagere kwaliteit; deze, en vele andere, opties van fontconfig kunnen voor elke gebruiker afzonderlijk ingesteld worden." + --- fontconfig-2.2.2.orig/debian/po/POTFILES.in +++ fontconfig-2.2.2/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] fontconfig.templates --- fontconfig-2.2.2.orig/debian/po/pt_BR.po +++ fontconfig-2.2.2/debian/po/pt_BR.po @@ -0,0 +1,79 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: fontconfig\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-10-09 23:59+0200\n" +"PO-Revision-Date: 2004-02-29 13:04-0300\n" +"Last-Translator: André Luís Lopes \n" +"Language-Team: Debian-BR Project \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Description +#: ../fontconfig.templates:4 +msgid "Enable sub-pixel text rendering?" +msgstr "Habilitar rendereização de texto de sub-pixel ?" + +#. Description +#: ../fontconfig.templates:4 +msgid "" +"If you have an LCD display, then you will want to enable this option. It " +"allows for higher-quality text rendering. For more information, please see " +"the fontconfig manual in /usr/share/doc/fontconfig/ on your Debian system." +msgstr "" +"Caso você possua um monitor LCD você irá desejar habilitar esta opção. " +"A mesma proporciona uma renderização de texto de alta qualidade. Para " +"maiores informações, por favor consulte o manual do fontconfig em " +"/usr/share/doc/fontconfig/ em seu sistema Debian." + +#. Description +#: ../fontconfig.templates:13 +msgid "Enable the freetype autohinter module?" +msgstr "Habilitar o módulo freetype autohinder ?" + +#. Description +#: ../fontconfig.templates:13 +msgid "" +"Depending on your display and on which fonts you use, they can look better " +"or worse when using the autohinter module. Enable it if you happen to prefer " +"the look it gives to your fonts." +msgstr "" +"Dependendo de seu monitor e das fontes que você usa, as mesmas podem " +"ter uma melhor ou pior aparência quando você utiliza o módulo autohinder. " +"Habilite-o caso você prefira a aparência que o mesmo oferece à suas fontes." + +#. Description +#: ../fontconfig.templates:21 +msgid "Enable bitmapped fonts by default?" +msgstr "Habilitar fontes bitmapped por padrão ?" + +#. Description +#: ../fontconfig.templates:21 +msgid "" +"By default, only outline fonts are used by applications which support " +"fontconfig. Outline fonts are fonts which scale well to various sizes. In " +"contrast, bitmapped fonts are often lower quality. Enabling this option will " +"affect the systemwide default; this and many other fontconfig options may be " +"enabled or disabled on a per-user basis." +msgstr "" +"Por padrão, somente fontes desenhadas são usadas por aplicações que " +"suportam o fontconfig. Fontes desenhadas (outline) são fontes que " +"escalam bem em diversos tamanhoz. Em contraste, fontes bitmapped são " +"geralmente de uma qualidade menor. A habilitação desta opção irá afetar " +"o padrão de todo o sistema; essa e muitas outras opções do fontconfig " +"podem ser habilitadas ou desabilitadas para cada usuário." --- fontconfig-2.2.2.orig/debian/control +++ fontconfig-2.2.2/debian/control @@ -0,0 +1,78 @@ +Source: fontconfig +Section: devel +Priority: optional +Maintainer: Josselin Mouette +Build-Depends: cdbs (>= 0.4.5.4), debhelper (>= 4.1.76), libfreetype6-dev (>= 2.1.7), libexpat1-dev, docbook-utils (>= 0.6.13), docbook-to-man, defoma (>= 0.7.0), binutils (>= 2.12.90.0.9) +Standards-Version: 3.6.1 + +Package: fontconfig +Section: utils +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, defoma (>= 0.7.0), ucf (>= 0.29), ttf-bitstream-vera | ttf-freefont | gsfonts-x11 | msttcorefonts, laptop-detect +Conflicts: libfontconfig1-dev (<< 2.2.2-1) +Description: generic font configuration library + Fontconfig is a font configuration and customization library, which + does not depend on the X Window System. It is designed to locate + fonts within the system and select them according to requirements + specified by applications. + . + Fontconfig is not a rasterization library, nor does it impose a + particular rasterization library on the application. The X-specific + library 'Xft' uses fontconfig along with freetype to specify and + rasterize fonts. + . + This package contains a program to maintain the fontconfig cache + (fc-cache), and a sample program to list installed fonts (fc-list). + +Package: fontconfig-udeb +Section: debian-installer +Architecture: any +Depends: libexpat1-udeb, libfreetype6-udeb, zlib1g-udeb +Description: generic font configuration library (shared library) + Fontconfig is a font configuration and customization library, which + does not depend on the X Window System. It is designed to locate + fonts within the system and select them according to requirements + specified by applications. + . + See the "fontconfig" package description for more information. + +Package: libfontconfig1-dev +Section: libdevel +Architecture: any +Depends: libfontconfig1 (= ${Source-Version}), libexpat1-dev, libfreetype6-dev (>= 2.1.7), pkg-config +Provides: libfontconfig-dev +Conflicts: libfontconfig-dev, fontconfig (<< 2.1-5) +Description: generic font configuration library (development headers) + Fontconfig is a font configuration and customization library, which + does not depend on the X Window System. It is designed to locate + fonts within the system and select them according to requirements + specified by applications. + . + See the "fontconfig" package description for more information. + +Package: libfontconfig1 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, fontconfig +Description: generic font configuration library (shared library) + Fontconfig is a font configuration and customization library, which + does not depend on the X Window System. It is designed to locate + fonts within the system and select them according to requirements + specified by applications. + . + See the "fontconfig" package description for more information. + +Package: libfontconfig1-dbg +Section: libdevel +Priority: extra +Architecture: any +Depends: libfontconfig1 (= ${Source-Version}) +Description: generic font configuration library (debugging symbols) + Fontconfig is a font configuration and customization library, which + does not depend on the X Window System. It is designed to locate + fonts within the system and select them according to requirements + specified by applications. + . + This package contains the debugging symbols associated with + libfontconfig1. They will automatically be used by gdb for debugging + fontconfig-related issues. --- fontconfig-2.2.2.orig/debian/rules +++ fontconfig-2.2.2/debian/rules @@ -0,0 +1,42 @@ +#!/usr/bin/make -f +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2002,2003 Colin Walters + +# This ensures the fontconfig package is built after libfontconfig1 +binary/fontconfig:: binary/libfontconfig1 + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/autotools.mk + +DEB_CONFIGURE_EXTRA_FLAGS := --enable-docs --with-add-fonts=/usr/X11R6/lib/X11/fonts/Type1,/usr/local/share/fonts + +# tight versioning +DEB_DH_MAKESHLIBS_ARGS_fontconfig-udeb := --no-act +DEB_DH_MAKESHLIBS_ARGS_libfontconfig1 := -V"libfontconfig1 (>= 2.2.1)" + +DEB_SHLIBDEPS_LIBRARY_fontconfig := libfontconfig1 +DEB_SHLIBDEPS_INCLUDE_fontconfig := debian/libfontconfig1/usr/lib/ + +ifneq ($(DEB_ARCH),alpha) + DEB_DH_STRIP_ARGS := --dbg-package=libfontconfig1 +endif + +clean:: + rm -f config/Makedefs Makefile {src,fontconfig}/Makefile fc-{cache,list}/Makefile fontconfig-config fontconfig.pc config.h debian/*.1 + +build/fontconfig:: debian/fc-cache.1 debian/fc-list.1 + +# work around dh_installman bug +binary-post-install/libfontconfig1-dev:: + if test -f debian/libfontconfig1-dev/usr/share/man/man3/fonts-conf.5; then \ + mkdir -p debian/libfontconfig1-dev/usr/share/man/man5/; \ + mv debian/libfontconfig1-dev/usr/share/man/man3/fonts-conf.5 debian/libfontconfig1-dev/usr/share/man/man5/fonts-conf.5; \ + fi + +%.1: %.sgml + docbook-to-man $< > $@ + +# defoma stuff +binary-post-install/fontconfig:: + dh_installdefoma --- fontconfig-2.2.2.orig/debian/changelog +++ fontconfig-2.2.2/debian/changelog @@ -0,0 +1,619 @@ +fontconfig (2.2.2-2ubuntu3) warty; urgency=low + + * Fix laptop-detect dependency. (Closes: #2122) + + -- Fabio M. Di Nitto Thu, 07 Oct 2004 06:04:17 +0200 + +fontconfig (2.2.2-2ubuntu2) warty; urgency=low + + * Use laptop-detect exit code instead of stdout + + -- Fabio M. Di Nitto Wed, 18 Aug 2004 18:17:13 +0200 + +fontconfig (2.2.2-2ubuntu1) warty; urgency=low + + * Add dependency on laptop-detect. + * Enable sub-pixel anti-aliasing if we are on laptop. + + -- Fabio M. Di Nitto Tue, 17 Aug 2004 16:19:06 +0200 + +fontconfig (2.2.2-2) unstable; urgency=low + + * added debian/patches/00maintainer_mode.patch: introduce + AM_MAINTAINER_MODE to avoid brain damage. + * added debian/patches/autoreconf.patch: this is the result of + libtoolize --force --copy; aclocal; autoheader; automake -acf; + autoconf with libtool 1.5.4 (closes: #218441). + * debian/po/nl.po: added Dutch debconf translation (closes: #237813). + * debian/po/da.po: updated Danish translation (closes: #241123). + + -- Josselin Mouette Wed, 7 Apr 2004 14:28:05 +0200 + +fontconfig (2.2.2-1) unstable; urgency=low + + * New upstream release. + * debian/rules: + + only require libfontconfig1 2.2.1 for dh_makeshlibs. + * debian/control: + + build-depend on binutils 2.12.90.0.9 for dh_strip (closes: #237417). + + build-depend on freetype 2.1.7, ditto for -dev depends. + + fontconfig now conflicts with libfontconfig1-dev << 2.2.2. + * Added debian/po/cs.po (closes: #236275). + * Added debian/po/pt_BR.po (closes: #235465). + * Removed freetype-build.patch. + * fontconfig.install: install fonts-conf.5. + * libfontconfig1-dev.install: only install manpages in section 3. + + -- Josselin Mouette Thu, 11 Mar 2004 14:17:58 +0100 + +fontconfig (2.2.1-16) unstable; urgency=low + + * Use the new debconf interface for ucf: + + fontconfig.postinst: use --debconf-ok option for ucf. + + fontconfig.postinst: remove the hack to get back stdio from debconf. + + control: depend on ucf 0.29. + * Work around objcopy breakage on alpha: + + libfontconfig1-dbg.install.alpha: copy the library to the debug + directory. + + rules: don't use --dbg-package on alpha. + + -- Josselin Mouette Sun, 22 Feb 2004 17:02:47 +0100 + +fontconfig (2.2.1-15) unstable; urgency=low + + * Make the dependencies back to ${misc:Depends} now debhelper was updated. + * Spanish debconf templates (closes: #232211). + * Danish debconf templates (closes: #233071). + + -- Josselin Mouette Fri, 20 Feb 2004 16:27:21 +0100 + +fontconfig (2.2.1-14) unstable; urgency=low + + * Rebuild with up to date cdbs (closes: #230357). + * Build-depend on docbook-utils 0.6.13. + * Make a libfontconfig1-dbg package, requiring debhelper 4.1.76. + * Remove po/ru.po (closes: #223349). + * Depend on debconf | debconf-2.0 (closes: #230520). + + -- Josselin Mouette Tue, 3 Feb 2004 13:16:29 +0100 + +fontconfig (2.2.1-13) unstable; urgency=low + + * patches/freetype-build.patch: include correctly freetype header + files (closes: #222680). + + -- Josselin Mouette Sat, 6 Dec 2003 15:32:30 +0100 + +fontconfig (2.2.1-12) unstable; urgency=low + + * fontconfig.postrm: support the case where /usr/local/share/fonts + doesn't exist (closes: #219992). + + -- Josselin Mouette Tue, 11 Nov 2003 10:42:24 +0100 + +fontconfig (2.2.1-11) unstable; urgency=low + + * fontconfig.postinst: support the case where /usr/local is mounted + read-only (closes: #219684). + + -- Josselin Mouette Sat, 8 Nov 2003 09:44:56 +0100 + +fontconfig (2.2.1-10) unstable; urgency=low + + * shlibs.local: require libfreetype6 2.1.5-3 to avoid the + gsfonts-other bug (closes: #218662). + * fontconfig.{config,postinst}: remove bashism. + * fontconfig.post{inst,rm}: really create /usr/local/share/fonts, + and remove it if non-empty on purge. + * po/ru.po: updated translation (closes: #219265). + * culmus-support.patch: removed, see below. + * fonts-conf-aliases.patch: patch from CVS, still add Culmus support, + now also support ttf-freefont (closes: #218924). + + -- Josselin Mouette Fri, 7 Nov 2003 17:02:37 +0100 + +fontconfig (2.2.1-9) unstable; urgency=low + + * rules: add /usr/local/share/fonts to the list of directories to + search for fonts. + * po/fr.po: update (closes: #218301). + * po/ja.po: update (closes: #217420). + * README.Debian: correct typo. + * patches/culmus-support.patch: support Culmus fonts for Hebrew + systems (closes: #198374). + + -- Josselin Mouette Sun, 2 Nov 2003 18:32:11 +0100 + +fontconfig (2.2.1-8) unstable; urgency=low + + * fontconfig.postinst: revert changes from 2.2.1-7 and just get back + stdin back from debconf before running ucf. Thanks a lot to Samuel + Hocevar for finding out this trick. + + -- Josselin Mouette Mon, 20 Oct 2003 15:36:03 +0200 + +fontconfig (2.2.1-7) unstable; urgency=low + + * fontconfig.postinst: when ucf fails (most likely due to being on + an autobuilder with no /dev/tty), just create local.conf if it is + not here, otherwise do nothing. + + -- Josselin Mouette Mon, 20 Oct 2003 13:45:20 +0200 + +fontconfig (2.2.1-6) unstable; urgency=low + + * Use ucf for local.conf handling (closes: #186730): + + fontconfig.{config,postinst}: remove debconf handling of + local.conf overwriting. + + fontconfig.postrm: new file. + + templates: remove overwrite_existing_local_conf. + + control: fontconfig depends on ucf 0.25. + + local.conf.md5sum: new file, containing all possible md5sums + for local.conf generated with debconf in the previous versions. + * Apply defoma patch from Angus Lees (closes: #206532, #204771): + + fontconfig.defoma: new file. + + control: build-depend and depend on defoma. + + rules: + - Run dh_installdefoma. + - Remove x-ttcidfont-conf stuff. + + README.Debian: document that fontconfig can now use defoma fonts. + + fontconfig.postinst: + - Remove old cache files in /var/lib/defoma/x-ttcidfont-conf.d + subdirectories. + - Include the defoma-generated file in local.conf. + + fontconfig.postrm: remove /var/lib/defoma/fontconfig.d. + * fonts-conf-ordering.patch: patches fonts.conf to include local.conf + before ~/.fonts.conf (closes: #215356). + * control: + + Remove po-debconf dependency, all autobuilders have a working + version now and it never made it to testing. + + Make libfontconfig1-dev depend on libfontconfig1 instead of + fontconfig. + + libfontconfig1-dev depends on libexpat1-dev. + + Make fontconfig require one of the 4 most widely used font + packages, as anyway all packages using fontconfig should + (closes: #189883). Also remove Suggests and Recommends. + * fontconfig.postrm: remove old fonts.cache-1 files in /usr/share/fonts + and /usr/X11R6/lib/X11/fonts on purge. + * No more scripts in fontconfig-udeb (closes: #216132): + + fontconfig-udeb.postinst: removed. + + rules: make dh_makeshlibs not run on fontconfig-udeb. + + -- Josselin Mouette Sun, 19 Oct 2003 11:04:35 +0200 + +fontconfig (2.2.1-5) unstable; urgency=low + + * debian/control: + + Build-depend on po-debconf 0.8.1 (closes: #214973). + + Remove trailing lines, by request of Ralf Nolden. + + -- Josselin Mouette Wed, 15 Oct 2003 21:05:45 +0200 + +fontconfig (2.2.1-4) unstable; urgency=low + + * Russian debconf templates (closes: #214337). + * French debconf templates (closes: #213141). + * Update manpages. + * Patch fc-cache to handle correctly -s (closes: #214091). + * Remove defoma comment in README.Debian. + * Ask whether to enable the autohinter (closes: #188829). + * Add a general documentation about font handling in README.Debian + (closes: #186944). + + -- Josselin Mouette Wed, 8 Oct 2003 22:23:41 +0200 + +fontconfig (2.2.1-3) unstable; urgency=low + + * New maintainer. + * fontconfig.postinst: nitpick output improvement. + * Standards-version is 3.6.1. + * Switch to po-debconf. + * Include japanese debconf templates (closes: #210733). + * Move libfontconfig1-dev to libdevel. + * Provide manpages for fc-list and fc-cache (closes: #191467). + + -- Josselin Mouette Tue, 16 Sep 2003 18:31:18 +0200 + +fontconfig (2.2.1-2) unstable; urgency=low + + * debian/control: + - Build-Depend on the latest cdbs to fix a udeb build error + (Closes: #205062) + + -- Colin Walters Tue, 26 Aug 2003 22:54:24 -0400 + +fontconfig (2.2.1-1) unstable; urgency=low + + * New upstream release. + - Eliminates italic_angle check for PS fonts + (Closes: #196739, #194832). + * debian/rules: + - Work around dh_installman bug and put fonts-conf.5 in section 5 + (Closes: #191026). + + -- Colin Walters Mon, 9 Jun 2003 20:40:57 -0400 + +fontconfig (2.2.0-5) unstable; urgency=low + + * debian/rules: + - Tighten up shlibs versioning again (Closes: #195118). + + -- Colin Walters Wed, 28 May 2003 18:53:21 -0400 + +fontconfig (2.2.0-4) unstable; urgency=low + + * debian/rules: + - Ensure fontconfig is built after libfontconfig1 (Closes: #194960). + + -- Colin Walters Tue, 27 May 2003 18:39:23 -0400 + +fontconfig (2.2.0-3) unstable; urgency=low + + * debian/control: + - Bump Standards-Version: 3.5.10, no changes required. + - Build-Depend on cdbs. + * debian/rules: + - Convert to cdbs. + * debian/rocks: + - Removed. + + -- Colin Walters Sun, 25 May 2003 04:42:10 -0400 + +fontconfig (2.2.0-2) unstable; urgency=low + + * The "Society For Creative Anachronism Seizes Control Of Russia" + release. + * debian/control: + - Recommend ttf-bitstream-vera, since it is the default fallback font + now. Plus it does look pretty nice. (Closes: #190675). + - Suggest: ttf-freefont, my favorite font. + * debian/rules: + - Update to the latest version of Colin's Build System. + + -- Colin Walters Tue, 6 May 2003 02:55:40 -0400 + +fontconfig (2.2.0-1) unstable; urgency=low + + * The "Harsh Light Of Morning Falls On One Night Stand's DVD Collection" + release. + * New upstream release. + + -- Colin Walters Wed, 23 Apr 2003 20:39:54 -0400 + +fontconfig (2.1.94-1) unstable; urgency=low + + * The "I speak better English than this villian Bush" release. + (Courtesy of Mohammed Saeed al-Sahaf). + * New upstream (pre)release. + * README.Debian: + - Remove experimental notice. + * debian/patches/fonts-conf-cleanup.patch: + - Update. + * debian/rules: + - Update to the latest version of Colin's Build System. + + -- Colin Walters Thu, 17 Apr 2003 00:13:37 -0400 + +fontconfig (2.1.93-1) unstable; urgency=low + + * The "Saddam Speech Suspiciously Mentions Nelly Song From Last Summer" + release. + * New upstream (pre)release. + - Actually puts some bytes in fontconfig-user.html (Closes: #185065) + - Handles "same" font binding (Closes: #184353) + - Handles aliases better (Closes: #179416) + - Will handle xfonts-terminus, although it's kinda ugly + (Closes: #176690) + * debian/control: + - Bump Standards-Version to 3.5.9, no changes required. + - Minor description fixes. + * debian/rocks: + - Add --enable-docs to DEB_CONFIGURE_EXTRA_FLAGS. + * debian/patches/fontconfig_pc_in-fix-version-var.patch: + - Deleted; fix was incorporated upstream. + * debian/patches/mono-font-enable.patch: + - Deleted; a better fix was incorporated upstream. + + -- Colin Walters Mon, 7 Apr 2003 22:16:52 -0400 + +fontconfig (2.1.92-5) unstable; urgency=low + + * The "Wingslinger's is definitely a mafia front" release. + * debian/control: + - Add back Depends line for fontconfig-udeb, and put libexpat1-udeb, + libfreetype6-udeb, zlib1g-udeb there. + + -- Colin Walters Sun, 6 Apr 2003 14:07:58 -0400 + +fontconfig (2.1.92-4) unstable; urgency=low + + * debian/control: + - Remove Depends for fontconfig-udeb (Closes: #187833). + * debian/fontconfig-udeb.postinst: + - New file, hacked up from fontconfig.postinst. + * debian/rules: + - Update to the latest version of Colin's Build System. + + -- Colin Walters Sun, 6 Apr 2003 13:18:06 -0400 + +fontconfig (2.1.92-3) unstable; urgency=low + + * debian/control: + - Merge libfontconfig1 and fontconfig packages (Closes: #185466). + - Turn libfontconfig1 and libfontconfig1-dev into dummy packages. + - Generate new fontconfig-udeb package (Closes: #183822). + * debian/patches/mono-font-enable.patch: + - New patch; enables marking fonts as monospaced again (Closes: #185239). + * debian/rocks: + - Remove old cruft like deb-common-build target. + * debian/rules: + - Update to the latest version of Colin's Build System. + + -- Colin Walters Fri, 28 Mar 2003 16:16:38 -0500 + +fontconfig (2.1.92-2) unstable; urgency=low + + * The "I should take up Tae Kwon Do again as a stress reliever" release. + * debian/README.Debian: + - Update with warning about bitmapped fonts. + * debian/fontconfig.templates: + - New question about overwriting existing local.conf. + * debian/fontconfig.config: + - Place into the public domain. + - Support new question about overwriting existing local.conf. + * debian/fontconfig.postinst: + - Place into the public domain. + - Support new question about overwriting existing local.conf. + - Rewrite so that we always write out the bits for bitmapped fonts and + subpixel rendering, but if they're disabled, then comment them out. + This will allow people to easily see the code so they can enable it by + hand. + - Add -v to fc-cache invocation so /var/log/fontconfig.log is a bit + more useful. + + -- Colin Walters Sun, 9 Mar 2003 14:40:43 -0500 + +fontconfig (2.1.92-1) unstable; urgency=low + + * The "I wish upstream actually used ChangeLog" release. + * New upstream (pre)release. + * debian/libfontconfig1-dev.install: + - Install upstream development HTML and text documentation. + - Install upstream development manpages. + * debian/fontconfig.install: + - Install upstream user HTML and text documentation. + - Don't include local.conf in package. D'oh! + * debian/control: + - Minor description improvements. + * debian/fontconfig.config,debian/fontconfig.postinst, + debian/fontconfig.templates: + - New debconf question about enabling bitmapped fonts. + + -- Colin Walters Fri, 7 Mar 2003 17:23:42 -0500 + +fontconfig (2.1.91-2) unstable; urgency=low + + * debian/control: + - Bump Build-Depends (and Depends for libfontconfig1-dev) on + libfreetype6-dev to the latest. This, in combination with this + version of fontconfig, will hopefully fix a lot of outstanding bugs. + - Drop Build-Depends on xlibs-dev and ed. + * debian/rocks: + - Hardcode font path here, and include + /var/lib/defoma/x-ttcidfont-conf.d/dirs in default font path + (Closes: #183342, #176020). + + -- Colin Walters Thu, 6 Mar 2003 22:00:13 -0500 + +fontconfig (2.1.91-1) unstable; urgency=low + + * New upstream (pre)release. + * debian/patches/fontconfig_pc_in-fix-version-var.patch: + - New patch (Closes: #183418). + + -- Colin Walters Wed, 5 Mar 2003 01:02:17 -0500 + +fontconfig (2.1.90-1) unstable; urgency=low + + * New upstream (pre)release. + * debian/patches/CVS-HEAD-subpixel-rendering-fix.patch, + debian/patches/fail-on-submake-failure.patch, + debian/patches/owen-fc-cache-fix.patch: + - Included upstream now; deleted. + * debian/patches/fonts-conf-cleanup.patch: + - New patch. Removes the date from fonts.conf, and helps move + subpixel rendering bits into local.conf. + * debian/control: + - [libfontconfig1-dev] Add Depends on pkg-config. + - Add Build-Depends on docbook-utils. + * debian/rocks: + - Remove manpage stuff. + * debian/fontconfig.templates, debian/fontconfig.config, + debian/fontconfig.postinst: + - Debconfiscation. Now prompts for subpixel rendering bits + (Closes: #182748). + * debian/rules: + - Update to the latest version of Colin's Build System. + + -- Colin Walters Sun, 2 Mar 2003 13:29:35 -0500 + +fontconfig (2.1-15) unstable; urgency=low + + * debian/control: + - Build-Depend on xlibs-dev (>= 4.2.0). + * debian/patches/owen-fc-cache-fix.patch: + - New patch, pulled from the GARNOME CVS; edited slightly. + This should fix those crashes in FcConfigAdd (Closes: #178780). + * debian/rules: + - Update to the latest version of Colin's Build System. + + -- Colin Walters Fri, 17 Jan 2003 13:20:09 -0500 + +fontconfig (2.1-14) unstable; urgency=low + + * debian/patches/CVS-HEAD-subpixel-rendering-fix.patch: + - New patch, should fix crashes when subpixel rendering is + turned on (Closes: #175903). Big thanks to + Michael Guntsche for extracting the relevant fix + from CVS! + + -- Colin Walters Fri, 10 Jan 2003 13:30:28 -0500 + +fontconfig (2.1-13) unstable; urgency=low + + * debian/rocks: + - Tighten up shlibs for libfontconfig1. + + -- Colin Walters Wed, 8 Jan 2003 22:34:53 -0500 + +fontconfig (2.1-12) unstable; urgency=low + + * debian/fontconfig.postinst: + - Redirect fc-cache error messages to /var/log/fontconfig.log, and + refer the user to this upon failure (Closes: #174507). + + -- Colin Walters Fri, 3 Jan 2003 15:04:05 -0500 + +fontconfig (2.1-11) unstable; urgency=low + + * debian/control: + - Remove Build-Depends on zlib1g; instead Build-Depend on the very + latest libfreetype6-dev which does this for us. + * debian/fontconfig.postinst: + - Display a little message about regenerating the fonts cache. + + -- Colin Walters Wed, 25 Dec 2002 01:08:05 -0500 + +fontconfig (2.1-10) unstable; urgency=low + + * debian/patches/fail-on-submake-failure.patch: + - New patch. This way at least the package won't build in the future + if there is a failure. + * debian/control: + - Build-Depend on zlib1g-dev directly until freetype is fixed. + - Change fontconfig section to utils. + + -- Colin Walters Sun, 22 Dec 2002 21:37:25 -0500 + +fontconfig (2.1-9) unstable; urgency=low + + * The " "*PANT* *PANT* YEAH BABY!!!! + FRESH COMMITS TO (freetype) CVS!!!!" *PANT* *PANT*" release. + * debian/control: + - Build-Depend on the very latest freetype, the previous version of + which was a CVS snapshot that broke the fontconfig build, and in fact + the build of almost any package dependent on freetype; see #173834. + Closes: #173900. + - Build-Depend on debhelper (>= 4.1.1) since we use some features from + it with CBS in this package (Closes: #173941). + * debian/fontconfig.postinst: + - New file, with the important contents stolen from Red Hat 8's + postinst. Thanks Anthony Fok . (Closes: #173949). + + -- Colin Walters Sun, 22 Dec 2002 03:36:21 -0500 + +fontconfig (2.1-8) unstable; urgency=low + + * debian/control: + - Build-Depend on xlibs-dev. This should fix the issue with + /usr/X11R6/lib/fonts or whatever being missing from fonts.conf. + - Mention more prominently that fontconfig doesn't depend on X. + * debian/rocks: + - Install fc-cache, fc-list, and fontconfig manpages + (Closes: #173748). + + -- Colin Walters Sat, 21 Dec 2002 02:54:36 -0500 + +fontconfig (2.1-7) unstable; urgency=low + + * debian/control: + - [libfontconfig1-dev] Add a Conflicts: fontconfig (<< 2.1-5) so that + we ensure upgrading happens in the correct order (due to + fontconfig-config switching packages). + + -- Colin Walters Wed, 11 Dec 2002 00:48:31 -0500 + +fontconfig (2.1-6) unstable; urgency=low + + * debian/patches/no-date-in-fonts-conf.patch: + - New patch; this will prevent the fonts.conf conffile from changing + on every package upload. + * debian/README.Debian: + - Update. + * debian/rules: + - Update to the latest version of Colin's Build System. + + -- Colin Walters Tue, 10 Dec 2002 14:48:24 -0500 + +fontconfig (2.1-5) unstable; urgency=low + + * debian/libfontconfig1-dev.install: + - Install fontconfig-config. + * debian/fontconfig.install + - Don't install fontconfig-config. + * debian/control: + - [libfontconfig1-dev] Add Depends: on libfreetype6-dev + (Closes: #172488) + * debian/rules: + - Update to the latest version of Colin's Build System. + * debian/rocks: + - Add debian/tmp/usr/lib/ to DEB_SHLIBDEPS_INCLUDE + (Closes: #172432). + - Ensure libfontconfig1 is built before fontconfig. + + -- Colin Walters Mon, 9 Dec 2002 23:54:06 -0500 + +fontconfig (2.1-4) unstable; urgency=low + + * debian/control: + - Really Build-Depend on ed (Closes: #172245). Now how did I add it + to the changelog, but not control? Don't ask me...) + * debian/rules: + - Update to the latest version of Colin's Build System. + + -- Colin Walters Mon, 9 Dec 2002 12:59:07 -0500 + +fontconfig (2.1-3) unstable; urgency=low + + * debian/control: + - Build-Depend on ed. + * debian/rules: + - Update to the latest version of Colin's Build System. + * debian/rocks: + - Remove extra cruft in deb-extra-clean rule. + + -- Colin Walters Sun, 8 Dec 2002 20:58:26 -0500 + +fontconfig (2.1-2) unstable; urgency=low + + * First upload to unstable; Closes: #170559. + * debian/rules: + - Update to latest version of Colin's Build System. + + -- Colin Walters Fri, 6 Dec 2002 01:37:16 -0500 + +fontconfig (2.1-1) unstable; urgency=low + + * New upstream version. + * debian/rules: + - Use Colin's Build System. + * debian/control: + - Bump Standards-Version to 3.5.8. + * debian/copyright: + - Fix Upstream Authors. + + -- Colin Walters Tue, 3 Dec 2002 22:38:28 -0500 + +fontconfig (2.0-2) unstable; urgency=low + + * debian/control: + - [fontconfig] New package; install configuration files and binaries in it. + - [libfontconfig1-dev] Fix up description. + + -- Colin Walters Mon, 14 Oct 2002 23:06:59 -0400 + +fontconfig (2.0-1) unstable; urgency=low + + * Initial version. + + -- Colin Walters Sun, 13 Oct 2002 14:43:56 -0400 --- fontconfig-2.2.2.orig/debian/fontconfig.config +++ fontconfig-2.2.2/debian/fontconfig.config @@ -0,0 +1,17 @@ +#! /bin/sh + +set -e + +. /usr/share/debconf/confmodule + +if [ "`which laptop-detect`" ] && [ ! -f /var/lib/fontconfig/local.conf ]; then + if laptop-detect > /dev/null; then + db_set fontconfig/subpixel_rendering true + else + db_set fontconfig/subpixel_rendering false + fi +fi +db_input medium fontconfig/subpixel_rendering || true +db_input low fontconfig/enable_bitmaps || true +db_input low fontconfig/enable_autohinter || true +db_go --- fontconfig-2.2.2.orig/debian/fontconfig.postrm +++ fontconfig-2.2.2/debian/fontconfig.postrm @@ -0,0 +1,26 @@ +#! /bin/sh +# postrm script for fontconfig + +set -e + +CONF=/etc/fonts/local.conf + +case "$1" in + purge) + if [ -x /usr/bin/ucf ]; then + ucf --purge $CONF + fi + rm -f $CONF + rm -rf /var/lib/fontconfig /var/lib/defoma/fontconfig.d + for dir in /usr/share/fonts /usr/X11R6/lib/X11/fonts /usr/local/share/fonts ; do + if [ -d $dir ]; then + find $dir -name fonts.cache-1 | xargs rm -f + fi + done + rmdir /usr/local/share/fonts 2> /dev/null || true + ;; +esac + +#DEBHELPER# + +exit 0 --- fontconfig-2.2.2.orig/debian/shlibs.local +++ fontconfig-2.2.2/debian/shlibs.local @@ -0,0 +1 @@ +libfreetype 6 libfreetype6 (>= 2.1.5-3) --- fontconfig-2.2.2.orig/debian/fc-list.sgml +++ fontconfig-2.2.2/debian/fc-list.sgml @@ -0,0 +1,166 @@ + manpage.1'. You may view + the manual page with: `docbook-to-man manpage.sgml | nroff -man | + less'. A typical entry in a Makefile or Makefile.am is: + +manpage.1: manpage.sgml + docbook-to-man $< > $@ + + + The docbook-to-man binary is found in the docbook-to-man package. + Please remember that if you create the nroff version in one of the + debian/rules file targets (such as build), you will need to include + docbook-to-man in your Build-Depends control field. + + --> + + + Josselin"> + Mouette"> + + Sep 16, 2003"> + + 1"> + <joss@debian.org>"> + + fc-list"> + + + Debian"> + GNU"> + GPL"> +]> + + + +
+ &dhemail; +
+ + &dhfirstname; + &dhsurname; + + + 2003 + &dhusername; + + &dhdate; + + + &dhucpackage; + + &dhsection; + + + &dhpackage; + + list available fonts + + + + &dhpackage; + + + + + + + + + + + + DESCRIPTION + + This manual page documents briefly the + &dhpackage; command. + +&dhpackage; lists fonts and styles available on the system for applications using fontconfig. + + + + OPTIONS + + This program follows the usual &gnu; command line syntax, + with long options starting with two dashes (`-'). A summary of + options is included below. + + + + + + + + Display status information while busy. + + + + + + + + Show summary of options. + + + + + + + + Show version of the program and exit. + + + + + + + If this argument is set, only fonts matching pattern are displayed. + + + + + + + If set, the element property is displayed for matching fonts. + + + + + + SEE ALSO + + fc-cache (1). + + The fontconfig user's guide, in HTML format: + /usr/share/doc/fontconfig/fontconfig-user.html. + + + + AUTHOR + + This manual page was written by &dhusername; &dhemail;. + + + + + + + --- fontconfig-2.2.2.orig/debian/fontconfig-udeb.install +++ fontconfig-2.2.2/debian/fontconfig-udeb.install @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/libfontconfig*.so.* +debian/tmp/etc/* +debian/tmp/usr/bin/* --- fontconfig-2.2.2.orig/debian/fontconfig.postinst +++ fontconfig-2.2.2/debian/fontconfig.postinst @@ -0,0 +1,130 @@ +#! /bin/sh + +set -e + +. /usr/share/debconf/confmodule + +LOCALCONF=/var/lib/fontconfig/local.conf +rm -f $LOCALCONF + +# Create the local.conf template using debconf data + cat >$LOCALCONF < + + +EOF + + # include defoma-generated file (if it exists) + cat >>$LOCALCONF </var/lib/defoma/fontconfig.d/fonts.conf +EOF + + # bitmapped fonts question + db_get fontconfig/enable_bitmaps + enable_bitmapped_fonts="$RET" + if [ "$enable_bitmapped_fonts" != "true" ]; then + cat >>$LOCALCONF < + +EOF + fi + + # subpixel rendering question + db_get fontconfig/subpixel_rendering + enable_subpixel_rendering="$RET" + if [ "$enable_subpixel_rendering" != "true" ]; then + cat >>$LOCALCONF < + +EOF + fi + + # autohinter module question + db_get fontconfig/enable_autohinter + enable_autohinter="$RET" + if [ "$enable_autohinter" != "true" ]; then + cat >>$LOCALCONF < + +EOF + fi + + cat >>$LOCALCONF < +EOF + +rm -f $LOCALCONF.md5sum +ln -sf /usr/share/fontconfig/local.conf.md5sum $LOCALCONF.md5sum +ucf --debconf-ok $LOCALCONF /etc/fonts/local.conf +rm -f $LOCALCONF.md5sum + +# Create /usr/local/share/fonts +LOCALDIR=/usr/local/share/fonts +if [ ! -d $LOCALDIR ]; then + if mkdir $LOCALDIR 2>/dev/null ; then + chmod 2775 $LOCALDIR + chown root:staff $LOCALDIR + fi +fi + +if [ "$1" = configure ]; then + # Ensure Defoma subst file exists, with some default substitutions + if ! defoma-subst check-rule fontconfig; then + defoma-subst new-rule fontconfig \ + 'serif --GeneralFamily,* Roman --Shape Serif Upright --Weight Medium' \ + 'sans-serif --GeneralFamily,* SansSerif --Shape NoSerif Upright --Weight Medium' \ + 'monospace --Width,* Fixed --GeneralFamily,2 Typewriter --Shape Upright --Weight Medium' + fi +fi + +if [ -d /var/lib/defoma/x-ttcidfont-conf.d ]; then + # Remove old fonts.cache-1 files + find /var/lib/defoma/x-ttcidfont-conf.d -name fonts.cache-1 | xargs rm -f +fi + +#DEBHELPER# + +if [ "$1" = configure ]; then + # (Hacked up from Red Hat 8 fontconfig RPM) + # Force regeneration of all fontconfig cache files. + # The redirect is because fc-cache is giving warnings about ~/fc.cache + # the HOME setting is to avoid problems if HOME hasn't been reset + printf "Regenerating fonts cache... " + HOME=/root fc-cache -f -v 1>/var/log/fontconfig.log 2>&1 || (printf "failed.\nSee /var/log/fontconfig.log for more information.\n"; exit 1) + printf "done.\n" +fi + +exit 0 --- fontconfig-2.2.2.orig/debian/fontconfig.manpages +++ fontconfig-2.2.2/debian/fontconfig.manpages @@ -0,0 +1,2 @@ +debian/fc-cache.1 +debian/fc-list.1 --- fontconfig-2.2.2.orig/debian/compat +++ fontconfig-2.2.2/debian/compat @@ -0,0 +1 @@ +4 --- fontconfig-2.2.2.orig/debian/libfontconfig1-dev.install +++ fontconfig-2.2.2/debian/libfontconfig1-dev.install @@ -0,0 +1,7 @@ +debian/tmp/usr/include/fontconfig/* +debian/tmp/usr/lib/pkgconfig/fontconfig.pc +debian/tmp/usr/lib/libfontconfig*.a +debian/tmp/usr/lib/libfontconfig*.so +debian/tmp/usr/share/man/man3/* +debian/tmp/usr/share/doc/fontconfig/fontconfig-devel* usr/share/doc/libfontconfig1-dev/ + --- fontconfig-2.2.2.orig/debian/fontconfig.dirs +++ fontconfig-2.2.2/debian/fontconfig.dirs @@ -0,0 +1 @@ +/var/lib/fontconfig --- fontconfig-2.2.2.orig/debian/README.Debian +++ fontconfig-2.2.2/debian/README.Debian @@ -0,0 +1,44 @@ +*** IMPORTANT *** + +Recently, fontconfig changed to not include bitmapped fonts in the +default font path. There is now a Debconf question about this. + +If you wish to enable bitmapped fonts manually, please edit +/etc/fonts/local.conf, and uncomment the portion with: + +/usr/X11R6/lib/X11/fonts + +in between the and . + +***************** + + +How fonts are handled in Debian: +-------------------------------- + +Fontconfig is a library which handles font configuration and access at +the system level. It is the foundation for a new font handling in X +applications (but can also be useful without X). + +Applications not using fontconfig are accessing their fonts through +the X server. Font packages for these applications are named xfonts-*. +You can also use TrueType fonts with these applications if you install +the x-ttcidfont-conf package, which connects the X server to defoma: +fonts included in ttf-* packages or added manually using dfontmgr can +then be used in these programs. +A few of these applications, using Xft1, can benefit of antialiasing +with vector fonts, but it is deprecated. + +The new font renderer in XFree86 is called freetype2, and applications +using it access fonts on the client side. Most of them (including all +GTK2/GNOME2 and KDE3 applications) do it using fontconfig, which +provides listing and matching facilities for all fonts installed on the +system. Any font installed in /usr/share/fonts or ~/.fonts will be +accessible to these applications. This is now also true for fonts added +using defoma. +These programs can all benefit from antialiasing, autohinting and +sub-pixel rendering. You can configure it through fontconfig, using +debconf (dpkg-reconfigure fontconfig), or by editing +/etc/fonts/local.conf by hand. + + -- Josselin Mouette Wed, 8 Oct 2003 21:51:35 +0200 --- fontconfig-2.2.2.orig/debian/libfontconfig1.install +++ fontconfig-2.2.2/debian/libfontconfig1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libfontconfig*.so.* --- fontconfig-2.2.2.orig/debian/fc-cache.sgml +++ fontconfig-2.2.2/debian/fc-cache.sgml @@ -0,0 +1,193 @@ + manpage.1'. You may view + the manual page with: `docbook-to-man manpage.sgml | nroff -man | + less'. A typical entry in a Makefile or Makefile.am is: + +manpage.1: manpage.sgml + docbook-to-man $< > $@ + + + The docbook-to-man binary is found in the docbook-to-man package. + Please remember that if you create the nroff version in one of the + debian/rules file targets (such as build), you will need to include + docbook-to-man in your Build-Depends control field. + + --> + + + Josselin"> + Mouette"> + + Sep 16, 2003"> + + 1"> + <joss@debian.org>"> + + fc-cache"> + + + Debian"> + GNU"> + GPL"> +]> + + + +
+ &dhemail; +
+ + &dhfirstname; + &dhsurname; + + + 2003 + &dhusername; + + &dhdate; + + + &dhucpackage; + + &dhsection; + + + &dhpackage; + + build font information cache files + + + + &dhpackage; + + + + + + + + + + + + + DESCRIPTION + + This manual page documents briefly the + &dhpackage; command. + +&dhpackage; scans the font directories on the system +and builds font information cache files for applications using fontconfig for +their font handling. + +If directory arguments are not given, &dhpackage; uses each directory in the current font configuration. Each directory is scanned for font files readable by FreeType. A cache is created which contains properties of each font and the associated filename. This cache is used to speed up application startup when using the fontconfig library. + + + + OPTIONS + + This program follows the usual &gnu; command line syntax, + with long options starting with two dashes (`-'). A summary of + options is included below. + + + + + + + + Force re-generation of apparently up-to-date cache files, overriding the timestamp checking. + + + + + + + + Only scan system-wide directories, omitting the places located in the user's home directory. + + + + + + + + Display status information while busy. + + + + + + + + Show summary of options. + + + + + + + + Show version of the program and exit. + + + + + + + A list of directories to scan for fonts. + + + + + + + FILES + + + fonts.cache-1 + + These files are generated by &dhpackage; and contains maps from file names to font properties. They are read by the fontconfig library at application startup to locate appropriate fonts. + + + + + + + SEE ALSO + + fc-list (1). + + The fontconfig user's guide, in HTML format: + /usr/share/doc/fontconfig/fontconfig-user.html. + + + + AUTHOR + + This manual page was written by Keith Packard <keithp@keithp.com> and &dhusername; &dhemail;. + + + + + + + --- fontconfig-2.2.2.orig/debian/patches/fc-cache-options.patch +++ fontconfig-2.2.2/debian/patches/fc-cache-options.patch @@ -0,0 +1,23 @@ +--- fc-cache/fc-cache.c.orig 2003-10-08 19:43:01.000000000 +0200 ++++ fc-cache/fc-cache.c 2003-10-08 19:44:05.000000000 +0200 +@@ -67,7 +67,7 @@ + static void + usage (char *program) + { +- fprintf (stderr, "usage: %s [-fvV?] [--force] [--verbose] [--version] [--help] [dirs]\n", ++ fprintf (stderr, "usage: %s [-fsvV?] [--force] [--system-only] [--verbose] [--version] [--help] [dirs]\n", + program); + fprintf (stderr, "Build font information caches in [dirs]\n" + "(all directories in font configuration by default).\n"); +@@ -216,9 +216,9 @@ + int c; + + #if HAVE_GETOPT_LONG +- while ((c = getopt_long (argc, argv, "fVv?", longopts, NULL)) != -1) ++ while ((c = getopt_long (argc, argv, "fsVv?", longopts, NULL)) != -1) + #else +- while ((c = getopt (argc, argv, "fVv?")) != -1) ++ while ((c = getopt (argc, argv, "fsVv?")) != -1) + #endif + { + switch (c) { --- fontconfig-2.2.2.orig/debian/patches/autoreconf.patch +++ fontconfig-2.2.2/debian/patches/autoreconf.patch @@ -0,0 +1,4007 @@ +diff -PruN fontconfig-2.2.2.orig/aclocal.m4 fontconfig-2.2.2/aclocal.m4 +--- fontconfig-2.2.2.orig/aclocal.m4 2004-03-10 21:43:14.000000000 +0100 ++++ fontconfig-2.2.2/aclocal.m4 2004-04-07 14:26:00.000000000 +0200 +@@ -833,6 +833,45 @@ + Usually this means the macro was only invoked conditionally.]) + fi])]) + ++# Add --enable-maintainer-mode option to configure. ++# From Jim Meyering ++ ++# Copyright 1996, 1998, 2000, 2001, 2002 Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2, or (at your option) ++# any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++# 02111-1307, USA. ++ ++# serial 2 ++ ++AC_DEFUN([AM_MAINTAINER_MODE], ++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) ++ dnl maintainer-mode is disabled by default ++ AC_ARG_ENABLE(maintainer-mode, ++[ --enable-maintainer-mode enable make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer], ++ USE_MAINTAINER_MODE=$enableval, ++ USE_MAINTAINER_MODE=no) ++ AC_MSG_RESULT([$USE_MAINTAINER_MODE]) ++ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) ++ MAINT=$MAINTAINER_MODE_TRUE ++ AC_SUBST(MAINT)dnl ++] ++) ++ ++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) ++ + # Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- + + # Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. +@@ -862,7 +901,7 @@ + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + + # serial 47 AC_PROG_LIBTOOL +-# Debian $Rev: 192 $ ++# Debian $Rev: 203 $ + + + # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +@@ -1481,7 +1520,7 @@ + AC_MSG_CHECKING([the maximum length of command line arguments]) + AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl + i=0 +- testring="ABCD" ++ teststring="ABCD" + + case $build_os in + msdosdjgpp*) +@@ -1520,16 +1559,16 @@ + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. +- while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \ +- = "XX$testring") >/dev/null 2>&1 && +- new_result=`expr "X$testring" : ".*" 2>&1` && ++ while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ ++ = "XX$teststring") >/dev/null 2>&1 && ++ new_result=`expr "X$teststring" : ".*" 2>&1` && + lt_cv_sys_max_cmd_len=$new_result && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` +- testring=$testring$testring ++ teststring=$teststring$teststring + done +- testring= ++ teststring= + # Add a significant safety factor because C++ compilers can tack on massive + # amounts of additional arguments before passing them to the linker. + # It appears as though 1/2 is a usable value. +@@ -1925,7 +1964,7 @@ + library_names_spec= + libname_spec='lib$name' + soname_spec= +-shrext=".so" ++shrext_cmds=".so" + postinstall_cmds= + postuninstall_cmds= + finish_cmds= +@@ -2038,7 +2077,7 @@ + + cygwin* | mingw* | pw32*) + version_type=windows +- shrext=".dll" ++ shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + +@@ -2103,7 +2142,7 @@ + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH +- shrext='$(test .$module = .yes && echo .so || echo .dylib)' ++ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' + # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. + if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +@@ -2186,7 +2225,7 @@ + need_version=no + case "$host_cpu" in + ia64*) +- shrext='.so' ++ shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH +@@ -2201,7 +2240,7 @@ + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) +- shrext='.sl' ++ shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH +@@ -2212,7 +2251,7 @@ + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) +- shrext='.sl' ++ shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH +@@ -2283,8 +2322,8 @@ + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then +- ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra" ++ lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '` ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -2366,7 +2405,7 @@ + + os2*) + libname_spec='$name' +- shrext=".dll" ++ shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' +@@ -2957,14 +2996,14 @@ + ;; + + cygwin*) +- # win32_libid is a shell function defined in ltmain.sh ++ # func_win32_libid is a shell function defined in ltmain.sh + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' +- lt_cv_file_magic_cmd='win32_libid' ++ lt_cv_file_magic_cmd='func_win32_libid' + ;; + + mingw* | pw32*) + # Base MSYS/MinGW do not provide the 'file' command needed by +- # win32_libid shell function, so use a weaker test based on 'objdump'. ++ # func_win32_libid shell function, so use a weaker test based on 'objdump'. + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; +@@ -3375,7 +3414,7 @@ + fi + ;; + +-aix4*) ++aix4* | aix5*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi +@@ -3823,7 +3862,7 @@ + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. +- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + *) + if test "$GXX" = yes; then +@@ -4526,7 +4565,7 @@ + postinstall_cmds='$RANLIB $lib' + fi + ;; +-aix4*) ++aix4* | aix5*) + test "$enable_shared" = yes && enable_static=no + ;; + esac +@@ -4881,7 +4920,7 @@ + libext="$libext" + + # Shared library suffix (normally ".so"). +-shrext='$shrext' ++shrext_cmds='$shrext_cmds' + + # Executable file suffix (normally ""). + exeext="$exeext" +@@ -5821,6 +5860,9 @@ + cygwin* | mingw*) + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' + ;; ++ linux*) ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no ++ ;; + *) + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; +@@ -5989,7 +6031,7 @@ + ;; + + linux*) +- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds" + supports_anon_versioning=no +@@ -6008,6 +6050,7 @@ + else + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds" + fi ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi +@@ -6189,7 +6232,7 @@ + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. +- shrext=".dll" ++ shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. +diff -PruN fontconfig-2.2.2.orig/config.guess fontconfig-2.2.2/config.guess +--- fontconfig-2.2.2.orig/config.guess 2004-03-10 21:14:00.000000000 +0100 ++++ fontconfig-2.2.2/config.guess 2004-04-07 14:26:23.000000000 +0200 +@@ -3,7 +3,7 @@ + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, + # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + +-timestamp='2003-02-22' ++timestamp='2004-01-05' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -106,6 +106,7 @@ + : ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || ++ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; + dummy=$tmp/dummy ; + tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +@@ -220,6 +221,9 @@ + mvmeppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; ++ pegasos:OpenBSD:*:*) ++ echo powerpc-unknown-openbsd${UNAME_RELEASE} ++ exit 0 ;; + pmax:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; +@@ -282,6 +286,9 @@ + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit 0 ;; ++ Alpha*:OpenVMS:*:*) ++ echo alpha-hp-vms ++ exit 0 ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead +@@ -303,6 +310,9 @@ + *:OS/390:*:*) + echo i370-ibm-openedition + exit 0 ;; ++ *:OS400:*:*) ++ echo powerpc-ibm-os400 ++ exit 0 ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit 0;; +@@ -320,6 +330,9 @@ + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 + exit 0 ;; ++ DRS?6000:unix:4.0:6*) ++ echo sparc-icl-nx6 ++ exit 0 ;; + DRS?6000:UNIX_SV:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7 && exit 0 ;; +@@ -727,7 +740,7 @@ + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; + *:UNICOS/mp:*:*) +- echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +@@ -735,6 +748,11 @@ + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit 0 ;; ++ 5000:UNIX_System_V:4.*:*) ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` ++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit 0 ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + exit 0 ;; +@@ -756,7 +774,10 @@ + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` +- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} ++ # GNU/KFreeBSD systems have a "k" prefix to indicate we are using ++ # FreeBSD's kernel, but not the complete OS. ++ case ${LIBC} in gnu) kernel_only='k' ;; esac ++ echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} + exit 0 ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin +@@ -767,8 +788,8 @@ + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit 0 ;; +- x86:Interix*:3*) +- echo i586-pc-interix3 ++ x86:Interix*:[34]*) ++ echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' + exit 0 ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks +@@ -789,14 +810,22 @@ + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; + *:GNU:*:*) ++ # the GNU system + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit 0 ;; ++ *:GNU/*:*:*) ++ # other systems with GNU libc and userland ++ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu ++ exit 0 ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit 0 ;; + arm*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; ++ cris:Linux:*:*) ++ echo cris-axis-linux-gnu ++ exit 0 ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; +@@ -875,6 +904,9 @@ + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit 0 ;; ++ sh64*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit 0 ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; +@@ -932,6 +964,9 @@ + LIBC=gnuaout + #endif + #endif ++ #ifdef __dietlibc__ ++ LIBC=dietlibc ++ #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 +@@ -962,6 +997,9 @@ + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit 0 ;; ++ i*86:syllable:*:*) ++ echo ${UNAME_MACHINE}-pc-syllable ++ exit 0 ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; +@@ -1033,7 +1071,7 @@ + exit 0 ;; + M68*:*:R3V[567]*:*) + test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; +- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0) ++ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` +@@ -1148,7 +1186,7 @@ + *:QNX:*:4*) + echo i386-pc-qnx + exit 0 ;; +- NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) ++ NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit 0 ;; + *:NonStop-UX:*:*) +@@ -1189,6 +1227,12 @@ + *:ITS:*:*) + echo pdp10-unknown-its + exit 0 ;; ++ SEI:*:*:SEIUX) ++ echo mips-sei-seiux${UNAME_RELEASE} ++ exit 0 ;; ++ *:DRAGONFLY:*:*) ++ echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE} ++ exit 0 ;; + esac + + #echo '(No uname command or uname output not recognized.)' 1>&2 +diff -PruN fontconfig-2.2.2.orig/config.sub fontconfig-2.2.2/config.sub +--- fontconfig-2.2.2.orig/config.sub 2004-03-10 21:14:00.000000000 +0100 ++++ fontconfig-2.2.2/config.sub 2004-04-07 14:26:23.000000000 +0200 +@@ -3,7 +3,7 @@ + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, + # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + +-timestamp='2003-02-22' ++timestamp='2004-01-05' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -118,7 +118,8 @@ + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) ++ nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ ++ kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; +@@ -228,13 +229,14 @@ + | a29k \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ ++ | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ +- | clipper \ ++ | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ +- | ip2k \ ++ | ip2k | iq2000 \ + | m32r | m68000 | m68k | m88k | mcore \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ +@@ -247,6 +249,7 @@ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ ++ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ +@@ -261,7 +264,7 @@ + | sh64 | sh64le \ + | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ + | strongarm \ +- | tahoe | thumb | tic80 | tron \ ++ | tahoe | thumb | tic4x | tic80 | tron \ + | v850 | v850e \ + | we32k \ + | x86 | xscale | xstormy16 | xtensa \ +@@ -304,7 +307,7 @@ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ +- | ip2k-* \ ++ | ip2k-* | iq2000-* \ + | m32r-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | mcore-* \ +@@ -319,6 +322,7 @@ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ ++ | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipstx39-* | mipstx39el-* \ +@@ -373,6 +377,12 @@ + basic_machine=a29k-none + os=-bsd + ;; ++ amd64) ++ basic_machine=x86_64-pc ++ ;; ++ amd64-*) ++ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + amdahl) + basic_machine=580-amdahl + os=-sysv +@@ -737,6 +747,10 @@ + basic_machine=or32-unknown + os=-coff + ;; ++ os400) ++ basic_machine=powerpc-ibm ++ os=-os400 ++ ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose +@@ -768,18 +782,24 @@ + pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc + ;; +- pentiumii | pentium2) ++ pentiumii | pentium2 | pentiumiii | pentium3) + basic_machine=i686-pc + ;; ++ pentium4) ++ basic_machine=i786-pc ++ ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; +- pentiumii-* | pentium2-*) ++ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; ++ pentium4-*) ++ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + pn) + basic_machine=pn-gould + ;; +@@ -838,6 +858,10 @@ + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; ++ sei) ++ basic_machine=mips-sei ++ os=-seiux ++ ;; + sequent) + basic_machine=i386-sequent + ;; +@@ -845,6 +869,9 @@ + basic_machine=sh-hitachi + os=-hms + ;; ++ sh64) ++ basic_machine=sh64-unknown ++ ;; + sparclite-wrs | simso-wrs) + basic_machine=sparclite-wrs + os=-vxworks +@@ -919,10 +946,6 @@ + basic_machine=t90-cray + os=-unicos + ;; +- tic4x | c4x*) +- basic_machine=tic4x-unknown +- os=-coff +- ;; + tic54x | c54x*) + basic_machine=tic54x-unknown + os=-coff +@@ -948,6 +971,10 @@ + tower | tower-32) + basic_machine=m68k-ncr + ;; ++ tpf) ++ basic_machine=s390x-ibm ++ os=-tpf ++ ;; + udi29k) + basic_machine=a29k-amd + os=-udi +@@ -1116,19 +1143,19 @@ + | -aos* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ +- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ ++ | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \ + | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ ++ | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ +- | -powermax* | -dnix*) ++ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) +@@ -1152,6 +1179,9 @@ + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; ++ -linux-dietlibc) ++ os=-linux-dietlibc ++ ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; +@@ -1164,6 +1194,9 @@ + -opened*) + os=-openedition + ;; ++ -os400*) ++ os=-os400 ++ ;; + -wince*) + os=-wince + ;; +@@ -1185,6 +1218,9 @@ + -atheos*) + os=-atheos + ;; ++ -syllable*) ++ os=-syllable ++ ;; + -386bsd) + os=-bsd + ;; +@@ -1207,6 +1243,9 @@ + -sinix*) + os=-sysv4 + ;; ++ -tpf*) ++ os=-tpf ++ ;; + -triton*) + os=-sysv3 + ;; +@@ -1274,6 +1313,9 @@ + arm*-semi) + os=-aout + ;; ++ c4x-* | tic4x-*) ++ os=-coff ++ ;; + # This must come before the *-dec entry. + pdp10-*) + os=-tops20 +@@ -1452,9 +1494,15 @@ + -mvs* | -opened*) + vendor=ibm + ;; ++ -os400*) ++ vendor=ibm ++ ;; + -ptx*) + vendor=sequent + ;; ++ -tpf*) ++ vendor=ibm ++ ;; + -vxsim* | -vxworks* | -windiss*) + vendor=wrs + ;; +diff -PruN fontconfig-2.2.2.orig/configure fontconfig-2.2.2/configure +--- fontconfig-2.2.2.orig/configure 2004-03-10 21:43:31.000000000 +0100 ++++ fontconfig-2.2.2/configure 2004-04-07 14:26:28.000000000 +0200 +@@ -463,7 +463,7 @@ + # include + #endif" + +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot LT_CURRENT LT_REVISION LT_VERSION_INFO LT_CURRENT_MINUS_AGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL OS_WIN32_TRUE OS_WIN32_FALSE ms_librarian MS_LIB_AVAILABLE_TRUE MS_LIB_AVAILABLE_FALSE ft_config FREETYPE_LIBS FREETYPE_CFLAGS HAVE_XMLPARSE_H HAVE_EXPAT EXPAT_LIBS EXPAT_CFLAGS FC_DEFAULT_FONTS FC_ADD_FONTS FC_FONTPATH FC_FONTDATE confdir CONFDIR ORTH_FILES HASDOCBOOK ENABLE_DOCS_TRUE ENABLE_DOCS_FALSE DOCDIR LIBOBJS LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LT_CURRENT LT_REVISION LT_VERSION_INFO LT_CURRENT_MINUS_AGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL OS_WIN32_TRUE OS_WIN32_FALSE ms_librarian MS_LIB_AVAILABLE_TRUE MS_LIB_AVAILABLE_FALSE ft_config FREETYPE_LIBS FREETYPE_CFLAGS HAVE_XMLPARSE_H HAVE_EXPAT EXPAT_LIBS EXPAT_CFLAGS FC_DEFAULT_FONTS FC_ADD_FONTS FC_FONTPATH FC_FONTDATE confdir CONFDIR ORTH_FILES HASDOCBOOK ENABLE_DOCS_TRUE ENABLE_DOCS_FALSE DOCDIR LIBOBJS LTLIBOBJS' + ac_subst_files='' + + # Initialize some variables set by options. +@@ -1023,6 +1023,8 @@ + Optional Features: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] ++ --enable-maintainer-mode enable make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer + --disable-dependency-tracking Speeds up one-time builds + --enable-dependency-tracking Do not reject slow dependency extractors + --enable-shared[=PKGS] +@@ -1906,6 +1908,30 @@ + + + ++echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 ++echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6 ++ # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. ++if test "${enable_maintainer_mode+set}" = set; then ++ enableval="$enable_maintainer_mode" ++ USE_MAINTAINER_MODE=$enableval ++else ++ USE_MAINTAINER_MODE=no ++fi; ++ echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 ++echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6 ++ ++ ++if test $USE_MAINTAINER_MODE = yes; then ++ MAINTAINER_MODE_TRUE= ++ MAINTAINER_MODE_FALSE='#' ++else ++ MAINTAINER_MODE_TRUE='#' ++ MAINTAINER_MODE_FALSE= ++fi ++ ++ MAINT=$MAINTAINER_MODE_TRUE ++ ++ + + + LT_CURRENT=1 +@@ -3509,14 +3535,14 @@ + ;; + + cygwin*) +- # win32_libid is a shell function defined in ltmain.sh ++ # func_win32_libid is a shell function defined in ltmain.sh + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' +- lt_cv_file_magic_cmd='win32_libid' ++ lt_cv_file_magic_cmd='func_win32_libid' + ;; + + mingw* | pw32*) + # Base MSYS/MinGW do not provide the 'file' command needed by +- # win32_libid shell function, so use a weaker test based on 'objdump'. ++ # func_win32_libid shell function, so use a weaker test based on 'objdump'. + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; +@@ -3695,7 +3721,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 3698 "configure"' > conftest.$ac_ext ++ echo '#line 3724 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -5494,7 +5520,7 @@ + + + # Provide some information about the compiler. +-echo "$as_me:5497:" \ ++echo "$as_me:5523:" \ + "checking for Fortran 77 compiler version" >&5 + ac_compiler=`set X $ac_compile; echo $2` + { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 +@@ -5647,7 +5673,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + i=0 +- testring="ABCD" ++ teststring="ABCD" + + case $build_os in + msdosdjgpp*) +@@ -5686,16 +5712,16 @@ + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. +- while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \ +- = "XX$testring") >/dev/null 2>&1 && +- new_result=`expr "X$testring" : ".*" 2>&1` && ++ while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ ++ = "XX$teststring") >/dev/null 2>&1 && ++ new_result=`expr "X$teststring" : ".*" 2>&1` && + lt_cv_sys_max_cmd_len=$new_result && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` +- testring=$testring$testring ++ teststring=$teststring$teststring + done +- testring= ++ teststring= + # Add a significant safety factor because C++ compilers can tack on massive + # amounts of additional arguments before passing them to the linker. + # It appears as though 1/2 is a usable value. +@@ -6526,11 +6552,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:6529: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:6555: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:6533: \$? = $ac_status" >&5 ++ echo "$as_me:6559: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -6759,11 +6785,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:6762: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:6788: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:6766: \$? = $ac_status" >&5 ++ echo "$as_me:6792: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -6819,11 +6845,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:6822: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:6848: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:6826: \$? = $ac_status" >&5 ++ echo "$as_me:6852: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -7035,7 +7061,7 @@ + ;; + + linux*) +- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds="$tmp_archive_cmds" + supports_anon_versioning=no +@@ -7054,6 +7080,7 @@ + else + archive_expsym_cmds="$tmp_archive_cmds" + fi ++ link_all_deplibs=no + else + ld_shlibs=no + fi +@@ -7335,7 +7362,7 @@ + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. +- shrext=".dll" ++ shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. +@@ -7791,7 +7818,7 @@ + library_names_spec= + libname_spec='lib$name' + soname_spec= +-shrext=".so" ++shrext_cmds=".so" + postinstall_cmds= + postuninstall_cmds= + finish_cmds= +@@ -7904,7 +7931,7 @@ + + cygwin* | mingw* | pw32*) + version_type=windows +- shrext=".dll" ++ shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + +@@ -7969,7 +7996,7 @@ + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH +- shrext='$(test .$module = .yes && echo .so || echo .dylib)' ++ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' + # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. + if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +@@ -8052,7 +8079,7 @@ + need_version=no + case "$host_cpu" in + ia64*) +- shrext='.so' ++ shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH +@@ -8067,7 +8094,7 @@ + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) +- shrext='.sl' ++ shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH +@@ -8078,7 +8105,7 @@ + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) +- shrext='.sl' ++ shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH +@@ -8149,8 +8176,8 @@ + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then +- ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra" ++ lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -8232,7 +8259,7 @@ + + os2*) + libname_spec='$name' +- shrext=".dll" ++ shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' +@@ -8994,7 +9021,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <&5) ++ (eval echo "\"\$as_me:11299: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:11276: \$? = $ac_status" >&5 ++ echo "$as_me:11303: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -11329,11 +11356,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:11332: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:11359: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:11336: \$? = $ac_status" >&5 ++ echo "$as_me:11363: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -11399,6 +11426,9 @@ + cygwin* | mingw*) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + ;; ++ linux*) ++ link_all_deplibs_CXX=no ++ ;; + *) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; +@@ -11480,7 +11510,7 @@ + library_names_spec= + libname_spec='lib$name' + soname_spec= +-shrext=".so" ++shrext_cmds=".so" + postinstall_cmds= + postuninstall_cmds= + finish_cmds= +@@ -11593,7 +11623,7 @@ + + cygwin* | mingw* | pw32*) + version_type=windows +- shrext=".dll" ++ shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + +@@ -11658,7 +11688,7 @@ + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH +- shrext='$(test .$module = .yes && echo .so || echo .dylib)' ++ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' + # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. + if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +@@ -11741,7 +11771,7 @@ + need_version=no + case "$host_cpu" in + ia64*) +- shrext='.so' ++ shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH +@@ -11756,7 +11786,7 @@ + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) +- shrext='.sl' ++ shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH +@@ -11767,7 +11797,7 @@ + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) +- shrext='.sl' ++ shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH +@@ -11838,8 +11868,8 @@ + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then +- ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra" ++ lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -11921,7 +11951,7 @@ + + os2*) + libname_spec='$name' +- shrext=".dll" ++ shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' +@@ -12683,7 +12713,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <&5) ++ (eval echo "\"\$as_me:13641: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:13615: \$? = $ac_status" >&5 ++ echo "$as_me:13645: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -13668,11 +13698,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:13671: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13701: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:13675: \$? = $ac_status" >&5 ++ echo "$as_me:13705: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -13884,7 +13914,7 @@ + ;; + + linux*) +- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds_F77="$tmp_archive_cmds" + supports_anon_versioning=no +@@ -13903,6 +13933,7 @@ + else + archive_expsym_cmds_F77="$tmp_archive_cmds" + fi ++ link_all_deplibs_F77=no + else + ld_shlibs_F77=no + fi +@@ -14164,7 +14195,7 @@ + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. +- shrext=".dll" ++ shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. +@@ -14620,7 +14651,7 @@ + library_names_spec= + libname_spec='lib$name' + soname_spec= +-shrext=".so" ++shrext_cmds=".so" + postinstall_cmds= + postuninstall_cmds= + finish_cmds= +@@ -14733,7 +14764,7 @@ + + cygwin* | mingw* | pw32*) + version_type=windows +- shrext=".dll" ++ shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + +@@ -14798,7 +14829,7 @@ + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH +- shrext='$(test .$module = .yes && echo .so || echo .dylib)' ++ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' + # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. + if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +@@ -14881,7 +14912,7 @@ + need_version=no + case "$host_cpu" in + ia64*) +- shrext='.so' ++ shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH +@@ -14896,7 +14927,7 @@ + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) +- shrext='.sl' ++ shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH +@@ -14907,7 +14938,7 @@ + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) +- shrext='.sl' ++ shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH +@@ -14978,8 +15009,8 @@ + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then +- ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra" ++ lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -15061,7 +15092,7 @@ + + os2*) + libname_spec='$name' +- shrext=".dll" ++ shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' +@@ -15402,7 +15433,7 @@ + libext="$libext" + + # Shared library suffix (normally ".so"). +-shrext='$shrext' ++shrext_cmds='$shrext_cmds' + + # Executable file suffix (normally ""). + exeext="$exeext" +@@ -15700,11 +15731,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15703: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15734: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:15707: \$? = $ac_status" >&5 ++ echo "$as_me:15738: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -15933,11 +15964,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15936: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15967: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:15940: \$? = $ac_status" >&5 ++ echo "$as_me:15971: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -15993,11 +16024,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15996: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16027: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:16000: \$? = $ac_status" >&5 ++ echo "$as_me:16031: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -16209,7 +16240,7 @@ + ;; + + linux*) +- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds_GCJ="$tmp_archive_cmds" + supports_anon_versioning=no +@@ -16228,6 +16259,7 @@ + else + archive_expsym_cmds_GCJ="$tmp_archive_cmds" + fi ++ link_all_deplibs_GCJ=no + else + ld_shlibs_GCJ=no + fi +@@ -16509,7 +16541,7 @@ + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. +- shrext=".dll" ++ shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. +@@ -16965,7 +16997,7 @@ + library_names_spec= + libname_spec='lib$name' + soname_spec= +-shrext=".so" ++shrext_cmds=".so" + postinstall_cmds= + postuninstall_cmds= + finish_cmds= +@@ -17078,7 +17110,7 @@ + + cygwin* | mingw* | pw32*) + version_type=windows +- shrext=".dll" ++ shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + +@@ -17143,7 +17175,7 @@ + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH +- shrext='$(test .$module = .yes && echo .so || echo .dylib)' ++ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' + # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. + if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +@@ -17226,7 +17258,7 @@ + need_version=no + case "$host_cpu" in + ia64*) +- shrext='.so' ++ shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH +@@ -17241,7 +17273,7 @@ + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) +- shrext='.sl' ++ shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH +@@ -17252,7 +17284,7 @@ + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) +- shrext='.sl' ++ shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH +@@ -17323,8 +17355,8 @@ + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then +- ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra" ++ lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -17406,7 +17438,7 @@ + + os2*) + libname_spec='$name' +- shrext=".dll" ++ shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' +@@ -18168,7 +18200,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <&5 ++echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi + if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +@@ -22113,6 +22152,9 @@ + s,@AWK@,$AWK,;t t + s,@SET_MAKE@,$SET_MAKE,;t t + s,@am__leading_dot@,$am__leading_dot,;t t ++s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t ++s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t ++s,@MAINT@,$MAINT,;t t + s,@LT_CURRENT@,$LT_CURRENT,;t t + s,@LT_REVISION@,$LT_REVISION,;t t + s,@LT_VERSION_INFO@,$LT_VERSION_INFO,;t t +diff -PruN fontconfig-2.2.2.orig/doc/Makefile.in fontconfig-2.2.2/doc/Makefile.in +--- fontconfig-2.2.2.orig/doc/Makefile.in 2004-03-10 21:44:16.000000000 +0100 ++++ fontconfig-2.2.2/doc/Makefile.in 2004-04-07 14:26:24.000000000 +0200 +@@ -97,6 +97,9 @@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_REVISION = @LT_REVISION@ + LT_VERSION_INFO = @LT_VERSION_INFO@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ +@@ -297,10 +300,10 @@ + + .SUFFIXES: + .SUFFIXES: .fncs .sgml .txt .html .c .lo .o .obj +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu doc/Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + version.sgml: $(top_builddir)/config.status version.sgml.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +diff -PruN fontconfig-2.2.2.orig/fc-cache/Makefile.in fontconfig-2.2.2/fc-cache/Makefile.in +--- fontconfig-2.2.2.orig/fc-cache/Makefile.in 2004-03-10 21:44:09.000000000 +0100 ++++ fontconfig-2.2.2/fc-cache/Makefile.in 2004-04-07 14:26:24.000000000 +0200 +@@ -119,6 +119,9 @@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_REVISION = @LT_REVISION@ + LT_VERSION_INFO = @LT_VERSION_INFO@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ +@@ -230,10 +233,10 @@ + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu fc-cache/Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + install-binPROGRAMS: $(bin_PROGRAMS) +diff -PruN fontconfig-2.2.2.orig/fc-lang/Makefile.in fontconfig-2.2.2/fc-lang/Makefile.in +--- fontconfig-2.2.2.orig/fc-lang/Makefile.in 2004-03-10 21:44:00.000000000 +0100 ++++ fontconfig-2.2.2/fc-lang/Makefile.in 2004-04-07 14:26:25.000000000 +0200 +@@ -120,6 +120,9 @@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_REVISION = @LT_REVISION@ + LT_VERSION_INFO = @LT_VERSION_INFO@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ +@@ -239,10 +242,10 @@ + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu fc-lang/Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + clean-noinstPROGRAMS: +diff -PruN fontconfig-2.2.2.orig/fc-list/Makefile.in fontconfig-2.2.2/fc-list/Makefile.in +--- fontconfig-2.2.2.orig/fc-list/Makefile.in 2004-03-10 21:44:12.000000000 +0100 ++++ fontconfig-2.2.2/fc-list/Makefile.in 2004-04-07 14:26:25.000000000 +0200 +@@ -119,6 +119,9 @@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_REVISION = @LT_REVISION@ + LT_VERSION_INFO = @LT_VERSION_INFO@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ +@@ -230,10 +233,10 @@ + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu fc-list/Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + install-binPROGRAMS: $(bin_PROGRAMS) +diff -PruN fontconfig-2.2.2.orig/fontconfig/Makefile.in fontconfig-2.2.2/fontconfig/Makefile.in +--- fontconfig-2.2.2.orig/fontconfig/Makefile.in 2004-03-10 21:43:56.000000000 +0100 ++++ fontconfig-2.2.2/fontconfig/Makefile.in 2004-04-07 14:26:25.000000000 +0200 +@@ -96,6 +96,9 @@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_REVISION = @LT_REVISION@ + LT_VERSION_INFO = @LT_VERSION_INFO@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ +@@ -184,10 +187,10 @@ + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu fontconfig/Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: +diff -PruN fontconfig-2.2.2.orig/INSTALL fontconfig-2.2.2/INSTALL +--- fontconfig-2.2.2.orig/INSTALL 2003-03-07 21:03:53.000000000 +0100 ++++ fontconfig-2.2.2/INSTALL 2004-04-07 14:26:23.000000000 +0200 +@@ -1,9 +1,229 @@ +-Fontconfig is built with the traditional configure script: ++Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software ++Foundation, Inc. + +- $ ./configure --sysconfdir=/etc --prefix=/usr --mandir=/usr/share/man ++ This file is free documentation; the Free Software Foundation gives ++unlimited permission to copy, distribute and modify it. + +-This should generate valid Makefiles, then: ++Basic Installation ++================== + +- $ make +- $ make install ++ These are generic installation instructions. ++ ++ The `configure' shell script attempts to guess correct values for ++various system-dependent variables used during compilation. It uses ++those values to create a `Makefile' in each directory of the package. ++It may also create one or more `.h' files containing system-dependent ++definitions. Finally, it creates a shell script `config.status' that ++you can run in the future to recreate the current configuration, and a ++file `config.log' containing compiler output (useful mainly for ++debugging `configure'). ++ ++ It can also use an optional file (typically called `config.cache' ++and enabled with `--cache-file=config.cache' or simply `-C') that saves ++the results of its tests to speed up reconfiguring. (Caching is ++disabled by default to prevent problems with accidental use of stale ++cache files.) ++ ++ If you need to do unusual things to compile the package, please try ++to figure out how `configure' could check whether to do them, and mail ++diffs or instructions to the address given in the `README' so they can ++be considered for the next release. If you are using the cache, and at ++some point `config.cache' contains results you don't want to keep, you ++may remove or edit it. ++ ++ The file `configure.ac' (or `configure.in') is used to create ++`configure' by a program called `autoconf'. You only need ++`configure.ac' if you want to change it or regenerate `configure' using ++a newer version of `autoconf'. ++ ++The simplest way to compile this package is: ++ ++ 1. `cd' to the directory containing the package's source code and type ++ `./configure' to configure the package for your system. If you're ++ using `csh' on an old version of System V, you might need to type ++ `sh ./configure' instead to prevent `csh' from trying to execute ++ `configure' itself. ++ ++ Running `configure' takes awhile. While running, it prints some ++ messages telling which features it is checking for. ++ ++ 2. Type `make' to compile the package. ++ ++ 3. Optionally, type `make check' to run any self-tests that come with ++ the package. ++ ++ 4. Type `make install' to install the programs and any data files and ++ documentation. ++ ++ 5. You can remove the program binaries and object files from the ++ source code directory by typing `make clean'. To also remove the ++ files that `configure' created (so you can compile the package for ++ a different kind of computer), type `make distclean'. There is ++ also a `make maintainer-clean' target, but that is intended mainly ++ for the package's developers. If you use it, you may have to get ++ all sorts of other programs in order to regenerate files that came ++ with the distribution. ++ ++Compilers and Options ++===================== ++ ++ Some systems require unusual options for compilation or linking that ++the `configure' script does not know about. Run `./configure --help' ++for details on some of the pertinent environment variables. ++ ++ You can give `configure' initial values for configuration parameters ++by setting variables in the command line or in the environment. Here ++is an example: ++ ++ ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix ++ ++ *Note Defining Variables::, for more details. ++ ++Compiling For Multiple Architectures ++==================================== ++ ++ You can compile the package for more than one kind of computer at the ++same time, by placing the object files for each architecture in their ++own directory. To do this, you must use a version of `make' that ++supports the `VPATH' variable, such as GNU `make'. `cd' to the ++directory where you want the object files and executables to go and run ++the `configure' script. `configure' automatically checks for the ++source code in the directory that `configure' is in and in `..'. ++ ++ If you have to use a `make' that does not support the `VPATH' ++variable, you have to compile the package for one architecture at a ++time in the source code directory. After you have installed the ++package for one architecture, use `make distclean' before reconfiguring ++for another architecture. ++ ++Installation Names ++================== ++ ++ By default, `make install' will install the package's files in ++`/usr/local/bin', `/usr/local/man', etc. You can specify an ++installation prefix other than `/usr/local' by giving `configure' the ++option `--prefix=PATH'. ++ ++ You can specify separate installation prefixes for ++architecture-specific files and architecture-independent files. If you ++give `configure' the option `--exec-prefix=PATH', the package will use ++PATH as the prefix for installing programs and libraries. ++Documentation and other data files will still use the regular prefix. ++ ++ In addition, if you use an unusual directory layout you can give ++options like `--bindir=PATH' to specify different values for particular ++kinds of files. Run `configure --help' for a list of the directories ++you can set and what kinds of files go in them. ++ ++ If the package supports it, you can cause programs to be installed ++with an extra prefix or suffix on their names by giving `configure' the ++option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. ++ ++Optional Features ++================= ++ ++ Some packages pay attention to `--enable-FEATURE' options to ++`configure', where FEATURE indicates an optional part of the package. ++They may also pay attention to `--with-PACKAGE' options, where PACKAGE ++is something like `gnu-as' or `x' (for the X Window System). The ++`README' should mention any `--enable-' and `--with-' options that the ++package recognizes. ++ ++ For packages that use the X Window System, `configure' can usually ++find the X include and library files automatically, but if it doesn't, ++you can use the `configure' options `--x-includes=DIR' and ++`--x-libraries=DIR' to specify their locations. ++ ++Specifying the System Type ++========================== ++ ++ There may be some features `configure' cannot figure out ++automatically, but needs to determine by the type of machine the package ++will run on. Usually, assuming the package is built to be run on the ++_same_ architectures, `configure' can figure that out, but if it prints ++a message saying it cannot guess the machine type, give it the ++`--build=TYPE' option. TYPE can either be a short name for the system ++type, such as `sun4', or a canonical name which has the form: ++ ++ CPU-COMPANY-SYSTEM ++ ++where SYSTEM can have one of these forms: ++ ++ OS KERNEL-OS ++ ++ See the file `config.sub' for the possible values of each field. If ++`config.sub' isn't included in this package, then this package doesn't ++need to know the machine type. ++ ++ If you are _building_ compiler tools for cross-compiling, you should ++use the `--target=TYPE' option to select the type of system they will ++produce code for. ++ ++ If you want to _use_ a cross compiler, that generates code for a ++platform different from the build platform, you should specify the ++"host" platform (i.e., that on which the generated programs will ++eventually be run) with `--host=TYPE'. ++ ++Sharing Defaults ++================ ++ ++ If you want to set default values for `configure' scripts to share, ++you can create a site shell script called `config.site' that gives ++default values for variables like `CC', `cache_file', and `prefix'. ++`configure' looks for `PREFIX/share/config.site' if it exists, then ++`PREFIX/etc/config.site' if it exists. Or, you can set the ++`CONFIG_SITE' environment variable to the location of the site script. ++A warning: not all `configure' scripts look for a site script. ++ ++Defining Variables ++================== ++ ++ Variables not defined in a site shell script can be set in the ++environment passed to `configure'. However, some packages may run ++configure again during the build, and the customized values of these ++variables may be lost. In order to avoid this problem, you should set ++them in the `configure' command line, using `VAR=value'. For example: ++ ++ ./configure CC=/usr/local2/bin/gcc ++ ++will cause the specified gcc to be used as the C compiler (unless it is ++overridden in the site shell script). ++ ++`configure' Invocation ++====================== ++ ++ `configure' recognizes the following options to control how it ++operates. ++ ++`--help' ++`-h' ++ Print a summary of the options to `configure', and exit. ++ ++`--version' ++`-V' ++ Print the version of Autoconf used to generate the `configure' ++ script, and exit. ++ ++`--cache-file=FILE' ++ Enable the cache: use and save the results of the tests in FILE, ++ traditionally `config.cache'. FILE defaults to `/dev/null' to ++ disable caching. ++ ++`--config-cache' ++`-C' ++ Alias for `--cache-file=config.cache'. ++ ++`--quiet' ++`--silent' ++`-q' ++ Do not print messages saying which checks are being made. To ++ suppress all normal output, redirect it to `/dev/null' (any error ++ messages will still be shown). ++ ++`--srcdir=DIR' ++ Look for the package's source code in directory DIR. Usually ++ `configure' can determine that directory automatically. ++ ++`configure' also accepts some other, not widely useful, options. Run ++`configure --help' for more details. + +diff -PruN fontconfig-2.2.2.orig/ltmain.sh fontconfig-2.2.2/ltmain.sh +--- fontconfig-2.2.2.orig/ltmain.sh 2004-03-10 21:14:01.000000000 +0100 ++++ fontconfig-2.2.2/ltmain.sh 2004-04-07 14:25:55.000000000 +0200 +@@ -1,7 +1,7 @@ + # ltmain.sh - Provide generalized library-building support services. + # NOTE: Changing this file will not affect anything until you rerun configure. + # +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003 ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004 + # Free Software Foundation, Inc. + # Originally by Gordon Matzigkeit , 1996 + # +@@ -24,6 +24,29 @@ + # configuration script generated by Autoconf, you may include it under + # the same distribution terms that you use for the rest of that program. + ++basename="s,^.*/,,g" ++ ++# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh ++# is ksh but when the shell is invoked as "sh" and the current value of ++# the _XPG environment variable is not equal to 1 (one), the special ++# positional parameter $0, within a function call, is the name of the ++# function. ++progpath="$0" ++ ++# The name of this program: ++progname=`echo "$progpath" | $SED $basename` ++modename="$progname" ++ ++# Global variables: ++EXIT_SUCCESS=0 ++EXIT_FAILURE=1 ++ ++PROGRAM=ltmain.sh ++PACKAGE=libtool ++VERSION=1.5.4 ++TIMESTAMP=" (1.1220.2.90 2004/04/03 14:10:19) Debian$Rev: 203 $" ++ ++ + # Check that we have a working $echo. + if test "X$1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. +@@ -36,7 +59,7 @@ + : + else + # Restart under the correct shell, and then maybe $echo will work. +- exec $SHELL "$0" --no-reexec ${1+"$@"} ++ exec $SHELL "$progpath" --no-reexec ${1+"$@"} + fi + + if test "X$1" = X--fallback-echo; then +@@ -45,19 +68,9 @@ + cat <&2 + $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Global variables. +@@ -118,10 +132,13 @@ + # Shell function definitions: + # This seems to be the best place for them + ++# func_win32_libid arg ++# return the library type of file 'arg' ++# + # Need a lot of goo to handle *both* DLLs and import libs + # Has to be a shell function in order to 'eat' the argument + # that is supplied when $file_magic_command is called. +-win32_libid () { ++func_win32_libid () { + win32_libid_type="unknown" + win32_fileres=`file -L $1 2>/dev/null` + case $win32_fileres in +@@ -130,7 +147,7 @@ + ;; + *ar\ archive*) # could be an import, or static + if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ +- grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then ++ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then + win32_nmres=`eval $NM -f posix -A $1 | \ + sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'` + if test "X$win32_nmres" = "Ximport" ; then +@@ -140,7 +157,7 @@ + fi + fi + ;; +- *DLL*) ++ *DLL*) + win32_libid_type="x86 DLL" + ;; + *executable*) # but shell scripts are "executable" too... +@@ -154,9 +171,76 @@ + $echo $win32_libid_type + } + ++ ++# func_infer_tag arg ++# Infer tagged configuration to use if any are available and ++# if one wasn't chosen via the "--tag" command line option. ++# Only attempt this if the compiler in the base compile ++# command doesn't match the default compiler. ++# arg is usually of the form 'gcc ...' ++func_infer_tag () { ++ if test -n "$available_tags" && test -z "$tagname"; then ++ CC_quoted= ++ for arg in $CC; do ++ case $arg in ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ arg="\"$arg\"" ++ ;; ++ esac ++ CC_quoted="$CC_quoted $arg" ++ done ++ case $@ in ++ # Blanks in the command may have been stripped by the calling shell, ++ # but not from the CC environment variable when configure was run. ++ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;; ++ # Blanks at the start of $base_compile will cause this to fail ++ # if we don't check for them as well. ++ *) ++ for z in $available_tags; do ++ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then ++ # Evaluate the configuration. ++ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" ++ CC_quoted= ++ for arg in $CC; do ++ # Double-quote args containing other shell metacharacters. ++ case $arg in ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ arg="\"$arg\"" ++ ;; ++ esac ++ CC_quoted="$CC_quoted $arg" ++ done ++ case "$@ " in ++ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ++ # The compiler in the base compile command matches ++ # the one in the tagged configuration. ++ # Assume this is the tagged configuration we want. ++ tagname=$z ++ break ++ ;; ++ esac ++ fi ++ done ++ # If $tagname still isn't set, then no tagged configuration ++ # was found and let the user know that the "--tag" command ++ # line option must be used. ++ if test -z "$tagname"; then ++ $echo "$modename: unable to infer tagged configuration" ++ $echo "$modename: specify a tag with \`--tag'" 1>&2 ++ exit $EXIT_FAILURE ++# else ++# $echo "$modename: using $tagname tagged configuration" ++ fi ++ ;; ++ esac ++ fi ++} + # End of Shell function definitions + ##################################### + ++# Darwin sucks ++eval std_shrext=\"$shrext_cmds\" ++ + # Parse our command line options once, thoroughly. + while test "$#" -gt 0 + do +@@ -176,12 +260,13 @@ + ;; + tag) + tagname="$arg" ++ preserve_args="${preserve_args}=$arg" + + # Check whether tagname contains only valid characters + case $tagname in + *[!-_A-Za-z0-9,/]*) + $echo "$progname: invalid tag name: $tagname" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + +@@ -191,10 +276,10 @@ + # not specially marked. + ;; + *) +- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then ++ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then + taglist="$taglist $tagname" + # Evaluate the configuration. +- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`" ++ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`" + else + $echo "$progname: ignoring unknown tag $tagname" 1>&2 + fi +@@ -223,21 +308,22 @@ + $echo "Copyright (C) 2003 Free Software Foundation, Inc." + $echo "This is free software; see the source for copying conditions. There is NO" + $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +- exit 0 ++ exit $EXIT_SUCCESS + ;; + + --config) +- ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0 ++ ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath + # Now print the configurations for the tags. + for tagname in $taglist; do +- ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0" ++ ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath" + done +- exit 0 ++ exit $EXIT_SUCCESS + ;; + + --debug) + $echo "$progname: enabling shell trace mode" + set -x ++ preserve_args="$preserve_args $arg" + ;; + + --dry-run | -n) +@@ -256,7 +342,7 @@ + else + $echo "disable static libraries" + fi +- exit 0 ++ exit $EXIT_SUCCESS + ;; + + --finish) mode="finish" ;; +@@ -268,6 +354,7 @@ + + --quiet | --silent) + show=: ++ preserve_args="$preserve_args $arg" + ;; + + --tag) prevopt="--tag" prev=tag ;; +@@ -275,6 +362,7 @@ + set tag "$optarg" ${1+"$@"} + shift + prev=tag ++ preserve_args="$preserve_args --tag" + ;; + + -dlopen) +@@ -285,7 +373,7 @@ + -*) + $echo "$modename: unrecognized option \`$arg'" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + + *) +@@ -298,7 +386,7 @@ + if test -n "$prevopt"; then + $echo "$modename: option \`$prevopt' requires an argument" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + # If this variable is set in any of the actions, the command in it +@@ -354,7 +442,7 @@ + if test -n "$execute_dlfiles" && test "$mode" != execute; then + $echo "$modename: unrecognized option \`-dlopen'" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Change the help message to a mode-specific one. +@@ -369,9 +457,11 @@ + # Get the compilation command and the source file. + base_compile= + srcfile="$nonopt" # always keep a non-empty value in "srcfile" ++ suppress_opt=yes + suppress_output= + arg_mode=normal + libobj= ++ later= + + for arg + do +@@ -394,24 +484,19 @@ + -o) + if test -n "$libobj" ; then + $echo "$modename: you cannot specify \`-o' more than once" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + arg_mode=target + continue + ;; + +- -static) +- build_old_libs=yes +- continue +- ;; +- +- -prefer-pic) +- pic_mode=yes ++ -static | -prefer-pic | -prefer-non-pic) ++ later="$later $arg" + continue + ;; + +- -prefer-non-pic) +- pic_mode=no ++ -no-suppress) ++ suppress_opt=no + continue + ;; + +@@ -424,7 +509,7 @@ + args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` + lastarg= + save_ifs="$IFS"; IFS=',' +- for arg in $args; do ++ for arg in $args; do + IFS="$save_ifs" + + # Double-quote args containing other shell metacharacters. +@@ -474,11 +559,11 @@ + case $arg_mode in + arg) + $echo "$modename: you must specify an argument for -Xcompile" +- exit 1 ++ exit $EXIT_FAILURE + ;; + target) + $echo "$modename: you must specify a target with \`-o'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + *) + # Get the name of the library object. +@@ -511,50 +596,30 @@ + *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;; + *) + $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + +- # Infer tagged configuration to use if any are available and +- # if one wasn't chosen via the "--tag" command line option. +- # Only attempt this if the compiler in the base compile +- # command doesn't match the default compiler. +- if test -n "$available_tags" && test -z "$tagname"; then +- case $base_compile in +- # Blanks in the command may have been stripped by the calling shell, +- # but not from the CC environment variable when configure was run. +- " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;; +- # Blanks at the start of $base_compile will cause this to fail +- # if we don't check for them as well. +- *) +- for z in $available_tags; do +- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then +- # Evaluate the configuration. +- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`" +- case "$base_compile " in +- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) +- # The compiler in the base compile command matches +- # the one in the tagged configuration. +- # Assume this is the tagged configuration we want. +- tagname=$z +- break +- ;; +- esac +- fi +- done +- # If $tagname still isn't set, then no tagged configuration +- # was found and let the user know that the "--tag" command +- # line option must be used. +- if test -z "$tagname"; then +- $echo "$modename: unable to infer tagged configuration" +- $echo "$modename: specify a tag with \`--tag'" 1>&2 +- exit 1 +-# else +-# $echo "$modename: using $tagname tagged configuration" +- fi ++ func_infer_tag $base_compile ++ ++ for arg in $later; do ++ case $arg in ++ -static) ++ build_old_libs=yes ++ continue ++ ;; ++ ++ -prefer-pic) ++ pic_mode=yes ++ continue ++ ;; ++ ++ -prefer-non-pic) ++ pic_mode=no ++ continue + ;; + esac +- fi ++ done + + objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` + xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` +@@ -568,7 +633,7 @@ + if test -z "$base_compile"; then + $echo "$modename: you must specify a compilation command" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Delete any leftover library objects. +@@ -579,7 +644,7 @@ + fi + + $run $rm $removelist +- trap "$run $rm $removelist; exit 1" 1 2 15 ++ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 + + # On Cygwin there's no "real" PIC flag so we must build both object types + case $host_os in +@@ -598,7 +663,7 @@ + output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} + lockfile="$output_obj.lock" + removelist="$removelist $output_obj $lockfile" +- trap "$run $rm $removelist; exit 1" 1 2 15 ++ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 + else + output_obj= + need_locks=no +@@ -608,7 +673,7 @@ + # Lock this critical section if it is needed + # We use this script file to make the link, it avoids creating a new file + if test "$need_locks" = yes; then +- until $run ln "$0" "$lockfile" 2>/dev/null; do ++ until $run ln "$progpath" "$lockfile" 2>/dev/null; do + $show "Waiting for $lockfile to be removed" + sleep 2 + done +@@ -626,7 +691,7 @@ + compiler." + + $run $rm $removelist +- exit 1 ++ exit $EXIT_FAILURE + fi + $echo $srcfile > "$lockfile" + fi +@@ -681,7 +746,7 @@ + if $run eval "$command"; then : + else + test -n "$output_obj" && $run $rm $removelist +- exit 1 ++ exit $EXIT_FAILURE + fi + + if test "$need_locks" = warn && +@@ -701,7 +766,7 @@ + compiler." + + $run $rm $removelist +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Just move the object if needed, then go on to compile the next one +@@ -722,7 +787,9 @@ + EOF + + # Allow error messages only from the first compilation. +- suppress_output=' >/dev/null 2>&1' ++ if test "$suppress_opt" = yes; then ++ suppress_output=' >/dev/null 2>&1' ++ fi + else + # No PIC object so indicate it doesn't exist in the libtool + # object file. +@@ -751,7 +818,7 @@ + if $run eval "$command"; then : + else + $run $rm $removelist +- exit 1 ++ exit $EXIT_FAILURE + fi + + if test "$need_locks" = warn && +@@ -771,7 +838,7 @@ + compiler." + + $run $rm $removelist +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Just move the object if needed +@@ -809,7 +876,7 @@ + $run $rm "$lockfile" + fi + +- exit 0 ++ exit $EXIT_SUCCESS + ;; + + # libtool link mode +@@ -835,7 +902,7 @@ + ;; + esac + libtool_args="$nonopt" +- base_compile="$nonopt" ++ base_compile="$nonopt $@" + compile_command="$nonopt" + finalize_command="$nonopt" + +@@ -867,6 +934,7 @@ + no_install=no + objs= + non_pic_objects= ++ precious_files_regex= + prefer_static_libs=no + preload=no + prev= +@@ -880,6 +948,8 @@ + vinfo= + vinfo_number=no + ++ func_infer_tag $base_compile ++ + # We need to know -static, to get the right output filenames. + for arg + do +@@ -911,7 +981,6 @@ + # Go through the arguments, transforming them on the way. + while test "$#" -gt 0; do + arg="$1" +- base_compile="$base_compile $arg" + shift + case $arg in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +@@ -975,7 +1044,7 @@ + export_symbols="$arg" + if test ! -f "$arg"; then + $echo "$modename: symbol file \`$arg' does not exist" +- exit 1 ++ exit $EXIT_FAILURE + fi + prev= + continue +@@ -990,6 +1059,11 @@ + prev= + continue + ;; ++ precious_regex) ++ precious_files_regex="$arg" ++ prev= ++ continue ++ ;; + release) + release="-$arg" + prev= +@@ -1022,7 +1096,7 @@ + test "$pic_object" = none && \ + test "$non_pic_object" = none; then + $echo "$modename: cannot find name of object for \`$arg'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Extract subdirectory from the argument. +@@ -1075,7 +1149,7 @@ + # Only an error if not doing a dry-run. + if test -z "$run"; then + $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + else + # Dry-run case. + +@@ -1096,7 +1170,7 @@ + done + else + $echo "$modename: link input file \`$save_arg' does not exist" +- exit 1 ++ exit $EXIT_FAILURE + fi + arg=$save_arg + prev= +@@ -1108,7 +1182,7 @@ + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + $echo "$modename: only absolute run-paths are allowed" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + if test "$prev" = rpath; then +@@ -1148,6 +1222,11 @@ + finalize_command="$finalize_command $qarg" + continue + ;; ++ shrext) ++ shrext_cmds="$arg" ++ prev= ++ continue ++ ;; + *) + eval "$prev=\"\$arg\"" + prev= +@@ -1196,7 +1275,7 @@ + -export-symbols | -export-symbols-regex) + if test -n "$export_symbols" || test -n "$export_symbols_regex"; then + $echo "$modename: more than one -exported-symbols argument is not allowed" +- exit 1 ++ exit $EXIT_FAILURE + fi + if test "X$arg" = "X-export-symbols"; then + prev=expsyms +@@ -1232,7 +1311,7 @@ + absdir=`cd "$dir" && pwd` + if test -z "$absdir"; then + $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + dir="$absdir" + ;; +@@ -1287,6 +1366,11 @@ + continue + ;; + ++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) ++ deplibs="$deplibs $arg" ++ continue ++ ;; ++ + -module) + module=yes + continue +@@ -1351,6 +1435,11 @@ + + -o) prev=output ;; + ++ -precious-files-regex) ++ prev=precious_regex ++ continue ++ ;; ++ + -release) + prev=release + continue +@@ -1373,7 +1462,7 @@ + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + $echo "$modename: only absolute run-paths are allowed" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + case "$xrpath " in +@@ -1496,7 +1585,7 @@ + test "$pic_object" = none && \ + test "$non_pic_object" = none; then + $echo "$modename: cannot find name of object for \`$arg'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Extract subdirectory from the argument. +@@ -1549,7 +1638,7 @@ + # Only an error if not doing a dry-run. + if test -z "$run"; then + $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + else + # Dry-run case. + +@@ -1616,48 +1705,7 @@ + if test -n "$prev"; then + $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 + $echo "$help" 1>&2 +- exit 1 +- fi +- +- # Infer tagged configuration to use if any are available and +- # if one wasn't chosen via the "--tag" command line option. +- # Only attempt this if the compiler in the base link +- # command doesn't match the default compiler. +- if test -n "$available_tags" && test -z "$tagname"; then +- case $base_compile in +- # Blanks in the command may have been stripped by the calling shell, +- # but not from the CC environment variable when configure was run. +- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;; +- # Blanks at the start of $base_compile will cause this to fail +- # if we don't check for them as well. +- *) +- for z in $available_tags; do +- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then +- # Evaluate the configuration. +- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`" +- case $base_compile in +- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) +- # The compiler in $compile_command matches +- # the one in the tagged configuration. +- # Assume this is the tagged configuration we want. +- tagname=$z +- break +- ;; +- esac +- fi +- done +- # If $tagname still isn't set, then no tagged configuration +- # was found and let the user know that the "--tag" command +- # line option must be used. +- if test -z "$tagname"; then +- $echo "$modename: unable to infer tagged configuration" +- $echo "$modename: specify a tag with \`--tag'" 1>&2 +- exit 1 +-# else +-# $echo "$modename: using $tagname tagged configuration" +- fi +- ;; +- esac ++ exit $EXIT_FAILURE + fi + + if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then +@@ -1701,7 +1749,7 @@ + "") + $echo "$modename: you must specify an output file" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + *.$libext) linkmode=oldlib ;; + *.lo | *.$objext) linkmode=obj ;; +@@ -1711,7 +1759,7 @@ + + case $host in + *cygwin* | *mingw* | *pw32*) +- # don't eliminate duplcations in $postdeps and $predeps ++ # don't eliminate duplications in $postdeps and $predeps + duplicate_compiler_generated_deps=yes + ;; + *) +@@ -1764,7 +1812,7 @@ + *.la) ;; + *) + $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + done +@@ -1790,7 +1838,10 @@ + case $pass in + dlopen) libs="$dlfiles" ;; + dlpreopen) libs="$dlprefiles" ;; +- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; ++ link) ++ libs="$deplibs %DEPLIBS%" ++ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" ++ ;; + esac + fi + if test "$pass" = dlopen; then +@@ -1802,6 +1853,15 @@ + lib= + found=no + case $deplib in ++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) ++ if test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ deplibs="$deplib $deplibs" ++ fi ++ continue ++ ;; + -l*) + if test "$linkmode" != lib && test "$linkmode" != prog; then + $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2 +@@ -1813,12 +1873,18 @@ + fi + name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` + for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do +- # Search the libtool library +- lib="$searchdir/lib${name}.la" +- if test -f "$lib"; then +- found=yes +- break +- fi ++ for search_ext in .la $std_shrext .so .a; do ++ # Search the libtool library ++ lib="$searchdir/lib${name}${search_ext}" ++ if test -f "$lib"; then ++ if test "$search_ext" = ".la"; then ++ found=yes ++ else ++ found=no ++ fi ++ break 2 ++ fi ++ done + done + if test "$found" != yes; then + # deplib doesn't seem to be a libtool library +@@ -1883,11 +1949,11 @@ + fi + if test "$pass" = scan; then + deplibs="$deplib $deplibs" +- newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` + else + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + fi ++ newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` + ;; + *) + $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2 +@@ -1966,14 +2032,14 @@ + if test "$found" = yes || test -f "$lib"; then : + else + $echo "$modename: cannot find the library \`$lib'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Check to see that this really is a libtool archive. + if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : + else + $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` +@@ -2009,7 +2075,7 @@ + if test -z "$libdir"; then + if test -z "$old_library"; then + $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + # It is a libtool convenience library, so add in its objects. + convenience="$convenience $ladir/$objdir/$old_library" +@@ -2026,12 +2092,12 @@ + done + elif test "$linkmode" != prog && test "$linkmode" != lib; then + $echo "$modename: \`$lib' is not a convenience library" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + continue + fi # $pass = conv + +- ++ + # Get the name of the library we link against. + linklib= + for l in $old_library $library_names; do +@@ -2039,16 +2105,18 @@ + done + if test -z "$linklib"; then + $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + # This library was specified with -dlopen. + if test "$pass" = dlopen; then + if test -z "$libdir"; then + $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi +- if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then ++ if test -z "$dlname" || ++ test "$dlopen_support" != yes || ++ test "$build_libtool_libs" = no; then + # If there is no dlname, no dlopen support or we're linking + # statically, we need to preload. We also need to preload any + # dependent libraries so libltdl's deplib preloader doesn't +@@ -2097,7 +2165,7 @@ + if test "$pass" = dlpreopen; then + if test -z "$libdir"; then + $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + # Prefer using a static library (so that no silly _DYNAMIC symbols + # are required to link). +@@ -2124,7 +2192,7 @@ + continue + fi + +- ++ + if test "$linkmode" = prog && test "$pass" != link; then + newlib_search_path="$newlib_search_path $ladir" + deplibs="$lib $deplibs" +@@ -2211,17 +2279,18 @@ + need_relink=yes + fi + # This is a shared library +- +- # Warn about portability, can't link against -module's on some systems (darwin) +- if test "$shouldnotlink" = yes && test "$pass" = link ; then ++ ++ # Warn about portability, can't link against -module's on ++ # some systems (darwin) ++ if test "$shouldnotlink" = yes && test "$pass" = link ; then + $echo + if test "$linkmode" = prog; then + $echo "*** Warning: Linking the executable $output against the loadable module" + else + $echo "*** Warning: Linking the shared library $output against the loadable module" + fi +- $echo "*** $linklib is not portable!" +- fi ++ $echo "*** $linklib is not portable!" ++ fi + if test "$linkmode" = lib && + test "$hardcode_into_libs" = yes; then + # Hardcode the library path. +@@ -2279,9 +2348,10 @@ + else + $show "extracting exported symbol list from \`$soname'" + save_ifs="$IFS"; IFS='~' +- eval cmds=\"$extract_expsyms_cmds\" ++ cmds=$extract_expsyms_cmds + for cmd in $cmds; do + IFS="$save_ifs" ++ eval cmd=\"$cmd\" + $show "$cmd" + $run eval "$cmd" || exit $? + done +@@ -2292,9 +2362,10 @@ + if test -f "$output_objdir/$newlib"; then :; else + $show "generating import library for \`$soname'" + save_ifs="$IFS"; IFS='~' +- eval cmds=\"$old_archive_from_expsyms_cmds\" ++ cmds=$old_archive_from_expsyms_cmds + for cmd in $cmds; do + IFS="$save_ifs" ++ eval cmd=\"$cmd\" + $show "$cmd" + $run eval "$cmd" || exit $? + done +@@ -2317,9 +2388,9 @@ + case $host in + *-*-sco3.2v5* ) add_dir="-L$dir" ;; + *-*-darwin* ) +- # if the lib is a module then we can not link against it, someone +- # is ignoring the new warnings I added +- if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then ++ # if the lib is a module then we can not link against ++ # it, someone is ignoring the new warnings I added ++ if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then + $echo "** Warning, lib $linklib is a module, not a shared library" + if test -z "$old_library" ; then + $echo +@@ -2327,7 +2398,7 @@ + $echo "** The link will probably fail, sorry" + else + add="$dir/$old_library" +- fi ++ fi + fi + esac + elif test "$hardcode_minus_L" = no; then +@@ -2352,7 +2423,7 @@ + if test -n "$inst_prefix_dir"; then + case "$libdir" in + [\\/]*) +- add_dir="-L$inst_prefix_dir$libdir $add_dir" ++ add_dir="$add_dir -L$inst_prefix_dir$libdir" + ;; + esac + fi +@@ -2369,7 +2440,7 @@ + + if test "$lib_linked" != yes; then + $echo "$modename: configuration error: unsupported hardcode properties" +- exit 1 ++ exit $EXIT_FAILURE + fi + + if test -n "$add_shlibpath"; then +@@ -2412,7 +2483,8 @@ + esac + add="-l$name" + elif test "$hardcode_automatic" = yes; then +- if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then ++ if test -n "$inst_prefix_dir" && ++ test -f "$inst_prefix_dir$libdir/$linklib" ; then + add="$inst_prefix_dir$libdir/$linklib" + else + add="$libdir/$linklib" +@@ -2424,7 +2496,7 @@ + if test -n "$inst_prefix_dir"; then + case "$libdir" in + [\\/]*) +- add_dir="-L$inst_prefix_dir$libdir $add_dir" ++ add_dir="$add_dir -L$inst_prefix_dir$libdir" + ;; + esac + fi +@@ -2492,7 +2564,8 @@ + + if test "$linkmode" = lib; then + if test -n "$dependency_libs" && +- { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes || ++ { test "$hardcode_into_libs" != yes || ++ test "$build_old_libs" = yes || + test "$link_static" = yes; }; then + # Extract -R from dependency_libs + temp_deplibs= +@@ -2549,7 +2622,7 @@ + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + if test -z "$libdir"; then + $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + if test "$absdir" != "$libdir"; then + $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 +@@ -2559,7 +2632,8 @@ + depdepl= + case $host in + *-*-darwin*) +- # we do not want to link against static libs, but need to link against shared ++ # we do not want to link against static libs, ++ # but need to link against shared + eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names" ; then + for tmp in $deplibrary_names ; do +@@ -2567,39 +2641,42 @@ + done + if test -f "$path/$depdepl" ; then + depdepl="$path/$depdepl" +- fi +- newlib_search_path="$newlib_search_path $path" +- path="" ++ fi ++ # do not add paths which are already there ++ case " $newlib_search_path " in ++ *" $path "*) ;; ++ *) newlib_search_path="$newlib_search_path $path";; ++ esac + fi ++ path="" + ;; + *) +- path="-L$path" +- ;; +- esac +- ++ path="-L$path" ++ ;; ++ esac + ;; +- -l*) ++ -l*) + case $host in + *-*-darwin*) +- # Again, we only want to link against shared libraries +- eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"` +- for tmp in $newlib_search_path ; do +- if test -f "$tmp/lib$tmp_libs.dylib" ; then +- eval depdepl="$tmp/lib$tmp_libs.dylib" +- break +- fi +- done +- path="" ++ # Again, we only want to link against shared libraries ++ eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"` ++ for tmp in $newlib_search_path ; do ++ if test -f "$tmp/lib$tmp_libs.dylib" ; then ++ eval depdepl="$tmp/lib$tmp_libs.dylib" ++ break ++ fi ++ done ++ path="" + ;; + *) continue ;; +- esac ++ esac + ;; + *) continue ;; + esac + case " $deplibs " in + *" $depdepl "*) ;; +- *) deplibs="$deplibs $depdepl" ;; +- esac ++ *) deplibs="$depdepl $deplibs" ;; ++ esac + case " $deplibs " in + *" $path "*) ;; + *) deplibs="$deplibs $path" ;; +@@ -2689,7 +2766,8 @@ + eval $var=\"$tmp_libs\" + done # for var + fi +- # Last step: remove runtime libs from dependency_libs (they stay in deplibs) ++ # Last step: remove runtime libs from dependency_libs ++ # (they stay in deplibs) + tmp_libs= + for i in $dependency_libs ; do + case " $predeps $postdeps $compiler_lib_search_path " in +@@ -2749,19 +2827,19 @@ + case $outputname in + lib*) + name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` +- eval shared_ext=\"$shrext\" ++ eval shared_ext=\"$shrext_cmds\" + eval libname=\"$libname_spec\" + ;; + *) + if test "$module" = no; then + $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + if test "$need_lib_prefix" != no; then + # Add the "lib" prefix for modules if required + name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` +- eval shared_ext=\"$shrext\" ++ eval shared_ext=\"$shrext_cmds\" + eval libname=\"$libname_spec\" + else + libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` +@@ -2772,7 +2850,7 @@ + if test -n "$objs"; then + if test "$deplibs_check_method" != pass_all; then + $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1 +- exit 1 ++ exit $EXIT_FAILURE + else + $echo + $echo "*** Warning: Linking the shared library $output against the non-libtool" +@@ -2820,13 +2898,13 @@ + if test -n "$8"; then + $echo "$modename: too many parameters to \`-version-info'" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + # convert absolute version numbers to libtool ages + # this retains compatibility with .la files and attempts + # to make the code below a bit more comprehensible +- ++ + case $vinfo_number in + yes) + number_major="$2" +@@ -2870,7 +2948,7 @@ + *) + $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 + $echo "$modename: \`$vinfo' is not valid version information" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + +@@ -2879,7 +2957,7 @@ + *) + $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 + $echo "$modename: \`$vinfo' is not valid version information" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + +@@ -2888,14 +2966,14 @@ + *) + $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 + $echo "$modename: \`$vinfo' is not valid version information" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + + if test "$age" -gt "$current"; then + $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 + $echo "$modename: \`$vinfo' is not valid version information" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Calculate the version variables. +@@ -2984,7 +3062,7 @@ + *) + $echo "$modename: unknown library version type \`$version_type'" 1>&2 + $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + +@@ -3038,6 +3116,12 @@ + *.$objext) + ;; + $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) ++ if test "X$precious_files_regex" != "X"; then ++ if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 ++ then ++ continue ++ fi ++ fi + removelist="$removelist $p" + ;; + *) ;; +@@ -3517,7 +3601,7 @@ + fi + + # Get the real and link names of the library. +- eval shared_ext=\"$shrext\" ++ eval shared_ext=\"$shrext_cmds\" + eval library_names=\"$library_names_spec\" + set dummy $library_names + realname="$2" +@@ -3547,10 +3631,11 @@ + $show "generating symbol list for \`$libname.la'" + export_symbols="$output_objdir/$libname.exp" + $run $rm $export_symbols +- eval cmds=\"$export_symbols_cmds\" ++ cmds=$export_symbols_cmds + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" ++ eval cmd=\"$cmd\" + if len=`expr "X$cmd" : ".*"` && + test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then + $show "$cmd" +@@ -3580,12 +3665,12 @@ + for test_deplib in $deplibs; do + case " $convenience " in + *" $test_deplib "*) ;; +- *) ++ *) + tmp_deplibs="$tmp_deplibs $test_deplib" + ;; + esac + done +- deplibs="$tmp_deplibs" ++ deplibs="$tmp_deplibs" + + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec"; then +@@ -3667,19 +3752,23 @@ + # Do each of the archive commands. + if test "$module" = yes && test -n "$module_cmds" ; then + if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then +- eval cmds=\"$module_expsym_cmds\" ++ eval test_cmds=\"$module_expsym_cmds\" ++ cmds=$module_expsym_cmds + else +- eval cmds=\"$module_cmds\" ++ eval test_cmds=\"$module_cmds\" ++ cmds=$module_cmds + fi + else + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then +- eval cmds=\"$archive_expsym_cmds\" ++ eval test_cmds=\"$archive_expsym_cmds\" ++ cmds=$archive_expsym_cmds + else +- eval cmds=\"$archive_cmds\" ++ eval test_cmds=\"$archive_cmds\" ++ cmds=$archive_cmds + fi + fi + +- if test "X$skipped_export" != "X:" && len=`expr "X$cmds" : ".*"` && ++ if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` && + test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then + : + else +@@ -3780,19 +3869,28 @@ + # value of $libobjs for piecewise linking. + + # Do each of the archive commands. ++ if test "$module" = yes && test -n "$module_cmds" ; then ++ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then ++ cmds=$module_expsym_cmds ++ else ++ cmds=$module_cmds ++ fi ++ else + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then +- eval cmds=\"$archive_expsym_cmds\" ++ cmds=$archive_expsym_cmds + else +- eval cmds=\"$archive_cmds\" ++ cmds=$archive_cmds ++ fi + fi + + # Append the command to remove the reloadable object files + # to the just-reset $cmds. +- eval cmds=\"\$cmds~$rm $delfiles\" ++ eval cmds=\"\$cmds~\$rm $delfiles\" + fi + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" ++ eval cmd=\"$cmd\" + $show "$cmd" + $run eval "$cmd" || exit $? + done +@@ -3801,7 +3899,7 @@ + # Restore the uninstalled library and exit + if test "$mode" = relink; then + $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? +- exit 0 ++ exit $EXIT_SUCCESS + fi + + # Create links to the real library. +@@ -3849,7 +3947,7 @@ + *.lo) + if test -n "$objs$old_deplibs"; then + $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + libobj="$output" + obj=`$echo "X$output" | $Xsed -e "$lo2o"` +@@ -3943,10 +4041,11 @@ + reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + + output="$obj" +- eval cmds=\"$reload_cmds\" ++ cmds=$reload_cmds + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" ++ eval cmd=\"$cmd\" + $show "$cmd" + $run eval "$cmd" || exit $? + done +@@ -3959,7 +4058,7 @@ + $run ${rm}r $gentop + fi + +- exit 0 ++ exit $EXIT_SUCCESS + fi + + if test "$build_libtool_libs" != yes; then +@@ -3972,17 +4071,18 @@ + # accidentally link it into a program. + # $show "echo timestamp > $libobj" + # $run eval "echo timestamp > $libobj" || exit $? +- exit 0 ++ exit $EXIT_SUCCESS + fi + + if test -n "$pic_flag" || test "$pic_mode" != default; then + # Only do commands if we really have different PIC objects. + reload_objs="$libobjs $reload_conv_objs" + output="$libobj" +- eval cmds=\"$reload_cmds\" ++ cmds=$reload_cmds + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" ++ eval cmd=\"$cmd\" + $show "$cmd" + $run eval "$cmd" || exit $? + done +@@ -3994,7 +4094,7 @@ + $run ${rm}r $gentop + fi + +- exit 0 ++ exit $EXIT_SUCCESS + ;; + + prog) +@@ -4312,7 +4412,7 @@ + ;; + *) + $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + else +@@ -4400,7 +4500,7 @@ + # Link the executable and exit + $show "$link_command" + $run eval "$link_command" || exit $? +- exit 0 ++ exit $EXIT_SUCCESS + fi + + if test "$hardcode_action" = relink; then +@@ -4455,10 +4555,10 @@ + fi + + # Quote $echo for shipping. +- if test "X$echo" = "X$SHELL $0 --fallback-echo"; then +- case $0 in +- [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";; +- *) qecho="$SHELL `pwd`/$0 --fallback-echo";; ++ if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then ++ case $progpath in ++ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; ++ *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; + esac + qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"` + else +@@ -4484,7 +4584,7 @@ + cwrappersource=`$echo ${objdir}/lt-${output}.c` + cwrapper=`$echo ${output}.exe` + $rm $cwrappersource $cwrapper +- trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15 ++ trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 + + cat > $cwrappersource < $output "\ + #! $SHELL +@@ -4793,7 +4893,7 @@ + else + $echo \"\$relink_command_output\" >&2 + $rm \"\$progdir/\$file\" +- exit 1 ++ exit $EXIT_FAILURE + fi + fi + +@@ -4855,20 +4955,20 @@ + esac + $echo >> $output "\ + \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" +- exit 1 ++ exit $EXIT_FAILURE + fi + else + # The program doesn't exist. + \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2 + \$echo \"This script is just a wrapper for \$program.\" 1>&2 + $echo \"See the $PACKAGE documentation for more information.\" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + fi\ + " + chmod +x $output + fi +- exit 0 ++ exit $EXIT_SUCCESS + ;; + esac + +@@ -4954,13 +5054,13 @@ + + # Do each command in the archive commands. + if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then +- eval cmds=\"$old_archive_from_new_cmds\" ++ cmds=$old_archive_from_new_cmds + else + eval cmds=\"$old_archive_cmds\" + + if len=`expr "X$cmds" : ".*"` && + test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then +- : ++ cmds=$old_archive_cmds + else + # the command line is too long to link in one step, link in parts + $echo "using piecewise archive linking..." +@@ -4987,7 +5087,7 @@ + for obj in $save_oldobjs + do + last_oldobj=$obj +- done ++ done + for obj in $save_oldobjs + do + oldobjs="$objlist $obj" +@@ -5001,7 +5101,7 @@ + oldobjs=$objlist + if test "$obj" = "$last_oldobj" ; then + RANLIB=$save_RANLIB +- fi ++ fi + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" + objlist= +@@ -5012,12 +5112,13 @@ + if test "X$oldobjs" = "X" ; then + eval cmds=\"\$concat_cmds\" + else +- eval cmds=\"\$concat_cmds~$old_archive_cmds\" ++ eval cmds=\"\$concat_cmds~\$old_archive_cmds\" + fi + fi + fi + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do ++ eval cmd=\"$cmd\" + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" || exit $? +@@ -5049,8 +5150,12 @@ + fi + done + # Quote the link command for shipping. +- relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)" ++ relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" + relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` ++ if test "$hardcode_automatic" = yes ; then ++ relink_command= ++ fi ++ + + # Only create the output if not a dry run. + if test -z "$run"; then +@@ -5069,7 +5174,7 @@ + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + if test -z "$libdir"; then + $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + newdependency_libs="$newdependency_libs $libdir/$name" + ;; +@@ -5083,7 +5188,7 @@ + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + if test -z "$libdir"; then + $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + newdlfiles="$newdlfiles $libdir/$name" + done +@@ -5094,11 +5199,30 @@ + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + if test -z "$libdir"; then + $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + newdlprefiles="$newdlprefiles $libdir/$name" + done + dlprefiles="$newdlprefiles" ++ else ++ newdlfiles= ++ for lib in $dlfiles; do ++ case $lib in ++ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; ++ *) abs=`pwd`"/$lib" ;; ++ esac ++ newdlfiles="$newdlfiles $abs" ++ done ++ dlfiles="$newdlfiles" ++ newdlprefiles= ++ for lib in $dlprefiles; do ++ case $lib in ++ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; ++ *) abs=`pwd`"/$lib" ;; ++ esac ++ newdlprefiles="$newdlprefiles $abs" ++ done ++ dlprefiles="$newdlprefiles" + fi + $rm $output + # place dlname in correct position for cygwin +@@ -5155,7 +5279,7 @@ + $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $? + ;; + esac +- exit 0 ++ exit $EXIT_SUCCESS + ;; + + # libtool install mode +@@ -5244,13 +5368,13 @@ + if test -z "$install_prog"; then + $echo "$modename: you must specify an install program" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + if test -n "$prev"; then + $echo "$modename: the \`$prev' option requires an argument" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + if test -z "$files"; then +@@ -5260,7 +5384,7 @@ + $echo "$modename: you must specify a destination" 1>&2 + fi + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Strip any trailing slash from the destination. +@@ -5281,7 +5405,7 @@ + if test "$#" -gt 2; then + $echo "$modename: \`$dest' is not a directory" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + fi + case $destdir in +@@ -5293,7 +5417,7 @@ + *) + $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + done +@@ -5322,7 +5446,7 @@ + else + $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + library_names= +@@ -5364,7 +5488,7 @@ + # but it's something to keep an eye on. + if test "$inst_prefix_dir" = "$destdir"; then + $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + if test -n "$inst_prefix_dir"; then +@@ -5379,7 +5503,7 @@ + if $run eval "$relink_command"; then : + else + $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + fi + +@@ -5414,10 +5538,11 @@ + + # Do each command in the postinstall commands. + lib="$destdir/$realname" +- eval cmds=\"$postinstall_cmds\" ++ cmds=$postinstall_cmds + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" ++ eval cmd=\"$cmd\" + $show "$cmd" + $run eval "$cmd" || exit $? + done +@@ -5457,7 +5582,7 @@ + *) + $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + +@@ -5475,7 +5600,7 @@ + $show "$install_prog $staticobj $staticdest" + $run eval "$install_prog \$staticobj \$staticdest" || exit $? + fi +- exit 0 ++ exit $EXIT_SUCCESS + ;; + + *) +@@ -5529,7 +5654,7 @@ + # Check the variables that should have been set. + if test -z "$notinst_deplibs"; then + $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + finalize=yes +@@ -5570,8 +5695,12 @@ + tmpdir="/tmp" + test -n "$TMPDIR" && tmpdir="$TMPDIR" + tmpdir="$tmpdir/libtool-$$" +- if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then : ++ save_umask=`umask` ++ umask 0077 ++ if $mkdir "$tmpdir"; then ++ umask $save_umask + else ++ umask $save_umask + $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 + continue + fi +@@ -5630,16 +5759,17 @@ + $show "$install_prog $file $oldlib" + $run eval "$install_prog \$file \$oldlib" || exit $? + +- if test -n "$stripme" && test -n "$striplib"; then ++ if test -n "$stripme" && test -n "$old_striplib"; then + $show "$old_striplib $oldlib" + $run eval "$old_striplib $oldlib" || exit $? + fi + + # Do each command in the postinstall commands. +- eval cmds=\"$old_postinstall_cmds\" ++ cmds=$old_postinstall_cmds + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" ++ eval cmd=\"$cmd\" + $show "$cmd" + $run eval "$cmd" || exit $? + done +@@ -5653,9 +5783,9 @@ + if test -n "$current_libdirs"; then + # Maybe just do a dry run. + test -n "$run" && current_libdirs=" -n$current_libdirs" +- exec_cmd='$SHELL $0 --finish$current_libdirs' ++ exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' + else +- exit 0 ++ exit $EXIT_SUCCESS + fi + ;; + +@@ -5674,10 +5804,11 @@ + for libdir in $libdirs; do + if test -n "$finish_cmds"; then + # Do each command in the finish commands. +- eval cmds=\"$finish_cmds\" ++ cmds=$finish_cmds + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" ++ eval cmd=\"$cmd\" + $show "$cmd" + $run eval "$cmd" || admincmds="$admincmds + $cmd" +@@ -5694,7 +5825,7 @@ + fi + + # Exit here if they wanted silent mode. +- test "$show" = : && exit 0 ++ test "$show" = : && exit $EXIT_SUCCESS + + $echo "----------------------------------------------------------------------" + $echo "Libraries have been installed in:" +@@ -5730,7 +5861,7 @@ + $echo "See any operating system documentation about shared libraries for" + $echo "more information, such as the ld(1) and ld.so(8) manual pages." + $echo "----------------------------------------------------------------------" +- exit 0 ++ exit $EXIT_SUCCESS + ;; + + # libtool execute mode +@@ -5742,7 +5873,7 @@ + if test -z "$cmd"; then + $echo "$modename: you must specify a COMMAND" 1>&2 + $echo "$help" +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Handle -dlopen flags immediately. +@@ -5750,7 +5881,7 @@ + if test ! -f "$file"; then + $echo "$modename: \`$file' is not a file" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + dir= +@@ -5761,7 +5892,7 @@ + else + $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Read the libtool library. +@@ -5788,7 +5919,7 @@ + dir="$dir/$objdir" + else + $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + ;; + +@@ -5868,7 +5999,7 @@ + $echo "export $shlibpath_var" + fi + $echo "$cmd$args" +- exit 0 ++ exit $EXIT_SUCCESS + fi + ;; + +@@ -5896,7 +6027,7 @@ + if test -z "$rm"; then + $echo "$modename: you must specify an RM program" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + rmdirs= +@@ -5951,10 +6082,11 @@ + if test "$mode" = uninstall; then + if test -n "$library_names"; then + # Do each command in the postuninstall commands. +- eval cmds=\"$postuninstall_cmds\" ++ cmds=$postuninstall_cmds + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" ++ eval cmd=\"$cmd\" + $show "$cmd" + $run eval "$cmd" + if test "$?" -ne 0 && test "$rmforce" != yes; then +@@ -5966,10 +6098,11 @@ + + if test -n "$old_library"; then + # Do each command in the old_postuninstall commands. +- eval cmds=\"$old_postuninstall_cmds\" ++ cmds=$old_postuninstall_cmds + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" ++ eval cmd=\"$cmd\" + $show "$cmd" + $run eval "$cmd" + if test "$?" -ne 0 && test "$rmforce" != yes; then +@@ -6008,7 +6141,7 @@ + if test "$mode" = clean ; then + noexename=$name + case $file in +- *.exe) ++ *.exe) + file=`$echo $file|${SED} 's,.exe$,,'` + noexename=`$echo $name|${SED} 's,.exe$,,'` + # $file with .exe has already been added to rmfiles, +@@ -6053,20 +6186,20 @@ + "") + $echo "$modename: you must specify a MODE" 1>&2 + $echo "$generic_help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + + if test -z "$exec_cmd"; then + $echo "$modename: invalid operation mode \`$mode'" 1>&2 + $echo "$generic_help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + fi # test -z "$show_help" + + if test -n "$exec_cmd"; then + eval exec $exec_cmd +- exit 1 ++ exit $EXIT_FAILURE + fi + + # We need to display help for each of the modes. +@@ -6102,7 +6235,7 @@ + a more detailed description of MODE. + + Report bugs to ." +- exit 0 ++ exit $EXIT_SUCCESS + ;; + + clean) +@@ -6214,6 +6347,8 @@ + -no-undefined declare that a library does not refer to external symbols + -o OUTPUT-FILE create OUTPUT-FILE from the specified objects + -objectlist FILE Use a list of object files found in FILE to specify objects ++ -precious-files-regex REGEX ++ don't remove output files matching REGEX + -release RELEASE specify package release information + -rpath LIBDIR the created library will eventually be installed in LIBDIR + -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries +@@ -6255,14 +6390,14 @@ + *) + $echo "$modename: invalid operation mode \`$mode'" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + + $echo + $echo "Try \`$modename --help' for more information about other modes." + +-exit 0 ++exit $EXIT_SUCCESS + + # The TAGs below are defined such that we never get into a situation + # in which we disable both kinds of libraries. Given conflicting +diff -PruN fontconfig-2.2.2.orig/Makefile.in fontconfig-2.2.2/Makefile.in +--- fontconfig-2.2.2.orig/Makefile.in 2004-03-10 21:43:27.000000000 +0100 ++++ fontconfig-2.2.2/Makefile.in 2004-04-07 14:26:24.000000000 +0200 +@@ -119,6 +119,9 @@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_REVISION = @LT_REVISION@ + LT_VERSION_INFO = @LT_VERSION_INFO@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ +@@ -231,18 +234,18 @@ + + am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) + + $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck +-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) ++$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) + cd $(srcdir) && $(AUTOCONF) + +-$(ACLOCAL_M4): configure.in ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + + config.h: stamp-h1 +@@ -255,7 +258,7 @@ + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h + +-$(srcdir)/config.h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOHEADER) + touch $(srcdir)/config.h.in + +diff -PruN fontconfig-2.2.2.orig/src/Makefile.in fontconfig-2.2.2/src/Makefile.in +--- fontconfig-2.2.2.orig/src/Makefile.in 2004-03-10 21:44:05.000000000 +0100 ++++ fontconfig-2.2.2/src/Makefile.in 2004-04-07 14:26:25.000000000 +0200 +@@ -96,6 +96,9 @@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_REVISION = @LT_REVISION@ + LT_VERSION_INFO = @LT_VERSION_INFO@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ +@@ -258,10 +261,10 @@ + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + fontconfig.def: $(top_builddir)/config.status fontconfig.def.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +diff -PruN fontconfig-2.2.2.orig/test/Makefile.in fontconfig-2.2.2/test/Makefile.in +--- fontconfig-2.2.2.orig/test/Makefile.in 2004-03-10 21:45:22.000000000 +0100 ++++ fontconfig-2.2.2/test/Makefile.in 2004-04-07 14:26:26.000000000 +0200 +@@ -96,6 +96,9 @@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_REVISION = @LT_REVISION@ + LT_VERSION_INFO = @LT_VERSION_INFO@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ +@@ -179,10 +182,10 @@ + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu test/Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: --- fontconfig-2.2.2.orig/debian/patches/00maintainer_mode.patch +++ fontconfig-2.2.2/debian/patches/00maintainer_mode.patch @@ -0,0 +1,10 @@ +--- configure.in.orig 2004-04-07 14:23:00.000000000 +0200 ++++ configure.in 2004-04-07 14:24:29.000000000 +0200 +@@ -34,6 +34,7 @@ + dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's + dnl not possible to extract the version number here from fontconfig.h + AM_INIT_AUTOMAKE(fontconfig, 2.2.2) ++AM_MAINTAINER_MODE + + dnl libtool versioning + --- fontconfig-2.2.2.orig/debian/patches/fonts-conf-ordering.patch +++ fontconfig-2.2.2/debian/patches/fonts-conf-ordering.patch @@ -0,0 +1,21 @@ +--- fonts.conf.in.orig 2003-10-13 18:16:58.000000000 +0200 ++++ fonts.conf.in 2003-10-13 18:17:29.000000000 +0200 +@@ -199,14 +199,14 @@ + + + +- ~/.fonts.conf ++ local.conf + + +- local.conf ++ ~/.fonts.conf + + + +- +- + @FC_DEFAULT_FONTS@ + @FC_FONTPATH@ + ~/.fonts --- fontconfig-2.2.2.orig/debian/patches/fonts-conf-aliases.patch +++ fontconfig-2.2.2/debian/patches/fonts-conf-aliases.patch @@ -0,0 +1,68 @@ +--- fonts.conf.in.orig 2003-11-07 16:00:34.000000000 +0100 ++++ fonts.conf.in 2003-11-07 16:10:32.000000000 +0100 +@@ -80,7 +80,8 @@ + Kochi Mincho + AR PL SungtiL GB + AR PL Mingti2L Big5 +- Baekmuk Batang ++ Baekmuk Batang ++ FreeSerif + serif + + + + $PkgDir +EOF + + # aliases + foreach (defoma_id_get_font($Id, installed => type => 'SaI')) { + print $fh < + $Id->{e_id}->[$_] + $Id->{e_depid}->[$_] + +EOF + } + + # substituded fonts + foreach (defoma_id_get_font($Id, installed => type => 'SSI')) { + print $fh < + $Id->{e_id}->[$_] + $Id->{e_depid}->[$_] + +EOF + } + + print $fh "\n"; + + close $fh; + + defoma_subst_close($Sb); + defoma_id_close_cache($Id); + + system('fc-cache', $PkgDir); + + return 0; +} + +sub main { + my $cmd = shift; + + if ($cmd eq 'init') { + init(); + } elsif ($cmd eq 'register') { + return register(@_); + } elsif ($cmd eq 'unregister') { + return unregister(@_); + } elsif ($cmd eq 'do-install-real') { + return do_install_real(@_); + } elsif ($cmd eq 'do-remove-real') { + return do_remove_real(@_); + } elsif ($cmd eq 'term') { + return term(@_); + } + + 0; +} + +no warnings; + +*truetype = \&main; +*type1 = \&main; +*cid = \&main; + +1;