use gprbuild instead of gnatmake

dont search for libzmq.a
This commit is contained in:
Per Sandberg 2016-10-30 08:39:17 +01:00
parent fcd31883f1
commit c36287f953
2 changed files with 7 additions and 7 deletions

View File

@ -5,7 +5,7 @@ all: compile
Makefile.config: configure
./configure
GNATMAKE = gnatmake ${GNATFLAGS} -p -f -R
GNATMAKE = gprbuild ${GNATFLAGS} -p -f -R
compile:
${GNATMAKE} -P zmq.gpr -XLIBRARY_TYPE=static

12
configure vendored
View File

@ -57,6 +57,7 @@ def whichzmqversion():
def whichzmq():
ret = "/usr"
with file("_locate_zmq.c", "w") as outf:
outf.write("#include <zmq.h>")
response = subprocess.Popen(["cpp", "-pipe", "_locate_zmq.c"],
@ -65,8 +66,8 @@ def whichzmq():
for line in response:
if "/zmq.h" in line:
line = line.split('"')[1]
return dirname(dirname(line))
return "/usr"
ret = dirname(dirname(line))
return ret
def parsargs(args):
@ -173,16 +174,15 @@ def parsargs(args):
if not exists(join(args.withzmqinclude, "zmq.h")):
sys.stderr.write("No zmq.h found\n")
fail = True
if not exists(join(args.withzmqlib, "libzmq.a")):
sys.stderr.write("No libzmq found\n")
fail = True
#if not exists(join(args.withzmqlib, "libzmq.a")):
# sys.stderr.write("No libzmq found\n")
# fail = True
if fail:
return None
return args
def expand(args):
print args.__dict__
for root, dirs, files in os.walk("."):
if "libzeromq" not in root:
for f in files: