mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-11-22 02:48:08 +01:00
Revert "ruby: Add workarounds to use in-tree build not the installed one"
This reverts commit 82b73ffd73
.
Only leave the copyright changes.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
This commit is contained in:
parent
2f1a11268f
commit
35cb1c95cc
2 changed files with 4 additions and 22 deletions
|
@ -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;
|
||||
|
|
|
@ -5,27 +5,9 @@
|
|||
|
||||
require 'mkmf'
|
||||
|
||||
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
|
||||
# Notmuch Library
|
||||
find_header('notmuch.h', '../../lib')
|
||||
find_library('notmuch', 'notmuch_database_create', '../../lib')
|
||||
|
||||
# Create Makefile
|
||||
dir_config('notmuch')
|
||||
|
|
Loading…
Reference in a new issue