$NetBSD: patch-aa,v 1.11 2005/09/22 00:05:40 dmcmahill Exp $

--- configure.in.orig	2005-05-25 15:00:45.000000000 +0000
+++ configure.in
@@ -452,8 +452,8 @@ case "$host" in
   *-*-solaris*)
     # standard compilers
     CC=cc
-    CC_OPTIONS='-O -DNDEBUG -DSVR4 -DSYSV -Dsolaris'
-    CC_LDFLAGS=
+    CC_OPTIONS="${CFLAGS} -DNDEBUG -DSVR4 -DSYSV -Dsolaris"
+    CC_LDFLAGS="${LDFLAGS}"
     if test "$WITH_G77" != yes; then    
       #AC_CHECK_PROG(F77,f77,yes,no)
       AC_CHECK_PROGS(F77,f77 f90 f2c-f77,no)
@@ -463,9 +463,9 @@ case "$host" in
       FC="$F77"
     fi
     #FC="$F77"
-    FC_OPTIONS=-O
+    FC_OPTIONS="${FFLAGS}"
     FC_OPTIONS_O0=
-    FC_LDFLAGS=
+    FC_LDFLAGS="${LDFLAGS}"
     LD=ld
     LD_LDFLAGS=
     if test "$enable_debug" = yes; then 
@@ -484,7 +484,7 @@ case "$host" in
       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'
@@ -1189,7 +1189,7 @@ case "$host" in
    FC="$F77"
    FC_OPTIONS="${FFLAGS}"
    FC_OPTIONS_O0=`echo $FC_OPTIONS | sed 's/-O[0-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"
@@ -1413,7 +1413,8 @@ if test "$PERIFILE" = periX11.o; then 
         LDFLAGS="$ac_save_LDFLAGS"
         save_cflags=$CFLAGS
         CFLAGS="$X_CFLAGS $CC_OPTIONS"
-        AC_TRY_COMPILE([#include <X11/IntrinsicP.h> #include <X11/Xaw3d/ViewportP.h>],,,
+        AC_TRY_COMPILE([#include <X11/IntrinsicP.h>
+	#include <X11/Xaw3d/ViewportP.h>],,,
         AC_MSG_ERROR([Include file "ViewportP.h" for Xaw3d not found. 
 			       Get and put it in <X11/Xaw3d/> .]))
 	CFLAGS=$save_cflags
@@ -1714,13 +1715,13 @@ case "$host" in
     ;;
 esac
 
-GETLIBTK=libtk$TK_MAJOR_VERSION.$TK_MINOR_VERSION.$SONAME
+GETLIBTK=libtk$TK_MAJOR_VERSION$TK_MINOR_VERSION.$SONAME
 
-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