g2c.hin: Renamed from g2c.h.in.

        * g2c.hin: Renamed from g2c.h.in.
        * Makefile.in, configure.in: Changed as needed.
        * configure: Rebuilt.
        * libU77/config.hin: Renamed from libU77/config.h.in.
        * Makefile.in, configure.in: Changed as needed.
        * configure: Rebuilt.

From-SVN: r21204

8 files changed, 20 insertions, 246 deletions

diff --git a/libf2c/ChangeLog.egcs b/libf2c/ChangeLog.egcs
index eaa7b7b5fcd..311c68d455e 100644
--- a/libf2c/ChangeLog.egcs
+++ b/libf2c/ChangeLog.egcs
@@ -1,3 +1,13 @@
+Thu Jul 16 00:58:52 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* g2c.hin: Renamed from g2c.h.in.
+	* Makefile.in, configure.in: Changed as needed.
+	* configure: Rebuilt.
+
+	* libU77/config.hin: Renamed from libU77/config.h.in.
+	* Makefile.in, configure.in: Changed as needed.
+	* configure: Rebuilt.
+
 Tue Jul 14 21:35:30 1998  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>
 
 	* Makefile.in (all): Invoke $(MAKE) instead of just make.
diff --git a/libf2c/Makefile.in b/libf2c/Makefile.in
index a4306746de9..12e68a7e5c6 100644
--- a/libf2c/Makefile.in
+++ b/libf2c/Makefile.in
@@ -118,7 +118,7 @@ ${srcdir}/configure: ${srcdir}/configure.in
 	cd $(srcdir) && autoconf
 
 # Dependence on Makefile serializes for parallel make.
-g2c.h: $(srcdir)/g2c.h.in config.status Makefile
+g2c.h: $(srcdir)/g2c.hin config.status Makefile
 # Might try to avoid rebuilding everything if Makefile or configure
 # changes and g2c.h doesn't; see also the Makefile rule.  Should
 # depend on another stamp file rather than using the commented-out
diff --git a/libf2c/configure b/libf2c/configure
index e386a9315f7..5f7d1ed521f 100755
--- a/libf2c/configure
+++ b/libf2c/configure
@@ -520,7 +520,7 @@ fi
 
 
 
-# From configure.in 1.11
+# From configure.in 1.12
 
 # For g77 we'll set CC to point at the built gcc, but this will get it into
 # the makefiles
@@ -1306,7 +1306,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile g2c.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile g2c.h:g2c.hin" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -1405,7 +1405,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile g2c.h"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile g2c.h:g2c.hin"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
diff --git a/libf2c/configure.in b/libf2c/configure.in
index 7e26525aa29..1b338c63e12 100644
--- a/libf2c/configure.in
+++ b/libf2c/configure.in
@@ -21,7 +21,7 @@
 
 AC_INIT(libF77/Version.c)
 
-AC_REVISION(1.11)
+AC_REVISION(1.12)
 
 dnl Checks for programs.
 # For g77 we'll set CC to point at the built gcc, but this will get it into
@@ -167,7 +167,7 @@ AC_CANONICAL_SYSTEM
 AC_SUBST(target_alias)
 
 AC_CONFIG_SUBDIRS(libU77 libI77 libF77)
-AC_OUTPUT(Makefile g2c.h)
+AC_OUTPUT(Makefile g2c.h:g2c.hin)
 
 dnl Local Variables:
 dnl comment-start: "dnl "
