Index: src/i18n/cs.po
===================================================================
--- src/i18n/cs.po	(revision 527)
+++ src/i18n/cs.po	(working copy)
@@ -6,10 +6,11 @@
 msgstr ""
 "Project-Id-Version: XaoS 3.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 10:56+0100\n"
+"POT-Creation-Date: 2013-11-01 09:09+0100\n"
 "PO-Revision-Date: 2002-08-17 21:44+0200\n"
 "Last-Translator: MadSoft <madsoft@centrum.cz>\n"
 "Language-Team: Czech\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -247,32 +248,32 @@
 msgstr "Zdravíme vás ve %s Xaos verzi!"
 
 # ../ui/ui.c:801
-#: ../ui/ui.c:1580
+#: ../ui/ui.c:1582
 msgid "Can not allocate buffers"
 msgstr "Není dostatek pufferu"
 
 # ../ui/ui.c:812
-#: ../ui/ui.c:1598
+#: ../ui/ui.c:1600
 msgid "Can not create palette"
 msgstr "Paleta barev nelze vytvořit"
 
 # ../ui/ui.c:820
-#: ../ui/ui.c:1610
+#: ../ui/ui.c:1612
 msgid "Can not create image"
 msgstr "Obraz nelze vytvořit"
 
 # ../ui/ui.c:853 ../ui/ui.c:917
-#: ../ui/ui.c:1641 ../ui/ui.c:1692
+#: ../ui/ui.c:1650 ../ui/ui.c:1701
 msgid "Can not allocate tables"
 msgstr "Není místo pro tabulky"
 
 # ../ui/ui.c:901
-#: ../ui/ui.c:1678
+#: ../ui/ui.c:1687
 msgid "Can not initialize driver"
 msgstr "Grafický ovladač nelze inicializovat"
 
 # ../ui/ui.c:904
-#: ../ui/ui.c:1681
+#: ../ui/ui.c:1690
 msgid "Can not return back to previous driver"
 msgstr "Předchzí grafický ovladač nelze zobrazit"
 
@@ -1556,50 +1557,50 @@
 msgid "Replay disabled at line %i"
 msgstr ""
 
-#: ../ui-hlp/ui_helper.c:646
+#: ../ui-hlp/ui_helper.c:648
 msgid "Tutorial files not found. Reinstall XaoS"
 msgstr ""
 
-#: ../ui-hlp/ui_helper.c:651
+#: ../ui-hlp/ui_helper.c:653
 msgid "Preparing first image"
 msgstr ""
 
 # ../ui-hlp/menu.c:976
-#: ../ui-hlp/ui_helper.c:661
+#: ../ui-hlp/ui_helper.c:663
 #, fuzzy
 msgid "Could not open examples"
 msgstr "Nahrání náhodného příkladu"
 
-#: ../ui-hlp/ui_helper.c:667
+#: ../ui-hlp/ui_helper.c:670 ../ui-hlp/ui_helper.c:672
 #, c-format
 msgid "File %s loaded."
 msgstr ""
 
 # ../ui-hlp/menu.c:975
-#: ../ui-hlp/ui_helper.c:676
+#: ../ui-hlp/ui_helper.c:682
 #, fuzzy
 msgid "Saving image..."
 msgstr "Uložení obrazu"
 
 # ../ui-hlp/menu.c:926 ../ui-hlp/menu.c:1046
-#: ../ui-hlp/ui_helper.c:684
+#: ../ui-hlp/ui_helper.c:690
 #, fuzzy
 msgid "Save interrupted"
 msgstr "Přerušení"
 
-#: ../ui-hlp/ui_helper.c:693 ../ui-hlp/ui_helper.c:710
-#: ../ui-hlp/ui_helper.c:777
+#: ../ui-hlp/ui_helper.c:699 ../ui-hlp/ui_helper.c:716
+#: ../ui-hlp/ui_helper.c:783
 #, c-format
 msgid "File %s saved."
 msgstr ""
 
 # ../ui/ui.c:853 ../ui/ui.c:917
-#: ../ui-hlp/ui_helper.c:704
+#: ../ui-hlp/ui_helper.c:710
 #, fuzzy
 msgid "Can not open file"
 msgstr "Není místo pro tabulky"
 
-#: ../ui-hlp/ui_helper.c:799
+#: ../ui-hlp/ui_helper.c:805
 #, c-format
 msgid "Recording to file %s enabled."
 msgstr ""
@@ -1610,7 +1611,7 @@
 msgid "Solid guessing 1"
 msgstr "Solidní hádání"
 
-#: ../engine/btrace.c:292 ../engine/btrace.c:373
+#: ../engine/btrace.c:290 ../engine/btrace.c:371
 msgid "Boundary trace"
 msgstr ""
 
@@ -1620,7 +1621,7 @@
 msgstr ""
 
 #: ../ui/dialog.c:313 ../ui/dialog.c:401 ../ui/dialog.c:1379
-#: ../ui/filesel.c:184 ../ui/ui-drv/cocoa/CustomDialog.m:312
+#: ../ui/filesel.c:190 ../ui/ui-drv/cocoa/CustomDialog.m:312
 msgid "Cancel"
 msgstr ""
 
@@ -1665,7 +1666,7 @@
 msgstr "Obraz nelze vytvořit"
 
 # ../ui/ui.c:812
-#: ../ui-hlp/render.c:313 ../ui-hlp/render.c:596
+#: ../ui-hlp/render.c:313 ../ui-hlp/render.c:597
 #, fuzzy
 msgid "Cannot create context\n"
 msgstr "Paleta barev nelze vytvořit"
@@ -1676,7 +1677,7 @@
 msgid "Cannot open animation file\n"
 msgstr "Není místo pro tabulky"
 
-#: ../ui-hlp/render.c:336 ../ui-hlp/render.c:605
+#: ../ui-hlp/render.c:336 ../ui-hlp/render.c:606
 msgid "Loading catalogs"
 msgstr ""
 
@@ -1691,7 +1692,7 @@
 msgstr "Jenom během animace"
 
 # ../ui/ui.c:853 ../ui/ui.c:917
-#: ../ui-hlp/render.c:396 ../ui-hlp/render.c:514
+#: ../ui-hlp/render.c:396
 #, fuzzy
 msgid "Cannot open image file"
 msgstr "Není místo pro tabulky"
@@ -1702,7 +1703,7 @@
 msgid "Cannot open pattern file"
 msgstr "Není místo pro tabulky"
 
-#: ../ui-hlp/render.c:427 ../ui-hlp/render.c:429 ../ui-hlp/render.c:638
+#: ../ui-hlp/render.c:427 ../ui-hlp/render.c:429 ../ui-hlp/render.c:639
 msgid "Entering calculation loop!"
 msgstr ""
 
@@ -1721,22 +1722,22 @@
 msgid "Frame %4i: "
 msgstr ""
 
-#: ../ui-hlp/render.c:528
+#: ../ui-hlp/render.c:529
 msgid " done."
 msgstr ""
 
-#: ../ui-hlp/render.c:532
+#: ../ui-hlp/render.c:533
 msgid " skipping..."
 msgstr ""
 
 # ../ui-hlp/menu.c:926 ../ui-hlp/menu.c:1046
-#: ../ui-hlp/render.c:565 ../ui-hlp/render.c:657
+#: ../ui-hlp/render.c:566 ../ui-hlp/render.c:658
 #, fuzzy
 msgid "Calculation interrupted"
 msgstr "Přerušení"
 
 # ../ui-hlp/menu.c:931
-#: ../ui-hlp/render.c:568 ../ui-hlp/render.c:570 ../ui-hlp/render.c:659
+#: ../ui-hlp/render.c:569 ../ui-hlp/render.c:571 ../ui-hlp/render.c:660
 #, fuzzy
 msgid "Calculation finished"
 msgstr "Počítání"
Index: src/i18n/fr.po
===================================================================
--- src/i18n/fr.po	(revision 527)
+++ src/i18n/fr.po	(working copy)
@@ -6,10 +6,11 @@
 msgstr ""
 "Project-Id-Version: XaoS 3.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 10:56+0100\n"
+"POT-Creation-Date: 2013-11-01 09:09+0100\n"
 "PO-Revision-Date: 2006-02-05 17:35+0200\n"
 "Last-Translator: Philippe Wautelet <traduc _at_ fractalzone _dot_ be>\n"
 "Language-Team: French\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -203,27 +204,27 @@
 msgid "Welcome to XaoS version %s"
 msgstr "Bienvenue sur XaoS version %s"
 
-#: ../ui/ui.c:1580
+#: ../ui/ui.c:1582
 msgid "Can not allocate buffers"
 msgstr "Ne peut pas allouer les tampons"
 
-#: ../ui/ui.c:1598
+#: ../ui/ui.c:1600
 msgid "Can not create palette"
 msgstr "Ne peut pas créer la palette"
 
-#: ../ui/ui.c:1610
+#: ../ui/ui.c:1612
 msgid "Can not create image"
 msgstr "Ne peut pas créer l'image"
 
-#: ../ui/ui.c:1641 ../ui/ui.c:1692
+#: ../ui/ui.c:1650 ../ui/ui.c:1701
 msgid "Can not allocate tables"
 msgstr "Ne peut pas allouer les tables"
 
-#: ../ui/ui.c:1678
+#: ../ui/ui.c:1687
 msgid "Can not initialize driver"
 msgstr "Ne peut pas initialiser le pilote"
 
-#: ../ui/ui.c:1681
+#: ../ui/ui.c:1690
 msgid "Can not return back to previous driver"
 msgstr "Ne peut pas retourner au pilote précédent"
 
@@ -1274,42 +1275,42 @@
 msgid "Replay disabled at line %i"
 msgstr "Répétition désactivée ŕ la ligne %i"
 
-#: ../ui-hlp/ui_helper.c:646
+#: ../ui-hlp/ui_helper.c:648
 msgid "Tutorial files not found. Reinstall XaoS"
 msgstr "Fichiers didacticiels introuvables. Réinstallez XaoS"
 
-#: ../ui-hlp/ui_helper.c:651
+#: ../ui-hlp/ui_helper.c:653
 msgid "Preparing first image"
 msgstr "Préparation premičre image"
 
-#: ../ui-hlp/ui_helper.c:661
+#: ../ui-hlp/ui_helper.c:663
 msgid "Could not open examples"
 msgstr "Echec ouverture exemples"
 
-#: ../ui-hlp/ui_helper.c:667
+#: ../ui-hlp/ui_helper.c:670 ../ui-hlp/ui_helper.c:672
 #, c-format
 msgid "File %s loaded."
 msgstr "Fichier %s chargé."
 
-#: ../ui-hlp/ui_helper.c:676
+#: ../ui-hlp/ui_helper.c:682
 msgid "Saving image..."
 msgstr "Enregistrement image..."
 
-#: ../ui-hlp/ui_helper.c:684
+#: ../ui-hlp/ui_helper.c:690
 msgid "Save interrupted"
 msgstr "Enregistrement interrompu"
 
-#: ../ui-hlp/ui_helper.c:693 ../ui-hlp/ui_helper.c:710
-#: ../ui-hlp/ui_helper.c:777
+#: ../ui-hlp/ui_helper.c:699 ../ui-hlp/ui_helper.c:716
+#: ../ui-hlp/ui_helper.c:783
 #, c-format
 msgid "File %s saved."
 msgstr "Fichier %s enregistré"
 
-#: ../ui-hlp/ui_helper.c:704
+#: ../ui-hlp/ui_helper.c:710
 msgid "Can not open file"
 msgstr "Echec ouverture fichier"
 
-#: ../ui-hlp/ui_helper.c:799
+#: ../ui-hlp/ui_helper.c:805
 #, c-format
 msgid "Recording to file %s enabled."
 msgstr "Enregistrement vers le fichier %s activé."
@@ -1318,7 +1319,7 @@
 msgid "Solid guessing 1"
 msgstr "Estimation solide 1"
 
-#: ../engine/btrace.c:292 ../engine/btrace.c:373
+#: ../engine/btrace.c:290 ../engine/btrace.c:371
 msgid "Boundary trace"
 msgstr "Détection de frontičre"
 
@@ -1328,7 +1329,7 @@
 msgstr "OK"
 
 #: ../ui/dialog.c:313 ../ui/dialog.c:401 ../ui/dialog.c:1379
-#: ../ui/filesel.c:184 ../ui/ui-drv/cocoa/CustomDialog.m:312
+#: ../ui/filesel.c:190 ../ui/ui-drv/cocoa/CustomDialog.m:312
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -1362,7 +1363,7 @@
 msgid "Cannot create checking buffer!"
 msgstr "Echec création tampon de vérification!"
 
-#: ../ui-hlp/render.c:313 ../ui-hlp/render.c:596
+#: ../ui-hlp/render.c:313 ../ui-hlp/render.c:597
 msgid "Cannot create context\n"
 msgstr "Echec création contexte\n"
 
@@ -1370,7 +1371,7 @@
 msgid "Cannot open animation file\n"
 msgstr "Echec ouverture fichier d'animation\n"
 
-#: ../ui-hlp/render.c:336 ../ui-hlp/render.c:605
+#: ../ui-hlp/render.c:336 ../ui-hlp/render.c:606
 msgid "Loading catalogs"
 msgstr "Chargement catalogues"
 
@@ -1382,7 +1383,7 @@
 msgid "Enabling animation replay\n"
 msgstr "Activation de la répétition d'animation\n"
 
-#: ../ui-hlp/render.c:396 ../ui-hlp/render.c:514
+#: ../ui-hlp/render.c:396
 msgid "Cannot open image file"
 msgstr "Echec ouverture fichier image"
 
@@ -1391,7 +1392,7 @@
 msgid "Cannot open pattern file"
 msgstr "Echec ouverture fichier de motif"
 
-#: ../ui-hlp/render.c:427 ../ui-hlp/render.c:429 ../ui-hlp/render.c:638
+#: ../ui-hlp/render.c:427 ../ui-hlp/render.c:429 ../ui-hlp/render.c:639
 msgid "Entering calculation loop!"
 msgstr "Commençant boucle de calcul!"
 
@@ -1410,19 +1411,19 @@
 msgid "Frame %4i: "
 msgstr "Image %4i : "
 
-#: ../ui-hlp/render.c:528
+#: ../ui-hlp/render.c:529
 msgid " done."
 msgstr " terminé."
 
-#: ../ui-hlp/render.c:532
+#: ../ui-hlp/render.c:533
 msgid " skipping..."
 msgstr " saute..."
 
-#: ../ui-hlp/render.c:565 ../ui-hlp/render.c:657
+#: ../ui-hlp/render.c:566 ../ui-hlp/render.c:658
 msgid "Calculation interrupted"
 msgstr "Calcul interrompu"
 
-#: ../ui-hlp/render.c:568 ../ui-hlp/render.c:570 ../ui-hlp/render.c:659
+#: ../ui-hlp/render.c:569 ../ui-hlp/render.c:571 ../ui-hlp/render.c:660
 msgid "Calculation finished"
 msgstr "Calcul terminé"
 
Index: src/i18n/es.po
===================================================================
--- src/i18n/es.po	(revision 527)
+++ src/i18n/es.po	(working copy)
@@ -6,10 +6,11 @@
 msgstr ""
 "Project-Id-Version: XaoS 3.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 10:56+0100\n"
