[med-svn] [biosquid] 01/02: Add AM_INIT_AUTOMAKE and LIB_VERSION

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository biosquid.

commit 65e89bde1ae9365deab461700359792f090dffc6
Author: Andreas Tille <tille at debian.org>
Date:   Tue Apr 4 15:29:53 2017 +0200

    Add AM_INIT_AUTOMAKE and LIB_VERSION
---
 debian/patches/automake.patch | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/debian/patches/automake.patch b/debian/patches/automake.patch
index a7b1c90..77122da 100644
--- a/debian/patches/automake.patch
+++ b/debian/patches/automake.patch
@@ -4,7 +4,7 @@ Last-Update: Thu, 23 Mar 2017 21:55:15 +0100
 
 --- /dev/null
 +++ b/Makefile.am
-@@ -0,0 +1,155 @@
+@@ -0,0 +1,153 @@
 +lib_LTLIBRARIES  = libbiosquid.la
 +
 +libbiosquiddir=$(includedir)/biosquid
@@ -61,7 +61,7 @@ Last-Update: Thu, 23 Mar 2017 21:55:15 +0100
 +	wuss.c
 +
 +libbiosquid_la_LDFLAGS = -version-info @LIB_VERSION@
-+libbiosquid_la_LDADD = @PVMLIBS@
++libbiosquid_la_LIBADD = @PVMLIBS@
 +
 +libbiosquid_la_CPPFLAGS = $(INCLUDES)
 +
@@ -90,8 +90,6 @@ Last-Update: Thu, 23 Mar 2017 21:55:15 +0100
 +
 +READMES = 00README INSTALL
 +
-+SCRIPTS = 
-+
 +PRECONFHDRS = \
 +	squid.h.in\
 +	squidconf.h.in
@@ -162,8 +160,15 @@ Last-Update: Thu, 23 Mar 2017 21:55:15 +0100
 +
 --- a/configure.ac
 +++ b/configure.ac
-@@ -38,6 +38,9 @@
+@@ -36,8 +36,16 @@
+ #
+ AC_PREREQ(2.57)
  AC_INIT(SQUID, 1.9g, eddy at genetics.wustl.edu, squid)
++
++AM_INIT_AUTOMAKE([1.6 foreign dist-zip tar-ustar filename-length-max=299])
++LIB_VERSION=1:0
++AC_SUBST([LIB_VERSION])
++
  AC_MSG_NOTICE([configuring the SQUID library for your system.])
  
 +# Write out squidconf.h header
@@ -172,7 +177,7 @@ Last-Update: Thu, 23 Mar 2017 21:55:15 +0100
  SQUID_RELCODE="squid1_9g"
  SQUID_DATE="January 2003"
  SQUID_COPYRIGHT="Copyright (C) 1992-2003 HHMI/Washington University School of Medicine"
-@@ -53,51 +56,28 @@
+@@ -53,51 +61,28 @@ AC_SUBST(SQUID_LICENSE)
  AC_SUBST(SQUID_LICENSETAG)
  AC_SUBST(SQUID_VERSION)
  
@@ -236,7 +241,7 @@ Last-Update: Thu, 23 Mar 2017 21:55:15 +0100
  # ================================================================
  # Provide for unsigned integers of known size
  # Sets SQD_UINT16, 32, and 64.
-@@ -162,11 +142,14 @@
+@@ -162,11 +147,14 @@ AC_DEFUN(SQ_ARITHMETIC_FPOS_T, [
     fpos_arithmetic="no."
     AC_TRY_COMPILE([#include <stdio.h>],
        [int main(void) { fpos_t f1, f2; if (f1 == f2) f1 = 0;}],
@@ -253,7 +258,7 @@ Last-Update: Thu, 23 Mar 2017 21:55:15 +0100
  # %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  
  # ================================================================
-@@ -177,6 +160,7 @@
+@@ -177,6 +165,7 @@ AC_CHECK_FUNCS(strtoull)
  AC_CHECK_FUNCS(ftello fseeko)
  AC_CHECK_FUNCS(ftello64 fseeko64)
  AC_CHECK_FUNCS(ftell64 fseek64)
@@ -261,7 +266,7 @@ Last-Update: Thu, 23 Mar 2017 21:55:15 +0100
  AC_CHECK_FUNC(stat64, 
     [AC_MSG_CHECKING(for struct stat64)
      stat64_struct="no!"	    
-@@ -184,10 +168,12 @@
+@@ -184,10 +173,12 @@ AC_CHECK_FUNC(stat64,
                      #include <sys/stat.h>
                      #include <unistd.h>],
                     [int main(void) { struct stat64 s1;} ],
@@ -275,7 +280,7 @@ Last-Update: Thu, 23 Mar 2017 21:55:15 +0100
  AC_CHECK_SIZEOF(off_t)
  AC_CHECK_SIZEOF(off64_t)
  AC_CHECK_SIZEOF(fpos_t)
-@@ -218,6 +204,7 @@
+@@ -218,6 +209,7 @@ esac])
  
  
  
@@ -283,7 +288,7 @@ Last-Update: Thu, 23 Mar 2017 21:55:15 +0100
  # --enable-debugging=x    - set debugging level to <x> (1-3)
  # 
  # At all levels, including 0, replaces CFLAGS w/ "-g -Wall" (so it assumes gcc).
-@@ -229,28 +216,28 @@
+@@ -229,28 +221,28 @@ AC_ARG_ENABLE(debugging,
  [ case $enable_debugging in
     yes)  AC_MSG_NOTICE([enabled debugging diagnostics level 0 (CFLAGS only, no verbosity)])
           CFLAGS="-g -Wall"
@@ -318,7 +323,7 @@ Last-Update: Thu, 23 Mar 2017 21:55:15 +0100
  
  # --enable-lfs           Large File Summit (LFS) support for >2GB files
  # See: http://ftp.sas.com/standards/large.file/x_open.20Mar96.html
-@@ -259,14 +246,22 @@
+@@ -259,14 +251,22 @@ AC_ARG_ENABLE(lfs,
  [  --enable-lfs            enable LFS, Large File Support],
  [case $enable_lfs in
     yes) AC_MSG_NOTICE([configured for optional LFS, large file support])
@@ -344,7 +349,7 @@ Last-Update: Thu, 23 Mar 2017 21:55:15 +0100
  
  
  
-@@ -282,21 +277,19 @@
+@@ -282,21 +282,19 @@ AC_ARG_ENABLE(pvm,
   	 PVMLIBDIR="-L${PVM_ROOT}/lib/${PVM_ARCH}"
  	 PVMINCDIR="-I${PVM_ROOT}/include"
  	 PVMLIBS="-lpvm3"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/biosquid.git