released 1.1.4

1 files changed, 28 insertions, 13 deletions

diff --git a/mpi/config.links b/mpi/config.links
index 48c7977c..8c47cb90 100644
--- a/mpi/config.links
+++ b/mpi/config.links
@@ -1,5 +1,24 @@
+# config.links - helper for ../configure
+# Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+#
+# This file is part of Libgcrypt.
+#
+# Libgcrypt is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# Libgcrypt is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
 # sourced by ../configure to get the list of files to link
-# this should set $mpi_ln_src and mpi_ln_dst.
+# this should set $mpi_ln_list.
 # Note: this is called from the above directory.
 
 
@@ -255,8 +274,7 @@ mpi_ln_modules="${mpi_extra_modules} mpih-add1 mpih-mul1 mpih-mul2 mpih-mul3 \
 		 mpih-lshift mpih-rshift mpih-sub1"
 
 mpi_ln_objects=
-mpi_ln_src=
-mpi_ln_dst=
+mpi_ln_list=
 
 # try to get file to link from the assembler subdirectory and
 # if this fails get it from the generic subdirectory.
@@ -266,12 +284,10 @@ for fn in $mpi_ln_modules ; do
     for dir in $path ; do
 	rm -f $srcdir/mpi/$fn.[Sc]
 	if test -f $srcdir/mpi/$dir/$fn.S ; then
-	    mpi_ln_src="$mpi_ln_src mpi/$dir/$fn.S"
-	    mpi_ln_dst="$mpi_ln_dst mpi/$fn.S"
+            mpi_ln_list="$mpi_ln_list mpi/$fn.S:mpi/$dir/$fn.S"
 	    break;
 	elif test -f $srcdir/mpi/$dir/$fn.c ; then
-	    mpi_ln_src="$mpi_ln_src mpi/$dir/$fn.c"
-	    mpi_ln_dst="$mpi_ln_dst mpi/$fn.c"
+            mpi_ln_list="$mpi_ln_list mpi/$fn.c:mpi/$dir/$fn.c"
 	    break;
 	fi
     done
@@ -280,10 +296,9 @@ done
 # Same thing for the file which defines the limb size
 path="$path generic"
 for dir in $path ; do
-     	rm -f $srcdir/mpi/mpi-asm-defs.h
-	if test -f $srcdir/mpi/$dir/mpi-asm-defs.h ; then
-	    mpi_ln_src="$mpi_ln_src mpi/$dir/mpi-asm-defs.h"
-	    mpi_ln_dst="$mpi_ln_dst mpi/mpi-asm-defs.h"
-	    break;
-	fi
+    rm -f $srcdir/mpi/mpi-asm-defs.h
+    if test -f $srcdir/mpi/$dir/mpi-asm-defs.h ; then
+        mpi_ln_list="$mpi_ln_list mpi/mpi-asm-defs.h:mpi/$dir/mpi-asm-defs.h"
+        break;
+    fi
 done