* build extensions last since this seems to be most likely to fail

* do more testing before building the ruby extension

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2/program@1012 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/Makefile.am b/Makefile.am
index cc9eeff..4bbab3e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 RSYNC = rsync --rsh=ssh
 
 # build the following subdirectories
 RSYNC = rsync --rsh=ssh
 
 # build the following subdirectories

-SUBDIRS = src bindings doc examples
+SUBDIRS = src doc examples bindings

 
   # the following files are not mentioned in any other Makefile
 EXTRA_DIST = COPYRIGHT CHANGES WIN32-BUILD-TIPS.txt TODO CONTRIBUTORS THREADS \
 
   # the following files are not mentioned in any other Makefile
 EXTRA_DIST = COPYRIGHT CHANGES WIN32-BUILD-TIPS.txt TODO CONTRIBUTORS THREADS \

diff --git a/bindings/ruby/extconf.rb b/bindings/ruby/extconf.rb
index dc30712..2045e5a 100644 (file)
--- a/bindings/ruby/extconf.rb
+++ b/bindings/ruby/extconf.rb
@@ -8,7 +8,7 @@ if /linux/ =~ RUBY_PLATFORM
 elsif /solaris/ =~ RUBY_PLATFORM
    $LDFLAGS += '-R$(EPREFIX)/lib'
 elsif /hpux/ =~ RUBY_PLATFORM
 elsif /solaris/ =~ RUBY_PLATFORM
    $LDFLAGS += '-R$(EPREFIX)/lib'
 elsif /hpux/ =~ RUBY_PLATFORM

-   $LDFLAGS += '+b$(EPREFIX)/lib';
+   $LDFLAGS += '+b$(EPREFIX)/lib'

 elsif /aix/ =~ RUBY_PLATFORM
    $LDFLAGS += '-Wl,-blibpath:$(EPREFIX)/lib'
 end
 elsif /aix/ =~ RUBY_PLATFORM
    $LDFLAGS += '-Wl,-blibpath:$(EPREFIX)/lib'
 end

diff --git a/configure.ac b/configure.ac
index c9732df..3af4293 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,3 +1,4 @@
+

 dnl RRDtool AutoConf script ... 
 dnl ---------------------------
 dnl
 dnl RRDtool AutoConf script ... 
 dnl ---------------------------
 dnl


@@ -496,18 +497,22 @@ AC_PATH_PROG(RUBY, ruby, no)
 AC_ARG_ENABLE(ruby,[  --disable-ruby          do not build the ruby modules],
 [],[enable_ruby=yes])
 
 AC_ARG_ENABLE(ruby,[  --disable-ruby          do not build the ruby modules],
 [],[enable_ruby=yes])
 

+AC_MSG_CHECKING(if ruby modules can be built)

 
 if test "x$RUBY" = "xno" -o  x$enable_ruby = xno; then
        COMP_RUBY=
 
 if test "x$RUBY" = "xno" -o  x$enable_ruby = xno; then
        COMP_RUBY=

+       AC_MSG_RESULT(No .. Ruby not found or disabled)

 else
 else

-       COMP_RUBY="ruby"
-
+       if $RUBY -e 'require "mkmf"' >/dev/null 2>&1; then
+               COMP_RUBY="ruby"
+               AC_MSG_RESULT(YES)
+       else
+               COMP_RUBY=
+               AC_MSG_RESULT(Ruby found but mkmf is missing! Install the -dev package)         
+       fi                              

 fi
 
 
 fi
 
 

-AC_MSG_CHECKING(Ruby Modules to build)
-AC_MSG_RESULT(${COMP_RUBY:-No Ruby Modules will be built})
-

 dnl pass additional ruby options when generating Makefile from Makefile.PL
 AC_ARG_ENABLE(ruby-site-install,
 [  --enable-ruby-site-install   by default the rrdtool ruby modules are installed
 dnl pass additional ruby options when generating Makefile from Makefile.PL
 AC_ARG_ENABLE(ruby-site-install,
 [  --enable-ruby-site-install   by default the rrdtool ruby modules are installed