Merge in default ENGINE-238
authorDamiano Boppart <damiano@pep-security.net>
Mon, 28 Aug 2017 12:12:24 +0000
branchENGINE-238
changeset 200677f26f8c5a7a
parent 2001 111c1f727b07
parent 2005 0011c2ff41fd
child 2007 2149f36880b6
child 2728 01f1da97c547
Merge in default
     1.1 --- a/src/Makefile	Sun Aug 27 16:11:58 2017 +0200
     1.2 +++ b/src/Makefile	Mon Aug 28 12:12:24 2017 +0000
     1.3 @@ -13,8 +13,7 @@
     1.4  ifeq ($(BUILD_ON),Darwin)
     1.5      ifeq ($(BUILD_FOR),Darwin)
     1.6          CFLAGS+= -DSQLITE_THREADSAFE=1
     1.7 -        #LDFLAGS+= -L/opt/local/lib
     1.8 -        LDLIBS+= -lsqlite3 -lz -liconv
     1.9 +        LDLIBS+= -lz -liconv
    1.10      else
    1.11          $(error I don't know how to make for $(BUILD_FOR) on $(BUILD_ON))
    1.12      endif
    1.13 @@ -32,6 +31,7 @@
    1.14  ifdef SQLITE3_FROM_OS
    1.15      NO_SOURCE+= sqlite3.c
    1.16      CFLAGS+= -DSQLITE3_FROM_OS
    1.17 +    LDLIBS+= -lsqlite3
    1.18  endif
    1.19  
    1.20  ifeq ($(OPENPGP),GPG)
     2.1 --- a/test/Makefile	Sun Aug 27 16:11:58 2017 +0200
     2.2 +++ b/test/Makefile	Mon Aug 28 12:12:24 2017 +0000
     2.3 @@ -24,6 +24,10 @@
     2.4      LDLIBS+= -lnetpgp
     2.5  endif
     2.6  
     2.7 +ifdef SQLITE3_FROM_OS
     2.8 +    LDLIBS+= -lsqlite3
     2.9 +endif
    2.10 +
    2.11  ifeq ($(shell uname),Darwin)
    2.12      LIBPATH=DYLD_LIBRARY_PATH
    2.13      LLDB_BIN=/Applications/Xcode.app/Contents/Developer/usr/bin/lldb