diff --git a/libf2c/g2c.h.in b/libf2c/g2c.h.in
deleted file mode 100644
index 5897525a230..00000000000
--- a/libf2c/g2c.h.in
+++ /dev/null
@@ -1,236 +0,0 @@
-/* g2c.h  --  g77 version of f2c (Standard Fortran to C header file) */
-
-/* This file is generated by the g77 libg2c configuration process from a
-   file named g2c.h.in.  This process sets up the appropriate types,
-   defines the appropriate macros, and so on.  The resulting g2c.h file
-   is used to build g77's copy of libf2c, named libg2c, and also can
-   be used when compiling C code produced by f2c to link the resulting
-   object file(s) with those produced by the same version of g77 that
-   produced this file, allowing inter-operability of f2c-compiled and
-   g77-compiled code.  */
-
-/**  barf  [ba:rf]  2.  "He suggested using FORTRAN, and everybody barfed."
-
-	- From The Shogakukan DICTIONARY OF NEW ENGLISH (Second edition) */
-
-#ifndef F2C_INCLUDE
-#define F2C_INCLUDE
-
-/* F2C_INTEGER will normally be `int' but would be `long' on 16-bit systems */
-/* we assume short, float are OK */
-typedef @F2C_INTEGER@ /* long int */ integer;
-typedef unsigned @F2C_INTEGER@ /* long */ uinteger;
-typedef char *address;
-typedef short int shortint;
-typedef float real;
-typedef double doublereal;
-typedef struct { real r, i; } complex;
-typedef struct { doublereal r, i; } doublecomplex;
-typedef @F2C_INTEGER@ /* long int */ logical;
-typedef short int shortlogical;
-typedef char logical1;
-typedef char integer1;
-typedef @F2C_LONGINT@ /* long long */ longint;		/* system-dependent */
-typedef unsigned @F2C_LONGINT@ /* long long */ ulongint;	/* system-dependent */
-#define qbit_clear(a,b)	((a) & ~((ulongint)1 << (b)))
-#define qbit_set(a,b)	((a) |  ((ulongint)1 << (b)))
-
-#define TRUE_ (1)
-#define FALSE_ (0)
-
-/* Extern is for use with -E */
-#ifndef Extern
-#define Extern extern
-#endif
-
-/* I/O stuff */
-
-#ifdef f2c_i2
-#error "f2c_i2 will not work with g77!!!!"
-/* for -i2 */
-typedef short flag;
-typedef short ftnlen;
-typedef short ftnint;
-#else
-typedef @F2C_INTEGER@ /* long int */ flag;
-typedef @F2C_INTEGER@ /* long int */ ftnlen;
-typedef @F2C_INTEGER@ /* long int */ ftnint;
-#endif
-
-/*external read, write*/
-typedef struct
-{	flag cierr;
-	ftnint ciunit;
-	flag ciend;
-	char *cifmt;
-	ftnint cirec;
-} cilist;
-
-/*internal read, write*/
-typedef struct
-{	flag icierr;
-	char *iciunit;
-	flag iciend;
-	char *icifmt;
-	ftnint icirlen;
-	ftnint icirnum;
-} icilist;
-
-/*open*/
-typedef struct
-{	flag oerr;
-	ftnint ounit;
-	char *ofnm;
-	ftnlen ofnmlen;
-	char *osta;
-	char *oacc;
-	char *ofm;
-	ftnint orl;
-	char *oblnk;
-} olist;
-
-/*close*/
-typedef struct
-{	flag cerr;
-	ftnint cunit;
-	char *csta;
-} cllist;
-
-/*rewind, backspace, endfile*/
-typedef struct
-{	flag aerr;
-	ftnint aunit;
-} alist;
-
-/* inquire */
-typedef struct
-{	flag inerr;
-	ftnint inunit;
-	char *infile;
-	ftnlen infilen;
-	ftnint	*inex;	/*parameters in standard's order*/
-	ftnint	*inopen;
-	ftnint	*innum;
-	ftnint	*innamed;
-	char	*inname;
-	ftnlen	innamlen;
-	char	*inacc;
-	ftnlen	inacclen;
-	char	*inseq;
-	ftnlen	inseqlen;
-	char 	*indir;
-	ftnlen	indirlen;
-	char	*infmt;
-	ftnlen	infmtlen;
-	char	*inform;
-	ftnint	informlen;
-	char	*inunf;
-	ftnlen	inunflen;
-	ftnint	*inrecl;
-	ftnint	*innrec;
-	char	*inblank;
-	ftnlen	inblanklen;
-} inlist;
-
-#define VOID void
-
-union Multitype {	/* for multiple entry points */
-	integer1 g;
-	shortint h;
-	integer i;
-	/* longint j; */
-	real r;
-	doublereal d;
-	complex c;
-	doublecomplex z;
-	};
-
-typedef union Multitype Multitype;
-
-/*typedef long int Long;*/	/* No longer used; formerly in Namelist */
-
-struct Vardesc {	/* for Namelist */
-	char *name;
-	char *addr;
-	ftnlen *dims;
-	int  type;
-	};
-typedef struct Vardesc Vardesc;
-
-struct Namelist {
-	char *name;
-	Vardesc **vars;
-	int nvars;
-	};
-typedef struct Namelist Namelist;
-
-#define abs(x) ((x) >= 0 ? (x) : -(x))
-#define dabs(x) (doublereal)abs(x)
-#define min(a,b) ((a) <= (b) ? (a) : (b))
-#define max(a,b) ((a) >= (b) ? (a) : (b))
-#define dmin(a,b) (doublereal)min(a,b)
-#define dmax(a,b) (doublereal)max(a,b)
-#define bit_test(a,b)	((a) >> (b) & 1)
-#define bit_clear(a,b)	((a) & ~((uinteger)1 << (b)))
-#define bit_set(a,b)	((a) |  ((uinteger)1 << (b)))
-
-/* procedure parameter types for -A and -C++ */
-
-#define F2C_proc_par_types 1
-#ifdef __cplusplus
-typedef int /* Unknown procedure type */ (*U_fp)(...);
-typedef shortint (*J_fp)(...);
-typedef integer (*I_fp)(...);
-typedef real (*R_fp)(...);
-typedef doublereal (*D_fp)(...), (*E_fp)(...);
-typedef /* Complex */ VOID (*C_fp)(...);
-typedef /* Double Complex */ VOID (*Z_fp)(...);
-typedef logical (*L_fp)(...);
-typedef shortlogical (*K_fp)(...);
-typedef /* Character */ VOID (*H_fp)(...);
-typedef /* Subroutine */ int (*S_fp)(...);
-#else
-typedef int /* Unknown procedure type */ (*U_fp)();
-typedef shortint (*J_fp)();
-typedef integer (*I_fp)();
-typedef real (*R_fp)();
-typedef doublereal (*D_fp)(), (*E_fp)();
-typedef /* Complex */ VOID (*C_fp)();
-typedef /* Double Complex */ VOID (*Z_fp)();
-typedef logical (*L_fp)();
-typedef shortlogical (*K_fp)();
-typedef /* Character */ VOID (*H_fp)();
-typedef /* Subroutine */ int (*S_fp)();
-#endif
-/* E_fp is for real functions when -R is not specified */
-typedef VOID C_f;	/* complex function */
-typedef VOID H_f;	/* character function */
-typedef VOID Z_f;	/* double complex function */
-typedef doublereal E_f;	/* real function with -R not specified */
-
-/* undef any lower-case symbols that your C compiler predefines, e.g.: */
-
-#ifndef Skip_f2c_Undefs
-/* (No such symbols should be defined in a strict ANSI C compiler.
-   We can avoid trouble with f2c-translated code by using
-   gcc -ansi [-traditional].) */
-#undef cray
-#undef gcos
-#undef mc68010
-#undef mc68020
-#undef mips
-#undef pdp11
-#undef sgi
-#undef sparc
-#undef sun
-#undef sun2
-#undef sun3
-#undef sun4
-#undef u370
-#undef u3b
-#undef u3b2
-#undef u3b5
-#undef unix
-#undef vax
-#endif
-#endif
diff --git a/libf2c/libU77/Makefile.in b/libf2c/libU77/Makefile.in
index a4067f2a669..4356478c034 100644
--- a/libf2c/libU77/Makefile.in
+++ b/libf2c/libU77/Makefile.in
@@ -99,7 +99,7 @@ config.status: configure
 ${srcdir}/configure: configure.in
 	cd ${srcdir} && autoconf
 
