summaryrefslogtreecommitdiffstats
path: root/korundum
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-09-11 11:57:25 -0500
committerTimothy Pearson <[email protected]>2012-09-11 11:57:25 -0500
commitc1faffb8ed0ebae85f21eb3e3ca81a2692a81ae9 (patch)
tree280207328f23ccbe68ecc11cd45c176cbd725f38 /korundum
parentde49c7480893e7d52f64ec1166a55cdf97b2541e (diff)
downloadtdebindings-c1faffb8ed0ebae85f21eb3e3ca81a2692a81ae9.tar.gz
tdebindings-c1faffb8ed0ebae85f21eb3e3ca81a2692a81ae9.zip
Use cflags from ruby pc file
Diffstat (limited to 'korundum')
-rw-r--r--korundum/rubylib/korundum/Makefile.am2
-rw-r--r--korundum/rubylib/korundum/configure.in.in4
2 files changed, 4 insertions, 2 deletions
diff --git a/korundum/rubylib/korundum/Makefile.am b/korundum/rubylib/korundum/Makefile.am
index 56427288..541e3f55 100644
--- a/korundum/rubylib/korundum/Makefile.am
+++ b/korundum/rubylib/korundum/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR)
+INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
rubylibdir = $(RUBY_ARCHDIR)
rubylib_LTLIBRARIES = korundum.la
diff --git a/korundum/rubylib/korundum/configure.in.in b/korundum/rubylib/korundum/configure.in.in
index 5782123e..e0d581b1 100644
--- a/korundum/rubylib/korundum/configure.in.in
+++ b/korundum/rubylib/korundum/configure.in.in
@@ -15,6 +15,7 @@ else
RUBY_SITEARCHDIR=`ruby -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitearchdir"@:>@)'`
RUBY_SITEDIR=`ruby -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitelibdir"@:>@)'`
RUBY_RUBYLIBDIR=`ruby -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubylibdir"@:>@)'`
+ RUBY_CFLAGS=`$PKGCONFIG ruby --cflags`
fi
fi
if test -z "$RUBY_VERSION"; then
@@ -23,10 +24,11 @@ else
RUBY_SITEDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
RUBY_RUBYLIBDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubylibdir"@:>@)'`
fi
- AC_MSG_RESULT([archdir $RUBY_ARCHDIR, sitearchdir $RUBY_SITEARCHDIR, sitedir $RUBY_SITEDIR])
+ AC_MSG_RESULT([archdir $RUBY_ARCHDIR, sitearchdir $RUBY_SITEARCHDIR, sitedir $RUBY_SITEDIR, cflags $RUBY_CFLAGS])
AC_SUBST(RUBY_ARCHDIR)
AC_SUBST(RUBY_SITEARCHDIR)
AC_SUBST(RUBY_RUBYLIBDIR)
AC_SUBST(RUBY_SITEDIR)
+ AC_SUBST(RUBY_CFLAGS)
fi