Commit aeb0abab87222f637fbf352d4effd3b76b52ed26

green 2008-02-14T15:54:27

* libffi.pc.in: Usse @PACKAGE_NAME@ and @PACKAGE_VERSION@. * configure.ac: Reset version to 2.99.1. * configure.in: Rebuilt. * Makefile.am (EXTRA_DIST): Add ChangeLog.libffi. * Makefile.in: Rebuilt. * LICENSE: Update copyright notice.

diff --git a/libffi/ChangeLog.libffi b/libffi/ChangeLog.libffi
index 6732157..351f1dd 100644
--- a/libffi/ChangeLog.libffi
+++ b/libffi/ChangeLog.libffi
@@ -1,5 +1,14 @@
 2008-02-14  Anthony Green  <green@redhat.com>
 
+	* libffi.pc.in: Usse @PACKAGE_NAME@ and @PACKAGE_VERSION@.
+	* configure.ac: Reset version to 2.99.1.
+	* configure.in: Rebuilt.
+	* Makefile.am (EXTRA_DIST): Add ChangeLog.libffi.
+	* Makefile.in: Rebuilt.
+	* LICENSE: Update copyright notice.
+
+2008-02-14  Anthony Green  <green@redhat.com>
+
 	* include/Makefile.am (nodist_includes_HEADERS): Define.  Don't
 	distribute ffitarget.h or ffi.h from the build include dir.
 	* Makefile.in: Rebuilt.
diff --git a/libffi/LICENSE b/libffi/LICENSE
index f591795..8a3588b 100644
--- a/libffi/LICENSE
+++ b/libffi/LICENSE
@@ -1,4 +1,5 @@
-libffi - Copyright (c) 1996-2003  Red Hat, Inc.
+libffi - Copyright (c) 1996-2008  Red Hat, Inc and others.  
+See source files for details.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/libffi/Makefile.am b/libffi/Makefile.am
index 4bbff0d..3059353 100644
--- a/libffi/Makefile.am
+++ b/libffi/Makefile.am
@@ -29,7 +29,7 @@ EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \
 	src/x86/ffi64.c src/x86/unix64.S src/x86/ffitarget.h \
 	src/pa/ffitarget.h src/pa/ffi.c src/pa/linux.S src/pa/hpux32.S \
 	src/frv/ffi.c src/frv/eabi.S src/frv/ffitarget.h src/dlmalloc.c \
-	libtool-version
+	libtool-version ChangeLog.libffi
 
 ## ################################################################
 
diff --git a/libffi/Makefile.in b/libffi/Makefile.in
index 269bccf..97f2842 100644
--- a/libffi/Makefile.in
+++ b/libffi/Makefile.in
@@ -344,7 +344,7 @@ EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \
 	src/x86/ffi64.c src/x86/unix64.S src/x86/ffitarget.h \
 	src/pa/ffitarget.h src/pa/ffi.c src/pa/linux.S src/pa/hpux32.S \
 	src/frv/ffi.c src/frv/eabi.S src/frv/ffitarget.h src/dlmalloc.c \
-	libtool-version
+	libtool-version ChangeLog.libffi
 
 
 # Work around what appears to be a GNU make bug handling MAKEFLAGS
diff --git a/libffi/configure b/libffi/configure
index 8a2bbf9..d997e0f 100755
--- a/libffi/configure
+++ b/libffi/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for libffi 3.0.
+# Generated by GNU Autoconf 2.61 for libffi 2.99.1.
 #
 # Report bugs to <http://gcc.gnu.org/bugs.html>.
 #
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='libffi'
 PACKAGE_TARNAME='libffi'
-PACKAGE_VERSION='3.0'
-PACKAGE_STRING='libffi 3.0'
+PACKAGE_VERSION='2.99.1'
+PACKAGE_STRING='libffi 2.99.1'
 PACKAGE_BUGREPORT='http://gcc.gnu.org/bugs.html'
 
 # Factoring default headers for most tests.
@@ -1457,7 +1457,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libffi 3.0 to adapt to many kinds of systems.
+\`configure' configures libffi 2.99.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1528,7 +1528,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libffi 3.0:";;
+     short | recursive ) echo "Configuration of libffi 2.99.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1638,7 +1638,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libffi configure 3.0
+libffi configure 2.99.1
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1652,7 +1652,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libffi $as_me 3.0, which was
+It was created by libffi $as_me 2.99.1, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2475,7 +2475,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libffi'
- VERSION='3.0'
+ VERSION='2.99.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -23297,7 +23297,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libffi $as_me 3.0, which was
+This file was extended by libffi $as_me 2.99.1, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23354,7 +23354,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-libffi config.status 3.0
+libffi config.status 2.99.1
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/libffi/configure.ac b/libffi/configure.ac
index fd9e4b8..a2192cc 100644
--- a/libffi/configure.ac
+++ b/libffi/configure.ac
@@ -2,7 +2,7 @@ dnl Process this with autoconf to create configure
 
 AC_PREREQ(2.59)
 
-AC_INIT([libffi], [3.0], [http://gcc.gnu.org/bugs.html])
+AC_INIT([libffi], [2.99.1], [http://gcc.gnu.org/bugs.html])
 AC_CONFIG_HEADERS([fficonfig.h])
 
 AC_CANONICAL_SYSTEM
diff --git a/libffi/libffi.pc.in b/libffi/libffi.pc.in
index 10c910a..06c14fc 100644
--- a/libffi/libffi.pc.in
+++ b/libffi/libffi.pc.in
@@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@/@PACKAGE_NAME@-@PACKAGE_VERSION@
 includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
 
-Name: libffi
+Name: @PACKAGE_NAME@
 Description: Library supporting Foreign Function Interfaces
-Version: 3.0
+Version: @PACKAGE_VERSION@
 Libs: -lffi
 Cflags: -I${includedir}