Hello community,
here is the log from the commit of package libosip2 for openSUSE:Factory checked in at 2013-06-26 20:28:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libosip2 (Old)
and /work/SRC/openSUSE:Factory/.libosip2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libosip2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libosip2/libosip2.changes 2012-02-21 12:20:41.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libosip2.new/libosip2.changes 2013-06-26 20:28:31.000000000 +0200
@@ -1,0 +2,19 @@
+Thu Jun 20 12:23:05 UTC 2013 - fisiu@opensuse.org
+
+- Update to 4.0.0:
+ * reduce path len // remove path in front of logs.
+ * accept only SIP/D.D format message.
+ * fix bug when releasing request with missing major headers.
+ * fix minor memory leak // remove limitation on fifo size.
+ * use system independant time for osip_gettimeofday on unix platform.
+ * To compile/use osip based application in multi threaded
+ env, you don't need to define -DOSIP_MT any more. Instead,
+ if you wish to disable the feature, you can compile with
+ -DOSIP_MONOTHREAD.
+ * A few other clean up were made inside osip to avoid any
+ define to appear in include files. Also to avoid conflict,
+ config.h has been renamed to osip-config.h.
+- Patches updated.
+- Spec cleanup.
+
+-------------------------------------------------------------------
Old:
----
libosip2-3.5.0-pthread.patch
libosip2-3.5.0.dif
libosip2-3.5.0.tar.bz2
New:
----
libosip2-4.0.0-pthread.patch
libosip2-4.0.0.patch
libosip2-4.0.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libosip2.spec ++++++
--- /var/tmp/diff_new_pack.3yeVhQ/_old 2013-06-26 20:28:33.000000000 +0200
+++ /var/tmp/diff_new_pack.3yeVhQ/_new 2013-06-26 20:28:33.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libosip2
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,21 +17,23 @@
Name: libosip2
+Version: 4.0.0
+Release: 0
+Summary: Implementation of SIP--RFC 3261
+License: LGPL-2.1+
+Group: Productivity/Networking/Other
+Url: http://www.fsf.org/software/osip/osip.html
+Source: http://ftp.gnu.org/gnu/osip/%{name}-%{version}.tar.gz
+# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
+Patch0: libosip2-4.0.0.patch
+# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
+Patch1: libosip2-4.0.0-pthread.patch
BuildRequires: docbook2x
BuildRequires: gcc-c++
BuildRequires: gperf
BuildRequires: libtool
BuildRequires: pkg-config
-Summary: Implementation of SIP--RFC 3261
-License: LGPL-2.1+
-Group: Productivity/Networking/Other
-Version: 3.5.0
-Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Url: http://www.fsf.org/software/osip/osip.html
-Source: %name-%version.tar.bz2
-Patch: %name-3.5.0.dif
-Patch1: libosip2-3.5.0-pthread.patch
%description
This is the GNU oSIP library. It has been designed to provide the
@@ -41,9 +43,10 @@
%package devel
Summary: Implementation of SIP--RFC 3261
-Group: Productivity/Networking/Other
+Group: Development/Libraries/C and C++
+Requires: %{name} = %{version}
+Requires: glibc-devel
Provides: libosip2:/usr/include/osip2/osip.h
-Requires: %{name} = %{version} glibc-devel
%description devel
This is the GNU oSIP library. It has been designed to provide the
@@ -53,7 +56,7 @@
%prep
%setup -q
-%patch -p1
+%patch0
%patch1
%build
@@ -68,7 +71,7 @@
make %{?_smp_mflags}
%install
-make DESTDIR=$RPM_BUILD_ROOT install
+%makeinstall
rm -f %{buildroot}%{_libdir}/*.la
%post -p /sbin/ldconfig
@@ -84,7 +87,7 @@
%{_includedir}/osipparser2
%{_includedir}/osip2
%{_libdir}/lib*.so
-%_libdir/pkgconfig/libosip2.pc
+%{_libdir}/pkgconfig/libosip2.pc
%{_mandir}/man1/*
%changelog
++++++ libosip2-3.5.0-pthread.patch -> libosip2-4.0.0-pthread.patch ++++++
--- /work/SRC/openSUSE:Factory/libosip2/libosip2-3.5.0-pthread.patch 2011-09-23 02:09:12.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libosip2.new/libosip2-4.0.0-pthread.patch 2013-06-26 20:28:31.000000000 +0200
@@ -1,3 +1,5 @@
+Index: scripts/acx_pthread.m4
+===================================================================
--- scripts/acx_pthread.m4.orig
+++ scripts/acx_pthread.m4
@@ -1,45 +1,88 @@
@@ -325,6 +327,8 @@
-])dnl ACX_PTHREAD
+AC_LANG_RESTORE
+])dnl AX_PTHREAD
+Index: configure.in
+===================================================================
--- configure.in.orig
+++ configure.in
@@ -42,6 +42,7 @@ AC_MSG_RESULT([Building Package on ${OS}
@@ -332,7 +336,7 @@
dnl Initialize automake stuff
AC_CONFIG_AUX_DIR(scripts)
+AC_CONFIG_MACRO_DIR([scripts])
- AC_CONFIG_HEADERS(config.h)
+ AC_CONFIG_HEADERS(osip-config.h)
AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
AM_ACLOCAL_INCLUDE(scripts)
@@ -119,15 +120,8 @@ AC_ARG_ENABLE(minisize,
@@ -341,16 +345,18 @@
dnl compile with mt support
-if test "x$enable_mt" = "xyes"; then
- if test "x$enable_pthread" = "xyes"; then
- SIP_FSM_FLAGS="-DOSIP_MT -DHAVE_PTHREAD"
-- dnl FSM_LIB="-lpthread"
+ SIP_FSM_FLAGS="-DHAVE_PTHREAD"
- else
-- SIP_FSM_FLAGS="-DOSIP_MT"
ACX_PTHREAD()
- fi
+-else
+- SIP_FSM_FLAGS="-DOSIP_MONOTHREAD"
-fi
AM_CONDITIONAL(BUILD_MT, test x$enable_mt = xyes)
+Index: Makefile.am
+===================================================================
--- Makefile.am.orig
+++ Makefile.am
@@ -1,3 +1,4 @@
@@ -358,6 +364,8 @@
EXTRA_DIST = README BUGS FEATURES HISTORY autogen.sh libosip2.pc.in
SUBDIRS = include src scripts help platform
+Index: src/osip2/Makefile.am
+===================================================================
--- src/osip2/Makefile.am.orig
+++ src/osip2/Makefile.am
@@ -15,9 +15,12 @@ endif
++++++ libosip2-3.5.0-pthread.patch -> libosip2-4.0.0.patch ++++++
--- /work/SRC/openSUSE:Factory/libosip2/libosip2-3.5.0-pthread.patch 2011-09-23 02:09:12.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libosip2.new/libosip2-4.0.0.patch 2013-06-26 20:28:31.000000000 +0200
@@ -1,377 +1,21 @@
---- scripts/acx_pthread.m4.orig
-+++ scripts/acx_pthread.m4
-@@ -1,45 +1,88 @@
--dnl @synopsis ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
--dnl
--dnl This macro figures out how to build C programs using POSIX
--dnl threads. It sets the PTHREAD_LIBS output variable to the threads
--dnl library and linker flags, and the PTHREAD_CFLAGS output variable
--dnl to any special C compiler flags that are needed. (The user can also
--dnl force certain compiler flags/libs to be tested by setting these
--dnl environment variables.)
--dnl
--dnl Also sets PTHREAD_CC to any special C compiler that is needed for
--dnl multi-threaded programs (defaults to the value of CC otherwise).
--dnl (This is necessary on AIX to use the special cc_r compiler alias.)
--dnl
--dnl If you are only building threads programs, you may wish to
--dnl use these variables in your default LIBS, CFLAGS, and CC:
--dnl
--dnl LIBS="$PTHREAD_LIBS $LIBS"
--dnl CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
--dnl CC="$PTHREAD_CC"
--dnl
--dnl In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute
--dnl constant has a nonstandard name, defines PTHREAD_CREATE_JOINABLE
--dnl to that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
--dnl
--dnl ACTION-IF-FOUND is a list of shell commands to run if a threads
--dnl library is found, and ACTION-IF-NOT-FOUND is a list of commands
--dnl to run it if it is not found. If ACTION-IF-FOUND is not specified,
--dnl the default action will define HAVE_PTHREAD.
--dnl
--dnl Please let the authors know if this macro fails on any platform,
--dnl or if you have any other suggestions or comments. This macro was
--dnl based on work by SGJ on autoconf scripts for FFTW (www.fftw.org)
--dnl (with help from M. Frigo), as well as ac_pthread and hb_pthread
--dnl macros posted by AFC to the autoconf macro repository. We are also
--dnl grateful for the helpful feedback of numerous users.
--dnl
--dnl @version $Id: acx_pthread.m4,v 1.1 2002-06-04 14:20:50 aymeric Exp $
--dnl @author Steven G. Johnson and Alejandro Forero Cuervo
-+# ===========================================================================
-+# http://www.gnu.org/software/autoconf-archive/ax_pthread.html
-+# ===========================================================================
-+#
-+# SYNOPSIS
-+#
-+# AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-+#
-+# DESCRIPTION
-+#
-+# This macro figures out how to build C programs using POSIX threads. It
-+# sets the PTHREAD_LIBS output variable to the threads library and linker
-+# flags, and the PTHREAD_CFLAGS output variable to any special C compiler
-+# flags that are needed. (The user can also force certain compiler
-+# flags/libs to be tested by setting these environment variables.)
-+#
-+# Also sets PTHREAD_CC to any special C compiler that is needed for
-+# multi-threaded programs (defaults to the value of CC otherwise). (This
-+# is necessary on AIX to use the special cc_r compiler alias.)
-+#
-+# NOTE: You are assumed to not only compile your program with these flags,
-+# but also link it with them as well. e.g. you should link with
-+# $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
-+#
-+# If you are only building threads programs, you may wish to use these
-+# variables in your default LIBS, CFLAGS, and CC:
-+#
-+# LIBS="$PTHREAD_LIBS $LIBS"
-+# CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+# CC="$PTHREAD_CC"
-+#
-+# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
-+# has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
-+# (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
-+#
-+# ACTION-IF-FOUND is a list of shell commands to run if a threads library
-+# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
-+# is not found. If ACTION-IF-FOUND is not specified, the default action
-+# will define HAVE_PTHREAD.
-+#
-+# Please let the authors know if this macro fails on any platform, or if
-+# you have any other suggestions or comments. This macro was based on work
-+# by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
-+# from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
-+# Alejandro Forero Cuervo to the autoconf macro repository. We are also
-+# grateful for the helpful feedback of numerous users.
-+#
-+# LICENSE
-+#
-+# Copyright (c) 2008 Steven G. Johnson
-+#
-+# This program is free software: you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License as published by the
-+# Free Software Foundation, either version 3 of the License, or (at your
-+# option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-+# Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License along
-+# with this program. If not, see http://www.gnu.org/licenses/.
-+#
-+# As a special exception, the respective Autoconf Macro's copyright owner
-+# gives unlimited permission to copy, distribute and modify the configure
-+# scripts that are the output of Autoconf when processing the Macro. You
-+# need not follow the terms of the GNU General Public License when using
-+# or distributing such scripts, even though portions of the text of the
-+# Macro appear in them. The GNU General Public License (GPL) does govern
-+# all other use of the material that constitutes the Autoconf Macro.
-+#
-+# This special exception to the GPL applies to versions of the Autoconf
-+# Macro released by the Autoconf Archive. When you make and distribute a
-+# modified version of the Autoconf Macro, you may extend this special
-+# exception to the GPL to apply to your modified version as well.
-
--AC_DEFUN([ACX_PTHREAD], [
-+#serial 11
+Index: src/osip2/port_sema.c
+===================================================================
+--- src/osip2/port_sema.c.orig
++++ src/osip2/port_sema.c
+@@ -297,6 +297,16 @@ osip_sem_trywait (struct osip_sem *_sem)
+ #elif defined (HAVE_SYS_SEM_H)
+ /* support for semctl, semop, semget */
+
++#ifdef _SEM_SEMUN_UNDEFINED
++union semun
++{
++ int val; /* value for SETVAL */
++ struct semid_ds *buf; /* buffer for IPC_STAT & IPC_SET */
++ unsigned short int *array; /* array for GETALL & SETALL */
++ struct seminfo *__buf; /* buffer for IPC_INFO */
++};
++#endif
+
-+AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
-+AC_DEFUN([AX_PTHREAD], [
- AC_REQUIRE([AC_CANONICAL_HOST])
--acx_pthread_ok=no
-+AC_LANG_SAVE
-+AC_LANG_C
-+ax_pthread_ok=no
-
- # We used to check for pthread.h first, but this fails if pthread.h
- # requires special compiler flags (e.g. on True64 or Sequent).
-@@ -54,9 +97,9 @@ if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS"
- save_LIBS="$LIBS"
- LIBS="$PTHREAD_LIBS $LIBS"
- AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
-- AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes)
-- AC_MSG_RESULT($acx_pthread_ok)
-- if test x"$acx_pthread_ok" = xno; then
-+ AC_TRY_LINK_FUNC(pthread_join, ax_pthread_ok=yes)
-+ AC_MSG_RESULT($ax_pthread_ok)
-+ if test x"$ax_pthread_ok" = xno; then
- PTHREAD_LIBS=""
- PTHREAD_CFLAGS=""
- fi
-@@ -71,9 +114,10 @@ fi
-
- # Create a list of thread flags to try. Items starting with a "-" are
- # C compiler flags, and other items are library names, except for "none"
--# which indicates that we try without any flags at all.
-+# which indicates that we try without any flags at all, and "pthread-config"
-+# which is a program returning the flags for the Pth emulation library.
-
--acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt"
-+ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
-
- # The ordering *is* (sometimes) important. Some notes on the
- # individual items follow:
-@@ -90,26 +134,32 @@ acx_pthread_flags="pthreads none -Kthrea
- # -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
- # doesn't hurt to check since this sometimes defines pthreads too;
- # also defines -D_REENTRANT)
-+# ... -mt is also the pthreads flag for HP/aCC
- # pthread: Linux, etcetera
- # --thread-safe: KAI C++
-+# pthread-config: use pthread-config program (for GNU Pth library)
-
- case "${host_cpu}-${host_os}" in
- *solaris*)
-
- # On Solaris (at least, for some versions), libc contains stubbed
- # (non-functional) versions of the pthreads routines, so link-based
-- # tests will erroneously succeed. (We need to link with -pthread or
-+ # tests will erroneously succeed. (We need to link with -pthreads/-mt/
- # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather
- # a function called by this macro, so we could check for that, but
- # who knows whether they'll stub that too in a future libc.) So,
- # we'll just look for -pthreads and -lpthread first:
-
-- acx_pthread_flags="-pthread -pthreads pthread -mt $acx_pthread_flags"
-+ ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
- ;;
-+
-+ *-darwin*)
-+ ax_pthread_flags="-pthread $ax_pthread_flags"
-+ ;;
- esac
-
--if test x"$acx_pthread_ok" = xno; then
--for flag in $acx_pthread_flags; do
-+if test x"$ax_pthread_ok" = xno; then
-+for flag in $ax_pthread_flags; do
-
- case $flag in
- none)
-@@ -121,6 +171,13 @@ for flag in $acx_pthread_flags; do
- PTHREAD_CFLAGS="$flag"
- ;;
-
-+ pthread-config)
-+ AC_CHECK_PROG(ax_pthread_config, pthread-config, yes, no)
-+ if test x"$ax_pthread_config" = xno; then continue; fi
-+ PTHREAD_CFLAGS="`pthread-config --cflags`"
-+ PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
-+ ;;
-+
- *)
- AC_MSG_CHECKING([for the pthreads library -l$flag])
- PTHREAD_LIBS="-l$flag"
-@@ -141,17 +198,22 @@ for flag in $acx_pthread_flags; do
- # pthread_cleanup_push because it is one of the few pthread
- # functions on Solaris that doesn't have a non-functional libc stub.
- # We try pthread_create on general principles.
-- AC_TRY_LINK([#include ],
-- [pthread_t th; pthread_join(th, 0);
-- pthread_attr_init(0); pthread_cleanup_push(0, 0);
-- pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
-- [acx_pthread_ok=yes])
-+ AC_TRY_LINK([#include
-+ static void routine(void* a) {a=0;}
-+ static void* start_routine(void* a) {return a;}],
-+ [pthread_t th; pthread_attr_t attr;
-+ pthread_create(&th,0,start_routine,0);
-+ pthread_join(th, 0);
-+ pthread_attr_init(&attr);
-+ pthread_cleanup_push(routine, 0);
-+ pthread_cleanup_pop(0); ],
-+ [ax_pthread_ok=yes])
-
- LIBS="$save_LIBS"
- CFLAGS="$save_CFLAGS"
-
-- AC_MSG_RESULT($acx_pthread_ok)
-- if test "x$acx_pthread_ok" = xyes; then
-+ AC_MSG_RESULT($ax_pthread_ok)
-+ if test "x$ax_pthread_ok" = xyes; then
- break;
- fi
-
-@@ -161,49 +223,46 @@ done
- fi
-
- # Various other checks:
--if test "x$acx_pthread_ok" = xyes; then
-+if test "x$ax_pthread_ok" = xyes; then
- save_LIBS="$LIBS"
- LIBS="$PTHREAD_LIBS $LIBS"
- save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-
-- # Detect AIX lossage: threads are created detached by default
-- # and the JOINABLE attribute has a nonstandard name (UNDETACHED).
-- AC_MSG_CHECKING([for joinable pthread attribute])
-- AC_TRY_LINK([#include ],
-- [int attr=PTHREAD_CREATE_JOINABLE;],
-- ok=PTHREAD_CREATE_JOINABLE, ok=unknown)
-- if test x"$ok" = xunknown; then
-- AC_TRY_LINK([#include ],
-- [int attr=PTHREAD_CREATE_UNDETACHED;],
-- ok=PTHREAD_CREATE_UNDETACHED, ok=unknown)
-- fi
-- if test x"$ok" != xPTHREAD_CREATE_JOINABLE; then
-- AC_DEFINE(PTHREAD_CREATE_JOINABLE, $ok,
-- [Define to the necessary symbol if this constant
-- uses a non-standard name on your system.])
-- fi
-- AC_MSG_RESULT(${ok})
-- if test x"$ok" = xunknown; then
-- AC_MSG_WARN([we do not know how to create joinable pthreads])
-+ # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
-+ AC_MSG_CHECKING([for joinable pthread attribute])
-+ attr_name=unknown
-+ for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
-+ AC_TRY_LINK([#include ], [int attr=$attr; return attr;],
-+ [attr_name=$attr; break])
-+ done
-+ AC_MSG_RESULT($attr_name)
-+ if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
-+ AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name,
-+ [Define to necessary symbol if this constant
-+ uses a non-standard name on your system.])
- fi
-
- AC_MSG_CHECKING([if more special flags are required for pthreads])
- flag=no
- case "${host_cpu}-${host_os}" in
-- *-aix* | *-freebsd*) flag="-D_THREAD_SAFE";;
-- *solaris* | alpha*-osf*) flag="-D_REENTRANT";;
-+ *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
-+ *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
- esac
- AC_MSG_RESULT(${flag})
- if test "x$flag" != xno; then
-- PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
-+ PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
- fi
-
- LIBS="$save_LIBS"
- CFLAGS="$save_CFLAGS"
-
-- # More AIX lossage: must compile with cc_r
-- AC_CHECK_PROG(PTHREAD_CC, cc_r, cc_r, ${CC})
-+ # More AIX lossage: must compile with xlc_r or cc_r
-+ if test x"$GCC" != xyes; then
-+ AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC})
-+ else
-+ PTHREAD_CC=$CC
-+ fi
- else
- PTHREAD_CC="$CC"
- fi
-@@ -213,12 +272,12 @@ AC_SUBST(PTHREAD_CFLAGS)
- AC_SUBST(PTHREAD_CC)
-
- # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
--if test x"$acx_pthread_ok" = xyes; then
-+if test x"$ax_pthread_ok" = xyes; then
- ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])
- :
- else
-- acx_pthread_ok=no
-+ ax_pthread_ok=no
- $2
- fi
--
--])dnl ACX_PTHREAD
-+AC_LANG_RESTORE
-+])dnl AX_PTHREAD
---- configure.in.orig
-+++ configure.in
-@@ -42,6 +42,7 @@ AC_MSG_RESULT([Building Package on ${OS}
- dnl *********************************************************************
- dnl Initialize automake stuff
- AC_CONFIG_AUX_DIR(scripts)
-+AC_CONFIG_MACRO_DIR([scripts])
- AC_CONFIG_HEADERS(config.h)
- AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
- AM_ACLOCAL_INCLUDE(scripts)
-@@ -119,15 +120,8 @@ AC_ARG_ENABLE(minisize,
- enable_minisize=$enableval,enable_minisize="no")
-
- dnl compile with mt support
--if test "x$enable_mt" = "xyes"; then
-- if test "x$enable_pthread" = "xyes"; then
- SIP_FSM_FLAGS="-DOSIP_MT -DHAVE_PTHREAD"
-- dnl FSM_LIB="-lpthread"
-- else
-- SIP_FSM_FLAGS="-DOSIP_MT"
- ACX_PTHREAD()
-- fi
--fi
-
- AM_CONDITIONAL(BUILD_MT, test x$enable_mt = xyes)
-
---- Makefile.am.orig
-+++ Makefile.am
-@@ -1,3 +1,4 @@
-+ACLOCAL_AMFLAGS = -I scripts
- EXTRA_DIST = README BUGS FEATURES HISTORY autogen.sh libosip2.pc.in
-
- SUBDIRS = include src scripts help platform
---- src/osip2/Makefile.am.orig
-+++ src/osip2/Makefile.am
-@@ -15,9 +15,12 @@ endif
-
- libosip2_la_LDFLAGS = -version-info $(LIBOSIP_SO_VERSION) \
- $(FSM_LIB) $(EXTRA_LIB) ../osipparser2/libosipparser2.la -no-undefined
--
-+if BUILD_MT
-+#for platforms not supporting -pthread
-+libosip2_la_LIBADD = $(PTHREAD_LIBS)
-+endif
-
- INCLUDES = -I$(top_srcdir)/include
--AM_CFLAGS = $(SIP_CFLAGS) $(SIP_FSM_FLAGS) $(SIP_EXTRA_FLAGS)
-+AM_CFLAGS = $(PTHREAD_CFLAGS) $(SIP_CFLAGS) $(SIP_FSM_FLAGS) $(SIP_EXTRA_FLAGS)
-
+ #define SEM_PERM 0600
+ struct osip_sem *
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org