$NetBSD: patch-ab,v 1.8 2004/07/15 04:00:47 dmcmahill Exp $

--- configure.orig	Fri Jul  9 08:28:05 2004
+++ configure
@@ -18901,8 +18901,8 @@ echo "$as_me: error: Unable to configure
   *-*-solaris*)
     # standard compilers
     CC=cc
-    CC_OPTIONS='-O -DSVR4 -DSYSV -Dsolaris'
-    CC_LDFLAGS=
+    CC_OPTIONS="${CFLAGS} -DSVR4 -DSYSV -Dsolaris"
+    CC_LDFLAGS="${LDFLAGS}"
     if test "$WITH_G77" != yes; then
       #AC_CHECK_PROG(F77,f77,yes,no)
       for ac_prog in f77 f90 f2c-f77
@@ -18956,9 +18956,9 @@ echo "$as_me: error: Unable to configure
     #FC="$F77"
     FC_OPTIONS=-O
     FC_OPTIONS_O0=
-    FC_LDFLAGS=
+    FC_LDFLAGS="${LDFLAGS}"
     LD=ld
-    LD_LDFLAGS=
+    LD_LDFLAGS="${LDFLAGS}"
     if test "$enable_debug" = yes; then
       CC_OPTIONS='-g -DSVR4 -DSYSV -Dsolaris'
       FC_OPTIONS=-g
@@ -18975,7 +18975,7 @@ echo "$as_me: error: Unable to configure
       FC=g77
       FC_OPTIONS=-O2
       FC_OPTIONS_O0=
-      FC_LDFLAGS='-t'
+      FC_LDFLAGS="${LDFLAGS} -t"
 #     for solaris 2.7 with gcc/g77 2.95.2, binutils 2.9
 #     the correct value should be
 #     FC_LDFLAGS='-t -Wl,-export-dynamic'
@@ -22347,7 +22347,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
    FC="$F77"
    FC_OPTIONS="${FFLAGS}"
    FC_OPTIONS_O0=`echo $FC_OPTIONS | sed 's/-O0-9*//g'`
-   FC_LDFLAGS="${LDLAGS} -Wl,-R${X11BASE}/lib"
+   FC_LDFLAGS="${LDFLAGS} -Wl,-R${X11BASE}/lib"
    FC_PICFLAGS='-fPIC'
    # check for --export-dynamic
    ac_save_LDFLAGS="$LDFLAGS"
@@ -25997,6 +25997,10 @@ CHK_TCL_MIN=$TCL_MINOR_VERSION
 TCL_LIB_OK=0
   echo "$as_me:$LINENO: checking for tcl library tcl$TCL_MAJOR_VERSION.$TCL_MINOR_VERSION" >&5
 echo $ECHO_N "checking for tcl library tcl$TCL_MAJOR_VERSION.$TCL_MINOR_VERSION... $ECHO_C" >&6
+if test -n "$TCL_CONFIG_SH" ; then  
+	. $TCL_CONFIG_SH
+fi    
+LDFLAGS="$LDFLAGS $TCL_LIBS" 
 dirs="$USER_TCL_LIB_PATH /lib /usr/lib /usr/lib/tcl /usr/lib/tcl8.* /shlib /shlib/tcl /shlib/tcl8.* /usr/shlib /shlib/tcl /usr//shlib/tcl8.* /usr/local/lib /usr/local/lib/tcl /usr/local/lib/tcl8.* /usr/local/shlib /usr/X11/lib/tcl /usr/X11/lib/tcl8.* /usr/lib/X11 /usr/lib/X11/tcl /usr/lib/X11/tcl8.* ../lib ../../lib  /usr/local/tcl /usr/tcl /usr/tcl/lib /usr/local/tcl/lib /sw/lib/ ."
 libexts="so so.1.0 sl dylib a"
 libnames="tcl$CHK_TCL_MAJ.$CHK_TCL_MIN tcl.$CHK_TCL_MAJ.$CHK_TCL_MIN tcl$CHK_TCL_MAJ$CHK_TCL_MIN tcl.$CHK_TCL_MAJ$CHK_TCL_MIN"
@@ -26163,7 +26167,7 @@ fi
 done
 
 			if test $TCL_LIB_OK = 1; then
-				TCLTK_LIBS=" $TCL_LIB $TCLTK_LIBS"
+				TCLTK_LIBS=" $TCL_LIB $TCL_LIBS $TCLTK_LIBS"
 				break;
 			fi
 		fi
@@ -26287,6 +26291,10 @@ TK_LIB_OK=0
 
 echo "$as_me:$LINENO: checking for tk library tk$TK_MAJOR_VERSION.$TK_MINOR_VERSION" >&5
 echo $ECHO_N "checking for tk library tk$TK_MAJOR_VERSION.$TK_MINOR_VERSION... $ECHO_C" >&6
+if test -n "$TK_CONFIG_SH" ; then  
+	. $TK_CONFIG_SH
+fi    
+LDFLAGS="$LDFLAGS $TK_LIBS" 
 dirs="$USER_TK_LIB_PATH /lib /usr/lib /usr/lib/tk /usr/lib/tk8.* /shlib /shlib/tk /shlib/tk8.* /usr/shlib /shlib/tk /usr/shlib/tk8.* /usr/local/lib /usr/local/lib/tk /usr/local/lib/tk8.* /usr/local/shlib /usr/X11/lib/tk /usr/X11/lib/tk8.*  /usr/lib/X11 /usr/lib/X11/tk /usr/lib/X11/tk8.* ../lib ../../lib /usr/tk /usr/local/tk /usr/local/tk/lib /usr/tk/lib /usr/local/tcl /usr/tcl /usr/local/tcl/lib /usr/tcl/lib /sw/lib "
 libexts="so so.1.0 sl dylib a"
 libnames="tk$CHK_TK_MAJ.$CHK_TK_MIN tk.$CHK_TK_MAJ.$CHK_TK_MIN tk$CHK_TK_MAJ$CHK_TK_MIN tk.$CHK_TK_MAJ$CHK_TK_MIN"
@@ -26474,7 +26482,7 @@ done
 echo "$as_me: error: tk library not found" >&2;}
    { (exit 1); exit 1; }; }
   else
-        TCLTK_LIBS=$TK_LIB" $TCLTK_LIBS"
+        TCLTK_LIBS=" $TK_LIB $TK_LIBS $TCLTK_LIBS"
         WITH_TKSCI=1
   fi
 
@@ -26503,13 +26511,13 @@ case "$host" in
     ;;
 esac
 
-GETLIBTK=libtk$TK_MAJOR_VERSION.$TK_MINOR_VERSION.so
+GETLIBTK=libtk$TK_MAJOR_VERSION$TK_MINOR_VERSION.so
 
-case "$host" in
-  *-*-darwin*)
-  GETLIBTK=/sw/lib/libtk$TK_MAJOR_VERSION.$TK_MINOR_VERSION.dylib
-  ;;
-esac
+#case "$host" in
+#  *-*-darwin*)
+#  GETLIBTK=/sw/lib/libtk$TK_MAJOR_VERSION.$TK_MINOR_VERSION.dylib
+#  ;;
+#esac
 
 fi