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
|
diff -urN SnoReport-1.3/Makefile.am SnoReport-1.3a/Makefile.am
--- SnoReport-1.3/Makefile.am 2014-12-04 11:40:34.000000000 +0100
+++ SnoReport-1.3a/Makefile.am 2015-09-19 14:24:17.017484372 +0200
@@ -10,6 +10,10 @@
EXTRA_DIST = $(pkgdata_DATA) $(man_MANS)
+LDADD = $(RNALIB_LIBS)
+
+AM_CPPFLAGS = $(RNALIB_CFLAGS)
+
# install the man pages
man_MANS = snoReport.1
diff -urN SnoReport-1.3/configure.in SnoReport-1.3a/configure.in
--- SnoReport-1.3/configure.in 2014-12-04 11:51:17.000000000 +0100
+++ SnoReport-1.3a/configure.in 2015-09-19 14:33:10.517596799 +0200
@@ -2,7 +2,9 @@
AC_INIT([snoReport], [1.3], [jana@bioinf.uni-leipzig.de], [snoReport])
dnl Every other copy of the package version number gets its value from here
-AM_INIT_AUTOMAKE(snoReport,1.3)
+
+AM_SILENT_RULES([yes])
+AM_INIT_AUTOMAKE([1.11])
dnl create a config.h file (Automake will add -DHAVE_CONFIG_H)
AM_CONFIG_HEADER(config.h)
@@ -14,29 +16,24 @@
AC_CANONICAL_HOST
-AC_ARG_WITH(ViennaRNA-include,
- [ --with-ViennaRNA-include where to search for ViennaRNA header files],
- ac_VRNA_includes="$withval",
- )
-
-AC_ARG_WITH(ViennaRNA-lib,
- [ --with-ViennaRNA-lib where to search for libRNA.a],
- ac_VRNA_lib="$withval",
- )
-
-AC_PATH_VRNA
-
dnl Checks for programs.
AC_PROG_INSTALL
AC_PROG_CC
AC_PROG_CXX
+dnl Check for functions
+AC_FUNC_MALLOC
+AC_FUNC_REALLOC
+AC_FUNC_STRTOD
+AC_CHECK_FUNCS([floor strdup strstr strchr strrchr strstr strtol strtoul pow rint sqrt erand48 memset memmove erand48])
+
dnl Checks for libraries.
-dnl checking for -lRNA will fail if both are built simultaneously
-dnl LIBS=["-lRNA ${LIBS}"]
-dnl AC_CHECK_LIB(m, exp)
-dnl AC_CHECK_LIB(RNA, fold)
+PKG_CHECK_MODULES([RNALIB], [RNAlib2],
+ [ AC_SUBST([RNALIB_CFLAGS])
+ AC_SUBST([RNALIB_LIBS])
+ ],
+ [])
dnl Checks for header files.
AC_HEADER_STDC
|