denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use proper Ruby library depending on the available version

Browse Source
This commit is contained in:
Tobias Brunner
2012-12-10 09:47:46 +01:00
parent 5057df5b73
commit afabe7b0ef
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.in
+8
View File
@@ -666,6 +666,14 @@ if test x$dumm = xtrue; then
else else
AC_MSG_ERROR([don't know how to run ruby]) AC_MSG_ERROR([don't know how to run ruby])
fi fi
AC_MSG_CHECKING([for libruby])
saved_LIBS=$LIBS
LIBS=`($RUBY -r rbconfig -e 'print RbConfig::CONFIG[["LIBRUBYARG_SHARED"]] || ""') 2>/dev/null`
AC_TRY_LINK_FUNC(ruby_init,
[AC_MSG_RESULT([$LIBS]); RUBYLIB=$LIBS],
[AC_MSG_ERROR([not found])])
AC_SUBST(RUBYLIB)
LIBS=$saved_LIBS
fi fi
if test x$fast = xtrue; then if test x$fast = xtrue; then
src/dumm/Makefile.am
+1 -1
View File
@@ -11,7 +11,7 @@ irdumm_SOURCES = irdumm.c
libdumm_la_LIBADD = -lbridge -lfuse -lutil $(top_builddir)/src/libstrongswan/libstrongswan.la libdumm_la_LIBADD = -lbridge -lfuse -lutil $(top_builddir)/src/libstrongswan/libstrongswan.la
dumm_LDADD = libdumm.la ${gtk_LIBS} $(top_builddir)/src/libstrongswan/libstrongswan.la dumm_LDADD = libdumm.la ${gtk_LIBS} $(top_builddir)/src/libstrongswan/libstrongswan.la
irdumm_LDADD = libdumm.la -lruby1.8 $(top_builddir)/src/libstrongswan/libstrongswan.la irdumm_LDADD = libdumm.la ${RUBYLIB} $(top_builddir)/src/libstrongswan/libstrongswan.la
INCLUDES = -I$(top_srcdir)/src/libstrongswan ${gtk_CFLAGS} \ INCLUDES = -I$(top_srcdir)/src/libstrongswan ${gtk_CFLAGS} \
${RUBYINCLUDE} ${RUBYINCLUDE}