Fix dmsetup.static install.

WHATS_NEW

@@ -1,3 +1,5 @@
+Version 2.00.09 - 31 Mar 2004
+=============================
   Update copyright notices for Red Hat.
   Fix vgmknodes to remove dud /dev/mapper entries. (libdevmapper update reqd).
   Add LVM1-style colon output to vgdisplay.

WHATS_NEW_DM

@@ -1,3 +1,19 @@
+Version 1.00.12 - 6 Apr 2004
+===========================
+  Fix dmsetup.static install.
+
+Version 1.00.11 - 5 Apr 2004
+===========================
+  configure --enable-static_link does static build in addition to dynamic.
+  Moved Makefile library targets definition into template.
+
+Version 1.00.10 - 2 Apr 2004
+============================
+  Fix DESTDIR handling.
+  Static build installs to dmsetup.static.
+  Basic support for internationalisation.
+  Minor Makefile tidy-ups/fixes.
+
 Version 1.00.09 - 31 Mar 2004
 =============================
   Update copyright notices to Red Hat.

configure

@@ -309,7 +309,7 @@ ac_includes_default="\
 #endif"
 
 ac_default_prefix=/usr
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os MSGFMT JOBS STATIC_LINK LVM1 OWNER GROUP CLDFLAGS CLDWHOLEARCHIVE CLDNOWHOLEARCHIVE LD_DEPS SOFLAG LVM_VERSION DEBUG DEVMAPPER HAVE_LIBDL CMDLIB LOCALEDIR INTL_PACKAGE INTL LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os MSGFMT JOBS STATIC_LINK LVM1 OWNER GROUP CLDFLAGS CLDWHOLEARCHIVE CLDNOWHOLEARCHIVE LD_DEPS LD_FLAGS SOFLAG LVM_VERSION DEBUG DEVMAPPER HAVE_LIBDL CMDLIB LOCALEDIR INTL_PACKAGE INTL LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -3885,6 +3885,7 @@ case "$host_os" in
 		CLDWHOLEARCHIVE="-Wl,-whole-archive"
 		CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
 		LD_DEPS=".export.sym"
+		LD_FLAGS="-Wl,--export-dynamic"
 		SOFLAG="-shared"
 		DEVMAPPER=yes
 		ODIRECT=yes ;;
@@ -3894,6 +3895,7 @@ case "$host_os" in
 		CLDWHOLEARCHIVE="-all_load"
 		CLDNOWHOLEARCHIVE=
 		LD_DEPS=
+		LD_FLAGS=
 		SOFLAG="-dynamiclib"
 		DEVMAPPER=no
 		ODIRECT=no ;;
@@ -4582,11 +4584,22 @@ else
 fi
 
 
-if test x$HAVE_LIBDL = xyes; then
+if [ "x$HAVE_LIBDL" = xyes -a "xSTATIC_LINK" = xno ]; then
 	CFLAGS="$CFLAGS -DHAVE_LIBDL"
 	LIBS="-ldl $LIBS"
+else
+	HAVE_LIBDL=no
 fi
 
