projects / packages / device-mapper.git / blame
| 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) | |
| 21 | diff -durN -x '*~' device-mapper.1.01.03.orig/dmsetup/Makefile.in device-mapper.1.01.03/dmsetup/Makefile.in | |
| 22 | --- device-mapper.1.01.03.orig/dmsetup/Makefile.in 2005-01-27 17:16:52.000000000 +0100 | |
| 23 | +++ device-mapper.1.01.03/dmsetup/Makefile.in 2005-07-31 19:10:13.000000000 +0200 | |
| 24 | @@ -16,8 +16,10 @@ | |
| 25 | top_srcdir = @top_srcdir@ | |
| 26 | VPATH = @srcdir@ | |
| 27 | ||
| 28 | +ifeq ("@DYNAMIC_LINK@", "yes") | |
| 29 | TARGETS = dmsetup | |
| 30 | INSTALL_TYPE = install_dynamic | |
| 31 | +endif | |
| 32 | ||
| 33 | ifeq ("@STATIC_LINK@", "yes") | |
| 34 | TARGETS += dmsetup.static | |
| 35 | diff -durN -x '*~' device-mapper.1.01.03.orig/lib/Makefile.in device-mapper.1.01.03/lib/Makefile.in | |
| 36 | --- device-mapper.1.01.03.orig/lib/Makefile.in 2005-04-28 00:32:00.000000000 +0200 | |
| 37 | +++ device-mapper.1.01.03/lib/Makefile.in 2005-07-31 19:10:13.000000000 +0200 | |
| 38 | @@ -45,7 +45,9 @@ | |
| 39 | .PHONY: install_dynamic install_static \ | |
| 40 | install_fs install_ioctl install_ioctl_static | |
| 41 | ||
| 42 | +ifeq ("@DYNAMIC_LINK@", "yes") | |
| 43 | INSTALL_TYPE = install_dynamic | |
| 44 | +endif | |
| 45 | ||
| 46 | ifeq ("@STATIC_LINK@", "yes") | |
| 47 | INSTALL_TYPE += install_static | |
| b89f2df0 JB |
48 | --- device-mapper.1.02.07/make.tmpl.in.orig 2006-05-10 21:38:25.000000000 +0200 |
| 49 | +++ device-mapper.1.02.07/make.tmpl.in 2006-05-17 19:11:38.814962000 +0200 | |
| 50 | @@ -123,7 +123,11 @@ | |
| 51 | .PHONY: $(SUBDIRS) $(SUBDIRS.install) $(SUBDIRS.clean) $(SUBDIRS.distclean) | |
| 52 | .PHONY: $(SUBDIRS.pofile) | |
| 53 | ||
| 54 | +ifeq ("@DYNAMIC_LINK@", "yes") | |
| 55 | TARGETS += $(LIB_SHARED) $(LIB_STATIC) | |
| 56 | +else | |
| 57 | +TARGETS += $(LIB_STATIC) | |
| 58 | +endif | |
| 59 | ||
| 60 | all: $(SUBDIRS) $(TARGETS) | |
| 61 |