]>
Commit | Line | Data |
---|---|---|
2d3993eb JK |
1 | diff -durN -x '*~' device-mapper.1.01.03.orig/configure.in device-mapper.1.01.03/configure.in |
2 | --- device-mapper.1.01.03.orig/configure.in 2005-06-13 16:07:29.000000000 +0200 | |
3 | +++ device-mapper.1.01.03/configure.in 2005-07-31 19:10:30.000000000 +0200 | |
8af586c3 AM |
4 | @@ -249,7 +249,15 @@ |
5 | STATIC_LINK=$enableval, STATIC_LINK=no) | |
6 | AC_MSG_RESULT($STATIC_LINK) | |
2d3993eb | 7 | |
8af586c3 AM |
8 | -################################################################################ |
9 | +# | |
10 | +AC_MSG_CHECKING(whether to use dynamic linking) | |
11 | +AC_ARG_ENABLE(dynamic_link, | |
12 | + [ --enable-dynamic_link Use this to not link the tools to their libraries | |
13 | + statically. Default is dynamic linking], | |
14 | + DYNAMIC_LINK=$enableval, DYNAMIC_LINK=no) | |
15 | +AC_MSG_RESULT($DYNAMIC_LINK) | |
16 | + | |
17 | +############################################################################### | |
18 | dnl -- Disable selinux | |
19 | AC_MSG_CHECKING(whether to enable selinux support) | |
20 | AC_ARG_ENABLE(selinux, [ --disable-selinux Disable selinux support], | |
21 | @@ -496,6 +496,7 @@ | |
22 | AC_SUBST(SNAPSHOTS) | |
23 | AC_SUBST(STATICDIR) | |
2d3993eb JK |
24 | AC_SUBST(STATIC_LINK) |
25 | +AC_SUBST(DYNAMIC_LINK) | |
8af586c3 AM |
26 | AC_SUBST([LIB_PTHREAD]) |
27 | AC_SUBST(interface) | |
28 | AC_SUBST(kerneldir) | |
31191a9e JB |
29 | --- device-mapper.1.02.23/dmsetup/Makefile.in.orig 2007-08-21 22:32:30.000000000 +0200 |
30 | +++ device-mapper.1.02.23/dmsetup/Makefile.in 2007-12-16 23:07:07.095562047 +0100 | |
2d3993eb JK |
31 | @@ -16,8 +16,10 @@ |
32 | top_srcdir = @top_srcdir@ | |
33 | VPATH = @srcdir@ | |
34 | ||
35 | +ifeq ("@DYNAMIC_LINK@", "yes") | |
36 | TARGETS = dmsetup | |
37 | INSTALL_TYPE = install_dynamic | |
38 | +endif | |
31191a9e | 39 | LIB_PTHREAD = @LIB_PTHREAD@ |
2d3993eb JK |
40 | |
41 | ifeq ("@STATIC_LINK@", "yes") | |
2d3993eb JK |
42 | diff -durN -x '*~' device-mapper.1.01.03.orig/lib/Makefile.in device-mapper.1.01.03/lib/Makefile.in |
43 | --- device-mapper.1.01.03.orig/lib/Makefile.in 2005-04-28 00:32:00.000000000 +0200 | |
44 | +++ device-mapper.1.01.03/lib/Makefile.in 2005-07-31 19:10:13.000000000 +0200 | |
45 | @@ -45,7 +45,9 @@ | |
46 | .PHONY: install_dynamic install_static \ | |
47 | install_fs install_ioctl install_ioctl_static | |
48 | ||
49 | +ifeq ("@DYNAMIC_LINK@", "yes") | |
50 | INSTALL_TYPE = install_dynamic | |
51 | +endif | |
52 | ||
53 | ifeq ("@STATIC_LINK@", "yes") | |
54 | INSTALL_TYPE += install_static | |
31191a9e JB |
55 | --- device-mapper.1.02.23/make.tmpl.in.orig 2007-10-03 12:48:27.000000000 +0200 |
56 | +++ device-mapper.1.02.23/make.tmpl.in 2007-12-16 23:06:42.922184485 +0100 | |
b89f2df0 JB |
57 | @@ -123,7 +123,11 @@ |
58 | .PHONY: $(SUBDIRS) $(SUBDIRS.install) $(SUBDIRS.clean) $(SUBDIRS.distclean) | |
59 | .PHONY: $(SUBDIRS.pofile) | |
60 | ||
61 | +ifeq ("@DYNAMIC_LINK@", "yes") | |
31191a9e | 62 | TARGETS += $(LIB_SHARED) $(LIB_STATIC) $(VERSIONED_SHLIB) |
b89f2df0 JB |
63 | +else |
64 | +TARGETS += $(LIB_STATIC) | |
65 | +endif | |
66 | ||
67 | all: $(SUBDIRS) $(TARGETS) | |
68 |