[SCM] log4shib Debian packaging branch, master, updated. debian/1.0.4-1-7-g3dea769

[Russ Allbery]

The following commit has been merged in the master branch:
commit 3cf81aaade35c6134e6344c51deedce1d5a0270d
Merge: 42b16d48b28c406cf4325080bfe591ed327885f7 026b1a596b5fe7abed2673b7dc5853cbd3a6841c
Author: Russ Allbery <rra at stanford.edu>
Date:   Wed May 22 20:00:08 2013 -0700

    Merge tag 'upstream/1.0.5'
    
    Upstream version 1.0.5
    
    Conflicts:
    	Makefile.am
    	debian/Makefile.in

diff --combined Makefile.am
index ae9ce8d,f255db8..c8f6b5e
--- a/Makefile.am
+++ b/Makefile.am
@@@ -1,12 -1,10 +1,12 @@@
 +ACLOCAL_AMFLAGS = -I m4
 +
  if DOC
- SUBDIRS = msvc6 msvc8 msvc9 bcb5 config src include tests doc 
 -SUBDIRS = debian msvc6 msvc8 msvc9 msvc10 bcb5 config src include tests doc 
++SUBDIRS = msvc6 msvc8 msvc9 msvc10 bcb5 config src include tests doc 
  else
- SUBDIRS = msvc6 msvc8 msvc9 bcb5 config src include tests
 -SUBDIRS = debian msvc6 msvc8 msvc9 msvc10 bcb5 config src include tests
++SUBDIRS = msvc6 msvc8 msvc9 msvc10 bcb5 config src include tests
  endif
  
- DIST_SUBDIRS = msvc6 msvc8 msvc9 bcb5 openvms config src include doc tests
 -DIST_SUBDIRS = debian msvc6 msvc8 msvc9 msvc10 bcb5 openvms config src include doc tests
++DIST_SUBDIRS = msvc6 msvc8 msvc9 msvc10 bcb5 openvms config src include doc tests
  
  bin_SCRIPTS = log4shib-config
  
@@@ -21,19 -19,7 +21,7 @@@ EXTRA_DIST = 
  	log4shib.spec \
  	log4shib.m4 \
  	Portfile.in \
- 	Portfile \
- 	m4/acx_pthread.m4 \
- 	m4/ac_config_libconfig_in.m4 \
- 	m4/ac_config_pkgconfig_in.m4 \
- 	m4/AC_CREATE_PREFIX_CONFIG_H.m4 \
- 	m4/BB_ENABLE_DOXYGEN.m4 \
- 	m4/AC_CXX_HAVE_SSTREAM.m4 \
- 	m4/AC_CXX_NAMESPACES.m4 \
- 	m4/PETI_PEDANTIC_GCC.m4 \
- 	m4/AC_FUNC_SNPRINTF.m4 \
- 	m4/AC_C_INT64_T.m4 \
- 	m4/BB_CHECK_OMNITHREADS.m4 \
- 	m4/BB_CHECK_PTHREADS.m4
+ 	Portfile
  
  .PHONY: check rpm docs doc-dist
  
@@@ -68,4 -54,4 +56,4 @@@ docs
  
  doc-dist: docs
  	tar -zcf $(PACKAGE)-docs-$(VERSION).tar.gz -C $(top_srcdir)/doc/html --exclude CVS --exclude .svn .
 - 
 + 
diff --combined configure.in
index 538b813,ba20885..e5ccc42
--- a/configure.in
+++ b/configure.in
@@@ -1,9 -1,8 +1,9 @@@
- AC_INIT(log4shib, 1.0.4)
+ AC_INIT(log4shib, 1.0.5)
  
  # autoconf 2.50 or higher to rebuild aclocal.m4, because the
  # AC_CREATE_PREFIX_CONFIG_H macro needs the AS_DIRNAME macro.
  AC_PREREQ(2.50)
 +AC_CONFIG_MACRO_DIR([m4])
  
  #
  # +1 : ? : +1  == new interface that does not break old one
@@@ -12,13 -11,14 +12,14 @@@
  #  ? :+1 : ?   == just some internal changes, nothing breaks but might work 
  #                 better
  # CURRENT : REVISION : AGE
- LT_VERSION=1:4:0
+ LT_VERSION=1:5:0
  
  AC_SUBST(LT_VERSION)
  
  #AC_CONFIG_SRCDIR(configure.in)
  AC_CONFIG_AUX_DIR(config)
  AM_CONFIG_HEADER(include/config.h)
+ AX_PREFIX_CONFIG_H([include/log4shib/config.h])
  
  AM_INIT_AUTOMAKE
  
@@@ -53,6 -53,14 +54,14 @@@ if test "$GCC" = "yes" ; the
      CXXFLAGS="-Wall $GCC_CXXFLAGS"
  fi
  
+ # Enables POSIX semantics for some functions.
+ case "${host_cpu}-${host_os}" in
+     *solaris*)
+         CFLAGS="$CFLAGS -D_POSIX_PTHREAD_SEMANTICS"
+         CXXFLAGS="$CXXFLAGS -D_POSIX_PTHREAD_SEMANTICS"
+     ;;
+ esac
+ 
  AC_PROG_CXXCPP
  AC_LANG(C)
  
@@@ -75,7 -83,7 +84,7 @@@ AC_CHECK_LIB(socket,socket, LIBS="-lsoc
  AC_CHECK_LIB(nsl,gethostbyname, LIBS="-lnsl $LIBS",,)
  
  # checks for pthreads
- ACX_PTHREAD([enable_threads="pthread"],[enable_threads="no"])
+ AX_PTHREAD([enable_threads="pthread"],[enable_threads="no"])
  if test $enable_threads != "pthread"; then
      AC_MSG_ERROR([unable to find pthreads, currently this is required])
  else
@@@ -86,6 -94,7 +95,7 @@@
      LIBS="$PTHREAD_LIBS $LIBS"
      CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
      CXXFLAGS="$PTHREAD_CFLAGS $CXXFLAGS"
+     CC="$PTHREAD_CC"
  fi
  
  AC_LANG(C++)
@@@ -136,6 -145,7 +146,6 @@@ include/Makefil
  include/log4shib/Makefile
  include/log4shib/threading/Makefile
  tests/Makefile
 -debian/Makefile
  msvc6/Makefile
  msvc6/log4shib/Makefile
  msvc6/log4shibDLL/Makefile
@@@ -163,6 -173,14 +173,14 @@@ msvc9/testMain/Makefil
  msvc9/testNDC/Makefile
  msvc9/testNTEventLog/Makefile
  msvc9/testPattern/Makefile
+ msvc10/Makefile
+ msvc10/log4shib/Makefile
+ msvc10/log4shibDLL/Makefile
+ msvc10/testCategory/Makefile
+ msvc10/testMain/Makefile
+ msvc10/testNDC/Makefile
+ msvc10/testNTEventLog/Makefile
+ msvc10/testPattern/Makefile
  bcb5/Makefile
  bcb5/log4shib/Makefile
  bcb5/testCategory/Makefile
@@@ -174,6 -192,3 +192,3 @@@ bcb5/testPattern/Makefil
  openvms/Makefile
  ])
  AC_OUTPUT
- 
- AC_CREATE_PREFIX_CONFIG_H([include/log4shib/config.h], 
-         $PACKAGE_TARNAME, [include/config.h])

-- 
log4shib Debian packaging