From 6ba9e3b09e3b5ed619de2f764c81cc034ae13605 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@cygnus.com>
Date: Wed, 1 Sep 1999 23:16:34 +0000
Subject: ffi.h.in: Removed PACKAGE and VERSION defines and undefs.

	* include/ffi.h.in: Removed PACKAGE and VERSION defines and
	undefs.
	* fficonfig.h.in: Rebuilt.
	* configure: Rebuilt.
	* configure.in: Pass 3rd argument to AM_INIT_AUTOMAKE.
	Use AM_PROG_LIBTOOL (automake 1.4 compatibility).
	* acconfig.h: Don't #undef PACKAGE or VERSION.

From-SVN: r29038
---
 libffi/include/Makefile.in |  3 ++-
 libffi/include/ffi.h.in    | 21 +--------------------
 2 files changed, 3 insertions(+), 21 deletions(-)

(limited to 'libffi/include')

diff --git a/libffi/include/Makefile.in b/libffi/include/Makefile.in
index 20192e5..1a85bf5 100644
--- a/libffi/include/Makefile.in
+++ b/libffi/include/Makefile.in
@@ -71,13 +71,14 @@ LN_S = @LN_S@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NM = @NM@
+OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 SHELL = @SHELL@
 TARGET = @TARGET@
 TARGETDIR = @TARGETDIR@
-USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
+install_sh = @install_sh@
 
 
 AUTOMAKE_OPTIONS = foreign
diff --git a/libffi/include/ffi.h.in b/libffi/include/ffi.h.in
index e438f77..8eefb6d 100644
--- a/libffi/include/ffi.h.in
+++ b/libffi/include/ffi.h.in
@@ -1,7 +1,7 @@
 /* -----------------------------------------------------------------*-C-*-
    libffi @VERSION@ - Copyright (c) 1996-1999  Cygnus Solutions
 
-   $Id: ffi.h.in,v 1.1 1999/08/08 22:58:30 green Exp $
+   $Id: ffi.h.in,v 1.2 1999/08/09 02:52:58 green Exp $
 
    Permission is hereby granted, free of charge, to any person obtaining
    a copy of this software and associated documentation files (the
@@ -36,27 +36,8 @@ extern "C" {
 
 /* ---- System configuration information --------------------------------- */
 
-#ifdef PACKAGE
-#define OLD_PACKAGE PACKAGE
-#undef PACKAGE
-#endif
-#ifdef VERSION
-#define OLD_VERSION VERSION
-#undef VERSION
-#endif
-
 #include <fficonfig.h>
 
-#undef PACKAGE
-#undef VERSION
-
-#ifdef OLD_PACKAGE
-#define PACKAGE OLD_PACKAGE
-#endif
-#ifdef OLD_VERSION
-#define VERSION OLD_VERSION
-#endif
-
 #if !defined(LIBFFI_ASM)
 #include <stddef.h>
 #if defined(FFI_DEBUG) 
-- 
cgit v1.1