blob: b14736bf2667edfb9c2a73dd5529686cf0318744 (
plain)
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
|
diff --git Makefile.am Makefile.am
index 5267123..a7e0d0c 100644
--- Makefile.am
+++ Makefile.am
@@ -1,6 +1,4 @@
-ACLOCAL_AMFLAGS = -I libltdl/m4
-
-SUBDIRS = libltdl src bindings .
+SUBDIRS = src bindings .
INCLUDES = $(LTDLINCL)
--- configure.ac.old 2016-01-04 13:55:39.286846436 +0400
+++ configure.ac 2016-01-04 13:56:07.905362298 +0400
@@ -2,12 +2,10 @@
AC_INIT([collectd],[m4_esyscmd(./version-gen.sh)])
AC_CONFIG_SRCDIR(src/)
AC_CONFIG_HEADERS(src/config.h)
-AC_CONFIG_AUX_DIR([libltdl/config])
m4_ifdef([LT_PACKAGE_VERSION],
# libtool >= 2.2
[
- LT_CONFIG_LTDL_DIR([libltdl])
LT_INIT([dlopen])
LTDL_INIT([convenience])
AC_DEFINE(LIBTOOL_VERSION, 2, [Define to used libtool version.])
@@ -19,7 +17,6 @@
AC_SUBST(LTDLINCL)
AC_SUBST(LIBLTDL)
AC_LIBTOOL_DLOPEN
- AC_CONFIG_SUBDIRS(libltdl)
AC_DEFINE(LIBTOOL_VERSION, 1, [Define to used libtool version.])
]
)
|
GitWeb
