make pkgconfig installation step optional, and clean up generated files

diff --git a/configure b/configure
index a8ff4d107bd29ef4e881e56c5808340f4e7113a8..54c77081bb6f5c44ef8c1168aa65aa357ae9a048 100755 (executable)
--- a/configure
+++ b/configure
@@ -310,7 +310,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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB LIBOBJS MSGFMT usrlibdir JOBS STATIC_LINK OWNER GROUP interface kerneldir missingkernel kernelvsn tmpdir LVM_DEFS COPTIMISE_FLAG CLDFLAGS LDDEPS LIB_SUFFIX DEBUG DM_LIB_VERSION COMPAT DMIOCTLS LOCALEDIR INTL_PACKAGE INTL DEVICE_UID DEVICE_GID DEVICE_MODE DMEVENTD 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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB LIBOBJS MSGFMT usrlibdir JOBS STATIC_LINK OWNER GROUP interface kerneldir missingkernel kernelvsn tmpdir LVM_DEFS COPTIMISE_FLAG CLDFLAGS LDDEPS LIB_SUFFIX DEBUG DM_LIB_VERSION COMPAT DMIOCTLS LOCALEDIR INTL_PACKAGE INTL DEVICE_UID DEVICE_GID DEVICE_MODE DMEVENTD PKGCONFIG LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -851,6 +851,7 @@ Optional Features:
   --enable-compat         Enable support for old device-mapper versions
   --disable-driver        Disable calls to device-mapper in the kernel
   --enable-dmeventd       Build the new event daemon
+  --enable-pkgconfig      Install pkgconfig support
   --enable-static_link    Use this to link the tools to their libraries
                           statically.  Default is dynamic linking
   --disable-selinux       Disable selinux support
@@ -5340,6 +5341,15 @@ else
   DMEVENTD=no
 fi;
 
+################################################################################
+# Check whether --enable-pkgconfig or --disable-pkgconfig was given.
+if test "${enable_pkgconfig+set}" = set; then
+  enableval="$enable_pkgconfig"
+  PKGCONFIG=$enableval
+else
+  PKGCONFIG=no
+fi;
+
 ################################################################################
 # Check whether --enable-static_link or --disable-static_link was given.
 if test "${enable_static_link+set}" = set; then
@@ -5894,6 +5904,7 @@ fi
 
 
 
+
 
 
 ################################################################################
@@ -6601,6 +6612,7 @@ s,@DEVICE_UID@,$DEVICE_UID,;t t
 s,@DEVICE_GID@,$DEVICE_GID,;t t
 s,@DEVICE_MODE@,$DEVICE_MODE,;t t
 s,@DMEVENTD@,$DMEVENTD,;t t
+s,@PKGCONFIG@,$PKGCONFIG,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF
 

diff --git a/configure.in b/configure.in
index ad00d83133529116afc8207fcb5fcb7832c5f9dd..9e9d601d9e62fe6ee28ab729cfdf1da153b38f1e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -184,6 +184,11 @@ dnl -- Enable dmeventd
 AC_ARG_ENABLE(dmeventd,   [  --enable-dmeventd       Build the new event daemon],
 DMEVENTD=$enableval, DMEVENTD=no)
 
