aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.Sanitize27
-rw-r--r--ChangeLog12
-rw-r--r--configure.in5
3 files changed, 43 insertions, 1 deletions
diff --git a/.Sanitize b/.Sanitize
index 8c13eae..445984e 100644
--- a/.Sanitize
+++ b/.Sanitize
@@ -374,4 +374,31 @@ for i in * ; do
fi
done
+if ( echo $* | grep keep\-gm > /dev/null ) ; then
+ for i in * ; do
+ if test ! -d $i && (grep sanitize-gm $i > /dev/null) ; then
+ if [ -n "${verbose}" ] ; then
+ echo Keeping gm stuff in $i
+ fi
+ fi
+ done
+else
+ for i in * ; do
+ if test ! -d $i && (grep sanitize-gm $i > /dev/null) ; then
+ if [ -n "${verbose}" ] ; then
+ echo Removing traces of \"gm\" from $i...
+ fi
+ cp $i new
+ sed '/start\-sanitize\-gm/,/end-\sanitize\-gm/d' < $i > new
+ if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+ if [ -n "${verbose}" ] ; then
+ echo Caching $i in .Recover...
+ fi
+ mv $i .Recover
+ fi
+ mv new $i
+ fi
+ done
+fi
+
# eof
diff --git a/ChangeLog b/ChangeLog
index be29b08..2f4d7f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Fri Oct 27 09:32:30 1995 Stu Grossman (grossman@cygnus.com)
+
+ * configure.in: Make sure that CC is undefined (as opposed to
+ null) if toplevel/config/mh-{host} doesn't define it. Fixes a
+ problem with autoconf trying to configure on a host without GCC.
+
+start-sanitize-gm
+Fri Oct 27 09:32:25 1995 Stu Grossman (grossman@cygnus.com)
+
+ * config.sub: Add `magic' as an OS target for General Magic.
+
+end-sanitize-gm
Thu Oct 26 22:35:01 1995 Stan Shebs <shebs@andros.cygnus.com>
* mpw-configure: Set host alias from choice of host compiler,
diff --git a/configure.in b/configure.in
index 8f5d5fb..12e5068 100644
--- a/configure.in
+++ b/configure.in
@@ -131,7 +131,10 @@ fi
# See if we can extract a definition of CC from the fragment.
if [ -z "${CC}" ]; then
if [ -n "${host_makefile_frag}" -a -f "${srcdir}/${host_makefile_frag}" ]; then
- CC=`sed -n -e 's/^[ ]*CC[ ]*=[ ]*\(.*\)$/\1/p' < ${srcdir}/${host_makefile_frag}`
+ xx=`sed -n -e 's/^[ ]*CC[ ]*=[ ]*\(.*\)$/\1/p' < ${srcdir}/${host_makefile_frag}`
+ if [ -n "${xx}" ] ; then
+ CC=$xx
+ fi
fi
fi