--- configure.orig	Wed Feb  1 21:47:53 2006
+++ configure	Sat May 27 19:27:55 2006
@@ -22162,7 +22162,7 @@
      CC_PICFLAGS='-fPIC'
      # script shell f77 have bugs, get ours
      FC=$F77
-     FC_OPTIONS="${CFLAGS} -Dfreebsd"
+     FC_OPTIONS="${FFLAGS} -Dfreebsd"
      FC_OPTIONS_O0='-Dfreebsd'
      FC_LDFLAGS='-lm -Wl,--export-dynamic'
      FC_PICFLAGS='-fPIC'
@@ -25056,7 +25056,8 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <X11/IntrinsicP.h> #include <X11/Xaw3d/ViewportP.h>
+#include <X11/IntrinsicP.h>
+#include <X11/Xaw3d/ViewportP.h>
 int
 main ()
 {
@@ -27200,7 +27201,7 @@
 	;;
 	esac
 
-	GETLIBTK=libtk$TK_MAJOR_VERSION.$TK_MINOR_VERSION.$SONAME
+	GETLIBTK=libtk$TK_MAJOR_VERSION$TK_MINOR_VERSION.$SONAME
 
 	case "$host" in
 		*-*-darwin*)