1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35
|
From: Ole Streicher <olebole@debian.org>
Date: Thu, 1 Dec 2016 21:18:56 +0100
Subject: Fix issues when using Debian libs instead of convienience copies
---
util/Makefile | 2 +-
util/makefile.gsl | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/util/Makefile b/util/Makefile
index a8e7010..7057712 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -100,7 +100,7 @@ CFLAGS += -I.
LDFLAGS += $(LDFLAGS_DEF)
-LDLIBS := $(LDLIBS_DEF) -lm
+LDLIBS := $(LDLIBS_DEF) -lwcs -lgsl -lgslcblas -lm
SHAREDLIBFLAGS := $(SHAREDLIBFLAGS_DEF)
diff --git a/util/makefile.gsl b/util/makefile.gsl
index 5bb6920..59a5529 100644
--- a/util/makefile.gsl
+++ b/util/makefile.gsl
@@ -2,7 +2,7 @@
# Licensed under a 3-clause BSD style license - see LICENSE
# On by default? This doesn't seem to work
-#SYSTEM_GSL ?= $(shell pkg-config --modversion gsl >/dev/null 2>/dev/null && echo yes)
+SYSTEM_GSL ?= yes
ifeq ($(SYSTEM_GSL),yes)
|