+if [ "x$LVM1" = xshared -a "x$STATIC_LINK" = xyes ];
+ then  { { echo "$as_me:$LINENO: error: Features cannot be \"shared\" when building statically
+" >&5
+echo "$as_me: error: Features cannot be \"shared\" when building statically
+" >&2;}
+   { (exit 1); exit 1; }; }
+ exit
+fi;
+
 
 for ac_header in getopt.h
 do
@@ -4989,6 +5002,7 @@ fi
 
 
 
+
 
 
                                                                                                                                             ac_config_files="$ac_config_files Makefile make.tmpl include/Makefile lib/Makefile lib/format1/Makefile man/Makefile po/Makefile tools/Makefile tools/version.h test/mm/Makefile test/device/Makefile test/format1/Makefile test/regex/Makefile test/filters/Makefile"
@@ -5678,6 +5692,7 @@ s,@CLDFLAGS@,$CLDFLAGS,;t t
 s,@CLDWHOLEARCHIVE@,$CLDWHOLEARCHIVE,;t t
 s,@CLDNOWHOLEARCHIVE@,$CLDNOWHOLEARCHIVE,;t t
 s,@LD_DEPS@,$LD_DEPS,;t t
+s,@LD_FLAGS@,$LD_FLAGS,;t t
 s,@SOFLAG@,$SOFLAG,;t t
 s,@LVM_VERSION@,$LVM_VERSION,;t t
 s,@DEBUG@,$DEBUG,;t t

configure.in

@@ -55,6 +55,7 @@ case "$host_os" in
 		CLDWHOLEARCHIVE="-Wl,-whole-archive"
 		CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
 		LD_DEPS=".export.sym"
+		LD_FLAGS="-Wl,--export-dynamic"
 		SOFLAG="-shared"
 		DEVMAPPER=yes
 		ODIRECT=yes ;;
@@ -64,6 +65,7 @@ case "$host_os" in
 		CLDWHOLEARCHIVE="-all_load"
 		CLDNOWHOLEARCHIVE=
 		LD_DEPS=
+		LD_FLAGS=
 		SOFLAG="-dynamiclib"
 		DEVMAPPER=no
 		ODIRECT=no ;;
@@ -183,11 +185,21 @@ fi
 dnl Check for dlopen
 AC_CHECK_LIB(dl, dlopen, HAVE_LIBDL=yes, HAVE_LIBDL=no)
 
-if test x$HAVE_LIBDL = xyes; then
+if [[ "x$HAVE_LIBDL" = xyes -a "xSTATIC_LINK" = xno ]]; then
 	CFLAGS="$CFLAGS -DHAVE_LIBDL"
 	LIBS="-ldl $LIBS"
+else
+	HAVE_LIBDL=no
 fi
 
+dnl Check for shared/static conflicts
+if [[ "x$LVM1" = xshared -a "x$STATIC_LINK" = xyes ]];
+ then  AC_MSG_ERROR(
+Features cannot be \"shared\" when building statically
+)
+ exit
+fi;
+
 dnl Check for getopt
 AC_CHECK_HEADERS(getopt.h, CFLAGS="$CFLAGS -DHAVE_GETOPTLONG")
 
@@ -246,6 +258,7 @@ AC_SUBST(CLDFLAGS)
 AC_SUBST(CLDWHOLEARCHIVE)
 AC_SUBST(CLDNOWHOLEARCHIVE)
 AC_SUBST(LD_DEPS)
+AC_SUBST(LD_FLAGS)
 AC_SUBST(SOFLAG)
 AC_SUBST(LIBS)
 AC_SUBST(LVM_VERSION)

lib/Makefile.in

@@ -97,7 +97,7 @@ endif
 
 LIB_STATIC = liblvm.a
 
-TARGETS = $(LIB_STATIC)
+$(SUBDIRS): $(LIB_STATIC)
 
 include ../make.tmpl
 

lib/format1/Makefile.in

@@ -25,7 +25,7 @@ SOURCES =\
 	lvm1-label.c \
 	vg_number.c
 
-TARGETS = liblvm2format1.so
+LIB_SHARED = liblvm2format1.so
 
 include ../../make.tmpl
 

libdm/Makefile.in

@@ -17,19 +17,27 @@ top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 interface = @interface@
 
-SOURCES=libdm-common.c $(interface)/libdevmapper.c
+SOURCES = libdm-common.c $(interface)/libdm-iface.c
 
-INCLUDES=-I$(interface)
+INCLUDES = -I$(interface)
 
 LIB_STATIC = $(interface)/libdevmapper.a
 LIB_SHARED = $(interface)/libdevmapper.so
 
-TARGETS = $(LIB_STATIC) $(LIB_SHARED)
-
 include ../make.tmpl
 
+.PHONY: install_dynamic install_static \
+	install_fs install_ioctl install_ioctl_static
 
-install: install_@interface@
+INSTALL_TYPE = install_dynamic
+
+ifeq ("@STATIC_LINK@", "yes")
+  INSTALL_TYPE += install_static
+endif
+
+install: $(INSTALL_TYPE)
+
+install_dynamic: install_@interface@
 	$(LN_S) -f libdevmapper.so.$(LIB_VERSION) $(libdir)/libdevmapper.so
 	$(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 444 libdevmapper.h \
 		$(includedir)/libdevmapper.h
@@ -39,9 +47,6 @@ install_static: install_@interface@_static
 	$(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 444 libdevmapper.h \
 		$(includedir)/libdevmapper.h
 
-
-.PHONY: install install_@interface@ install_static install_@interface@_static
-
 install_fs: fs/libdevmapper.so
 	$(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) $< \
 		$(libdir)/libdevmapper.so.$(LIB_VERSION)
@@ -54,10 +59,10 @@ install_ioctl_static: ioctl/libdevmapper.a
 	$(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) $< \
 		$(libdir)/libdevmapper.a.$(LIB_VERSION)
 
+.PHONY: distclean_lib distclean
+
 distclean_lib: 
 	$(RM) libdm-common.h
 
 distclean: distclean_lib
 
-.PHONY: distclean_lib distclean
-

make.tmpl.in

@@ -29,6 +29,7 @@ CLDFLAGS += @CLDFLAGS@
 CLDWHOLEARCHIVE += @CLDWHOLEARCHIVE@
 CLDNOWHOLEARCHIVE += @CLDNOWHOLEARCHIVE@
 LD_DEPS += @LD_DEPS@
+LD_FLAGS += @LD_FLAGS@
 SOFLAG += @SOFLAG@
 
 # Setup directory variables
@@ -109,6 +110,8 @@ SUBDIRS.distclean := $(SUBDIRS:=.distclean)
 .PHONY: $(SUBDIRS) $(SUBDIRS.install) $(SUBDIRS.clean) $(SUBDIRS.distclean)
 .PHONY: $(SUBDIRS.pofile)
 
+TARGETS += $(LIB_SHARED) $(LIB_STATIC)
+
 all: $(SUBDIRS) $(TARGETS)
 
 install: all $(SUBDIRS.install)

tools/lvmcmdline.c

@@ -1299,7 +1299,7 @@ int lvm2_main(int argc, char **argv)
 	base = basename(namebase);
 	while (*base == '/')
 		base++;
-	if (strcmp(base, "lvm"))
+	if (strcmp(base, "lvm") && strcmp(base, "lvm.static"))
 		alias = 1;
 	free(namebase);