From d98720af4d63a7fc135290a9fd21b11129f38d01 Mon Sep 17 00:00:00 2001
From: steve <steve>
Date: Tue, 20 Jan 2004 21:00:47 +0000
Subject: [PATCH]  Isolate configure from containing config.h

---
 tgt-vvp/.cvsignore      |  1 +
 tgt-vvp/Makefile.in     |  4 ++--
 tgt-vvp/configure.in    |  1 +
 tgt-vvp/vvp_config.h.in | 44 +++++++++++++++++++++++++++++++++++++++++
 tgt-vvp/vvp_priv.h      |  6 +++++-
 5 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 tgt-vvp/vvp_config.h.in

diff --git a/tgt-vvp/.cvsignore b/tgt-vvp/.cvsignore
index 4bac49958..89c6ad11f 100644
--- a/tgt-vvp/.cvsignore
+++ b/tgt-vvp/.cvsignore
@@ -1,4 +1,5 @@
 Makefile
+vvp_config.h
 configure
 config.status
 config.log
diff --git a/tgt-vvp/Makefile.in b/tgt-vvp/Makefile.in
index 6577ebf1f..c295c532b 100644
--- a/tgt-vvp/Makefile.in
+++ b/tgt-vvp/Makefile.in
@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.18 2003/12/12 19:58:40 steve Exp $"
+#ident "$Id: Makefile.in,v 1.19 2004/01/20 21:00:47 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -49,7 +49,7 @@ dep:
 	mkdir dep
 
 %.o: %.c
-	$(CC) -Wall @ident_support@ -I$(srcdir)/.. $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o
+	$(CC) -Wall @ident_support@ $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o
 	mv $*.d dep
 
 O = vvp.o draw_mux.o draw_vpi.o eval_expr.o eval_real.o vector.o \
diff --git a/tgt-vvp/configure.in b/tgt-vvp/configure.in
index cdb23ca64..c6ff0fab3 100644
--- a/tgt-vvp/configure.in
+++ b/tgt-vvp/configure.in
@@ -1,5 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(vvp.c)
+AC_CONFIG_HEADER(vvp_config.h)
 
 dnl Checks for programs.
 AC_PROG_CC
diff --git a/tgt-vvp/vvp_config.h.in b/tgt-vvp/vvp_config.h.in
new file mode 100644
index 000000000..7afec9e31
--- /dev/null
+++ b/tgt-vvp/vvp_config.h.in
@@ -0,0 +1,44 @@
+#ifndef __vvp_config_H
+#define __vvp_config_H
+/*
+ * Copyright (c) 2004 Stephen Williams (steve@icarus.com)
+ *
+ *    This source code is free software; you can redistribute it
+ *    and/or modify it in source code form under the terms of the GNU
+ *    General Public License as published by the Free Software
+ *    Foundation; either version 2 of the License, or (at your option)
+ *    any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: vvp_config.h.in,v 1.1 2004/01/20 21:00:47 steve Exp $"
+#endif
+
+#if defined(__cplusplus)
+#  if !defined(__GNUC__)
+     using namespace std;
+#  elif (__GNUC__ == 3)
+     using namespace std;
+#  endif
+#endif
+
+# undef HAVE_MALLOC_H
+
+# undef _LARGEFILE_SOURCE
+# undef _LARGEFILE64_SOURCE
+
+/*
+ * $Log: vvp_config.h.in,v $
+ * Revision 1.1  2004/01/20 21:00:47  steve
+ *  Isolate configure from containing config.h
+ *
+ */
+#endif // __vvp_config_H
diff --git a/tgt-vvp/vvp_priv.h b/tgt-vvp/vvp_priv.h
index 38a865a41..da7a1361a 100644
--- a/tgt-vvp/vvp_priv.h
+++ b/tgt-vvp/vvp_priv.h
@@ -19,9 +19,10 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: vvp_priv.h,v 1.27 2003/06/17 19:17:42 steve Exp $"
+#ident "$Id: vvp_priv.h,v 1.28 2004/01/20 21:00:47 steve Exp $"
 #endif
 
+# include  "vvp_config.h"
 # include  "ivl_target.h"
 # include  <stdio.h>
 
@@ -192,6 +193,9 @@ extern unsigned thread_count;
 
 /*
  * $Log: vvp_priv.h,v $
+ * Revision 1.28  2004/01/20 21:00:47  steve
+ *  Isolate configure from containing config.h
+ *
  * Revision 1.27  2003/06/17 19:17:42  steve
  *  Remove short int restrictions from vvp opcodes.
  *