[svn-r2905] Purpose:

	Bug
Description:
	Applied the DYNAMIC_DIRS patch to this configure file. It was
	applied to the hdf5 stuff but didn't make it down here.

2 files changed, 18 insertions, 10 deletions

diff --git a/fortran/configure b/fortran/configure
index 55991d4..13f5512 100755
--- a/fortran/configure
+++ b/fortran/configure
@@ -2646,13 +2646,17 @@ rm -f conftest core core.* *.core conftest.o conftest.c dummy.o $ac_clean_files
 DYNAMIC_DIRS=""
 if test -n "$LDFLAGS"; then
    for d in $LDFLAGS ; do
-      d=`echo $d | sed -e 's/-L//g'`
       case "$d" in
-         .*)
-	    	    	    d=${ROOT}/$d
+         -L*)
+            d=`echo $d | sed -e 's/-L//g'`
+            case "$d" in
+               .*)
+	                                              d=${ROOT}/$d
+                  ;;
+            esac
+            DYNAMIC_DIRS="-R${d} $DYNAMIC_DIRS"
 	    ;;
       esac
-      DYNAMIC_DIRS="-R${d} $DYNAMIC_DIRS"
    done
 fi
 
diff --git a/fortran/configure.in b/fortran/configure.in
index c367674..618094e 100644
--- a/fortran/configure.in
+++ b/fortran/configure.in
@@ -537,15 +537,19 @@ dnl
 DYNAMIC_DIRS=""
 if test -n "$LDFLAGS"; then
    for d in $LDFLAGS ; do
-      d=`echo $d | sed -e 's/-L//g'`
       case "$d" in
-         .*)
-	    dnl If the path isn't absolute, make it so by prepending the
-	    dnl ROOT directory to it.
-	    d=${ROOT}/$d
+         -L*)
+            d=`echo $d | sed -e 's/-L//g'`
+            case "$d" in
+               .*)
+	          dnl If the path isn't absolute, make it so by prepending the
+                  dnl ROOT directory to it.
+                  d=${ROOT}/$d
+                  ;;
+            esac
+            DYNAMIC_DIRS="-R${d} $DYNAMIC_DIRS"
 	    ;;
       esac
-      DYNAMIC_DIRS="-R${d} $DYNAMIC_DIRS"
    done
 fi
 AC_SUBST(DYNAMIC_DIRS)