[med-svn] [Git][med-team/ksw2][master] cleaned up zlib detection in autoconf

[Étienne Mollier]

Étienne Mollier pushed to branch master at Debian Med / ksw2


Commits:
1dff0e6b by Etienne Mollier at 2020-07-09T20:22:01+02:00
cleaned up zlib detection in autoconf

- - - - -


2 changed files:

- debian/patches/autoconf.patch
- debian/rules


Changes:

=====================================
debian/patches/autoconf.patch
=====================================
@@ -26,13 +26,12 @@ Description: Provide automake build system to get proper library packaging
 +
 --- /dev/null
 +++ b/configure.ac
-@@ -0,0 +1,69 @@
+@@ -0,0 +1,66 @@
 +#                                               -*- Autoconf -*-
 +# Process this file with autoconf to produce a configure script.
 +
 +AC_INIT(ksw2, 0.0, lh3 at me.com)
 +AC_CONFIG_HEADERS([config.h])
-+dnl AC_CONFIG_MACRO_DIR([/usr/share/aclocal]) - this does not help to find ax_check_zlib.m4
 +
 +AC_PREREQ(2.57)
 +
@@ -76,8 +75,6 @@ Description: Provide automake build system to get proper library packaging
 +
 +CPPFLAGS="-I\$(top_srcdir) $CPPFLAGS"
 +# Checks for libraries.
-+
-+m4_include([ax_check_zlib.m4])
 +AX_CHECK_ZLIB()
 +
 +# Checks for header files.


=====================================
debian/rules
=====================================
@@ -5,16 +5,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 %:
 	dh $@
 
-# FIXME: I'd love to get rid of this dirty hack - but I have no better idea how to check for zlib
-override_dh_autoreconf:
-	ln -s /usr/share/aclocal/ax_check_zlib.m4 .
-	dh_autoreconf
-
-override_dh_auto_install:
-	dh_auto_install
-	rm ax_check_zlib.m4
-# FIXME: End of dirty hack.
-
 override_dh_install:
 	dh_install
 	d-shlibmove --commit \



View it on GitLab: https://salsa.debian.org/med-team/ksw2/-/commit/1dff0e6b3018d1a26563c2e0666c97ac91df518d

-- 
View it on GitLab: https://salsa.debian.org/med-team/ksw2/-/commit/1dff0e6b3018d1a26563c2e0666c97ac91df518d
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200710/10fd9776/attachment-0001.html>