debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-22 17:34:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "ruby: Add workarounds to use in-tree build not the installed one"

Browse source 
This reverts commit 82b73ffd73.

Only leave the copyright changes.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
(cherry picked from commit 35cb1c95cc)
This commit is contained in:
Felipe Contreras 2012-05-25 15:08:17 +02:00 committed by David Bremner
parent 97527b0a66
commit 5946aba519
2 changed files with 4 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bindings/ruby/defs.h
View file

@ -21,8 +21,8 @@
#ifndef DEFS_H #ifndef DEFS_H
#define DEFS_H #define DEFS_H
#include <notmuch.h>
#include <ruby.h> #include <ruby.h>
#include "notmuch.h"
VALUE notmuch_rb_cDatabase; VALUE notmuch_rb_cDatabase;
VALUE notmuch_rb_cDirectory; VALUE notmuch_rb_cDirectory;

24
bindings/ruby/extconf.rb
View file

@ -5,27 +5,9 @@
require 'mkmf' require 'mkmf'
NOTDIR = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib')) # Notmuch Library
NOTHDR = File.join(NOTDIR, 'notmuch.h') find_header('notmuch.h', '../../lib')
NOTLIB = File.join(NOTDIR, 'libnotmuch.a') find_library('notmuch', 'notmuch_database_create', '../../lib')
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 # Create Makefile
dir_config('notmuch') dir_config('notmuch')