+"POT-Creation-Date: 2013-11-01 09:09+0100\n"
 "PO-Revision-Date: 2002-10-04 15:22+0200\n"
 "Last-Translator: César Pérez <oroz@users.sourceforge.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -203,27 +204,27 @@
 msgid "Welcome to XaoS version %s"
 msgstr "Bienvenido a XaoS versión %s"
 
-#: ../ui/ui.c:1580
+#: ../ui/ui.c:1582
 msgid "Can not allocate buffers"
 msgstr "No se puede asignar búfer"
 
-#: ../ui/ui.c:1598
+#: ../ui/ui.c:1600
 msgid "Can not create palette"
 msgstr "No se puede crear la paleta"
 
-#: ../ui/ui.c:1610
+#: ../ui/ui.c:1612
 msgid "Can not create image"
 msgstr "No se puede crear la imagen"
 
-#: ../ui/ui.c:1641 ../ui/ui.c:1692
+#: ../ui/ui.c:1650 ../ui/ui.c:1701
 msgid "Can not allocate tables"
 msgstr "No se asignar tablas"
 
-#: ../ui/ui.c:1678
+#: ../ui/ui.c:1687
 msgid "Can not initialize driver"
 msgstr "No se puede inicializar el driver"
 
-#: ../ui/ui.c:1681
+#: ../ui/ui.c:1690
 msgid "Can not return back to previous driver"
 msgstr "No se puede volver al driver anterior"
 
@@ -1313,46 +1314,46 @@
 msgid "Replay disabled at line %i"
 msgstr ""
 
-#: ../ui-hlp/ui_helper.c:646
+#: ../ui-hlp/ui_helper.c:648
 msgid "Tutorial files not found. Reinstall XaoS"
 msgstr ""
 
-#: ../ui-hlp/ui_helper.c:651
+#: ../ui-hlp/ui_helper.c:653
 msgid "Preparing first image"
 msgstr ""
 
-#: ../ui-hlp/ui_helper.c:661
+#: ../ui-hlp/ui_helper.c:663
 #, fuzzy
 msgid "Could not open examples"
 msgstr "Cargar ejemplo aleatorio"
 
-#: ../ui-hlp/ui_helper.c:667
+#: ../ui-hlp/ui_helper.c:670 ../ui-hlp/ui_helper.c:672
 #, c-format
 msgid "File %s loaded."
 msgstr ""
 
-#: ../ui-hlp/ui_helper.c:676
+#: ../ui-hlp/ui_helper.c:682
 #, fuzzy
 msgid "Saving image..."
 msgstr "Guardar imagen"
 
-#: ../ui-hlp/ui_helper.c:684
+#: ../ui-hlp/ui_helper.c:690
 #, fuzzy
 msgid "Save interrupted"
 msgstr "Interrumpir"
 
-#: ../ui-hlp/ui_helper.c:693 ../ui-hlp/ui_helper.c:710
-#: ../ui-hlp/ui_helper.c:777
+#: ../ui-hlp/ui_helper.c:699 ../ui-hlp/ui_helper.c:716
+#: ../ui-hlp/ui_helper.c:783
 #, c-format
 msgid "File %s saved."
 msgstr ""
 
-#: ../ui-hlp/ui_helper.c:704
+#: ../ui-hlp/ui_helper.c:710
 #, fuzzy
 msgid "Can not open file"
 msgstr "No se asignar tablas"
 
-#: ../ui-hlp/ui_helper.c:799
+#: ../ui-hlp/ui_helper.c:805
 #, c-format
 msgid "Recording to file %s enabled."
 msgstr ""
@@ -1361,7 +1362,7 @@
 msgid "Solid guessing 1"
 msgstr ""
 
-#: ../engine/btrace.c:292 ../engine/btrace.c:373
+#: ../engine/btrace.c:290 ../engine/btrace.c:371
 msgid "Boundary trace"
 msgstr ""
 
@@ -1371,7 +1372,7 @@
 msgstr ""
 
 #: ../ui/dialog.c:313 ../ui/dialog.c:401 ../ui/dialog.c:1379
-#: ../ui/filesel.c:184 ../ui/ui-drv/cocoa/CustomDialog.m:312
+#: ../ui/filesel.c:190 ../ui/ui-drv/cocoa/CustomDialog.m:312
 msgid "Cancel"
 msgstr ""
 
@@ -1410,7 +1411,7 @@
 msgid "Cannot create checking buffer!"
 msgstr "No se puede crear la imagen"
 
-#: ../ui-hlp/render.c:313 ../ui-hlp/render.c:596
+#: ../ui-hlp/render.c:313 ../ui-hlp/render.c:597
 #, fuzzy
 msgid "Cannot create context\n"
 msgstr "No se puede crear la paleta"
@@ -1420,7 +1421,7 @@
 msgid "Cannot open animation file\n"
 msgstr "No se asignar tablas"
 
-#: ../ui-hlp/render.c:336 ../ui-hlp/render.c:605
+#: ../ui-hlp/render.c:336 ../ui-hlp/render.c:606
 msgid "Loading catalogs"
 msgstr ""
 
@@ -1434,7 +1435,7 @@
 msgid "Enabling animation replay\n"
 msgstr "Usar sólo durante la animación"
 
-#: ../ui-hlp/render.c:396 ../ui-hlp/render.c:514
+#: ../ui-hlp/render.c:396
 #, fuzzy
 msgid "Cannot open image file"
 msgstr "No se asignar tablas"
@@ -1444,7 +1445,7 @@
 msgid "Cannot open pattern file"
 msgstr "No se asignar tablas"
 
-#: ../ui-hlp/render.c:427 ../ui-hlp/render.c:429 ../ui-hlp/render.c:638
+#: ../ui-hlp/render.c:427 ../ui-hlp/render.c:429 ../ui-hlp/render.c:639
 msgid "Entering calculation loop!"
 msgstr ""
 
@@ -1463,20 +1464,20 @@
 msgid "Frame %4i: "
 msgstr ""
 
-#: ../ui-hlp/render.c:528
+#: ../ui-hlp/render.c:529
 msgid " done."
 msgstr ""
 
-#: ../ui-hlp/render.c:532
+#: ../ui-hlp/render.c:533
 msgid " skipping..."
 msgstr ""
 
-#: ../ui-hlp/render.c:565 ../ui-hlp/render.c:657
+#: ../ui-hlp/render.c:566 ../ui-hlp/render.c:658
 #, fuzzy
 msgid "Calculation interrupted"
 msgstr "Interrumpir"
 
-#: ../ui-hlp/render.c:568 ../ui-hlp/render.c:570 ../ui-hlp/render.c:659
+#: ../ui-hlp/render.c:569 ../ui-hlp/render.c:571 ../ui-hlp/render.c:660
 #, fuzzy
 msgid "Calculation finished"
 msgstr "Cálculo"
Index: src/i18n/it.po
===================================================================
--- src/i18n/it.po	(revision 527)
+++ src/i18n/it.po	(working copy)
@@ -7,10 +7,11 @@
 msgstr ""
 "Project-Id-Version: xaos\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 10:56+0100\n"
+"POT-Creation-Date: 2013-11-01 09:09+0100\n"
 "PO-Revision-Date: 2008-04-08 10:10+0000\n"
 "Last-Translator: Sergio Zanchetta <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -205,27 +206,27 @@
 msgid "Welcome to XaoS version %s"
 msgstr "Benvenuto a XaoS versione %s"
 
-#: ../ui/ui.c:1580
+#: ../ui/ui.c:1582
 msgid "Can not allocate buffers"
 msgstr "Non č possibile allocare i buffer"
 
-#: ../ui/ui.c:1598
+#: ../ui/ui.c:1600
 msgid "Can not create palette"
 msgstr "Non č possibile creare la tavolozza"
 
-#: ../ui/ui.c:1610
+#: ../ui/ui.c:1612
 msgid "Can not create image"
 msgstr "Non č possibile creare l'immagine"
 
-#: ../ui/ui.c:1641 ../ui/ui.c:1692
+#: ../ui/ui.c:1650 ../ui/ui.c:1701
 msgid "Can not allocate tables"
 msgstr "Non č possibile allocare le tabelle"
 
-#: ../ui/ui.c:1678
+#: ../ui/ui.c:1687
 msgid "Can not initialize driver"
 msgstr "Non č possibile inizializzare il driver"
 
-#: ../ui/ui.c:1681
+#: ../ui/ui.c:1690
 msgid "Can not return back to previous driver"
 msgstr "Non č possibile tornare al driver precedente"
 
@@ -1263,42 +1264,42 @@
 msgid "Replay disabled at line %i"
 msgstr "Riproduzione disabilitata alla linea %i"
 
-#: ../ui-hlp/ui_helper.c:646
+#: ../ui-hlp/ui_helper.c:648
 msgid "Tutorial files not found. Reinstall XaoS"
 msgstr "File della guida non trovati. Reinstallare XaoS"
 
-#: ../ui-hlp/ui_helper.c:651
+#: ../ui-hlp/ui_helper.c:653
 msgid "Preparing first image"
 msgstr "Preparazione della prima immagine"
 
-#: ../ui-hlp/ui_helper.c:661
+#: ../ui-hlp/ui_helper.c:663
 msgid "Could not open examples"
 msgstr "Impossibile aprire gli esempi"
 
-#: ../ui-hlp/ui_helper.c:667
+#: ../ui-hlp/ui_helper.c:670 ../ui-hlp/ui_helper.c:672
 #, c-format
 msgid "File %s loaded."
 msgstr "File %s caricato."
 
-#: ../ui-hlp/ui_helper.c:676
+#: ../ui-hlp/ui_helper.c:682
 msgid "Saving image..."
 msgstr "Salvataggio dell'immagine..."
 
-#: ../ui-hlp/ui_helper.c:684
+#: ../ui-hlp/ui_helper.c:690
 msgid "Save interrupted"
 msgstr "Salvataggio interrotto"
 
-#: ../ui-hlp/ui_helper.c:693 ../ui-hlp/ui_helper.c:710
-#: ../ui-hlp/ui_helper.c:777
+#: ../ui-hlp/ui_helper.c:699 ../ui-hlp/ui_helper.c:716
+#: ../ui-hlp/ui_helper.c:783
 #, c-format
 msgid "File %s saved."
 msgstr "File %s salvato."
 
-#: ../ui-hlp/ui_helper.c:704
+#: ../ui-hlp/ui_helper.c:710
 msgid "Can not open file"
 msgstr "Impossibile aprire il file"
 
-#: ../ui-hlp/ui_helper.c:799
+#: ../ui-hlp/ui_helper.c:805
 #, c-format
 msgid "Recording to file %s enabled."
 msgstr "Registrazione nel file %s abilitata."
@@ -1307,7 +1308,7 @@
 msgid "Solid guessing 1"
 msgstr "Stima di uniformitŕ colore 1"
 
-#: ../engine/btrace.c:292 ../engine/btrace.c:373
+#: ../engine/btrace.c:290 ../engine/btrace.c:371
 msgid "Boundary trace"
 msgstr "Traccia dei contorni"
 
@@ -1317,7 +1318,7 @@
 msgstr "OK"
 
 #: ../ui/dialog.c:313 ../ui/dialog.c:401 ../ui/dialog.c:1379
-#: ../ui/filesel.c:184 ../ui/ui-drv/cocoa/CustomDialog.m:312
+#: ../ui/filesel.c:190 ../ui/ui-drv/cocoa/CustomDialog.m:312
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -1351,7 +1352,7 @@
 msgid "Cannot create checking buffer!"
 msgstr "Impossibile creare il buffer di controllo!"
 
-#: ../ui-hlp/render.c:313 ../ui-hlp/render.c:596
+#: ../ui-hlp/render.c:313 ../ui-hlp/render.c:597
 msgid "Cannot create context\n"
 msgstr "Impossibile creare il contesto\n"
 
@@ -1359,7 +1360,7 @@
 msgid "Cannot open animation file\n"
 msgstr "Impossibile aprire il file di animazione\n"
 
-#: ../ui-hlp/render.c:336 ../ui-hlp/render.c:605
+#: ../ui-hlp/render.c:336 ../ui-hlp/render.c:606
 msgid "Loading catalogs"
 msgstr "Carimento dei cataloghi"
 
@@ -1371,7 +1372,7 @@
 msgid "Enabling animation replay\n"
 msgstr "Abilitazione della riproduzione animazione\n"
 
-#: ../ui-hlp/render.c:396 ../ui-hlp/render.c:514
+#: ../ui-hlp/render.c:396
 msgid "Cannot open image file"
 msgstr "Impossibile aprire il file dell'immagine"
 
@@ -1379,7 +1380,7 @@
 msgid "Cannot open pattern file"
 msgstr "Impossibile aprire il file della trama"
 
-#: ../ui-hlp/render.c:427 ../ui-hlp/render.c:429 ../ui-hlp/render.c:638
+#: ../ui-hlp/render.c:427 ../ui-hlp/render.c:429 ../ui-hlp/render.c:639
 msgid "Entering calculation loop!"
 msgstr "Ingresso in un loop di calcolo!"
 
@@ -1398,19 +1399,19 @@
 msgid "Frame %4i: "
 msgstr "Fotogramma %4i: "
 
-#: ../ui-hlp/render.c:528
+#: ../ui-hlp/render.c:529
 msgid " done."
 msgstr " fatto."
 
-#: ../ui-hlp/render.c:532
+#: ../ui-hlp/render.c:533
 msgid " skipping..."
 msgstr " passaggio al successivo..."
 
-#: ../ui-hlp/render.c:565 ../ui-hlp/render.c:657
+#: ../ui-hlp/render.c:566 ../ui-hlp/render.c:658
 msgid "Calculation interrupted"
 msgstr "Calcolo interrotto"
 
-#: ../ui-hlp/render.c:568 ../ui-hlp/render.c:570 ../ui-hlp/render.c:659
+#: ../ui-hlp/render.c:569 ../ui-hlp/render.c:571 ../ui-hlp/render.c:660
 msgid "Calculation finished"
 msgstr "Calcolo concluso"
 
Index: src/i18n/hu.po
===================================================================
--- src/i18n/hu.po	(revision 527)
+++ src/i18n/hu.po	(working copy)
@@ -6,10 +6,11 @@
 msgstr ""
 "Project-Id-Version: XaoS 3.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 10:56+0100\n"
+"POT-Creation-Date: 2013-11-01 09:09+0100\n"
 "PO-Revision-Date: 2002-08-17 21:44+0200\n"
 "Last-Translator: Zoltan Kovacs <kovzol@math.u-szeged.hu>\n"
 "Language-Team: Hungarian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -202,27 +203,27 @@
 msgid "Welcome to XaoS version %s"
 msgstr "Köszöntjük a XaoS %s verziójában!"
 
-#: ../ui/ui.c:1580
+#: ../ui/ui.c:1582
 msgid "Can not allocate buffers"
 msgstr "Nincs elegendő puffer"
 
-#: ../ui/ui.c:1598
+#: ../ui/ui.c:1600
 msgid "Can not create palette"
 msgstr "A színpaletta nem hozható létre"
 
-#: ../ui/ui.c:1610
+#: ../ui/ui.c:1612
 msgid "Can not create image"
 msgstr "A kép nem hozható létre"
 
