diff --git a/src/.cvsignore b/src/.cvsignore
index 9202f776be9de73169c901cbc2c23c66e3ec4e0c..4f332be3a0385c2dfa3ccb3b0cb1c4f36e40334d 100644
--- a/src/.cvsignore
+++ b/src/.cvsignore
@@ -2,6 +2,7 @@
 Makefile
 config.cache
 config.log
+config.h.in
 config.status
 configure
 dependencies
diff --git a/src/.gitignore b/src/.gitignore
index 4fc6d684a24d5a361b45c56687fac7cbc85eb14d..b3287969053d16e3defd1ad15bd08ce1e800e752 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -2,6 +2,7 @@
 /Makefile
 /config.cache
 /config.log
+/config.h.in
 /config.status
 /configure
 /dependencies
diff --git a/src/Makefile.in b/src/Makefile.in
index e9ab5ebb016c6d5a8dbe749131d175acc0f488d2..c739c6bb90a936e7d91e9b426a7c39bf56b97605 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -224,7 +224,7 @@ $(SRCDIR)/peep_engine.c: $(SRCDIR)/peep.in
 
 peep.o: $(SRCDIR)/peep_engine.c
 
-# make dependencies (requires compiled Pike)
+# make dependencies
 depend: language.c
 	gcc -MM $(PREFLAGS) $(SRCDIR)/*.c | $(TMP_BINDIR)/fixdepends.sh $(SRCDIR)
 	( cd modules ; $(MAKE) $(MAKE_FLAGS) depend )
diff --git a/src/configure.in b/src/configure.in
index 8a6dc8b76f7ae9013ea905796fc7346352c6c203..84d52087f623de0b1eeacdd9f6d9df6f87d0a1f9 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1,4 +1,4 @@
-AC_REVISION("$Id: configure.in,v 1.81 1997/04/15 03:47:42 hubbe Exp $")
+AC_REVISION("$Id: configure.in,v 1.82 1997/04/15 08:59:12 hubbe Exp $")
 AC_INIT(interpret.c)
 AC_CONFIG_HEADER(machine.h)
 
@@ -45,8 +45,8 @@ done
 
 if test ! -z "$ac_cv_prog_CC" -a ! -z "$CC" -a "$CC" != "$ac_cv_prog_CC"
 then
-  AC_MSG_WARN(CC is different than last time Pike was compiled,
-It is probably best to delete ./config.cache before proceeding)
+  AC_MSG_WARN([CC is different than last time Pike was compiled,
+It is probably best to delete ./config.cache before proceeding])
 fi
 
 
@@ -219,8 +219,8 @@ else
     AC_TRY_COMPILE([int foo(int bar);],[],[],
     [
       OLD_CC="${CC-cc}"
-      if test "$CC" = "cc" -a -x /usr/bin/cc ; then
-        CC=/usr/bin/cc
+      if test "$CC" = "$BINDIR/smartlink cc" -a -x /usr/bin/cc ; then
+        CC="$BINDIR/smartlink /usr/bin/cc"
       fi
       CC="$CC -Aa -D_HPUX_SOURCE +Olibcalls"
       AC_TRY_COMPILE([int foo(int bar);],[],[],[CC="$OLD_CC"])