1 files changed, 7 insertions, 1 deletions
diff --git a/configure b/configure
index 38e4dd0c4..07c165d22 100755
--- a/configure
+++ b/configure
@@ -14,6 +14,7 @@
 
 # $Id$
 
+configure_options=$*
 prefix=/usr/local
 bindir=''
 libdir=''
@@ -101,6 +102,10 @@ cd config/auto-aux
 rm -f s.h m.h Makefile
 touch s.h m.h Makefile
 
+# Write options to Makefile
+
+echo "# generated by ./configure $configure_options" >> Makefile
+
 # Where to install
 
 echo "PREFIX=$prefix" >> Makefile
@@ -426,7 +431,8 @@ case "$arch,$model,$system" in
                          *) asppflags='-P -DSYS_$(SYSTEM)';;
                     esac;;
   i386,*,solaris)   case "$cc" in
-                      gcc*) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
+                    # Intel/solaris assembler doesn't like GNU cpp output
+                    # gcc*) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
                          *) asppflags='-P -DSYS_$(SYSTEM)';;
                     esac;;
   i386,*,*)         aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;