Просмотр исходного кода

build: Add new --without-install-info

Other distributions already ship the GNU reimplementation of install-info
which is slated to completely replace the Debian one in the near future,
additionally the current install-info in dpkg is just a wrapper, so we
allow them to disable it at configure time.
Guillem Jover лет назад: 16
Родитель
Сommit
2bae29f6c8
3 измененных файлов с 15 добавлено и 0 удалено
  1. 9 0
      configure.ac
  2. 2 0
      debian/changelog
  3. 4 0
      utils/Makefile.am

+ 9 - 0
configure.ac

@@ -49,6 +49,15 @@ AC_ARG_WITH(update-alternatives,
 AM_CONDITIONAL(WITH_UPDATE_ALTERNATIVES,
 	[test "x$build_update_alternatives" = "xyes"])
 
+# Allow compilation without install-info
+AC_ARG_WITH(install-info,
+	AS_HELP_STRING([--without-install-info],
+		       [do not build or use install-info]),
+	[build_install_info=$with_install_info],
+	[build_install_info=yes])
+AM_CONDITIONAL(WITH_INSTALL_INFO,
+	[test "x$build_install_info" = "xyes"])
+
 # Allow alternate admin directory
 admindir="${localstatedir}/${PACKAGE_NAME}"
 AC_ARG_WITH(admindir,

+ 2 - 0
debian/changelog

@@ -103,6 +103,8 @@ dpkg (1.15.6) UNRELEASED; urgency=low
     Thanks to Daniel Martin <Daniel.Martin@jhu.edu> for the idea.
   * Add support for disabling update-alternatives at configure time using
     --withouth-update-alternatives.
+  * Add support for disabling install-info at configure time using
+    --withouth-install-info.
 
   [ Modestas Vainius ]
   * Implement symbol patterns (Closes: #563752). From now on, it is possible to

+ 4 - 0
utils/Makefile.am

@@ -20,6 +20,7 @@ if WITH_START_STOP_DAEMON
 	$(SSD_LIBS)
 endif
 
+if WITH_INSTALL_INFO
 sbin_PROGRAMS += dpkg-install-info
 
 # Automake has its own install-info rule, gah
@@ -27,9 +28,12 @@ dpkg_install_info_SOURCES = install-info.c
 
 dpkg_install_info_LDADD = \
 	../lib/compat/libcompat.a
+endif
 
 transform = s/dpkg-install-info/install-info/; $(program_transform_name)
 
 uninstall-local:
+if WITH_INSTALL_INFO
 	rm -f $(DESTDIR)$(sbindir)/install-info
+endif