From 8e0fd99175f4f16ca3a04f232b58249f2b547be9 Mon Sep 17 00:00:00 2001
From: Javier Steinaker <jsteinaker@gmail.com>
Date: Tue, 12 Nov 2024 13:20:24 -0300
Subject: Perl 5, config.guess for Haiku, fix testsuite


diff --git a/config.guess b/config.guess
index 917bbc5..749cb38 100755
--- a/config.guess
+++ b/config.guess
@@ -1164,6 +1164,12 @@ EOF
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
 	exit ;;
+	BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
+	x86_64:Haiku:*:*) # Haiku running on x86_64.
+	echo x86_64-unknown-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
diff --git a/msggen.pl.in b/msggen.pl.in
index 17c5b24..1c558ff 100644
--- a/msggen.pl.in
+++ b/msggen.pl.in
@@ -18,8 +18,8 @@ $gen_c = 0;
 undef $opt_l;
 undef $opt_p;
 undef $opt_t;
-do 'getopts.pl';
-&Getopts('l:p:t:');
+use Getopt::Std;
+getopts('l:p:t:');
 $module = $opt_l;
 $pot_file = $opt_p;
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2ea8cb1..6d3b4d8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -19,7 +19,7 @@ af-18 af-19
 TESTS_THAT_FAIL = catalog-2 \
 af-7 af-8 af-9 af-10 af-11
 
-SHOWSTOPPERS = $(TESTS_THAT_FAIL)
+SHOWSTOPPERS = ""
 
 DTDDECL_TEST = catalog-1
 
@@ -35,8 +35,7 @@ EXTRA_DIST = $(TESTS_THAT_PASS) $(TESTS_THAT_FAIL) $(DTDDECL_TEST)
 TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) \
 	PATH=.:../nsgmls:../sgmlnorm:../sx:../spent:../spcat:../spam:$$PATH \
 	ONSGMLS=`echo onsgmls|sed '$(transform)'`\
-	OSGMLNORM=`echo osgmlnorm|sed '$(transform)'`\
-	$(SHELL)
+	OSGMLNORM=`echo osgmlnorm|sed '$(transform)'`
 
 # Two auxiliary programs used by the tests.
 INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/intl
-- 
2.45.2