diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2017-06-07 16:22:11 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2017-06-07 16:48:02 +0200 |
| commit | d29531c2262e067583f2e9e38cc73e1037e399d3 (patch) | |
| tree | 760feff641b0a9ea6978a2f3a3cb6bd2e208dce9 | |
| parent | aa66e2b704475d6a848b1aa188bc3b28fb9247ca (diff) | |
| download | strongswan-d29531c2262e067583f2e9e38cc73e1037e399d3.tar.bz2 strongswan-d29531c2262e067583f2e9e38cc73e1037e399d3.tar.xz | |
configure: Use pkg-config to determine Ruby CFLAGS/LIBS
| -rw-r--r-- | configure.ac | 32 | ||||
| -rw-r--r-- | src/dumm/Makefile.am | 9 | ||||
| -rw-r--r-- | src/dumm/ext/dumm.c | 2 | ||||
| -rw-r--r-- | src/dumm/irdumm.c | 2 |
4 files changed, 10 insertions, 35 deletions
diff --git a/configure.ac b/configure.ac index 1ca254e61..e4832b391 100644 --- a/configure.ac +++ b/configure.ac @@ -1011,37 +1011,9 @@ if test x$dumm = xtrue; then AC_SUBST(gtk_CFLAGS) AC_SUBST(gtk_LIBS) AC_CHECK_PROGS(RUBY, ruby) - AC_MSG_CHECKING([for Ruby header files]) - if test -n "$RUBY"; then - RUBYINCLUDE= - RUBYDIR=`($RUBY -r rbconfig -e 'print RbConfig::CONFIG[["rubyhdrdir"]] || ""') 2>/dev/null` - if test -n "$RUBYDIR" -a -r "$RUBYDIR/ruby.h"; then - RUBYARCH=`($RUBY -r rbconfig -e 'print RbConfig::CONFIG[["arch"]] || ""') 2>/dev/null` - if test -n "$RUBYARCH"; then - AC_MSG_RESULT([$RUBYDIR]) - RUBYINCLUDE="-I$RUBYDIR -I$RUBYDIR/$RUBYARCH" - fi - else - RUBYDIR=`($RUBY -r rbconfig -e 'print RbConfig::CONFIG[["archdir"]] || ""') 2>/dev/null` - if test -n "$RUBYDIR" -a -r "$RUBYDIR/ruby.h"; then - AC_MSG_RESULT([$RUBYDIR]) - RUBYINCLUDE="-I$RUBYDIR" - fi - fi - if test -z "$RUBYINCLUDE"; then - AC_MSG_ERROR([ruby.h not found]) - fi - AC_SUBST(RUBYINCLUDE) - else - AC_MSG_ERROR([don't know how to run ruby]) - fi - AC_MSG_CHECKING([for libruby]) + PKG_CHECK_MODULES(ruby, [ruby]) 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=$ruby_LIBS AC_CHECK_FUNCS(rb_errinfo) LIBS=$saved_LIBS fi diff --git a/src/dumm/Makefile.am b/src/dumm/Makefile.am index 1c6a68f58..0d1cfb704 100644 --- a/src/dumm/Makefile.am +++ b/src/dumm/Makefile.am @@ -11,15 +11,14 @@ irdumm_SOURCES = irdumm.c libdumm_la_LIBADD = -lbridge -lfuse -lutil $(top_builddir)/src/libstrongswan/libstrongswan.la dumm_LDADD = libdumm.la ${gtk_LIBS} $(top_builddir)/src/libstrongswan/libstrongswan.la -irdumm_LDADD = libdumm.la ${RUBYLIB} $(top_builddir)/src/libstrongswan/libstrongswan.la +irdumm_LDADD = libdumm.la ${ruby_LIBS} $(top_builddir)/src/libstrongswan/libstrongswan.la AM_CPPFLAGS = \ -D_FILE_OFFSET_BITS=64 \ - -I$(top_srcdir)/src/libstrongswan \ - ${RUBYINCLUDE} + -I$(top_srcdir)/src/libstrongswan -AM_CFLAGS = \ - ${gtk_CFLAGS} +dumm_CFLAGS = ${gtk_CFLAGS} +irdumm_CFLAGS = ${ruby_CFLAGS} all-local: ext diff --git a/src/dumm/ext/dumm.c b/src/dumm/ext/dumm.c index df7ec4703..b898a2564 100644 --- a/src/dumm/ext/dumm.c +++ b/src/dumm/ext/dumm.c @@ -30,6 +30,8 @@ #undef PACKAGE_STRING #undef PACKAGE_BUGREPORT #undef PACKAGE_URL +#undef HAVE_DLADDR +#undef HAVE_QSORT_R /* avoid redefintiion of snprintf etc. */ #define RUBY_DONT_SUBST /* undef our _GNU_SOURCE, as it gets redefined by <ruby.h> */ diff --git a/src/dumm/irdumm.c b/src/dumm/irdumm.c index d30973737..1a4235c9d 100644 --- a/src/dumm/irdumm.c +++ b/src/dumm/irdumm.c @@ -19,6 +19,8 @@ #undef PACKAGE_STRING #undef PACKAGE_BUGREPORT #undef PACKAGE_URL +#undef HAVE_DLADDR +#undef HAVE_QSORT_R #include <ruby.h> #ifdef HAVE_RB_ERRINFO |