+################################################################################
+dnl -- Enable pkg-config
+AC_ARG_ENABLE(pkgconfig,   [  --enable-pkgconfig      Install pkgconfig support],
+PKGCONFIG=$enableval, PKGCONFIG=no)
+
 ################################################################################
 dnl -- Enables staticly-linked tools
 AC_ARG_ENABLE(static_link, [  --enable-static_link    Use this to link the tools to their libraries
@@ -372,6 +377,7 @@ AC_SUBST(DEVICE_UID)
 AC_SUBST(DEVICE_GID)
 AC_SUBST(DEVICE_MODE)
 AC_SUBST(DMEVENTD)
+AC_SUBST(PKGCONFIG)
 
 ################################################################################
 dnl -- First and last lines should not contain files to generate in order to 

diff --git a/dmeventd/Makefile.in b/dmeventd/Makefile.in
index ef21c7afa2a7a8a021a79d6b66146a956097c45c..df0e94a75d545d1fcfdb1f4b0f8795dd7ef8fc7b 100644 (file)
--- a/dmeventd/Makefile.in
+++ b/dmeventd/Makefile.in
@@ -30,7 +30,8 @@ include ../make.tmpl
 
 CLDFLAGS += -ldl -ldevmapper -lpthread
 
-.PHONY: install_dynamic install_static install_include
+.PHONY: install_dynamic install_static install_include \
+       install_pkgconfig
 
 INSTALL_TYPE = install_dynamic
 
@@ -38,6 +39,10 @@ ifeq ("@STATIC_LINK@", "yes")
   INSTALL_TYPE += install_static
 endif
 
+ifeq ("@PKGCONFIG@", "yes")
+  INSTALL_TYPE += install_pkgconfig
+endif
+
 install: $(INSTALL_TYPE)
 
 install_include:
@@ -49,6 +54,8 @@ install_dynamic: libdevmapper-event.$(LIB_SUFFIX)
                $(libdir)/libdevmapper-event.$(LIB_SUFFIX).$(LIB_VERSION)
        $(LN_S) -f libdevmapper-event.$(LIB_SUFFIX).$(LIB_VERSION) \
                $(libdir)/libdevmapper-event.$(LIB_SUFFIX)
+
+install_pkgconfig:
        $(INSTALL) -D $(OWNER) $(GROUP) -m 444 devmapper-event.pc \
                $(usrlibdir)/pkgconfig/libdevmapper-event.pc
 
@@ -57,3 +64,10 @@ install_static: libdevmapper-event.a
                $(libdir)/libdevmapper-event.a.$(LIB_VERSION)
        $(LN_S) -f libdevmapper-event.a.$(LIB_VERSION) $(libdir)/libdevmapper-event.a
 
+.PHONY: distclean_lib distclean
+
+distclean_lib: 
+        $(RM) libdevmapper-event.pc
+
+distclean: distclean_lib
+

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 8fd990eca8449077ef005bc194d1795b03006d91..91e0c5d4ae2a159c75629d3a95fd88b3fcbe1669 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -43,7 +43,8 @@ CFLAGS += -DDEVICE_UID=@DEVICE_UID@ -DDEVICE_GID=@DEVICE_GID@ \
 include ../make.tmpl
 
 .PHONY: install_dynamic install_static install_include \
-       install_fs install_ioctl install_ioctl_static
+       install_fs install_ioctl install_ioctl_static \
+       install_pkgconfig
 
 INSTALL_TYPE = install_dynamic
 
@@ -51,6 +52,10 @@ ifeq ("@STATIC_LINK@", "yes")
   INSTALL_TYPE += install_static
 endif
 
+ifeq ("@PKGCONFIG@", "yes")
+  INSTALL_TYPE += install_pkgconfig
+endif
+
 install: $(INSTALL_TYPE) install_include
 
 install_include:
@@ -71,6 +76,8 @@ install_fs: fs/libdevmapper.$(LIB_SUFFIX)
 install_ioctl: ioctl/libdevmapper.$(LIB_SUFFIX)
        $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
                $(libdir)/libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION)
+
+install_pkgconfig:
        $(INSTALL) -D $(OWNER) $(GROUP) -m 444 devmapper.pc \
                $(usrlibdir)/pkgconfig/libdevmapper.pc
 
@@ -81,7 +88,7 @@ install_ioctl_static: ioctl/libdevmapper.a
 .PHONY: distclean_lib distclean
 
 distclean_lib: 
-       $(RM) libdm-common.h
+       $(RM) libdm-common.h libdevmapper.pc
 
 distclean: distclean_lib