-${srcdir}/config.h.in: stamp-h.in
+${srcdir}/config.hin: stamp-h.in
 ${srcdir}/stamp-h.in: configure.in acconfig.h
 	cd ${srcdir} && autoheader
 	echo timestamp > ${srcdir}/stamp-h.in
diff --git a/libf2c/libU77/configure b/libf2c/libU77/configure
index f5171cc941c..07424cbdc27 100755
--- a/libf2c/libU77/configure
+++ b/libf2c/libU77/configure
@@ -1540,7 +1540,7 @@ done
 
 ac_given_srcdir=$srcdir
 
-trap 'rm -fr `echo "Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile config.h:config.hin" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -1698,7 +1698,7 @@ ac_eD='%g'
 if test "${CONFIG_HEADERS+set}" != set; then
 EOF
 cat >> $CONFIG_STATUS <<EOF
-  CONFIG_HEADERS="config.h"
+  CONFIG_HEADERS="config.h:config.hin"
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 fi
diff --git a/libf2c/libU77/configure.in b/libf2c/libU77/configure.in
index 456c01375b9..2e6e608c04e 100644
--- a/libf2c/libU77/configure.in
+++ b/libf2c/libU77/configure.in
@@ -20,7 +20,7 @@
 #USA.
 
 AC_INIT(access_.c)
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER(config.h:config.hin)
 
 dnl Checks for programs.
 # For g77 we'll set CC to point at the built gcc, but this will get it into