aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Ali Polatel <alip@exherbo.org>2012-05-07 18:02:45 +0300
committerGravatar David Bremner <bremner@debian.org>2012-05-08 10:34:33 -0300
commit82b73ffd7380b85d259eeb91100dd6ac2d14223a (patch)
treeaf9c0d5c1dedf763700f523f89b046f5dd3a49e1
parent92680f12ebd276952ae51ff271526f4dd995a18a (diff)
ruby: Add workarounds to use in-tree build not the installed one
- Make mkmf use the notmuch.h under ../../lib - Use libnotmuch.a instead of linking to the installed libnotmuch.so
-rw-r--r--bindings/ruby/defs.h4
-rw-r--r--bindings/ruby/extconf.rb26
2 files changed, 24 insertions, 6 deletions
diff --git a/bindings/ruby/defs.h b/bindings/ruby/defs.h
index a41cf10e..6fe57870 100644
--- a/bindings/ruby/defs.h
+++ b/bindings/ruby/defs.h
@@ -1,6 +1,6 @@
/* The Ruby interface to the notmuch mail library
*
- * Copyright © 2010, 2011 Ali Polatel
+ * Copyright © 2010, 2011, 2012 Ali Polatel
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,8 +21,8 @@
#ifndef DEFS_H
#define DEFS_H
-#include <notmuch.h>
#include <ruby.h>
+#include "notmuch.h"
VALUE notmuch_rb_cDatabase;
VALUE notmuch_rb_cDirectory;
diff --git a/bindings/ruby/extconf.rb b/bindings/ruby/extconf.rb
index ccac609c..933f34a9 100644
--- a/bindings/ruby/extconf.rb
+++ b/bindings/ruby/extconf.rb
@@ -1,13 +1,31 @@
#!/usr/bin/env ruby
# coding: utf-8
-# Copyright 2010, 2011 Ali Polatel <alip@exherbo.org>
+# Copyright 2010, 2011, 2012 Ali Polatel <alip@exherbo.org>
# Distributed under the terms of the GNU General Public License v3
require 'mkmf'
-# Notmuch Library
-find_header('notmuch.h', '../../lib')
-find_library('notmuch', 'notmuch_database_create', '../../lib')
+NOTDIR = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
+NOTHDR = File.join(NOTDIR, 'notmuch.h')
+NOTLIB = File.join(NOTDIR, 'libnotmuch.a')
+
+unless File.exists? NOTHDR
+ $stderr.puts "notmuch.h is missing under #{NOTDIR}"
+ exit 1
+end
+
+unless File.exists? NOTLIB
+ $stderr.puts "libnotmuch.a is missing under #{NOTDIR}"
+ exit 1
+end
+
+# Small hack to build with in-tree version not the installed one.
+# find_header() and friends use standard include/library paths first.
+$stderr.puts "Added -I#{NOTDIR} to $INCFLAGS"
+$INCFLAGS = "-I#{NOTDIR}".quote + " " + $INCFLAGS
+find_header('notmuch.h', NOTDIR)
+
+$LOCAL_LIBS += NOTLIB
# Create Makefile
dir_config('notmuch')