* include/ffi.h.in: Try to work around messy header problem

with PACKAGE and VERSION.

	* configure: Rebuilt.
	* configure.in: Change version to 2.00-beta.

        * fficonfig.h.in: Rebuilt.
	* acconfig.h (FFI_NO_STRUCTS, FFI_NO_RAW_API): Define.

	* src/x86/ffi.c (ffi_raw_call): Rename.

libffi/include/ffi.h.in

@@ -1,7 +1,7 @@
 /* -----------------------------------------------------------------*-C-*-
    libffi @VERSION@ - Copyright (c) 1996-1999  Cygnus Solutions
 
-   $Id: ffi.h.in,v 1.2 1999/08/04 18:00:05 green Exp $
+   $Id: ffi.h.in,v 1.3 1999/08/08 13:05:12 green Exp $
 
    Permission is hereby granted, free of charge, to any person obtaining
    a copy of this software and associated documentation files (the
@@ -32,8 +32,27 @@
 
 /* ---- 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)