[librep] fixup for previous commit



commit 0531218df8d4eaa8586c73d51f4a45a04c2aa98f
Author: Christopher Roy Bratusek <zanghar freenet de>
Date:   Mon Sep 27 17:52:16 2010 +0200

    fixup for previous commit

 config.h.in  |    6 ++++++
 configure.in |   20 ++++++++------------
 2 files changed, 14 insertions(+), 12 deletions(-)
---
diff --git a/config.h.in b/config.h.in
index d40fabe..cc1241f 100644
--- a/config.h.in
+++ b/config.h.in
@@ -76,6 +76,9 @@
 /* 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
 
@@ -103,6 +106,9 @@
 /* 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 fba491f..14b3f89 100644
--- a/configure.in
+++ b/configure.in
@@ -214,18 +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
-   ])
+  ,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)
 fi
 
 dnl Check for dynamic loading



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]