]>
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 | |
4 | @@ -178,6 +178,8 @@ | |
5 | dnl -- Enables staticly-linked tools | |
6 | AC_ARG_ENABLE(static_link, [ --enable-static_link Use this to link the tools to their libraries | |
7 | statically. Default is dynamic linking], STATIC_LINK=$enableval, STATIC_LINK=no) | |
8 | +AC_ARG_ENABLE(dynamic_link, [ --disable-dynamic_link Use this not to link the tools to their libraries | |
9 | + statically. Default is dynamic linking], DYNAMIC_LINK=$enableval, DYNAMIC_LINK=yes) | |
10 | ||
11 | ################################################################################ | |
12 | dnl -- Clear default exec_prefix - install into /sbin rather than /usr/sbin | |
13 | @@ -324,6 +326,7 @@ | |
14 | ################################################################################ | |
15 | AC_SUBST(JOBS) | |
16 | AC_SUBST(STATIC_LINK) | |
17 | +AC_SUBST(DYNAMIC_LINK) | |
18 | AC_SUBST(OWNER) | |
19 | AC_SUBST(GROUP) | |
20 | AC_SUBST(LIBS) | |
31191a9e JB |
21 | --- device-mapper.1.02.23/dmsetup/Makefile.in.orig 2007-08-21 22:32:30.000000000 +0200 |
22 | +++ device-mapper.1.02.23/dmsetup/Makefile.in 2007-12-16 23:07:07.095562047 +0100 | |
2d3993eb JK |
23 | @@ -16,8 +16,10 @@ |
24 | top_srcdir = @top_srcdir@ | |
25 | VPATH = @srcdir@ | |
26 | ||
27 | +ifeq ("@DYNAMIC_LINK@", "yes") | |
28 | TARGETS = dmsetup | |
29 | INSTALL_TYPE = install_dynamic | |
30 | +endif | |
31191a9e | 31 | LIB_PTHREAD = @LIB_PTHREAD@ |
2d3993eb JK |
32 | |
33 | ifeq ("@STATIC_LINK@", "yes") | |
2d3993eb JK |
34 | diff -durN -x '*~' device-mapper.1.01.03.orig/lib/Makefile.in device-mapper.1.01.03/lib/Makefile.in |
35 | --- device-mapper.1.01.03.orig/lib/Makefile.in 2005-04-28 00:32:00.000000000 +0200 | |
36 | +++ device-mapper.1.01.03/lib/Makefile.in 2005-07-31 19:10:13.000000000 +0200 | |
37 | @@ -45,7 +45,9 @@ | |
38 | .PHONY: install_dynamic install_static \ | |
39 | install_fs install_ioctl install_ioctl_static | |
40 | ||
41 | +ifeq ("@DYNAMIC_LINK@", "yes") | |
42 | INSTALL_TYPE = install_dynamic | |
43 | +endif | |
44 | ||
45 | ifeq ("@STATIC_LINK@", "yes") | |
46 | INSTALL_TYPE += install_static | |
31191a9e JB |
47 | --- device-mapper.1.02.23/make.tmpl.in.orig 2007-10-03 12:48:27.000000000 +0200 |
48 | +++ device-mapper.1.02.23/make.tmpl.in 2007-12-16 23:06:42.922184485 +0100 | |
b89f2df0 JB |
49 | @@ -123,7 +123,11 @@ |
50 | .PHONY: $(SUBDIRS) $(SUBDIRS.install) $(SUBDIRS.clean) $(SUBDIRS.distclean) | |
51 | .PHONY: $(SUBDIRS.pofile) | |
52 | ||
53 | +ifeq ("@DYNAMIC_LINK@", "yes") | |
31191a9e | 54 | TARGETS += $(LIB_SHARED) $(LIB_STATIC) $(VERSIONED_SHLIB) |
b89f2df0 JB |
55 | +else |
56 | +TARGETS += $(LIB_STATIC) | |
57 | +endif | |
58 | ||
59 | all: $(SUBDIRS) $(TARGETS) | |
60 |