-#: ../ui/ui.c:1641 ../ui/ui.c:1692
+#: ../ui/ui.c:1650 ../ui/ui.c:1701
 msgid "Can not allocate tables"
 msgstr "Nincs hely a tábláknak"
 
-#: ../ui/ui.c:1678
+#: ../ui/ui.c:1687
 msgid "Can not initialize driver"
 msgstr "A grafikus meghajtó nem inicializálható"
 
-#: ../ui/ui.c:1681
+#: ../ui/ui.c:1690
 msgid "Can not return back to previous driver"
 msgstr "Az előző grafikus meghajtó nem tölthető be"
 
@@ -1256,43 +1257,43 @@
 msgid "Replay disabled at line %i"
 msgstr "A lejátszás a(z) %i sorszámú sornál megszakadt"
 
-#: ../ui-hlp/ui_helper.c:646
+#: ../ui-hlp/ui_helper.c:648
 msgid "Tutorial files not found. Reinstall XaoS"
 msgstr ""
 "A tankönyv fájlok nem találhatók. A XaoS programot újra kell telepíteni"
 
-#: ../ui-hlp/ui_helper.c:651
+#: ../ui-hlp/ui_helper.c:653
 msgid "Preparing first image"
 msgstr "Az első kép elkészítése"
 
-#: ../ui-hlp/ui_helper.c:661
+#: ../ui-hlp/ui_helper.c:663
 msgid "Could not open examples"
 msgstr "A példák nem nyithatók meg"
 
-#: ../ui-hlp/ui_helper.c:667
+#: ../ui-hlp/ui_helper.c:670 ../ui-hlp/ui_helper.c:672
 #, c-format
 msgid "File %s loaded."
 msgstr "A(z) %s fájl betöltődött."
 
-#: ../ui-hlp/ui_helper.c:676
+#: ../ui-hlp/ui_helper.c:682
 msgid "Saving image..."
 msgstr "Kép mentése..."
 
-#: ../ui-hlp/ui_helper.c:684
+#: ../ui-hlp/ui_helper.c:690
 msgid "Save interrupted"
 msgstr "A mentés félbeszakadt"
 
-#: ../ui-hlp/ui_helper.c:693 ../ui-hlp/ui_helper.c:710
-#: ../ui-hlp/ui_helper.c:777
+#: ../ui-hlp/ui_helper.c:699 ../ui-hlp/ui_helper.c:716
+#: ../ui-hlp/ui_helper.c:783
 #, c-format
 msgid "File %s saved."
 msgstr "A(z) %s fájl elmentve."
 
-#: ../ui-hlp/ui_helper.c:704
+#: ../ui-hlp/ui_helper.c:710
 msgid "Can not open file"
 msgstr "A fájl nem nyitható meg"
 
-#: ../ui-hlp/ui_helper.c:799
+#: ../ui-hlp/ui_helper.c:805
 #, c-format
 msgid "Recording to file %s enabled."
 msgstr "A(z) %s fájlba történő felvétel elindítva."
@@ -1301,7 +1302,7 @@
 msgid "Solid guessing 1"
 msgstr "Egyszerű találgatás 1"
 
-#: ../engine/btrace.c:292 ../engine/btrace.c:373
+#: ../engine/btrace.c:290 ../engine/btrace.c:371
 msgid "Boundary trace"
 msgstr "Határkövetés"
 
@@ -1311,7 +1312,7 @@
 msgstr ""
 
 #: ../ui/dialog.c:313 ../ui/dialog.c:401 ../ui/dialog.c:1379
-#: ../ui/filesel.c:184 ../ui/ui-drv/cocoa/CustomDialog.m:312
+#: ../ui/filesel.c:190 ../ui/ui-drv/cocoa/CustomDialog.m:312
 msgid "Cancel"
 msgstr "Mégsem"
 
@@ -1345,7 +1346,7 @@
 msgid "Cannot create checking buffer!"
 msgstr "Az ellenőrző puffer nem hozható létre!"
 
-#: ../ui-hlp/render.c:313 ../ui-hlp/render.c:596
+#: ../ui-hlp/render.c:313 ../ui-hlp/render.c:597
 msgid "Cannot create context\n"
 msgstr "A kontextus nem hozható létre\n"
 
@@ -1353,7 +1354,7 @@
 msgid "Cannot open animation file\n"
 msgstr "Az animációs fájl nem nyitható meg\n"
 
-#: ../ui-hlp/render.c:336 ../ui-hlp/render.c:605
+#: ../ui-hlp/render.c:336 ../ui-hlp/render.c:606
 msgid "Loading catalogs"
 msgstr "Filmfájlok szövegeinek betöltése"
 
@@ -1365,7 +1366,7 @@
 msgid "Enabling animation replay\n"
 msgstr "Animáció-visszajátszás bekapcsolva\n"
 
-#: ../ui-hlp/render.c:396 ../ui-hlp/render.c:514
+#: ../ui-hlp/render.c:396
 msgid "Cannot open image file"
 msgstr "A képfájl nem nyitható meg"
 
@@ -1373,7 +1374,7 @@
 msgid "Cannot open pattern file"
 msgstr "A mintát tartalmazó fájl nem nyitható meg"
 
-#: ../ui-hlp/render.c:427 ../ui-hlp/render.c:429 ../ui-hlp/render.c:638
+#: ../ui-hlp/render.c:427 ../ui-hlp/render.c:429 ../ui-hlp/render.c:639
 msgid "Entering calculation loop!"
 msgstr "A számítási ciklus kezdete!"
 
@@ -1392,19 +1393,19 @@
 msgid "Frame %4i: "
 msgstr "%4i. képkocka: "
 
-#: ../ui-hlp/render.c:528
+#: ../ui-hlp/render.c:529
 msgid " done."
 msgstr " kész."
 
-#: ../ui-hlp/render.c:532
+#: ../ui-hlp/render.c:533
 msgid " skipping..."
 msgstr " kihagyva..."
 
-#: ../ui-hlp/render.c:565 ../ui-hlp/render.c:657
+#: ../ui-hlp/render.c:566 ../ui-hlp/render.c:658
 msgid "Calculation interrupted"
 msgstr "A számítás félbeszakadt"
 
-#: ../ui-hlp/render.c:568 ../ui-hlp/render.c:570 ../ui-hlp/render.c:659
+#: ../ui-hlp/render.c:569 ../ui-hlp/render.c:571 ../ui-hlp/render.c:660
 msgid "Calculation finished"
 msgstr "A számítás véget ért"
 
Index: src/i18n/ro.po
===================================================================
--- src/i18n/ro.po	(revision 527)
+++ src/i18n/ro.po	(working copy)
@@ -6,10 +6,11 @@
 msgstr ""
 "Project-Id-Version: XaoS 3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 10:56+0100\n"
+"POT-Creation-Date: 2013-11-01 09:09+0100\n"
 "PO-Revision-Date: 2008-04-28 11:21+0100\n"
 "Last-Translator: Zoltan Kovacs <kovzol@matek.hu>\n"
 "Language-Team: The XaoS Development Team <xaos-devel@lists.sf.net>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -207,27 +208,27 @@
 msgid "Welcome to XaoS version %s"
 msgstr "Bine ati venit la XaoS Versiunea %s"
 
-#: ../ui/ui.c:1580
+#: ../ui/ui.c:1582
 msgid "Can not allocate buffers"
 msgstr "Nu se pot aloca bufferele"
 
-#: ../ui/ui.c:1598
+#: ../ui/ui.c:1600
 msgid "Can not create palette"
 msgstr "Nu se poate crea paleta"
 
-#: ../ui/ui.c:1610
+#: ../ui/ui.c:1612
 msgid "Can not create image"
 msgstr "Nu se poate crea imaginea"
 
-#: ../ui/ui.c:1641 ../ui/ui.c:1692
+#: ../ui/ui.c:1650 ../ui/ui.c:1701
 msgid "Can not allocate tables"
 msgstr "Nu se pot aloca tabelele"
 
-#: ../ui/ui.c:1678
+#: ../ui/ui.c:1687
 msgid "Can not initialize driver"
 msgstr "Nu se poate initializa driverul"
 
-#: ../ui/ui.c:1681
+#: ../ui/ui.c:1690
 msgid "Can not return back to previous driver"
 msgstr "Nu se poate intoarce la driverul precedent"
 
@@ -1273,42 +1274,42 @@
 msgid "Replay disabled at line %i"
 msgstr "Replay dezactivat pe linia %i"
 
-#: ../ui-hlp/ui_helper.c:646
+#: ../ui-hlp/ui_helper.c:648
 msgid "Tutorial files not found. Reinstall XaoS"
 msgstr "Fisierele cu tutoriale nu au fost gasite. Reinstalati XaoS"
 
-#: ../ui-hlp/ui_helper.c:651
+#: ../ui-hlp/ui_helper.c:653
 msgid "Preparing first image"
 msgstr "Se pregateste prima imagine"
 
-#: ../ui-hlp/ui_helper.c:661
+#: ../ui-hlp/ui_helper.c:663
 msgid "Could not open examples"
 msgstr "Exemplele nu s-au putut deschide"
 
-#: ../ui-hlp/ui_helper.c:667
+#: ../ui-hlp/ui_helper.c:670 ../ui-hlp/ui_helper.c:672
 #, c-format
 msgid "File %s loaded."
 msgstr "S-a incarcat fisierul %s."
 
-#: ../ui-hlp/ui_helper.c:676
+#: ../ui-hlp/ui_helper.c:682
 msgid "Saving image..."
 msgstr "Imginea se salveaza..."
 
-#: ../ui-hlp/ui_helper.c:684
+#: ../ui-hlp/ui_helper.c:690
 msgid "Save interrupted"
 msgstr "Salvare intrerupta"
 
-#: ../ui-hlp/ui_helper.c:693 ../ui-hlp/ui_helper.c:710
-#: ../ui-hlp/ui_helper.c:777
+#: ../ui-hlp/ui_helper.c:699 ../ui-hlp/ui_helper.c:716
+#: ../ui-hlp/ui_helper.c:783
 #, c-format
 msgid "File %s saved."
 msgstr "Fisierul %s salvat."
 
-#: ../ui-hlp/ui_helper.c:704
+#: ../ui-hlp/ui_helper.c:710
 msgid "Can not open file"
 msgstr "Nu se poate deschide fisierul"
 
-#: ../ui-hlp/ui_helper.c:799
+#: ../ui-hlp/ui_helper.c:805
 #, c-format
 msgid "Recording to file %s enabled."
 msgstr "S-a activat inregistrearea in fisierul %s "
@@ -1317,7 +1318,7 @@
 msgid "Solid guessing 1"
 msgstr "Solid-Guessing 1"
 
-#: ../engine/btrace.c:292 ../engine/btrace.c:373
+#: ../engine/btrace.c:290 ../engine/btrace.c:371
 msgid "Boundary trace"
 msgstr "Boundary-Trace"
 
@@ -1327,7 +1328,7 @@
 msgstr "OK"
 
 #: ../ui/dialog.c:313 ../ui/dialog.c:401 ../ui/dialog.c:1379
-#: ../ui/filesel.c:184 ../ui/ui-drv/cocoa/CustomDialog.m:312
+#: ../ui/filesel.c:190 ../ui/ui-drv/cocoa/CustomDialog.m:312
 msgid "Cancel"
 msgstr "Anulare"
 
@@ -1361,7 +1362,7 @@
 msgid "Cannot create checking buffer!"
 msgstr "Nu se poate crea bufferul de control!"
 
-#: ../ui-hlp/render.c:313 ../ui-hlp/render.c:596
+#: ../ui-hlp/render.c:313 ../ui-hlp/render.c:597
 msgid "Cannot create context\n"
 msgstr "Nu se poate crea contextul\n"
 
@@ -1369,7 +1370,7 @@
 msgid "Cannot open animation file\n"
 msgstr "Nu se poate deschide fisierul cu animatii\n"
 
-#: ../ui-hlp/render.c:336 ../ui-hlp/render.c:605
+#: ../ui-hlp/render.c:336 ../ui-hlp/render.c:606
 msgid "Loading catalogs"
 msgstr "Cataloagele se incarca"
 
@@ -1381,7 +1382,7 @@
 msgid "Enabling animation replay\n"
 msgstr "Se activeaza animation replay\n"
 
-#: ../ui-hlp/render.c:396 ../ui-hlp/render.c:514
+#: ../ui-hlp/render.c:396
 msgid "Cannot open image file"
 msgstr "Nu se poate deschide fisierul cu imaginea"
 
@@ -1389,7 +1390,7 @@
 msgid "Cannot open pattern file"
 msgstr "Nu se poate deschide fiserul de sabloane"
 
-#: ../ui-hlp/render.c:427 ../ui-hlp/render.c:429 ../ui-hlp/render.c:638
+#: ../ui-hlp/render.c:427 ../ui-hlp/render.c:429 ../ui-hlp/render.c:639
 msgid "Entering calculation loop!"
 msgstr "Intrare in bucla de calcul!"
 
@@ -1408,19 +1409,19 @@
 msgid "Frame %4i: "
 msgstr "Cadru %4i: "
 
-#: ../ui-hlp/render.c:528
+#: ../ui-hlp/render.c:529
 msgid " done."
 msgstr " terminat."
 
-#: ../ui-hlp/render.c:532
+#: ../ui-hlp/render.c:533
 msgid " skipping..."
 msgstr " se omite..."
 
-#: ../ui-hlp/render.c:565 ../ui-hlp/render.c:657
+#: ../ui-hlp/render.c:566 ../ui-hlp/render.c:658
 msgid "Calculation interrupted"
 msgstr "Calculare intrerupta"
 
-#: ../ui-hlp/render.c:568 ../ui-hlp/render.c:570 ../ui-hlp/render.c:659
+#: ../ui-hlp/render.c:569 ../ui-hlp/render.c:571 ../ui-hlp/render.c:660
 msgid "Calculation finished"
 msgstr "Calculare terminata"
 
Index: src/i18n/pt.po
===================================================================
--- src/i18n/pt.po	(revision 527)
+++ src/i18n/pt.po	(working copy)
@@ -5,10 +5,11 @@
 msgstr ""
 "Project-Id-Version: XaoS 3.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 10:56+0100\n"
+"POT-Creation-Date: 2013-11-01 09:09+0100\n"
 "PO-Revision-Date: 2009-06-01 14:07-0300\n"
 "Last-Translator: Lucio de Araujo <lucio.matema@gmail.com>\n"
 "Language-Team: Portuguese <zeliagarcia@seed.pr.gov.br>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -206,27 +207,27 @@
 msgid "Welcome to XaoS version %s"
 msgstr "Bem-vindo ao XaoS versăo %s"
 
-#: ../ui/ui.c:1580
+#: ../ui/ui.c:1582
 msgid "Can not allocate buffers"
 msgstr "Năo pode partilhar buffers (memórias temporárias)"
 
-#: ../ui/ui.c:1598
+#: ../ui/ui.c:1600
 msgid "Can not create palette"
 msgstr "Năo pode criar paleta"
 
-#: ../ui/ui.c:1610
+#: ../ui/ui.c:1612
 msgid "Can not create image"
 msgstr "Năo pode criar imagem"
 
-#: ../ui/ui.c:1641 ../ui/ui.c:1692
+#: ../ui/ui.c:1650 ../ui/ui.c:1701
 msgid "Can not allocate tables"
 msgstr "Năo pode partilhar tabelas"
 
