Put Java/Ruby framework detection under CY_LT_LIB.

diff --git a/configure b/configure
index 397f2e5be196393d8a820114672e6e37aa707abb..76fe2164547d8e2498e0b1e6111d642eee99fa02 100755 (executable)
--- a/configure
+++ b/configure
@@ -23038,6 +23038,9 @@ fi
 
 
 
 
 
 

+    cy_save=$LIBS
+    LIBS=
+

                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for framework JavaVM" >&5
 $as_echo_n "checking for framework JavaVM... " >&6; }
 if ${ac_cv_framework_JavaVM+:} false; then :
                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for framework JavaVM" >&5
 $as_echo_n "checking for framework JavaVM... " >&6; }
 if ${ac_cv_framework_JavaVM+:} false; then :


@@ -23109,10 +23112,7 @@ if test "x$ac_cv_header_jni_h" = xyes; then :
 
         CY_JAVA=1
 
 
         CY_JAVA=1
 

-
-    cy_save=$LIBS
-    LIBS=
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing JNI_GetCreatedJavaVMs" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing JNI_GetCreatedJavaVMs" >&5

 $as_echo_n "checking for library containing JNI_GetCreatedJavaVMs... " >&6; }
 if ${ac_cv_search_JNI_GetCreatedJavaVMs+:} false; then :
   $as_echo_n "(cached) " >&6
 $as_echo_n "checking for library containing JNI_GetCreatedJavaVMs... " >&6; }
 if ${ac_cv_search_JNI_GetCreatedJavaVMs+:} false; then :
   $as_echo_n "(cached) " >&6


@@ -23169,10 +23169,6 @@ if test "$ac_res" != no; then :
 
 fi
 
 
 fi
 

-    LTJAVA=$LIBS
-    LIBS=$cy_save
-
-

 
 else
 
 
 else
 


@@ -23183,8 +23179,15 @@ fi
 
 
 fi
 
 
 fi

+    LTJAVA=$LIBS
+    LIBS=$cy_save

 
 
 
 

+
+
+    cy_save=$LIBS
+    LIBS=
+

                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for framework Ruby" >&5
 $as_echo_n "checking for framework Ruby... " >&6; }
 if ${ac_cv_framework_Ruby+:} false; then :
                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for framework Ruby" >&5
 $as_echo_n "checking for framework Ruby... " >&6; }
 if ${ac_cv_framework_Ruby+:} false; then :


@@ -23261,10 +23264,7 @@ _ACEOF
 
         CY_RUBY=1
 
 
         CY_RUBY=1
 

-
-    cy_save=$LIBS
-    LIBS=
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ruby_init" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ruby_init" >&5

 $as_echo_n "checking for library containing ruby_init... " >&6; }
 if ${ac_cv_search_ruby_init+:} false; then :
   $as_echo_n "(cached) " >&6
 $as_echo_n "checking for library containing ruby_init... " >&6; }
 if ${ac_cv_search_ruby_init+:} false; then :
   $as_echo_n "(cached) " >&6


@@ -23318,11 +23318,8 @@ ac_res=$ac_cv_search_ruby_init
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 

-fi
-
-    LTRUBY=$LIBS
-    LIBS=$cy_save

 
 

+fi

 
 
 else
 
 
 else


@@ -23335,6 +23332,10 @@ fi
 done
 
 fi
 done
 
 fi

+    LTRUBY=$LIBS
+    LIBS=$cy_save
+
+

 
     ac_ext=mm
 ac_cpp='$OBJCXXCPP $CPPFLAGS'
 
     ac_ext=mm
 ac_cpp='$OBJCXXCPP $CPPFLAGS'

diff --git a/configure.ac b/configure.ac
index f39e089e0d91e55239289a554226ceb07a7a5036..5823e91aac01f5f982ba4e020a32f39b7df62de7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -219,29 +219,29 @@ AS_CASE([$CY_EXECUTE], [1], [
         AC_CHECK_FUNCS([ffi_prep_cif_var])
     ])])
 
         AC_CHECK_FUNCS([ffi_prep_cif_var])
     ])])
 

-    AC_CHECK_FRAMEWORK([JavaVM], [
+    CY_LT_LIB([LTJAVA], [AC_CHECK_FRAMEWORK([JavaVM], [

         #include <JavaVM/jni.h>
     ], [JNI_GetCreatedJavaVMs(NULL, 0, NULL);], [
         AC_SUBST([CY_JAVA], [1])
     ], [AC_CHECK_HEADER([jni.h], [
         AC_SUBST([CY_JAVA], [1])
         #include <JavaVM/jni.h>
     ], [JNI_GetCreatedJavaVMs(NULL, 0, NULL);], [
         AC_SUBST([CY_JAVA], [1])
     ], [AC_CHECK_HEADER([jni.h], [
         AC_SUBST([CY_JAVA], [1])

-        CY_LT_LIB([LTJAVA], [AC_SEARCH_LIBS([JNI_GetCreatedJavaVMs], [dvm], [
-        ])])
+        AC_SEARCH_LIBS([JNI_GetCreatedJavaVMs], [dvm], [
+        ])

     ], [
         AC_SUBST([CY_JAVA], [0])
     ], [
         AC_SUBST([CY_JAVA], [0])

-    ])])
+    ])])])

 
 

-    AC_CHECK_FRAMEWORK([Ruby], [
+    CY_LT_LIB([LTRUBY], [AC_CHECK_FRAMEWORK([Ruby], [

         #include <Ruby/ruby.h>
     ], [ruby_init();], [
         AC_SUBST([CY_RUBY], [1])
     ], [AC_CHECK_HEADERS([ruby.h], [
         AC_SUBST([CY_RUBY], [1])
         #include <Ruby/ruby.h>
     ], [ruby_init();], [
         AC_SUBST([CY_RUBY], [1])
     ], [AC_CHECK_HEADERS([ruby.h], [
         AC_SUBST([CY_RUBY], [1])

-        CY_LT_LIB([LTRUBY], [AC_SEARCH_LIBS([ruby_init], [ruby], [
-        ])])
+        AC_SEARCH_LIBS([ruby_init], [ruby], [
+        ])

     ], [
         AC_SUBST([CY_RUBY], [0])
     ], [
         AC_SUBST([CY_RUBY], [0])

-    ])])
+    ])])])

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