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
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
From: Ole Streicher <debian@liska.ath.cx>
Date: Tue, 25 Oct 2016 21:52:53 +0200
Subject: Link the executables against libfuntools.so
and link libfuntools.so against the needed libs.
---
Makefile.in | 4 ++--
configure.ac | 4 +---
mklib | 1 -
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 3b92adc..a68f6ad 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -160,7 +160,7 @@ LIB = @LIB@
# this is used in the link line
# LLIB = $(LIB)
-LLIB = @LLIB@
+LLIB = -L. -lfuntools
# libraries containing main as subroutines
MAINLIB = lib$(PACKAGE)MainLib.a
@@ -228,7 +228,7 @@ shlib: sublib $(LIBOBJS)
@(rm -rf $(PACKAGE)tmp; mkdir -p $(PACKAGE)tmp; \
(cd $(PACKAGE)tmp && ar x ../$(LIB)); \
CC='$(CC)' CXX=$(CXX) \
- ./mklib -o $(PACKAGE) $(PACKAGE)tmp/*.o; \
+ ./mklib -o $(PACKAGE) -ldl $(WCS_LIBS) -lm -lz $(PACKAGE)tmp/*.o; \
rm -rf $(PACKAGE)tmp;)
mainlib: $(MAINLIBOBJS) funmainlib.o lex.calc.o
diff --git a/configure.ac b/configure.ac
index f0a0dfc..4a1ecd8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,7 +79,7 @@ AC_SUBST(DEFLIB)
AC_MSG_CHECKING(for external zlib)
AC_ARG_WITH(zlib, [ --with-zlib=LIB library name],
- zlib=yes EXTRA_LIBS="$EXTRA_LIBS $withval", zlib=no)
+ zlib=yes, zlib=no)
AC_MSG_RESULT($zlib)
AC_MSG_CHECKING(for external wcslib)
@@ -99,7 +99,6 @@ if test "$fun_ok" != "no"; then
if test "$have_dl" = yes; then
using_shlib="yes"
fpic="yes"
- EXTRA_LIBS="$EXTRA_LIBS -ldl"
if test `$CC -v -rdynamic 2>&1 | grep -c unrecognized` = "0" ; then
LDFLAGS="$LDFLAGS -rdynamic"
fi
@@ -136,7 +135,6 @@ if test "$CC" = "gcc" -o `$CC -v 2>&1 | grep -c gcc` != "0" ; then
if test "$have_dl" = yes; then
USE_DL="-DUSE_DL=1"
fpic="yes"
- EXTRA_LIBS="$EXTRA_LIBS -ldl"
if test `$CC -v -rdynamic 2>&1 | grep -c unrecognized` = "0" ; then
LDFLAGS="$LDFLAGS -rdynamic"
fi
diff --git a/mklib b/mklib
index c900b3e..2f99336 100755
--- a/mklib
+++ b/mklib
@@ -34,7 +34,6 @@ MINOR=0
PATCH=""
DEPS=""
LINK=""
-LDFLAGS=""
CPLUSPLUS=0
STATIC=0
DLOPEN=0
|
