[librep] Reverted last 3 commits

[Christopher Bratusek <chrisb src gnome org>]

commit 412bed722133402cd7172e741c0145538d859b31
Author: Christopher Roy Bratusek <zanghar freenet de>
Date:   Sun Dec 5 08:51:31 2010 +0100

    Reverted last 3 commits
    
    This reverts commit dfa027075b00f5b6731cdd7deac01806ff7c61ed.
    This reverts commit 78dac1e29b9019e6f812c17c115e0b
    This reverts commit dfa027075b00f5b6731cdd7deac01806ff7c61ed

 ChangeLog     |    3 ---
 config.h.in   |    6 ------
 configure.in  |   16 ++++++++--------
 man/news.texi |    5 -----
 4 files changed, 8 insertions(+), 22 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 7dfbb8e..5c8b74d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,3 @@
-2010-09-26  Christopher Bratusek <zanghar freenet de>
-	* configure.in: fixed libffi detection [Sergey Bolshakov]
-
 2010-09-25  Christopher Bratusek <zanghar freenet de>
 	* lisp/Makefile.in
 	* lisp/rep/ffi/util.jl: added ffi utils. [Sergey Bolshakov]
diff --git a/config.h.in b/config.h.in
index cc1241f..d40fabe 100644
--- a/config.h.in
+++ b/config.h.in
@@ -76,9 +76,6 @@
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
-/* Have ffi.h */
-#undef HAVE_FFI_H
-
 /* Define to 1 if you have the `getcwd' function. */
 #undef HAVE_GETCWD
 
@@ -106,9 +103,6 @@
 /* Define to 1 if you have the `dl' library (-ldl). */
 #undef HAVE_LIBDL
 
-/* Have libffi */
-#undef HAVE_LIBFFI
-
 /* Define to 1 if you have the <libintl.h> header file. */
 #undef HAVE_LIBINTL_H
 
diff --git a/configure.in b/configure.in
index 14b3f89..d0ad1b8 100644
--- a/configure.in
+++ b/configure.in
@@ -214,14 +214,14 @@ AC_ARG_WITH(ffi,
 
 if test "$with_ffi" != "no"; then
   PKG_CHECK_MODULES(LIBFFI, libffi >= $FFI_MIN_VER
-  ,AC_DEFINE(HAVE_FFI_H, 1, [Have ffi.h])
-   AC_DEFINE(HAVE_LIBFFI, 1, [Have libffi])
-   found_ffi=yes
-  ,AC_CHECK_HEADER([ffi.h],[LIBFFI_CFLAGS=],[LIBFFI_FOUND=no])
-   AC_SEARCH_LIBS([ffi_call], [ffi],[LIBFFI_LIBS=-lffi],[LIBFFI_FOUND=no])
-   if test "x${LIBFFI_FOUND}" = xno; then
-     AC_MSG_ERROR([cannot locate libffi])
-   fi)
+  ,[found_ffi=yes]
+  ,[
+     AC_CHECK_HEADER([ffi.h],[LIBFFI_CFLAGS=],[LIBFFI_FOUND=no])
+     AC_SEARCH_LIBS([ffi_call], [ffi],[LIBFFI_LIBS=-lffi],[LIBFFI_FOUND=no])
+     if test "x${LIBFFI_FOUND}" = xno; then
+       AC_MSG_ERROR([cannot locate libffi])
+     fi
+   ])
 fi
 
 dnl Check for dynamic loading
diff --git a/man/news.texi b/man/news.texi
index 94eef34..337d568 100644
--- a/man/news.texi
+++ b/man/news.texi
@@ -6,11 +6,6 @@
 @heading 0.91.1
 @itemize @bullet
 
- item libffi-detection [Sergey Bolshakov]
-
-Fixed the detection of libffi. rep.ffi module does
-now build correctly.
-
 @item @code{rep.ffi.util} module [Sergey Bolshakov]
 
 A module containing utils for rep's ffi binding.