[packages/heimdal/AC-branch] fix syntax error in configure script

glen glen at pld-linux.org
Thu Jan 1 17:39:25 CET 2015


commit 0f810dc1386d6639309838cc945c00bb229e5499
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Jan 1 18:38:14 2015 +0200

    fix syntax error in configure script

 heimdal.spec |  4 +++-
 optarg.patch | 26 ++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)
---
diff --git a/heimdal.spec b/heimdal.spec
index 1fbd62c..a95c097 100644
--- a/heimdal.spec
+++ b/heimdal.spec
@@ -36,6 +36,7 @@ Patch8:		%{name}-gcc4.patch
 Patch9:		%{name}-db4.patch
 Patch10:	%{name}-libadd.patch
 Patch11:	ftp://ftp.pdc.kth.se/pub/heimdal/src/%{name}-0.7.2-setuid-patch.txt
+Patch12:	optarg.patch
 URL:		http://www.pdc.kth.se/heimdal/
 %{?with_x11:BuildRequires:	XFree86-devel}
 BuildRequires:	autoconf
@@ -294,6 +295,7 @@ Biblioteki statyczne heimdal.
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 %build
 rm -f acinclude.m4
@@ -310,7 +312,7 @@ export CPPFLAGS="-Dglob=heimdal_glob -Dglobfree=heimdal_globfree"
 	--enable-new-des3-code \
 	--with-openldap=/usr \
 	--with-readline=/usr \
-		--with%{!?with_x11:out}-x \
+	--with%{!?with_x11:out}-x \
 	--with-ipv6
 
 %{__make}
diff --git a/optarg.patch b/optarg.patch
new file mode 100644
index 0000000..639329b
--- /dev/null
+++ b/optarg.patch
@@ -0,0 +1,26 @@
+fix syntax error
+
+checking whether __progname is declared... no
+checking whether optarg is declared... yes
+./configure[28783]: syntax error: `fi' unexpected
+
+
+checking whether h_nerr is declared... no
+checking for __progname... yes
+checking whether __progname is declared... no
+checking whether optarg is declared... yes
+./configure: line 28783: syntax error near unexpected token `fi'
+./configure: line 28783: `fi'
+
+--- heimdal-0.7.2/cf/roken-frag.m4~	2015-01-01 18:14:07.000000000 +0200
++++ heimdal-0.7.2/cf/roken-frag.m4	2015-01-01 18:34:31.890707544 +0200
+@@ -624,7 +624,8 @@
+ #include <err.h>
+ #endif])
+ 
+-AC_CHECK_DECLS([optarg, optind, opterr, optopt, environ],[],[][
++AC_CHECK_DECLS([optarg, optind, opterr, optopt, environ],[],[],
++[
+ #include <stdlib.h>
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/heimdal.git/commitdiff/0f810dc1386d6639309838cc945c00bb229e5499



More information about the pld-cvs-commit mailing list