-#: ../ui/ui.c:1678
+#: ../ui/ui.c:1687
 msgid "Can not initialize driver"
 msgstr "Năo pode inicializar o navegador"
 
-#: ../ui/ui.c:1681
+#: ../ui/ui.c:1690
 msgid "Can not return back to previous driver"
 msgstr "Năo pode retornar ao navegador anterior"
 
@@ -1323,46 +1324,46 @@
 msgid "Replay disabled at line %i"
 msgstr "Repetiçăo desabilitada na linha %i"
 
-#: ../ui-hlp/ui_helper.c:646
+#: ../ui-hlp/ui_helper.c:648
 msgid "Tutorial files not found. Reinstall XaoS"
 msgstr "Arquivos de tutoriais năo encontrados. Reinstale o Xaos"
 
-#: ../ui-hlp/ui_helper.c:651
+#: ../ui-hlp/ui_helper.c:653
 msgid "Preparing first image"
 msgstr "Preparando a primeira imagem"
 
-#: ../ui-hlp/ui_helper.c:661
+#: ../ui-hlp/ui_helper.c:663
 #, fuzzy
 msgid "Could not open examples"
 msgstr "Năo pode abrir os exemplos"
 
-#: ../ui-hlp/ui_helper.c:667
+#: ../ui-hlp/ui_helper.c:670 ../ui-hlp/ui_helper.c:672
 #, c-format
 msgid "File %s loaded."
 msgstr "Arquivo %s carregado"
 
-#: ../ui-hlp/ui_helper.c:676
+#: ../ui-hlp/ui_helper.c:682
 #, fuzzy
 msgid "Saving image..."
 msgstr "Salvando imagem"
 
-#: ../ui-hlp/ui_helper.c:684
+#: ../ui-hlp/ui_helper.c:690
 #, fuzzy
 msgid "Save interrupted"
 msgstr "Interrupçăo na açăo de salvar"
 
-#: ../ui-hlp/ui_helper.c:693 ../ui-hlp/ui_helper.c:710
-#: ../ui-hlp/ui_helper.c:777
+#: ../ui-hlp/ui_helper.c:699 ../ui-hlp/ui_helper.c:716
+#: ../ui-hlp/ui_helper.c:783
 #, c-format
 msgid "File %s saved."
 msgstr "Arquivo %s salvo"
 
-#: ../ui-hlp/ui_helper.c:704
+#: ../ui-hlp/ui_helper.c:710
 #, fuzzy
 msgid "Can not open file"
 msgstr "Năo pode abrir o arquivo"
 
-#: ../ui-hlp/ui_helper.c:799
+#: ../ui-hlp/ui_helper.c:805
 #, c-format
 msgid "Recording to file %s enabled."
 msgstr "Gravando para arquivar %s habilitada"
@@ -1371,7 +1372,7 @@
 msgid "Solid guessing 1"
 msgstr "Simulaçăo tridimensional"
 
-#: ../engine/btrace.c:292 ../engine/btrace.c:373
+#: ../engine/btrace.c:290 ../engine/btrace.c:371
 msgid "Boundary trace"
 msgstr "Sinal do perímetro"
 
@@ -1381,7 +1382,7 @@
 msgstr "Certo"
 
 #: ../ui/dialog.c:313 ../ui/dialog.c:401 ../ui/dialog.c:1379
-#: ../ui/filesel.c:184 ../ui/ui-drv/cocoa/CustomDialog.m:312
+#: ../ui/filesel.c:190 ../ui/ui-drv/cocoa/CustomDialog.m:312
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -1420,7 +1421,7 @@
 msgid "Cannot create checking buffer!"
 msgstr "Năo pode criar verifcaçăo de buffer"
 
-#: ../ui-hlp/render.c:313 ../ui-hlp/render.c:596
+#: ../ui-hlp/render.c:313 ../ui-hlp/render.c:597
 #, fuzzy
 msgid "Cannot create context\n"
 msgstr "Năo pode criar o contexto"
@@ -1430,7 +1431,7 @@
 msgid "Cannot open animation file\n"
 msgstr "Năo pode abrir o arquivo de animaçăo\n"
 
-#: ../ui-hlp/render.c:336 ../ui-hlp/render.c:605
+#: ../ui-hlp/render.c:336 ../ui-hlp/render.c:606
 msgid "Loading catalogs"
 msgstr "Carregando catálogos"
 
@@ -1444,7 +1445,7 @@
 msgid "Enabling animation replay\n"
 msgstr "Habilitando a repetiçăo da animaçăo"
 
-#: ../ui-hlp/render.c:396 ../ui-hlp/render.c:514
+#: ../ui-hlp/render.c:396
 #, fuzzy
 msgid "Cannot open image file"
 msgstr "Năo pode abrir o arquivo de imagem"
@@ -1454,7 +1455,7 @@
 msgid "Cannot open pattern file"
 msgstr "Năo pode abrir o arquivo padrăo "
 
-#: ../ui-hlp/render.c:427 ../ui-hlp/render.c:429 ../ui-hlp/render.c:638
+#: ../ui-hlp/render.c:427 ../ui-hlp/render.c:429 ../ui-hlp/render.c:639
 msgid "Entering calculation loop!"
 msgstr "Entrada de cálculo"
 
@@ -1473,20 +1474,20 @@
 msgid "Frame %4i: "
 msgstr "Quadro %4i"
 
-#: ../ui-hlp/render.c:528
+#: ../ui-hlp/render.c:529
 msgid " done."
 msgstr "Pronto"
 
-#: ../ui-hlp/render.c:532
+#: ../ui-hlp/render.c:533
 msgid " skipping..."
 msgstr "Pulando..."
 
-#: ../ui-hlp/render.c:565 ../ui-hlp/render.c:657
+#: ../ui-hlp/render.c:566 ../ui-hlp/render.c:658
 #, fuzzy
 msgid "Calculation interrupted"
 msgstr "Cálculo interrompido"
 
-#: ../ui-hlp/render.c:568 ../ui-hlp/render.c:570 ../ui-hlp/render.c:659
+#: ../ui-hlp/render.c:569 ../ui-hlp/render.c:571 ../ui-hlp/render.c:660
 #, fuzzy
 msgid "Calculation finished"
 msgstr "Cálculo finalizado"
Index: src/i18n/de.po
===================================================================
--- src/i18n/de.po	(revision 527)
+++ src/i18n/de.po	(working copy)
@@ -7,10 +7,11 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 10:56+0100\n"
+"POT-Creation-Date: 2013-11-01 09:09+0100\n"
 "PO-Revision-Date: 2008-04-27 21:48+0200\n"
 "Last-Translator: \n"
 "Language-Team:  <de@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -204,27 +205,27 @@
 msgid "Welcome to XaoS version %s"
 msgstr "Willkommen zu XaoS Version %s"
 
-#: ../ui/ui.c:1580
+#: ../ui/ui.c:1582
 msgid "Can not allocate buffers"
 msgstr "Kann Puffer nicht allozieren"
 
-#: ../ui/ui.c:1598
+#: ../ui/ui.c:1600
 msgid "Can not create palette"
 msgstr "Kann Palette nicht erzeugen"
 
-#: ../ui/ui.c:1610
+#: ../ui/ui.c:1612
 msgid "Can not create image"
 msgstr "Kann Bild nicht erzeugen"
 
-#: ../ui/ui.c:1641 ../ui/ui.c:1692
+#: ../ui/ui.c:1650 ../ui/ui.c:1701
 msgid "Can not allocate tables"
 msgstr "Kann Tabellen nicht erzeugen"
 
-#: ../ui/ui.c:1678
+#: ../ui/ui.c:1687
 msgid "Can not initialize driver"
 msgstr "Kann Treiber nicht initialisieren"
 
-#: ../ui/ui.c:1681
+#: ../ui/ui.c:1690
 msgid "Can not return back to previous driver"
 msgstr "Kann nicht zu vorhergehendem Treiber zurückkehren"
 
@@ -1261,42 +1262,42 @@
 msgid "Replay disabled at line %i"
 msgstr "Wiedergabe auf Zeile %i ausgeschaltet"
 
-#: ../ui-hlp/ui_helper.c:646
+#: ../ui-hlp/ui_helper.c:648
 msgid "Tutorial files not found. Reinstall XaoS"
 msgstr "Tutorial Dateien nicht gefunden. Installiere XaoS neu"
 
-#: ../ui-hlp/ui_helper.c:651
+#: ../ui-hlp/ui_helper.c:653
 msgid "Preparing first image"
 msgstr "Erstes Bild wird vorbereitet"
 
-#: ../ui-hlp/ui_helper.c:661
+#: ../ui-hlp/ui_helper.c:663
 msgid "Could not open examples"
 msgstr "Konnte Beispiele nicht öffnen"
 
-#: ../ui-hlp/ui_helper.c:667
+#: ../ui-hlp/ui_helper.c:670 ../ui-hlp/ui_helper.c:672
 #, c-format
 msgid "File %s loaded."
 msgstr "Datei %s geöffnet."
 
-#: ../ui-hlp/ui_helper.c:676
+#: ../ui-hlp/ui_helper.c:682
 msgid "Saving image..."
 msgstr "Speichere Bild..."
 
-#: ../ui-hlp/ui_helper.c:684
+#: ../ui-hlp/ui_helper.c:690
 msgid "Save interrupted"
 msgstr "Speicher Vorgang unterbrochen"
 
-#: ../ui-hlp/ui_helper.c:693 ../ui-hlp/ui_helper.c:710
-#: ../ui-hlp/ui_helper.c:777
+#: ../ui-hlp/ui_helper.c:699 ../ui-hlp/ui_helper.c:716
+#: ../ui-hlp/ui_helper.c:783
 #, c-format
 msgid "File %s saved."
 msgstr "Datei %s gespeichert."
 
-#: ../ui-hlp/ui_helper.c:704
+#: ../ui-hlp/ui_helper.c:710
 msgid "Can not open file"
 msgstr "Kann Datei nicht öffnen"
 
-#: ../ui-hlp/ui_helper.c:799
+#: ../ui-hlp/ui_helper.c:805
 #, c-format
 msgid "Recording to file %s enabled."
 msgstr "Aufzeichnung in Datei %s eingeschaltet"
@@ -1305,7 +1306,7 @@
 msgid "Solid guessing 1"
 msgstr "Solid-Guessing 1"
 
-#: ../engine/btrace.c:292 ../engine/btrace.c:373
+#: ../engine/btrace.c:290 ../engine/btrace.c:371
 msgid "Boundary trace"
 msgstr "Boundary-Trace"
 
@@ -1315,7 +1316,7 @@
 msgstr "OK"
 
 #: ../ui/dialog.c:313 ../ui/dialog.c:401 ../ui/dialog.c:1379
-#: ../ui/filesel.c:184 ../ui/ui-drv/cocoa/CustomDialog.m:312
+#: ../ui/filesel.c:190 ../ui/ui-drv/cocoa/CustomDialog.m:312
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -1349,7 +1350,7 @@
 msgid "Cannot create checking buffer!"
 msgstr "Kann Kontroll-Puffer nicht erstellen!"
 
-#: ../ui-hlp/render.c:313 ../ui-hlp/render.c:596
+#: ../ui-hlp/render.c:313 ../ui-hlp/render.c:597
 msgid "Cannot create context\n"
 msgstr "Kann Kontext nicht erstellen\n"
 
@@ -1357,7 +1358,7 @@
 msgid "Cannot open animation file\n"
 msgstr "Kann Animationsdatei nicht öffnen\n"
 
-#: ../ui-hlp/render.c:336 ../ui-hlp/render.c:605
+#: ../ui-hlp/render.c:336 ../ui-hlp/render.c:606
 msgid "Loading catalogs"
 msgstr "Öffne Kataloge"
 
@@ -1369,7 +1370,7 @@
 msgid "Enabling animation replay\n"
 msgstr "Wiedergabe von Animation wird eingeschaltet\n"
 
-#: ../ui-hlp/render.c:396 ../ui-hlp/render.c:514
+#: ../ui-hlp/render.c:396
 msgid "Cannot open image file"
 msgstr "Kann Bilddatei nicht öffnen"
 
@@ -1377,7 +1378,7 @@
 msgid "Cannot open pattern file"
 msgstr "Kann Palettendatei nicht öffnen"
 
-#: ../ui-hlp/render.c:427 ../ui-hlp/render.c:429 ../ui-hlp/render.c:638
+#: ../ui-hlp/render.c:427 ../ui-hlp/render.c:429 ../ui-hlp/render.c:639
 msgid "Entering calculation loop!"
 msgstr "Trete in Berechnungsschlaufe ein!"
 
@@ -1396,19 +1397,19 @@
 msgid "Frame %4i: "
 msgstr "Bild %4i: "
 
-#: ../ui-hlp/render.c:528
+#: ../ui-hlp/render.c:529
 msgid " done."
 msgstr " fertig."
 
-#: ../ui-hlp/render.c:532
+#: ../ui-hlp/render.c:533
 msgid " skipping..."
 msgstr " beim Überspringen..."
 
-#: ../ui-hlp/render.c:565 ../ui-hlp/render.c:657
+#: ../ui-hlp/render.c:566 ../ui-hlp/render.c:658
 msgid "Calculation interrupted"
 msgstr "Berechnung unterbrochen"
 
-#: ../ui-hlp/render.c:568 ../ui-hlp/render.c:570 ../ui-hlp/render.c:659
+#: ../ui-hlp/render.c:569 ../ui-hlp/render.c:571 ../ui-hlp/render.c:660
 msgid "Calculation finished"
 msgstr "Berechnung beendet"
 
Index: tools/tarball
===================================================================
--- tools/tarball	(revision 527)
+++ tools/tarball	(working copy)
@@ -1,14 +1,15 @@
 #!/bin/sh
 # Creates a recent tarball.
-# Assumes that the directory name is XaoS/tools where we currently are.
+# Assumes that the directory name is xaos-code/tools where we currently are.
 # Be careful: this script will delete files without asking questions!
 
-NAME=xaos-3.5
+NAME=xaos-`cat configure.in | grep AC_INIT | cut -f2 -d, | sed s/"\["// | sed s/"\]"//`
 
 test -x tarball || exit 1 # Sorry, this script should be run inside its directory.
 
 ./mkChangeLog
 cd ..
+autoconf
 ./configure
 cd doc
 make clean
Index: doc/xaos.info
===================================================================
--- doc/xaos.info	(revision 527)
+++ doc/xaos.info	(working copy)
@@ -1,11 +1,11 @@
-This is xaos.info, produced by makeinfo version 4.11 from xaos.texinfo.
+This is xaos.info, produced by makeinfo version 4.13 from xaos.texinfo.
 
 INFO-DIR-SECTION Graphics
 START-INFO-DIR-ENTRY
 * XaoS: (xaos).               A fast real-time interactive fractal zoomer
 END-INFO-DIR-ENTRY
 
-   (C) 1996-2008 Jan Hubicka and the XaoS Development Team
+   (C) 1996-2013 Jan Hubicka and the XaoS Development Team
 
    Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
@@ -14,12 +14,12 @@
 
 File: xaos.info,  Node: Top,  Next: Overview,  Prev: (dir),  Up: (dir)
 
-XaoS 3.4
+XaoS 3.6
 ********
 
                                  A real-time interactive fractal zoomer
                                                           User's manual
