Only link libcycript against libffi (not cycript).

diff --git a/Makefile.am b/Makefile.am
index 7c97a6d7ec491b9eae00ea44ce9aa8544bc37bf0..0ca2fe9994d911e6f19d7c00e1985a84c9e96ce2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,7 +33,7 @@ AM_CPPFLAGS += -include $(srcdir)/config.h -include $(srcdir)/unconfig.h
 
 lib_LTLIBRARIES = libcycript.la
 libcycript_la_SOURCES = Highlight.cpp Network.cpp Output.cpp Parser.cpp Replace.cpp
 
 lib_LTLIBRARIES = libcycript.la
 libcycript_la_SOURCES = Highlight.cpp Network.cpp Output.cpp Parser.cpp Replace.cpp

-libcycript_la_LDFLAGS = -no-undefined $(LTLIBAPR) $(LTLIBICONV) -ldl
+libcycript_la_LDFLAGS = -no-undefined $(LTLIBAPR) $(LTLIBFFI) $(LTLIBICONV) -ldl

 
 libcycript_la_SOURCES += Cycript.tab.cc
 libcycript_la_SOURCES += lex.cy.cpp
 
 libcycript_la_SOURCES += Cycript.tab.cc
 libcycript_la_SOURCES += lex.cy.cpp

diff --git a/configure.ac b/configure.ac
index 1eecf5bdf7b91ab37bed0a7566b6ede4734352ac..9bd07547870963a36896422c651de79c4ab46add 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -138,6 +138,15 @@ done
 AC_SUBST([CY_ARCH])
 dnl }}}
 
 AC_SUBST([CY_ARCH])
 dnl }}}
 

+AC_DEFUN([CY_LT_LIB], [
+    cy_save=$LIBS
+    LIBS=
+    ]$2[
+    ]$1[=$LIBS
+    LIBS=$cy_save
+    AC_SUBST(]$1[)
+])
+

 dnl --with-frameworks {{{
 AC_ARG_WITH([frameworks], [AS_HELP_STRING(
     [--with-frameworks=DIRS],
 dnl --with-frameworks {{{
 AC_ARG_WITH([frameworks], [AS_HELP_STRING(
     [--with-frameworks=DIRS],


@@ -203,12 +212,13 @@ AM_CONDITIONAL([CY_EXECUTE], [test "x$CY_EXECUTE" = x1])
 
 AS_CASE([$CY_EXECUTE], [1], [
     AC_CHECK_HEADERS([ffi.h ffi/ffi.h], [break])
 
 AS_CASE([$CY_EXECUTE], [1], [
     AC_CHECK_HEADERS([ffi.h ffi/ffi.h], [break])

-    AS_IF([test "x$ac_cv_header_ffi_h" = xno && test "x$ac_cv_header_ffi_ffi_h" = xno], [
+
+    CY_LT_LIB([LTLIBFFI], AS_IF([test "x$ac_cv_header_ffi_h" = xno && test "x$ac_cv_header_ffi_ffi_h" = xno], [

         CY_CHECK_PKG_CONFIG_LIBFFI
     ], [
         AC_SEARCH_LIBS([ffi_call], [ffi])
         AS_CASE([$ac_cv_search_ffi_call], [no], [CY_CHECK_PKG_CONFIG_LIBFFI])
         CY_CHECK_PKG_CONFIG_LIBFFI
     ], [
         AC_SEARCH_LIBS([ffi_call], [ffi])
         AS_CASE([$ac_cv_search_ffi_call], [no], [CY_CHECK_PKG_CONFIG_LIBFFI])

-    ])
+    ]))

 
     AC_LANG_PUSH([Objective C++])
 
 
     AC_LANG_PUSH([Objective C++])
 


@@ -248,15 +258,6 @@ AS_CASE([$CY_EXECUTE], [1], [
 
 AM_CONDITIONAL([CY_OBJECTIVEC], [test "x$CY_OBJECTIVEC" = x1])
 
 
 AM_CONDITIONAL([CY_OBJECTIVEC], [test "x$CY_OBJECTIVEC" = x1])
 

-AC_DEFUN([CY_LT_LIB], [
-    cy_save=$LIBS
-    LIBS=
-    ]$2[
-    ]$1[=$LIBS
-    LIBS=$cy_save
-    AC_SUBST(]$1[)
-])
-

 CY_LT_LIB([LTLIBREADLINE], [AX_LIB_READLINE])
 AS_CASE([$ax_cv_lib_readline], [no], [AC_MSG_ERROR([missing "libreadline"])])
 
 CY_LT_LIB([LTLIBREADLINE], [AX_LIB_READLINE])
 AS_CASE([$ax_cv_lib_readline], [no], [AC_MSG_ERROR([missing "libreadline"])])