--- a/configure.in
+++ b/configure.in
@@ -21,7 +21,7 @@
 ### along with Octave; see the file COPYING.  If not, write to the Free
 ### Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-AC_REVISION($Revision: 1.103 $)
+AC_REVISION($Revision: 1.104 $)
 AC_PREREQ(2.0)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h)
@@ -274,6 +274,9 @@
 ### See what libraries are used by the C++ compiler.  Need this for
 ### dynamic linking.
 
+if test -n "$CXX"; then
+  export CXX
+fi
 CXXLIBS=`sh $srcdir/cxxlibs.sh`
 AC_MSG_RESULT([defining CXXLIBS to be $CXXLIBS])
 
@@ -478,13 +481,13 @@
 
 changequote(,)dnl
 FLIB_LIST=`echo " $FLIBS " | sed -e 's/ -Xlinker *[^ ]*/ /g' \
-	-e 's/ -L *[^ ]*/ /g' \
+	-e 's/ -[LR] *[^ ]*/ /g' \
 	-e 's/ -l *\([^ ]*\)/ lib\1.a/g' -e 's/ -u *[^ ]*/ /g' \
 	-e 's/ [^ ]*\.o//g' \
 	-e 's/^ *//' -e 's/ *$//' -e 's/  */:/g'`
 
 CXXLIB_LIST=`echo " $CXXLIBS " | sed -e 's/ -Xlinker *[^ ]*/ /g' \
-	-e 's/ -L *[^ ]*/ /g' \
+	-e 's/ -[LR] *[^ ]*/ /g' \
 	-e 's/ -l *\([^ ]*\)/ lib\1.a/g' -e 's/ -u *[^ ]*/ /g' \
 	-e 's/ [^ ]*\.o//g' \
 	-e 's/^ *//' -e 's/ *$//' -e 's/  */:/g'`
@@ -493,13 +496,13 @@
 
 FLIB_PATH=`echo " $FLIBS " | sed \
 	-e 's/ /  /g' -e 's/ -Xlinker *[^ ]*/ /g' \
-	-e 's/ -L *\([^ ]*\)/ \1/g' -e 's, /[^ ]*\.a , ,g' \
+	-e 's/ -[LR] *\([^ ]*\)/ \1/g' -e 's, /[^ ]*\.a , ,g' \
 	-e 's/ -l *[^ ]*/ /g' -e 's/ -u *[^ ]*/ /g' \
 	-e 's/ [^ ]*\.o//g' \
 	-e 's/^ *//' -e 's/ *$//' -e 's/  */:/g'`
 
 CXXLIB_PATH=`echo " $CXXLIBS " | sed -e 's/ -Xlinker *[^ ]*/ /g' \
-	-e 's/ -L *\([^ ]*\)/ \1/g' -e 's, /[^ ]*\.a , ,g' \
+	-e 's/ -[LR] *\([^ ]*\)/ \1/g' -e 's, /[^ ]*\.a , ,g' \
 	-e 's/ /  /g' -e 's/ -Xlinker *[^ ]*/ /g' \
 	-e 's/ -l *[^ ]*/ /g' -e 's/ -u *[^ ]*/ /g' \
 	-e 's/ [^ ]*\.o//g' \