-                                                         April 17, 2008
+                                                       November 1, 2013
 
    This manual contains user documentation about XaoS -- a fast
 real-time fractal zoomer. XaoS uses a development model, so sources are
@@ -421,8 +421,8 @@
 
 File: xaos.info,  Node: video,  Next: format,  Prev: controls,  Up: Top
 
-4 How to encode video files from XaoS
-*************************************
+4 How to encode MPEG files from XaoS
+************************************
 
 To create a video, make and `xaf' file first (the easiest way to do
 this is to use the _record_ function in the file menu). Then you need
@@ -2975,7 +2975,7 @@
 A.14.2 Render animation
 -----------------------
 
-Render an animation to image files. See How to encode MPEG files for
+Render an animation to image files. See How to encode video files for
 more information.
 
    _Available as_: menu item,
@@ -3371,7 +3371,7 @@
 *Martin Dozsa (madsoft@centrum.cz)*
      cs.po (Czech translation of menus)
 
-*Arpad Fekete (Fekete.Arpad.2@stud.u-szeged.hu)*
+*Arpad Fekete*
      Some new fractals, and the 'More formulae' menu
 
 *Zelia Maria Horta Garcia (zeliagarcia@seed.pr.gov.br)*
@@ -3518,7 +3518,6 @@
 XaoS has two discussion forums hosted on SourceForge. You can read them
 freely, but in order to post, you must to register for a free
 SourceForge account.
-
 *Help*
      Provides a place for you to ask for help using XaoS. Other XaoS
      users and/or the XaoS developers will answer your questions.
@@ -3698,121 +3697,121 @@
 Node: tutorial4423
 Node: controls14259
 Node: video16315
-Node: format20282
-Node: writehelp25754
-Node: xshl26241
-Node: drivers27386
-Node: aa28084
-Node: BeOS30601
-Node: DGA33457
-Node: dos34077
-Node: dX-fullscreen36510
-Node: dX-window37637
-Node: ggi37722
-Node: plan938273
-Node: SVGAlib39374
-Node: win3240754
-Node: X1142660
-Node: menus43657
-Node: root44527
-Node: animroot44588
-Node: stopreplay44871
-Node: plc45020
-Node: load45377
-Node: linemenu45710
-Node: animf48485
-Node: animateview49195
-Node: smoothmorph49730
-Node: morphview50314
-Node: morphjulia51377
-Node: moveview52005
-Node: morphangle52236
-Node: zoom52905
-Node: time53743
-Node: usleep54217
-Node: textsleep54618
-Node: wait55175
-Node: file55760
-Node: loadpos56031
-Node: savepos56293
-Node: record56739
-Node: play57242
-Node: saveimg57454
-Node: loadexample58090
-Node: savecfg58446
-Node: quit58833
-Node: edit59010
-Node: undo59200
-Node: redo59473
-Node: copy59648
-Node: paste59940
-Node: fractal60224
-Node: formula60787
-Node: uimandelbrot61519
-Node: uiperturbation63041
-Node: bailout64230
-Node: uiview65327
-Node: initstate67336
-Node: plane67829
-Node: incoloring68996
-Node: outcoloring70522
-Node: tcolor72247
-Node: calc73867
-Node: range74331
-Node: periodicity74958
-Node: maxiter77134
-Node: fastjulia78377
-Node: dynamic79136
-Node: rotate79975
-Node: mfilter81407
-Node: filter82063
-Node: edge82712
-Node: edge283251
-Node: starfield83795
-Node: stereogram84154
-Node: interlace88540
-Node: blur88956
-Node: emboss89371
-Node: palettef89706
-Node: anti90274
-Node: truecolor90981
-Node: ui91592
-Node: speed92053
-Node: letterspersec93116
-Node: autopilot93511
-Node: recalculate94348
-Node: interrupt94723
-Node: nogui94958
-Node: status95432
-Node: ministatus95835
-Node: misc96140
-Node: command96541
-Node: renderanim96927
-Node: clearscreen97180
-Node: display97525
-Node: text97831
-Node: color98571
-Node: textposition98855
-Node: message99325
-Node: helpmenu99732
-Node: xtextpos99871
-Node: ytextpos100144
-Node: mformula100424
-Node: mandel100775
-Node: mandel3101054
-Node: octal101531
-Node: newton101870
-Node: barnsley102414
-Node: phoenix102694
-Node: magnet102930
-Node: palettemenu103272
-Node: defpalette103608
-Node: randompalette104104
-Node: palette104609
-Node: cycling105473
-Node: shiftpalette106452
-Node: about107164
-Node: support111546
-Node: index115382
+Node: format20280
+Node: writehelp25752
+Node: xshl26239
+Node: drivers27384
+Node: aa28082
+Node: BeOS30599
+Node: DGA33455
+Node: dos34075
+Node: dX-fullscreen36508
+Node: dX-window37635
+Node: ggi37720
+Node: plan938271
+Node: SVGAlib39372
+Node: win3240752
+Node: X1142658
+Node: menus43655
+Node: root44525
+Node: animroot44586
+Node: stopreplay44869
+Node: plc45018
+Node: load45375
+Node: linemenu45708
+Node: animf48483
+Node: animateview49193
+Node: smoothmorph49728
+Node: morphview50312
+Node: morphjulia51375
+Node: moveview52003
+Node: morphangle52234
+Node: zoom52903
+Node: time53741
+Node: usleep54215
+Node: textsleep54616
+Node: wait55173
+Node: file55758
+Node: loadpos56029
+Node: savepos56291
+Node: record56737
+Node: play57240
+Node: saveimg57452
+Node: loadexample58088
+Node: savecfg58444
+Node: quit58831
+Node: edit59008
+Node: undo59198
+Node: redo59471
+Node: copy59646
+Node: paste59938
+Node: fractal60222
+Node: formula60785
+Node: uimandelbrot61517
+Node: uiperturbation63039
+Node: bailout64228
+Node: uiview65325
+Node: initstate67334
+Node: plane67827
+Node: incoloring68994
+Node: outcoloring70520
+Node: tcolor72245
+Node: calc73865
+Node: range74329
+Node: periodicity74956
+Node: maxiter77132
+Node: fastjulia78375
+Node: dynamic79134
+Node: rotate79973
+Node: mfilter81405
+Node: filter82061
+Node: edge82710
+Node: edge283249
+Node: starfield83793
+Node: stereogram84152
+Node: interlace88538
+Node: blur88954
+Node: emboss89369
+Node: palettef89704
+Node: anti90272
+Node: truecolor90979
+Node: ui91590
+Node: speed92051
+Node: letterspersec93114
+Node: autopilot93509
+Node: recalculate94346
+Node: interrupt94721
+Node: nogui94956
+Node: status95430
+Node: ministatus95833
+Node: misc96138
+Node: command96539
+Node: renderanim96925
+Node: clearscreen97179
+Node: display97524
+Node: text97830
+Node: color98570
+Node: textposition98854
+Node: message99324
+Node: helpmenu99731
+Node: xtextpos99870
+Node: ytextpos100143
+Node: mformula100423
+Node: mandel100774
+Node: mandel3101053
+Node: octal101530
+Node: newton101869
+Node: barnsley102413
+Node: phoenix102693
+Node: magnet102929
+Node: palettemenu103271
+Node: defpalette103607
+Node: randompalette104103
+Node: palette104608
+Node: cycling105472
+Node: shiftpalette106451
+Node: about107163
+Node: support111511
+Node: index115346
 
 End Tag Table
Index: doc/XaoS.lsm
===================================================================
--- doc/XaoS.lsm	(revision 527)
+++ doc/XaoS.lsm	(working copy)
@@ -1,7 +1,7 @@
 Begin3
 Title:          XaoS - a fast portable real-time interactive fractal zoomer/morpher
-Version:        3.4
-Entered-date:   Sep 28 2008
+Version:        3.6
+Entered-date:   Nov 1 2013
 
 Description:    XaoS is a fast portable real-time interactive fractal zoomer.
 		It displays the Mandelbrot set (among other escape
@@ -19,6 +19,7 @@
 Author:         jh@ucw.cz (Jan Hubicka)
 		thomas@tivoli.com (Thomas Marsh)
 Maintained-by:  kovzol@particio.com (Zoltan Kovacs)
+		jblangston@jblangston.com (J.B. Langston)
 Primary-site:   xaos.sf.net
 Platform:       GNU/Linux or any UNIX with X11 and ANSI C compiler,
 		Microsoft Windows (95, 98, XP), Mac OS X
Index: doc/xaos.texinfo
===================================================================
--- doc/xaos.texinfo	(revision 527)
+++ doc/xaos.texinfo	(working copy)
@@ -18,7 +18,7 @@
 
 
 @ifinfo
-@copyright{} 1996-2008 Jan Hubicka and the XaoS Development Team
+@copyright{} 1996-2013 Jan Hubicka and the XaoS Development Team
 
 Permission is granted to make and distribute verbatim
 copies of this manual provided the copyright notice and
@@ -28,8 +28,8 @@
 
 @c %**end of header
 
-@set VERSION    3.4
-@set DATE       April 17, 2008
+@set VERSION    3.6
+@set DATE       November 1, 2013
 
 @titlepage
 
@@ -52,7 +52,7 @@
 @vskip 0pt plus 1filll
 @vskip 0pt plus 1filll
 
-@copyright{} 1996-2008 @tex Jan Hubi\v cka and the XaoS Development Team
+@copyright{} 1996-2013 @tex Jan Hubi\v cka and the XaoS Development Team
 @end tex
 
 Permission is granted to make and distribute verbatim
@@ -459,7 +459,7 @@
 @node video, format, controls ,Top
 
 
-@chapter How to encode video files from XaoS
+@chapter How to encode MPEG files from XaoS
 
 To create a video, make and @code{xaf} file first (the easiest way to do this is
 to use the @emph{record} function in the file menu). Then you need to render
@@ -2899,7 +2899,7 @@
 
 @appendixsubsec Render animation
 
-Render an animation to image files. See How to encode MPEG files
+Render an animation to image files. See How to encode video files
 for more information.
 
 @emph{Available as}: menu item,
@@ -3261,7 +3261,7 @@
 TK interface, windowid patches
 @item Martin Dozsa (madsoft@@centrum.cz)
 cs.po (Czech translation of menus)
-@item Arpad Fekete (Fekete.Arpad.2@@stud.u-szeged.hu)
+@item Arpad Fekete
 Some new fractals, and the 'More formulae' menu
 @item Zelia Maria Horta Garcia (zeliagarcia@@seed.pr.gov.br)
 Brazilian/Portuguese translation
@@ -3363,12 +3363,10 @@
 The XaoS homepage is @code{http://xaos.sf.net}. Check here for the
 latest news and information about XaoS and to download the latest versions.
 
-
 @subsection Discussion Forums
 XaoS has two discussion forums hosted on SourceForge. You can read them
 freely, but in order to post, you must to register for a free SourceForge
 account.
-
 @table @strong
 @item Help
 Provides a place for you to ask for help using XaoS. Other XaoS users
@@ -3385,7 +3383,6 @@
 @code{http://sourceforge.net/forum/forum.php?forum_id=17767}
 @end table
 
-
 We welcome you to join these forums and become involved in the XaoS community.
 
 @subsection Mailing Lists
@@ -3402,14 +3399,12 @@
 
 Subscribe: @code{http://lists.sourceforge.net/mailman/listinfo/xaos-announce}
 Archive: @code{http://sourceforge.net/mailarchive/forum.php?forum_name=xaos-announce}
-
 @item xaos-devel@@lists.sourceforge.net
 Developer mailing list, where the developers coordinate and discuss XaoS development.
 
 
 Subscribe: @code{http://lists.sourceforge.net/mailman/listinfo/xaos-devel}
 Archive: @code{http://sourceforge.net/mailarchive/forum.php?forum_name=xaos-devel}
-
 @item xaos-discuss@@lists.sourceforge.net
 General discussion list is for XaoS users to share tips and ideas about XaoS.
 
@@ -3418,7 +3413,6 @@
 Archive: @code{http://sourceforge.net/mailarchive/forum.php?forum_name=xaos-discuss}
 @end table
 
-
 Please feel free to join any or all of these mailing lists and share your ideas with the
 developers and other XaoS users.
 
@@ -3441,6 +3435,8 @@
 
 Support Requests: @code{http://sourceforge.net/tracker/?atid=205771&group_id=5771}
 
+
+
 @subsection Feature Requests
 If you have an idea for a great new feature you'd like to see added to XaoS, please let us know about it.
 You can submit a feature request via SourceForge, and the XaoS developers will do their best to
@@ -3454,6 +3450,8 @@
 first to make sure nobody has already requested the feature your want. You may add your
 vote for a feature by adding a comment to the existing request.
 
+
+
 @c ## appendix support ##
 
 @c %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Index: doc/xaos.geninfo
===================================================================
--- doc/xaos.geninfo	(revision 527)
+++ doc/xaos.geninfo	(working copy)
@@ -18,7 +18,7 @@
 
 
 @ifinfo
-@copyright{} 1996-2008 Jan Hubicka and the XaoS Development Team
+@copyright{} 1996-2013 Jan Hubicka and the XaoS Development Team
 
 Permission is granted to make and distribute verbatim
 copies of this manual provided the copyright notice and
@@ -28,8 +28,8 @@
 
 @c %**end of header
 
-@set VERSION    3.4
-@set DATE       April 17, 2008
+@set VERSION    3.6
+@set DATE       November 1, 2013
 
 @titlepage
 
@@ -52,7 +52,7 @@
 @vskip 0pt plus 1filll
 @vskip 0pt plus 1filll
 
-@copyright{} 1996-2008 @tex Jan Hubi\v cka and the XaoS Development Team
+@copyright{} 1996-2013 @tex Jan Hubi\v cka and the XaoS Development Team
 @end tex
 
 Permission is granted to make and distribute verbatim
Index: NEWS
===================================================================
--- NEWS	(revision 527)
+++ NEWS	(working copy)
@@ -1,3 +1,22 @@
+RELEASE NOTES FOR XAOS VERSION 3.6
+----------------------------------
+
+Cross-platform changes
+======================
+
+o New fractal types (Arpad Fekete)
+
+o Supporting libpng >= 1.5 and 1.6 (J.B. Langston, Petr Gajdos)
+
+o Various bug fixes
+
+
+Mac-specific changes
+====================
+
+o Fixing zooming on Mac OS X 10.8 (J.B. Langston)
+
+
 RELEASE NOTES FOR XAOS VERSION 3.5
 ----------------------------------
 
Index: configure.in
===================================================================
--- configure.in	(revision 527)
+++ configure.in	(working copy)
@@ -1,4 +1,4 @@
-AC_INIT([XaoS],[3.5],[xaos-devel@lists.sourceforge.net])
+AC_INIT([XaoS],[3.6],[xaos-devel@lists.sourceforge.net])
 
 AC_PREREQ(2.63)
 AC_CONFIG_HEADER(src/include/aconfig.h src/include/version.h)
Index: help/xaos.hlp
===================================================================
--- help/xaos.hlp	(revision 527)
+++ help/xaos.hlp	(working copy)
@@ -45,6 +45,8 @@
 <dl>
 <dt>Lucio Henrique de Araujo (lucio.matema@gmail.com)
 <dd>Brazilian/Portuguese translation
+<dt>Samuel Bizien (samuel@bizien.info)
+<dd>Beryl fractal
 <dt>Eric Courteau (ecourteau@cplus.fr)
 <dd>francais.cat (translation of tutorials)
 <dt>Jean-Pierre Demailly (Jean-Pierre.Demailly@ujf-grenoble.fr)
@@ -53,8 +55,8 @@
 <dd>TK interface, windowid patches
 <dt>Martin Dozsa (madsoft@centrum.cz)
 <dd>cs.po (Czech translation of menus)
-<dt>Arpad Fekete (Fekete.Arpad.2@stud.u-szeged.hu)
-<dd>some new fractals, and the 'More formulae' menu
+<dt>Arpad Fekete
+<dd>Some new fractals, and the 'More formulae' menu
 <dt>Zelia Maria Horta Garcia (zeliagarcia@seed.pr.gov.br)
 <dd>Brazilian/Portuguese translation
 <dt>Tim Goodwin	(tgoodwin@cygnus.co.uk)
@@ -170,66 +172,77 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %support
-<head>Support</head>
-XaoS is a community-supported free software project.
+<head>Getting Support</head>
+XaoS is a community-supported free software project. There are many ways
+to get help, all of which are explained below.
 
 <head>Home Page</head>
-Site: <tt>http://xaos.sourceforge.net</tt><p>
+The XaoS homepage is <tt>http://xaos.sf.net</tt>. Check here for the
+latest news and information about XaoS and to download the latest versions.
 
-Check the Xaos home page for the latest news and information about 
-XaoS and to download the latest versions.
+<head>Discussion Forums</head>
+XaoS has two discussion forums hosted on SourceForge. You can read them
+freely, but in order to post, you must to register for a free SourceForge
+account. 
+<dl>
+<dt>Help
+<dd>Provides a place for you to ask for help using XaoS. Other XaoS users
+and/or the XaoS developers will answer your questions.<p>
+<tt>http://sourceforge.net/forum/forum.php?forum_id=17768</tt>
+<dt>Open Discussion
+<dd>Provides a place to discuss anything related to XaoS or fractals.
+You can share tips, your own fractal creations, or any other fractal-related
+ideas with other XaoS users.<p>
+<tt>http://sourceforge.net/forum/forum.php?forum_id=17767</tt>
+</dl>
 
-<head>Users' Discussion Group</head>
-Site: <tt>http://groups.google.com/group/xaos-users</tt><p>
+We welcome you to join these forums and become involved in the XaoS community.
 
-The xaos-users discussion group on Google Groups provides a place for XaoS 
-users to help each other get the most out of XaoS. XaoS developers also 
-monitor this discussion and answer questions from time to time.<p>
+<head>Mailing Lists</head>
 
-You can browse the archives freely but you must join the group in order to 
-post. However, Google Groups provides a range of options for participation 
-from a traditional mailing list to a completely web-based forum, so you 
-don't have to get emails if you don't want to.<p>
+XaoS currently has three mailing lists hosted on SourceForge. Unfortunately,
+there is currently very little traffic on any of them. Hopefully in the future,
+we can get more XaoS users and developers involved in the mailing lists.
+The lists are as follows:
 
-If you have a question or problem, please feel free to ask for help. We 
-also encourage you to share examples (.xaf or .xpf files), hints and 
-tips. If you have a gallery of images created using XaoS, feel free to 
-post a link to the group.
+<dl>
+<dt>xaos-announce@lists.sourceforge.net
+<dd>Low volume list that is used only to announce new releases.<p>
+Subscribe: <tt>http://lists.sourceforge.net/mailman/listinfo/xaos-announce</tt>
+Archive: <tt>http://sourceforge.net/mailarchive/forum.php?forum_name=xaos-announce</tt>
+<dt>xaos-devel@lists.sourceforge.net
+<dd>Developer mailing list, where the developers coordinate and discuss XaoS development.<p>
+Subscribe: <tt>http://lists.sourceforge.net/mailman/listinfo/xaos-devel</tt>
+Archive: <tt>http://sourceforge.net/mailarchive/forum.php?forum_name=xaos-devel</tt>
+<dt>xaos-discuss@lists.sourceforge.net
+<dd>General discussion list is for XaoS users to share tips and ideas about XaoS.<p>
+Subscribe: <tt>http://lists.sourceforge.net/mailman/listinfo/xaos-discuss</tt>
+Archive: <tt>http://sourceforge.net/mailarchive/forum.php?forum_name=xaos-discuss</tt>
+</dl>
 
+Please feel free to join any or all of these mailing lists and share your ideas with the
+developers and other XaoS users.
 
-<head>Developers' Discussion Group</head>
+<head>Bug Reports</head>
+If you think you have found a bug in XaoS, please report it. The developers will do their
+best to resolve the bug in a timely manner.<p>
+Bug Tracker: <tt>http://sourceforge.net/tracker/?atid=105771&group_id=5771</tt><p>
+Please don't submit duplicate bugs. Browse the existing ones first to make
+sure nobody has already reported it. You may add additional information about a bug by
+entering a comment on an existing bug.<p>
+If you are not sure if something is a bug, please open a support request. The developers
+will try to answer your question and can convert your support request to a bug if necessary.<p>
+Support Requests: <tt>http://sourceforge.net/tracker/?atid=205771&group_id=5771</tt><p>
 
-Site: <tt>http://groups.google.com/group/xaos-devel</tt><p>
+<head>Feature Requests</head>
+If you have an idea for a great new feature you'd like to see added to XaoS, please let us know about it.
+You can submit a feature request via SourceForge, and the XaoS developers will do their best to
+implement your request in a future version.<p>
+Feature Requests: <tt>http://sourceforge.net/tracker/?atid=355771&group_id=5771</tt><p>
+Please don't submit duplicate feature requests. Browse the existing ones
+first to make sure nobody has already requested the feature your want. You may add your
+vote for a feature by adding a comment to the existing request.<p>
 
-The xaos-devel discussion group on Google Groups is where XaoS developers 
-discuss and coordinate the further development of XaoS. XaoS users are 
-welcome to monitor this forum as well, but general discussion and requests 
-for help should be posted to the Users' Discussion Group instead.
-
-
-<head>Issue Tracker</head>
-
-Site: <tt>http://code.google.com/p/gnuxaos/issues/list</tt><p>
-
-Issues are tracked on Google Code. If you think you have found a bug in 
-XaoS or have an idea for a great new feature, please let us know about it. 
-However, if you're not sure how to submit a useful issue report, please ask 
-on the xaos-users discussion group first (see above).<p>
-
-Please don't submit duplicate issues. Search the existing ones first to make 
-sure nobody has already reported it. You can add additional information about 
-a bug by entering a comment on an existing bug. You can also express your 
-interest in an issue by using the "Star" function on Google Code. This lets 
-the developers know how many users are interested in an issue and also allows 
-you receive status updates.<p>
-
-The developers will do their best to respond to issues in a timely manner. 
-However, keep in mind that XaoS is developed on a volunteer basis and the 
-developers work on it in their spare time. Therefore, we can't guarantee that 
-issues will be addressed in a certain timeframe.<p>
-
-
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %devel
 <head>Development</head>
@@ -334,7 +347,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %video
 
-<head>How to encode video files from XaoS</head>
+<head>How to encode MPEG files from XaoS</head>
 <p>
 To create a video, make and <tt>xaf</tt> file first (the easiest way to do this is
 to use the <emph>record</emph> function in the file menu). Then you need to render 
@@ -3435,9 +3448,9 @@
 <node mandel3, mandel, octal, mformula>
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %mandel3 mandel4 mandel5 mandel6
-<head>Mandelbrot^3--Mandelbrot^6</head>
+<head>Mandelbrot^3--Mandelbrot^6 and Mandelbrot^9</head>
 <p>
-This fractal is a simple modification of the standard 
+The Mandelbrot^3 fractal is a simple modification of the standard 
 <a mandel>Mandelbrot set</a> formula, using <math>z=z^3+c</math> instead of
 <math>z=z^2+c</math>. 
 <p>
@@ -3452,7 +3465,7 @@
 <p>
 This is a less well-known fractal that Thomas discovered in Fractint.
 It has an interesting shape when displayed in the alternative 
-<a mplane>planes</a>. See the <tutor octo.xaf>tutorial chapter</tutor>.
+<a plane>planes</a>. See the <tutor octo.xaf>tutorial chapter</tutor>.
 <p>
 <emph>Available as</emph>: menu item, command line option
 
Index: configure
===================================================================
--- configure	(revision 527)
+++ configure	(working copy)
@@ -1,13 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for XaoS 3.5.
+# Generated by GNU Autoconf 2.69 for XaoS 3.6.
 #
 # Report bugs to <xaos-devel@lists.sourceforge.net>.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -91,6 +89,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -135,6 +134,31 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -168,7 +192,8 @@
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -213,14 +238,25 @@
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -319,10 +355,18 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -359,19 +403,19 @@
 fi # as_fn_arith
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -444,6 +488,10 @@
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -478,16 +526,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -499,28 +547,8 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -533,7 +561,7 @@
 exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -552,8 +580,8 @@
 # Identity of this package.
 PACKAGE_NAME='XaoS'
 PACKAGE_TARNAME='xaos'
-PACKAGE_VERSION='3.5'
-PACKAGE_STRING='XaoS 3.5'
+PACKAGE_VERSION='3.6'
+PACKAGE_STRING='XaoS 3.6'
 PACKAGE_BUGREPORT='xaos-devel@lists.sourceforge.net'
 PACKAGE_URL=''
 
@@ -797,8 +825,9 @@
   fi
 
   case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -843,7 +872,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -869,7 +898,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1073,7 +1102,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1089,7 +1118,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1119,8 +1148,8 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
   *=*)
@@ -1128,7 +1157,7 @@
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
@@ -1138,7 +1167,7 @@
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
@@ -1146,13 +1175,13 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error "missing argument to $ac_option"
+  as_fn_error $? "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1175,7 +1204,7 @@
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1189,8 +1218,6 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1205,9 +1232,9 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error "working directory cannot be determined"
+  as_fn_error $? "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error "pwd does not report name of working directory"
+  as_fn_error $? "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1246,11 +1273,11 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1276,7 +1303,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures XaoS 3.5 to adapt to many kinds of systems.
+\`configure' configures XaoS 3.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1290,7 +1317,7 @@
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1345,7 +1372,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of XaoS 3.5:";;
+     short | recursive ) echo "Configuration of XaoS 3.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1461,10 +1488,10 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-XaoS configure 3.5
-generated by GNU Autoconf 2.65
+XaoS configure 3.6
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1508,7 +1535,7 @@
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
@@ -1550,7 +1577,7 @@
        ac_retval=$ac_status
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_run
@@ -1582,7 +1609,7 @@
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -1596,7 +1623,7 @@
   # interfere with the next link command; also delete a directory that is
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
@@ -1622,7 +1649,7 @@
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } >/dev/null && {
+  test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then :
@@ -1633,7 +1660,7 @@
 
     ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
@@ -1646,7 +1673,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1701,7 +1728,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
 
@@ -1713,10 +1740,10 @@
 ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  if eval \${$3+:} false; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -1752,7 +1779,7 @@
 else
   ac_header_preproc=no
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
 $as_echo "$ac_header_preproc" >&6; }
 
@@ -1775,17 +1802,15 @@
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( cat <<\_ASBOX
-## ----------------------------------------------- ##
+( $as_echo "## ----------------------------------------------- ##
 ## Report this to xaos-devel@lists.sourceforge.net ##
-## ----------------------------------------------- ##
-_ASBOX
+## ----------------------------------------------- ##"
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -1794,7 +1819,7 @@
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_mongrel
 
@@ -1807,7 +1832,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1825,7 +1850,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
 
@@ -1838,7 +1863,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=no"
@@ -1879,7 +1904,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_type
 
@@ -1900,7 +1925,8 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) >= 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -1916,7 +1942,8 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -1942,7 +1969,8 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) < 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -1958,7 +1986,8 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) >= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -1992,7 +2021,8 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -2056,7 +2086,7 @@
 rm -f conftest.val
 
   fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_compute_int
@@ -2064,8 +2094,8 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by XaoS $as_me 3.5, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+It was created by XaoS $as_me 3.6, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -2175,11 +2205,9 @@
   {
     echo
 
-    cat <<\_ASBOX
-## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -2213,11 +2241,9 @@
 )
     echo
 
-    cat <<\_ASBOX
-## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
     echo
     for ac_var in $ac_subst_vars
     do
@@ -2230,11 +2256,9 @@
     echo
 
     if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
+      $as_echo "## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
       echo
       for ac_var in $ac_subst_files
       do
@@ -2248,11 +2272,9 @@
     fi
 
     if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
       echo
       cat confdefs.h
       echo
@@ -2307,7 +2329,12 @@
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -2322,7 +2349,11 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
 
@@ -2399,7 +2430,7 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -2419,16 +2450,22 @@
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  for ac_t in install-sh install.sh shtool; do
-    if test -f "$ac_dir/$ac_t"; then
-      ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
-      break 2
-    fi
-  done
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -2442,27 +2479,27 @@
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
+if ${ac_cv_build+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -2480,14 +2517,14 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then :
+if ${ac_cv_host+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
@@ -2495,7 +2532,7 @@
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -2526,7 +2563,7 @@
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2538,7 +2575,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2566,7 +2603,7 @@
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -2578,7 +2615,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2619,7 +2656,7 @@
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2631,7 +2668,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2659,7 +2696,7 @@
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2672,7 +2709,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -2718,7 +2755,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2730,7 +2767,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2762,7 +2799,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -2774,7 +2811,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2816,8 +2853,8 @@
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -2931,9 +2968,8 @@
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "C compiler cannot create executables
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -2975,8 +3011,8 @@
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3033,9 +3069,9 @@
     else
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
+as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
@@ -3046,7 +3082,7 @@
 ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
+if ${ac_cv_objext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3086,8 +3122,8 @@
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -3097,7 +3133,7 @@
 ac_objext=$OBJEXT
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3134,7 +3170,7 @@
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -3212,7 +3248,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -3221,8 +3257,7 @@
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -3311,7 +3346,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler vendor" >&5
 $as_echo_n "checking for C compiler vendor... " >&6; }
-if test "${ax_cv_c_compiler_vendor+set}" = set; then :
+if ${ax_cv_c_compiler_vendor+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ax_cv_c_compiler_vendor=unknown
@@ -3439,7 +3474,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for x86 cpuid 0 output" >&5
 $as_echo_n "checking for x86 cpuid 0 output... " >&6; }
-if test "${ax_cv_gcc_x86_cpuid_0+set}" = set; then :
+if ${ax_cv_gcc_x86_cpuid_0+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -3494,7 +3529,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for x86 cpuid 1 output" >&5
 $as_echo_n "checking for x86 cpuid 1 output... " >&6; }
-if test "${ax_cv_gcc_x86_cpuid_1+set}" = set; then :
+if ${ax_cv_gcc_x86_cpuid_1+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -3603,7 +3638,7 @@
      # -malign-double for x86 systems
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -malign-double" >&5
 $as_echo_n "checking whether C compiler accepts -malign-double... " >&6; }
-if test "${ax_cv_c_flags__malign_double+set}" = set; then :
+if ${ax_cv_c_flags__malign_double+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -3642,7 +3677,7 @@
      #  -fstrict-aliasing for gcc-2.95+
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fstrict-aliasing" >&5
 $as_echo_n "checking whether C compiler accepts -fstrict-aliasing... " >&6; }
-if test "${ax_cv_c_flags__fstrict_aliasing+set}" = set; then :
+if ${ax_cv_c_flags__fstrict_aliasing+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -3681,7 +3716,7 @@
      # note that we enable "unsafe" fp optimization with other compilers, too
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -ffast-math" >&5
 $as_echo_n "checking whether C compiler accepts -ffast-math... " >&6; }
-if test "${ax_cv_c_flags__ffast_math+set}" = set; then :
+if ${ax_cv_c_flags__ffast_math+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -3733,7 +3768,7 @@
 $as_echo_n "checking for gcc architecture flag... " >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
 $as_echo "" >&6; }
-if test "${ax_cv_gcc_archflag+set}" = set; then :
+if ${ax_cv_gcc_archflag+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -3755,7 +3790,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for x86 cpuid 0 output" >&5
 $as_echo_n "checking for x86 cpuid 0 output... " >&6; }
-if test "${ax_cv_gcc_x86_cpuid_0+set}" = set; then :
+if ${ax_cv_gcc_x86_cpuid_0+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -3810,7 +3845,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for x86 cpuid 1 output" >&5
 $as_echo_n "checking for x86 cpuid 1 output... " >&6; }
-if test "${ax_cv_gcc_x86_cpuid_1+set}" = set; then :
+if ${ax_cv_gcc_x86_cpuid_1+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -3893,7 +3928,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for x86 cpuid 0x80000006 output" >&5
 $as_echo_n "checking for x86 cpuid 0x80000006 output... " >&6; }
-if test "${ax_cv_gcc_x86_cpuid_0x80000006+set}" = set; then :
+if ${ax_cv_gcc_x86_cpuid_0x80000006+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -3970,7 +4005,7 @@
 set dummy prtdiag; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PRTDIAG+set}" = set; then :
+if ${ac_cv_path_PRTDIAG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $PRTDIAG in
@@ -3985,7 +4020,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PRTDIAG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4246,7 +4281,7 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 $as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if test "${acl_cv_path_LD+set}" = set; then :
+if ${acl_cv_path_LD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
@@ -4280,10 +4315,10 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${acl_cv_prog_gnu_ld+set}" = set; then :
+if ${acl_cv_prog_gnu_ld+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
@@ -4303,7 +4338,7 @@
 
                                                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
 $as_echo_n "checking for shared library run path origin... " >&6; }
-if test "${acl_cv_rpath+set}" = set; then :
+if ${acl_cv_rpath+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -4824,7 +4859,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
 $as_echo_n "checking for iconv... " >&6; }
-if test "${am_cv_func_iconv+set}" = set; then :
+if ${am_cv_func_iconv+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -4881,7 +4916,7 @@
   if test "$am_cv_func_iconv" = yes; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
 $as_echo_n "checking for working iconv... " >&6; }
-if test "${am_cv_func_iconv_works+set}" = set; then :
+if ${am_cv_func_iconv_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -4997,7 +5032,7 @@
   if test "$am_cv_func_iconv" = yes; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5
 $as_echo_n "checking for iconv declaration... " >&6; }
-    if test "${am_cv_proto_iconv+set}" = set; then :
+    if ${am_cv_proto_iconv+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -5049,7 +5084,7 @@
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -5057,7 +5092,7 @@
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -5093,7 +5128,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
+if ${ac_cv_path_install+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5113,7 +5148,7 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -5172,7 +5207,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then :
+  if ${ac_cv_path_mkdir+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5182,7 +5217,7 @@
   test -z "$as_dir" && as_dir=.
     for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	     'mkdir (GNU coreutils) '* | \
 	     'mkdir (coreutils) '* | \
@@ -5270,7 +5305,7 @@
 set dummy msgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then :
+if ${ac_cv_path_MSGFMT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case "$MSGFMT" in
@@ -5311,7 +5346,7 @@
 set dummy gmsgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+if ${ac_cv_path_GMSGFMT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $GMSGFMT in
@@ -5325,7 +5360,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5393,7 +5428,7 @@
 set dummy xgettext; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+if ${ac_cv_path_XGETTEXT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case "$XGETTEXT" in
@@ -5471,7 +5506,7 @@
 set dummy msgmerge; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGMERGE+set}" = set; then :
+if ${ac_cv_path_MSGMERGE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case "$MSGMERGE" in
@@ -5542,7 +5577,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
 $as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
-if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then :
+if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   gt_save_LIBS="$LIBS"
@@ -5576,7 +5611,7 @@
   fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
 $as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
-if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then :
+if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   gt_save_LIBS="$LIBS"
@@ -5652,7 +5687,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
 $as_echo_n "checking for GNU gettext in libc... " >&6; }
-if { as_var=$gt_func_gnugettext_libc; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$gt_func_gnugettext_libc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5715,7 +5750,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
 $as_echo_n "checking for iconv... " >&6; }
-if test "${am_cv_func_iconv+set}" = set; then :
+if ${am_cv_func_iconv+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -5772,7 +5807,7 @@
   if test "$am_cv_func_iconv" = yes; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
 $as_echo_n "checking for working iconv... " >&6; }
-if test "${am_cv_func_iconv_works+set}" = set; then :
+if ${am_cv_func_iconv_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -6323,7 +6358,7 @@
 
           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
 $as_echo_n "checking for GNU gettext in libintl... " >&6; }
-if { as_var=$gt_func_gnugettext_libintl; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$gt_func_gnugettext_libintl+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   gt_save_CPPFLAGS="$CPPFLAGS"
@@ -6504,7 +6539,7 @@
 set dummy msgmerge; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGMERGE+set}" = set; then :
+if ${ac_cv_path_MSGMERGE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $MSGMERGE in
@@ -6519,7 +6554,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6542,7 +6577,7 @@
 
 
   if test "x$ac_cv_path_MSGMERGE" = x; then
-    as_fn_error "Install the msgmerge utility first for i18n
+    as_fn_error $? "Install the msgmerge utility first for i18n
                   or re-configure XaoS with --disable-nls" "$LINENO" 5
   fi
   if test "x$POFILES" = x; then
@@ -6654,7 +6689,7 @@
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -6662,7 +6697,7 @@
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -6686,7 +6721,7 @@
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then :
+if ${ac_cv_prog_RANLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
@@ -6698,7 +6733,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6726,7 +6761,7 @@
 set dummy ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
@@ -6738,7 +6773,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6826,7 +6861,7 @@
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then :
+  if ${ac_cv_prog_CPP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -6856,7 +6891,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -6872,11 +6907,11 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -6915,7 +6950,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -6931,18 +6966,18 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -6967,8 +7002,8 @@
   have_x=disabled
 else
   case $x_includes,$x_libraries in #(
-    *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #(
-    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
+    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
+    *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   # One or both of the vars are not set, and there is no cached value.
@@ -6985,7 +7020,7 @@
 	@echo libdir='${LIBDIR}'
 _ACEOF
   if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
-    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+    # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
     for ac_var in incroot usrlibdir libdir; do
       eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
     done
@@ -7071,7 +7106,7 @@
   fi
 done
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 fi # $ac_x_includes = no
 
 if test "$ac_x_libraries" = no; then
@@ -7245,7 +7280,7 @@
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
 $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
-if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
+if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7279,14 +7314,14 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
 $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
+if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
 $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
-if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
+if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7320,7 +7355,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
 $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
+if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
 fi
 
@@ -7339,14 +7374,14 @@
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
     ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-if test "x$ac_cv_func_gethostbyname" = x""yes; then :
+if test "x$ac_cv_func_gethostbyname" = xyes; then :
 
 fi
 
     if test $ac_cv_func_gethostbyname = no; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
 $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
+if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7380,14 +7415,14 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
 $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
+if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
       if test $ac_cv_lib_nsl_gethostbyname = no; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
 $as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
+if ${ac_cv_lib_bsd_gethostbyname+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7421,7 +7456,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
 $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
-if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
+if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
 fi
 
@@ -7436,14 +7471,14 @@
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
     ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
-if test "x$ac_cv_func_connect" = x""yes; then :
+if test "x$ac_cv_func_connect" = xyes; then :
 
 fi
 
     if test $ac_cv_func_connect = no; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
 $as_echo_n "checking for connect in -lsocket... " >&6; }
-if test "${ac_cv_lib_socket_connect+set}" = set; then :
+if ${ac_cv_lib_socket_connect+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7477,7 +7512,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
 $as_echo "$ac_cv_lib_socket_connect" >&6; }
-if test "x$ac_cv_lib_socket_connect" = x""yes; then :
+if test "x$ac_cv_lib_socket_connect" = xyes; then :
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
 fi
 
@@ -7485,14 +7520,14 @@
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
     ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
-if test "x$ac_cv_func_remove" = x""yes; then :
+if test "x$ac_cv_func_remove" = xyes; then :
 
 fi
 
     if test $ac_cv_func_remove = no; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
 $as_echo_n "checking for remove in -lposix... " >&6; }
-if test "${ac_cv_lib_posix_remove+set}" = set; then :
+if ${ac_cv_lib_posix_remove+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7526,7 +7561,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
 $as_echo "$ac_cv_lib_posix_remove" >&6; }
-if test "x$ac_cv_lib_posix_remove" = x""yes; then :
+if test "x$ac_cv_lib_posix_remove" = xyes; then :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
 fi
 
@@ -7534,14 +7569,14 @@
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
-if test "x$ac_cv_func_shmat" = x""yes; then :
+if test "x$ac_cv_func_shmat" = xyes; then :
 
 fi
 
     if test $ac_cv_func_shmat = no; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
 $as_echo_n "checking for shmat in -lipc... " >&6; }
-if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
+if ${ac_cv_lib_ipc_shmat+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7575,7 +7610,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
 $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
-if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
+if test "x$ac_cv_lib_ipc_shmat" = xyes; then :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
 fi
 
@@ -7593,7 +7628,7 @@
   # John Interrante, Karl Berry
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
 $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
+if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7627,7 +7662,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
 $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
+if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then :
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
 fi
 
@@ -7653,7 +7688,7 @@
   for ac_func in pthread_create
 do :
   ac_fn_c_check_func "$LINENO" "pthread_create" "ac_cv_func_pthread_create"
-if test "x$ac_cv_func_pthread_create" = x""yes; then :
+if test "x$ac_cv_func_pthread_create" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_PTHREAD_CREATE 1
 _ACEOF
@@ -7668,7 +7703,7 @@
     for ac_func in pthread_sighandler
 do :
   ac_fn_c_check_func "$LINENO" "pthread_sighandler" "ac_cv_func_pthread_sighandler"
-if test "x$ac_cv_func_pthread_sighandler" = x""yes; then :
+if test "x$ac_cv_func_pthread_sighandler" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_PTHREAD_SIGHANDLER 1
 _ACEOF
@@ -7679,7 +7714,7 @@
   else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
 $as_echo_n "checking for pthread_create in -lpthread... " >&6; }
-if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then :
+if ${ac_cv_lib_pthread_pthread_create+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7713,7 +7748,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
 $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then :
+if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBPTHREAD 1
 _ACEOF
@@ -7729,7 +7764,7 @@
     for ac_func in pthread_sighandler
 do :
   ac_fn_c_check_func "$LINENO" "pthread_sighandler" "ac_cv_func_pthread_sighandler"
-if test "x$ac_cv_func_pthread_sighandler" = x""yes; then :
+if test "x$ac_cv_func_pthread_sighandler" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_PTHREAD_SIGHANDLER 1
 _ACEOF
@@ -7769,7 +7804,7 @@
             unset ac_cv_lib_aa_aa_init
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for aa_init in -laa" >&5
 $as_echo_n "checking for aa_init in -laa... " >&6; }
-if test "${ac_cv_lib_aa_aa_init+set}" = set; then :
+if ${ac_cv_lib_aa_aa_init+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7803,7 +7838,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_aa_aa_init" >&5
 $as_echo "$ac_cv_lib_aa_aa_init" >&6; }
-if test "x$ac_cv_lib_aa_aa_init" = x""yes; then :
+if test "x$ac_cv_lib_aa_aa_init" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBAA 1
 _ACEOF
@@ -7817,7 +7852,7 @@
 $as_echo "Found aalib on /usr/include/aalib.h" >&6; }
               { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether aalib version >= 1.4" >&5
 $as_echo_n "checking whether aalib version >= 1.4... " >&6; }
-if test "${ac_cv_aalib_ver_ok+set}" = set; then :
+if ${ac_cv_aalib_ver_ok+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   echo '#include <aalib.h>
@@ -7870,7 +7905,7 @@
             unset ac_cv_lib_aa_aa_init
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for aa_init in -laa" >&5
 $as_echo_n "checking for aa_init in -laa... " >&6; }
-if test "${ac_cv_lib_aa_aa_init+set}" = set; then :
+if ${ac_cv_lib_aa_aa_init+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7904,7 +7939,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_aa_aa_init" >&5
 $as_echo "$ac_cv_lib_aa_aa_init" >&6; }
-if test "x$ac_cv_lib_aa_aa_init" = x""yes; then :
+if test "x$ac_cv_lib_aa_aa_init" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBAA 1
 _ACEOF
@@ -7918,7 +7953,7 @@
 $as_echo "Found aalib on /usr/local/include/aalib.h" >&6; }
               { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether aalib version >= 1.4" >&5
 $as_echo_n "checking whether aalib version >= 1.4... " >&6; }
-if test "${ac_cv_aalib_ver_ok+set}" = set; then :
+if ${ac_cv_aalib_ver_ok+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   echo '#include <aalib.h>
@@ -7973,7 +8008,7 @@
             unset ac_cv_lib_aa_aa_init
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for aa_init in -laa" >&5
 $as_echo_n "checking for aa_init in -laa... " >&6; }
-if test "${ac_cv_lib_aa_aa_init+set}" = set; then :
+if ${ac_cv_lib_aa_aa_init+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -8007,7 +8042,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_aa_aa_init" >&5
 $as_echo "$ac_cv_lib_aa_aa_init" >&6; }
-if test "x$ac_cv_lib_aa_aa_init" = x""yes; then :
+if test "x$ac_cv_lib_aa_aa_init" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBAA 1
 _ACEOF
@@ -8021,7 +8056,7 @@
 $as_echo "Found aalib on $name/aalib.h" >&6; }
               { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether aalib version >= 1.4" >&5
 $as_echo_n "checking whether aalib version >= 1.4... " >&6; }
-if test "${ac_cv_aalib_ver_ok+set}" = set; then :
+if ${ac_cv_aalib_ver_ok+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   echo '#include <aalib.h>
@@ -8076,7 +8111,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
+if ${ac_cv_path_GREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
@@ -8090,7 +8125,7 @@
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -8125,7 +8160,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
-    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_GREP=$GREP
@@ -8139,7 +8174,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
+if ${ac_cv_path_EGREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -8156,7 +8191,7 @@
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -8191,7 +8226,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -8206,7 +8241,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8323,8 +8358,7 @@
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 "
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -8338,8 +8372,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -8351,7 +8384,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
 $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if test "${ac_cv_c_const+set}" = set; then :
+if ${ac_cv_c_const+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8360,11 +8393,11 @@
 int
 main ()
 {
-/* FIXME: Include the comments suggested by Paul. */
+
 #ifndef __cplusplus
-  /* Ultrix mips cc rejects this.  */
+  /* Ultrix mips cc rejects this sort of thing.  */
   typedef int charset[2];
-  const charset cs;
+  const charset cs = { 0, 0 };
   /* SunOS 4.1.1 cc rejects this.  */
   char const *const *pcpcc;
   char **ppc;
@@ -8381,8 +8414,9 @@
   ++pcpcc;
   ppc = (char**) pcpcc;
   pcpcc = (char const *const *) ppc;
-  { /* SCO 3.2v4 cc rejects this.  */
-    char *t;
+  { /* SCO 3.2v4 cc rejects this sort of thing.  */
+    char tx;
+    char *t = &tx;
     char const *s = 0 ? (char *) 0 : (char const *) 0;
 
     *t++ = 0;
@@ -8398,10 +8432,10 @@
     iptr p = 0;
     ++p;
   }
-  { /* AIX XL C 1.02.0.0 rejects this saying
+  { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
        "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-    struct s { int j; const int *ap[3]; };
-    struct s *b; b->j = 5;
+    struct s { int j; const int *ap[3]; } bx;
+    struct s *b = &bx; b->j = 5;
   }
   { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
     const int foo = 10;
@@ -8431,7 +8465,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
 $as_echo_n "checking for inline... " >&6; }
-if test "${ac_cv_c_inline+set}" = set; then :
+if ${ac_cv_c_inline+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_c_inline=no
@@ -8475,7 +8509,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long double" >&5
 $as_echo_n "checking for long double... " >&6; }
-if test "${ac_cv_type_long_double+set}" = set; then :
+if ${ac_cv_type_long_double+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$GCC" = yes; then
@@ -8491,7 +8525,8 @@
 {
 static int test_array [1 - 2 * !(/* On Ultrix 4.3 cc, long double is 4 and double is 8.  */
 	      sizeof (double) <= sizeof (long double))];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -8518,7 +8553,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
 $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-if test "${ac_cv_header_time+set}" = set; then :
+if ${ac_cv_header_time+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8556,7 +8591,7 @@
   as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
 $as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$as_ac_Header+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8583,8 +8618,7 @@
 eval ac_res=\$$as_ac_Header
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
 _ACEOF
@@ -8597,7 +8631,7 @@
 if test $ac_header_dirent = dirent.h; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
 $as_echo_n "checking for library containing opendir... " >&6; }
-if test "${ac_cv_search_opendir+set}" = set; then :
+if ${ac_cv_search_opendir+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -8631,11 +8665,11 @@
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test "${ac_cv_search_opendir+set}" = set; then :
+  if ${ac_cv_search_opendir+:} false; then :
   break
 fi
 done
-if test "${ac_cv_search_opendir+set}" = set; then :
+if ${ac_cv_search_opendir+:} false; then :
 
 else
   ac_cv_search_opendir=no
@@ -8654,7 +8688,7 @@
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
 $as_echo_n "checking for library containing opendir... " >&6; }
-if test "${ac_cv_search_opendir+set}" = set; then :
+if ${ac_cv_search_opendir+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -8688,11 +8722,11 @@
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test "${ac_cv_search_opendir+set}" = set; then :
+  if ${ac_cv_search_opendir+:} false; then :
   break
 fi
 done
-if test "${ac_cv_search_opendir+set}" = set; then :
+if ${ac_cv_search_opendir+:} false; then :
 
 else
   ac_cv_search_opendir=no
@@ -8712,7 +8746,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
 $as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
-if test "${ac_cv_header_sys_wait_h+set}" = set; then :
+if ${ac_cv_header_sys_wait_h+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8752,7 +8786,7 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
-if test "x$ac_cv_type_pid_t" = x""yes; then :
+if test "x$ac_cv_type_pid_t" = xyes; then :
 
 else
 
@@ -8763,7 +8797,7 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = x""yes; then :
+if test "x$ac_cv_type_size_t" = xyes; then :
 
 else
 
@@ -8775,7 +8809,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
 $as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
-if test "${ac_cv_struct_tm+set}" = set; then :
+if ${ac_cv_struct_tm+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8824,7 +8858,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
 $as_echo_n "checking size of short... " >&6; }
-if test "${ac_cv_sizeof_short+set}" = set; then :
+if ${ac_cv_sizeof_short+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short"        "$ac_includes_default"; then :
@@ -8833,9 +8867,8 @@
   if test "$ac_cv_type_short" = yes; then
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (short)
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "cannot compute sizeof (short)
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_short=0
    fi
@@ -8858,7 +8891,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
 $as_echo_n "checking size of int... " >&6; }
-if test "${ac_cv_sizeof_int+set}" = set; then :
+if ${ac_cv_sizeof_int+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
@@ -8867,9 +8900,8 @@
   if test "$ac_cv_type_int" = yes; then
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (int)
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "cannot compute sizeof (int)
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_int=0
    fi
@@ -8892,7 +8924,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
 $as_echo_n "checking size of long... " >&6; }
-if test "${ac_cv_sizeof_long+set}" = set; then :
+if ${ac_cv_sizeof_long+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
@@ -8901,9 +8933,8 @@
   if test "$ac_cv_type_long" = yes; then
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (long)
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "cannot compute sizeof (long)
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_long=0
    fi
@@ -8924,7 +8955,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5
 $as_echo_n "checking for pow in -lm... " >&6; }
-if test "${ac_cv_lib_m_pow+set}" = set; then :
+if ${ac_cv_lib_m_pow+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -8958,7 +8989,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
 $as_echo "$ac_cv_lib_m_pow" >&6; }
-if test "x$ac_cv_lib_m_pow" = x""yes; then :
+if test "x$ac_cv_lib_m_pow" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBM 1
 _ACEOF
@@ -8971,7 +9002,7 @@
 if test $png = yes; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lz" >&5
 $as_echo_n "checking for inflate in -lz... " >&6; }
-if test "${ac_cv_lib_z_inflate+set}" = set; then :
+if ${ac_cv_lib_z_inflate+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -9005,7 +9036,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflate" >&5
 $as_echo "$ac_cv_lib_z_inflate" >&6; }
-if test "x$ac_cv_lib_z_inflate" = x""yes; then :
+if test "x$ac_cv_lib_z_inflate" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBZ 1
 _ACEOF
@@ -9017,7 +9048,7 @@
   if test x"$ac_cv_lib_z_inflate" = xno; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lgz" >&5
 $as_echo_n "checking for inflate in -lgz... " >&6; }
-if test "${ac_cv_lib_gz_inflate+set}" = set; then :
+if ${ac_cv_lib_gz_inflate+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -9051,7 +9082,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gz_inflate" >&5
 $as_echo "$ac_cv_lib_gz_inflate" >&6; }
-if test "x$ac_cv_lib_gz_inflate" = x""yes; then :
+if test "x$ac_cv_lib_gz_inflate" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBGZ 1
 _ACEOF
@@ -9066,7 +9097,7 @@
   fi
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_create_info_struct in -lpng" >&5
 $as_echo_n "checking for png_create_info_struct in -lpng... " >&6; }
-if test "${ac_cv_lib_png_png_create_info_struct+set}" = set; then :
+if ${ac_cv_lib_png_png_create_info_struct+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -9100,7 +9131,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_create_info_struct" >&5
 $as_echo "$ac_cv_lib_png_png_create_info_struct" >&6; }
-if test "x$ac_cv_lib_png_png_create_info_struct" = x""yes; then :
+if test "x$ac_cv_lib_png_png_create_info_struct" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBPNG 1
 _ACEOF
@@ -9121,7 +9152,7 @@
 # for constant arguments.  Useless!
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
 $as_echo_n "checking for working alloca.h... " >&6; }
-if test "${ac_cv_working_alloca_h+set}" = set; then :
+if ${ac_cv_working_alloca_h+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9154,7 +9185,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
 $as_echo_n "checking for alloca... " >&6; }
-if test "${ac_cv_func_alloca_works+set}" = set; then :
+if ${ac_cv_func_alloca_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9173,7 +9204,7 @@
  #pragma alloca
 #   else
 #    ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
+void *alloca (size_t);
 #    endif
 #   endif
 #  endif
@@ -9217,7 +9248,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
 $as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
-if test "${ac_cv_os_cray+set}" = set; then :
+if ${ac_cv_os_cray+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9244,8 +9275,7 @@
   for ac_func in _getb67 GETB67 getb67; do
     as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
 
 cat >>confdefs.h <<_ACEOF
 #define CRAY_STACKSEG_END $ac_func
@@ -9259,7 +9289,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
 $as_echo_n "checking stack direction for C alloca... " >&6; }
-if test "${ac_cv_c_stack_direction+set}" = set; then :
+if ${ac_cv_c_stack_direction+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -9269,23 +9299,20 @@
 /* end confdefs.h.  */
 $ac_includes_default
 int
-find_stack_direction ()
+find_stack_direction (int *addr, int depth)
 {
-  static char *addr = 0;
-  auto char dummy;
-  if (addr == 0)
-    {
-      addr = &dummy;
-      return find_stack_direction ();
-    }
-  else
-    return (&dummy > addr) ? 1 : -1;
+  int dir, dummy = 0;
+  if (! addr)
+    addr = &dummy;
+  *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
+  dir = depth ? find_stack_direction (addr, depth - 1) : 0;
+  return dir + dummy;
 }
 
 int
-main ()
+main (int argc, char **argv)
 {
-  return find_stack_direction () < 0;
+  return find_stack_direction (0, argc + !argv + 20) < 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
@@ -9311,8 +9338,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -9324,7 +9350,7 @@
 if test  "$x_driver_test" = yes; then
 if test "x$no_x" = x; then
   ac_fn_c_check_header_mongrel "$LINENO" "sys/ipc.h" "ac_cv_header_sys_ipc_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_ipc_h" = x""yes; then :
+if test "x$ac_cv_header_sys_ipc_h" = xyes; then :
   $as_echo "#define HAVE_IPC_H 1" >>confdefs.h
 
 else
@@ -9333,7 +9359,7 @@
 
 
   ac_fn_c_check_header_mongrel "$LINENO" "sys/shm.h" "ac_cv_header_sys_shm_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_shm_h" = x""yes; then :
+if test "x$ac_cv_header_sys_shm_h" = xyes; then :
   $as_echo "#define HAVE_IPC_H 1" >>confdefs.h
 
 else
@@ -9359,7 +9385,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShmAttach in -lXext" >&5
 $as_echo_n "checking for XShmAttach in -lXext... " >&6; }
-if test "${ac_cv_lib_Xext_XShmAttach+set}" = set; then :
+if ${ac_cv_lib_Xext_XShmAttach+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -9393,7 +9419,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XShmAttach" >&5
 $as_echo "$ac_cv_lib_Xext_XShmAttach" >&6; }
-if test "x$ac_cv_lib_Xext_XShmAttach" = x""yes; then :
+if test "x$ac_cv_lib_Xext_XShmAttach" = xyes; then :
   LIBS="$LIBS -lXext"
 else
   no_ext_lib=yes
@@ -9412,7 +9438,7 @@
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -9426,7 +9452,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -9455,7 +9481,7 @@
 set dummy pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $ac_pt_PKG_CONFIG in
@@ -9469,7 +9495,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -9702,7 +9728,7 @@
 set dummy gsl-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GSL_CONFIG+set}" = set; then :
+if ${ac_cv_path_GSL_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $GSL_CONFIG in
@@ -9716,7 +9742,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_GSL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -9762,7 +9788,7 @@
 set dummy nasm; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_NASM+set}" = set; then :
+if ${ac_cv_prog_NASM+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$NASM"; then
@@ -9774,7 +9800,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_NASM="yes"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -9889,10 +9915,21 @@
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
+    if test "x$cache_file" != "x/dev/null"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -9908,6 +9945,7 @@
 
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -9923,7 +9961,7 @@
 
 
 
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -10024,6 +10062,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -10069,19 +10108,19 @@
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -10219,16 +10258,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -10277,7 +10316,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -10288,29 +10327,17 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
 
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 
@@ -10330,8 +10357,8 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by XaoS $as_me 3.5, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+This file was extended by XaoS $as_me 3.6, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -10396,11 +10423,11 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-XaoS config.status 3.5
-configured by $0, generated by GNU Autoconf 2.65,
+XaoS config.status 3.6
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -10417,11 +10444,16 @@
 while test $# != 0
 do
   case $1 in
-  --*=*)
+  --*=?*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -10443,6 +10475,7 @@
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -10455,7 +10488,7 @@
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    as_fn_error "ambiguous option: \`$1'
+    as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
@@ -10464,7 +10497,7 @@
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error "unrecognized option: \`$1'
+  -*) as_fn_error $? "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
@@ -10484,7 +10517,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
@@ -10544,7 +10577,7 @@
     "src/ui/ui-drv/gtk/Makefile") CONFIG_FILES="$CONFIG_FILES src/ui/ui-drv/gtk/Makefile" ;;
     "src/sffe/Makefile") CONFIG_FILES="$CONFIG_FILES src/sffe/Makefile" ;;
 
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -10567,9 +10600,10 @@
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp=
+  tmp= ac_tmp=
   trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
 }
@@ -10577,12 +10611,13 @@
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
+  test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -10599,12 +10634,12 @@
 fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\r'
+  ac_cs_awk_cr='\\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -10613,18 +10648,18 @@
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -10632,7 +10667,7 @@
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -10680,7 +10715,7 @@
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
 
@@ -10712,21 +10747,29 @@
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
   cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
 s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
@@ -10738,7 +10781,7 @@
 # No need to generate them if there are no CONFIG_HEADERS.
 # This happens for instance with `./config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 
