[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/lib/kross
From:       Martin Ellis <martin.ellis () kdemail ! net>
Date:       2006-02-02 17:38:16
Message-ID: 1138901896.435569.11897.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 504966 by martin:

Give up with Ruby at configure time if we don't know what
interpreter library to link against, instead of failing at
compile time.

Should give a better idea of whether Ruby has been built
without a shared library (where it has been built with
nodynamic option in ext/Setup?)

CCMAIL: fernando.lujan@mandic.com.br


 M  +15 -6     configure.in.in  


--- trunk/koffice/lib/kross/configure.in.in #504965:504966
@@ -30,7 +30,8 @@
     RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
     RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
     RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
-    AC_MSG_RESULT([archdir $RUBY_ARCHDIR,
+    AC_MSG_RESULT([
+                   archdir $RUBY_ARCHDIR,
                    sitearchdir $RUBY_SITEARCHDIR,
                    sitedir $RUBY_SITEDIR,
                    libdir $RUBY_LIBDIR,
@@ -43,9 +44,16 @@
 
     AC_MSG_CHECKING(for Ruby header)
     if test ! -r $RUBY_ARCHDIR/ruby.h; then
-        RUBY_LIBDIR=""
-        AC_MSG_RESULT([not found])
+      RUBY_LIBDIR=""
+      AC_MSG_RESULT([not found])
     else
+      AC_MSG_RESULT([found]) # header
+      AC_MSG_CHECKING(how to link against Ruby shared library)
+      if test -z "$RUBY_LIBRUBYARG" ; then
+        AC_MSG_RESULT([link argument not found])
+        RUBY_LIBDIR="" 
+      else
+        AC_MSG_RESULT([found]) # shared library link arg
         AC_MSG_CHECKING([if C++ program with ruby can be compiled])
         AC_LANG_SAVE
         AC_LANG_CPLUSPLUS
@@ -67,8 +75,9 @@
         fi
         CXXFLAGS="$ac_save_CXXFLAGS"
         AC_LANG_RESTORE
-    fi
-  fi
-fi
+      fi # have ruby shared lib argument
+    fi # have ruby header
+  fi # have ruby
+fi # compiling kross
 
 AM_CONDITIONAL(compile_kross_ruby, test -n "$RUBY_LIBDIR")
[prev in list] [next in list] [prev in thread] [next in thread]