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
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
|
Author: Andreas Tille <tille@debian.org>
Last-Update: Thu, 19 Oct 2017 16:27:56 +0200
Description: Create dynamic library
--- a/gbtools/configure.ac
+++ b/gbtools/configure.ac
@@ -36,7 +36,9 @@ fi
AC_CONFIG_MACRO_DIR([m4])
-LT_INIT([disable-shared])
+AC_ENABLE_SHARED
+AC_ENABLE_STATIC
+AC_PROG_LIBTOOL(libtool)
LT_LANG([C++])
@@ -66,7 +68,7 @@ AC_FUNC_MALLOC
AC_CHECK_FUNCS([dup2 floor gethostbyname memset socket sqrt strcasecmp strchr strcspn strerror strncasecmp strrchr strstr strtol uname])
# Check for dependencies required by all executables
-PKG_CHECK_MODULES([DEPS], [glib-2.0 gtk+-2.0 >= 2.10])
+PKG_CHECK_MODULES([DEPS], [glib-2.0 gtk+-2.0 >= 2.10 jsoncpp])
# Check for optional dependencies
AX_CHECK_OPENSSL()
--- a/belvuApp/Makefile.am
+++ b/belvuApp/Makefile.am
@@ -19,13 +19,13 @@ belvu_LDADD = $(top_builddir)/seqtoolsUt
# If gbtools is in a subdirectory, add it; otherwise look for a local installation
if USE_GBTOOLS
-belvu_LDADD += $(top_builddir)/gbtools/.libs/libgbtools.a
+belvu_LDADD += -L$(top_builddir)/gbtools/.libs -lgbtools
else
belvu_LDADD += -lgbtools
endif
# the gtk deps etc. must go at the end so that gbtools can pick them up
-belvu_LDADD += $(DEPS_LIBS) $(X_LIB)
+belvu_LDADD += $(DEPS_LIBS) $(X_LIB) -lcurl
# Extra files to remove for the maintainer-clean target.
#
--- a/blixemApp/Makefile.am
+++ b/blixemApp/Makefile.am
@@ -11,13 +11,13 @@ BLX_LIBS = $(top_builddir)/seqtoolsUtils
# If gbtools is in a subdirectory, add it; otherwise look for a local installation
if USE_GBTOOLS
-BLX_LIBS += $(top_builddir)/gbtools/.libs/libgbtools.a
+BLX_LIBS += -L$(top_builddir)/gbtools/.libs -lgbtools
else
BLX_LIBS += -lgbtools
endif
# the gtk deps etc. must go at the end so that gbtools can pick them up
-BLX_LIBS += $(DEPS_LIBS) $(X_LIB)
+BLX_LIBS += $(DEPS_LIBS) $(X_LIB) -lcurl
# use sqlite for blixem if it's available
if USE_SQLITE3
@@ -44,7 +44,7 @@ blixemh_CPPFLAGS = $(blixem_CPPFLAGS) -D
#blixemh_LDADD = $(top_builddir)/libpfetch/libpfetch.a $(BLX_LIBS) -lcurl
# but I've commented it back in ....need to try a compile....
-blixemh_LDADD = $(BLX_LIBS) -lcurl
+blixemh_LDADD = $(BLX_LIBS)
endif
--- a/dotterApp/Makefile.am
+++ b/dotterApp/Makefile.am
@@ -12,13 +12,13 @@ dotter_LDADD = $(top_builddir)/seqtoolsU
# If gbtools is in a subdirectory, add it; otherwise look for a local installation
if USE_GBTOOLS
-dotter_LDADD += $(top_builddir)/gbtools/.libs/libgbtools.a
+dotter_LDADD += -L$(top_builddir)/gbtools/.libs -lgbtools
else
dotter_LDADD += -lgbtools
endif
# the gtk deps etc. must go at the end so that gbtools can pick them up
-dotter_LDADD += $(DEPS_LIBS) $(X_LIB)
+dotter_LDADD += $(DEPS_LIBS) $(X_LIB) -lcurl
# Extra files to remove for the maintainer-clean target.
#
|