@@ -10750,11 +10793,11 @@
 # handling of long lines.
 ac_delim='%!_!# '
 for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -10839,7 +10882,7 @@
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error "could not setup config headers machinery" "$LINENO" 5
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -10852,7 +10895,7 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -10871,7 +10914,7 @@
     for ac_f
     do
       case $ac_f in
-      -) ac_f="$tmp/stdin";;
+      -) ac_f="$ac_tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -10880,7 +10923,7 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -10906,8 +10949,8 @@
     esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -11043,23 +11086,24 @@
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
+which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
+which seems to be undefined.  Please make sure it is defined" >&2;}
 
-  rm -f "$tmp/stdin"
+  rm -f "$ac_tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
   esac \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
@@ -11068,21 +11112,21 @@
   if test x"$ac_file" != x-; then
     {
       $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+    } >"$ac_tmp/config.h" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
-	|| as_fn_error "could not create $ac_file" "$LINENO" 5
+      mv "$ac_tmp/config.h" "$ac_file" \
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error "could not create -" "$LINENO" 5
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error $? "could not create -" "$LINENO" 5
   fi
  ;;
 
@@ -11216,7 +11260,7 @@
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -11237,7 +11281,7 @@
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit $?
+  $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
Index: AUTHORS
===================================================================
--- AUTHORS	(revision 527)
+++ AUTHORS	(working copy)
@@ -27,7 +27,7 @@
 Martin Dozsa (madsoft@centrum.cz)
      cs.po (Czech translation of menus)
 
-Arpad Fekete (rxpi@freemail.hu)
+Arpad Fekete
      Some new fractals, and the 'More formulae' menu
 
 Zelia Maria Horta Garcia (zeliagarcia@seed.pr.gov.br)
