From xemacs-m  Fri Mar 28 21:45:50 1997
Received: from altair.xemacs.org (steve@xemacs.miranova.com [206.190.83.19])
	by xemacs.org (8.8.5/8.8.5) with ESMTP id VAA14705
	for <xemacs-beta@xemacs.org>; Fri, 28 Mar 1997 21:45:47 -0600 (CST)
Received: (from steve@localhost)
	by altair.xemacs.org (8.8.5/8.8.5) id TAA03942;
	Fri, 28 Mar 1997 19:58:35 -0800
Mail-Copies-To: never
To: xemacs-beta@xemacs.org
Subject: Patch for 20.1-b10 `]' typo in configure.in.
X-Url: http://www.miranova.com/%7Esteve/
X-Face: #!T9!#9s-3o8)*uHlX{Ug[xW7E7Wr!*L46-OxqMu\xz23v|R9q}lH?cRS{rCNe^'[`^sr5"
 f8*@r4ipO6Jl!:Ccq<xoV[Qz2u8<8-+Vwf2gzJ44lf_/y9OaQ`@#Q65{U4/TC)i2`~/M&QI$X>p:9I
 OSS'2{-)-4wBnVeg0S\O4Al@)uC[pD|+
X-Attribution: sb
From: Steven L Baur <steve@miranova.com>
Mime-Version: 1.0 (generated by tm-edit 7.106)
Content-Type: text/plain; charset=US-ASCII
Date: 28 Mar 1997 19:58:32 -0800
Message-ID: <m2208zl57b.fsf@altair.xemacs.org>
Lines: 91
X-Mailer: Gnus v5.4.37/XEmacs 20.1(beta11)

I guess I am an autoconf bozo.  Hopefully this should make things work 
better.

Index: configure.in
===================================================================
RCS file: /usr/local/xemacs/xemacs-20.0/configure.in,v
retrieving revision 1.16
diff -u -r1.16 configure.in
--- configure.in	1997/03/28 02:27:59	1.16
+++ configure.in	1997/03/29 03:54:14
@@ -1878,7 +1878,7 @@
     # In the IRIX 5.3 ld, only the last -rpath arg has any effect.  This is 
     # fundamentaly incompatible with having separate LD_SWITCH_X_SITE
     # and LD_SWITCH_SITE variables.  Fortunately, SGI fixed this by 6.2.
-    if [ -n "${x_libraries}" ] || [ -n "${site_runtime_libraries}" ]; then
+    if test -n "${x_libraries}" || test -n "${site_runtime_libraries}" ; then
       (echo "WARNING: The IRIX 5 ld ignores all but the last -rpath argument,";
        echo "         so if you need to specify more than one additional";
        echo "         runtime library directory, you will have to do so";
@@ -1899,7 +1899,7 @@
 esac
 
 if test -n "${x_libraries}" ; then
-    if test "${add_runtime_flag}" = "yes" ]; then
+    if test "${add_runtime_flag}" = "yes" ; then
 	LD_SWITCH_X_SITE="-L${x_libraries} ${runtime_arg}${x_libraries}"
   else
     LD_SWITCH_X_SITE="-L${x_libraries}"
@@ -2991,7 +2991,7 @@
     case "${arg}" in
 	-L*) if test -f `echo "${arg}/libtt.a" | sed 's/^\-L//'` ; then
 		 dash_r=''
-		 if [ "${add_runtime_flag}" = "yes" ]; then
+		 if test "${add_runtime_flag}" = "yes" ; then
 		     dash_r=`echo ${arg} | sed "s/^-L */${runtime_arg}/"`
 		 fi
 		 LD_SWITCH_X_SITE="${LD_SWITCH_X_SITE} ${arg} ${dash_r}"


Index: configure
===================================================================
RCS file: /usr/local/xemacs/xemacs-20.0/configure,v
retrieving revision 1.15
diff -u -r1.15 configure
--- configure	1997/03/28 02:27:58	1.15
+++ configure	1997/03/29 03:55:54
@@ -2688,7 +2688,7 @@
     # In the IRIX 5.3 ld, only the last -rpath arg has any effect.  This is 
     # fundamentaly incompatible with having separate LD_SWITCH_X_SITE
     # and LD_SWITCH_SITE variables.  Fortunately, SGI fixed this by 6.2.
-    if [ -n "${x_libraries}" ] || [ -n "${site_runtime_libraries}" ]; then
+    if test -n "${x_libraries}" || test -n "${site_runtime_libraries}" ; then
       (echo "WARNING: The IRIX 5 ld ignores all but the last -rpath argument,";
        echo "         so if you need to specify more than one additional";
        echo "         runtime library directory, you will have to do so";
@@ -2880,11 +2880,11 @@
 CPP=`eval "echo $CPP"`
 eval `${CPP} -Isrc ${tempcname} \
        | grep 'configure___' \
-       | sed -n -e 's/^configure___ \(^=*=\)\(.*\)$/\1"\2"/p'`
+       | sed -n -e 's/^configure___ \([^=]*=\)\(.*\)$/\1"\2"/p'`
 if test "x$SPECIFIED_CFLAGS" = x ; then
   eval `${CPP} -Isrc -DTHIS_IS_CONFIGURE ${tempcname} \
 	 | grep 'configure___' \
-	 | sed -n -e 's/^configure___ \(^=*=\)\(.*\)$/\1"\2"/p'`
+	 | sed -n -e 's/^configure___ \([^=]*=\)\(.*\)$/\1"\2"/p'`
 else
   REAL_CFLAGS="$CFLAGS"
 fi
@@ -2916,7 +2916,7 @@
 
 #### Add the libraries to LIBS and check for some functions.
 
-]
+
 CPPFLAGS="${C_SWITCH_SITE} $c_switch_system $c_switch_machine $c_switch_x_system $CPPFLAGS"
 DEFS="${C_SWITCH_SITE} $c_switch_system $c_switch_machine $c_switch_x_system $DEFS"
 LIBS="${LD_SWITCH_SITE} $ld_switch_x_system $libsrc_libs $LIBS"
@@ -5881,7 +5881,7 @@
     case "${arg}" in
 	-L*) if test -f `echo "${arg}/libtt.a" | sed 's/^\-L//'` ; then
 		 dash_r=''
-		 if  "${add_runtime_flag}" = "yes" ; then
+		 if test "${add_runtime_flag}" = "yes" ; then
 		     dash_r=`echo ${arg} | sed "s/^-L */${runtime_arg}/"`
 		 fi
 		 LD_SWITCH_X_SITE="${LD_SWITCH_X_SITE} ${arg} ${dash_r}"

-- 
steve@miranova.com baur
Unsolicited commercial e-mail will be billed at $250/message.

