--- /dev/null
+diff -ru --ignore-matching-lines='^#' twinkle-0.3.2.orig/Makefile.in twinkle-0.3.2/Makefile.in
+--- twinkle-0.3.2.orig/Makefile.in 2005-10-22 22:09:43.000000000 +1000
++++ twinkle-0.3.2/Makefile.in 2005-11-07 21:32:48.000000000 +1100
+@@ -223,6 +223,7 @@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+diff -ru --ignore-matching-lines='^#' twinkle-0.3.2.orig/aclocal.m4 twinkle-0.3.2/aclocal.m4
+--- twinkle-0.3.2.orig/aclocal.m4 2005-10-22 22:09:29.000000000 +1000
++++ twinkle-0.3.2/aclocal.m4 2005-11-07 21:32:38.000000000 +1100
+@@ -239,63 +239,120 @@
+ dnl #undef HAVE_FOX_FX_H
+ dnl END ACCONFIG
+
++# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
++#
++# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
++#
++# 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 2 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, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
+
+-dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
+-dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
+-dnl also defines GSTUFF_PKG_ERRORS on error
+-AC_DEFUN([PKG_CHECK_MODULES], [
+- succeeded=no
+-
+- if test -z "$PKG_CONFIG"; then
+- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+- fi
+-
+- if test "$PKG_CONFIG" = "no" ; then
+- echo "*** The pkg-config script could not be found. Make sure it is"
+- echo "*** in your path, or set the PKG_CONFIG environment variable"
+- echo "*** to the full path to pkg-config."
+- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+- else
+- PKG_CONFIG_MIN_VERSION=0.9.0
+- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+- AC_MSG_CHECKING(for $2)
+-
+- if $PKG_CONFIG --exists "$2" ; then
+- AC_MSG_RESULT(yes)
+- succeeded=yes
+-
+- AC_MSG_CHECKING($1_CFLAGS)
+- $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
+- AC_MSG_RESULT($$1_CFLAGS)
+-
+- AC_MSG_CHECKING($1_LIBS)
+- $1_LIBS=`$PKG_CONFIG --libs "$2"`
+- AC_MSG_RESULT($$1_LIBS)
+- else
+- $1_CFLAGS=""
+- $1_LIBS=""
+- ## If we have a custom action on failure, don't print errors, but
+- ## do set a variable so people can do so.
+- $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+- ifelse([$4], ,echo $$1_PKG_ERRORS,)
+- fi
+-
+- AC_SUBST($1_CFLAGS)
+- AC_SUBST($1_LIBS)
+- else
+- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+- echo "*** See http://www.freedesktop.org/software/pkgconfig"
+- fi
+- fi
+-
+- if test $succeeded = yes; then
+- ifelse([$3], , :, [$3])
+- else
+- ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
+- fi
+-])
+-
++# PKG_PROG_PKG_CONFIG([MIN-VERSION])
++# ----------------------------------
++AC_DEFUN([PKG_PROG_PKG_CONFIG],
++[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
++m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
++fi
++if test -n "$PKG_CONFIG"; then
++ _pkg_min_version=m4_ifval([$1], [$1], [0.9.0])
++ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++ AC_MSG_RESULT([yes])
++ else
++ AC_MSG_RESULT([no])
++ PKG_CONFIG=""
++ fi
++
++fi[]dnl
++])# PKG_PROG_PKG_CONFIG
++
++# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
++# ---------------------------------------------
++m4_define([_PKG_CONFIG],
++[if test "x$ac_cv_env_[]$1[]_set" = "xset"; then
++ pkg_cv_[]$1=$ac_cv_env_[]$1[]_value
++elif test -n "$PKG_CONFIG"; then
++ if AC_RUN_LOG([$PKG_CONFIG --exists "$3" >/dev/null 2>&1]); then
++ pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
++ else
++ pkg_failed=yes
++ fi
++else
++ pkg_failed=untried
++fi[]dnl
++])# _PKG_CONFIG
++
++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
++# [ACTION-IF-NOT-FOUND])
++#
++#
++# Note that if there is a possibility the first call to
++# PKG_CHECK_MODULES might not happen, you should be sure to include an
++# explicit call to PKG_PROG_PKG_CONFIG in your configure.in
++#
++#
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_MODULES],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
++
++pkg_failed=no
++AC_CACHE_CHECK([for $1][_CFLAGS], [pkg_cv_][$1][_CFLAGS],
++ [_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])])
++AC_CACHE_CHECK([for $1][_LIBS], [pkg_cv_][$1][_LIBS],
++ [_PKG_CONFIG([$1][_LIBS], [libs], [$2])])
++
++if test $pkg_failed = yes; then
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
++ # Put the nasty error message in config.log where it belongs
++ echo "$$1[]_PKG_ERRORS" 1>&AS_MESSAGE_LOG_FD
++
++ ifelse([$4], , [AC_MSG_ERROR(dnl
++[Package requirements ($2) were not met.
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
++to avoid the need to call pkg-config. See the pkg-config man page for
++more details.])],
++ [$4])
++elif test $pkg_failed = untried; then
++ ifelse([$4], , [AC_MSG_FAILURE(dnl
++[The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
++to avoid the need to call pkg-config. See the pkg-config man page for
++more details.
+
++To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
++ [$4])
++else
++ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
++ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
++ ifelse([$3], , :, [$3])
++fi[]dnl
++])# PKG_CHECK_MODULES
+
+ # Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+ #
+@@ -314,7 +371,7 @@
+ # Call AM_AUTOMAKE_VERSION so it can be traced.
+ # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+- [AM_AUTOMAKE_VERSION([1.9.5])])
++ [AM_AUTOMAKE_VERSION([1.9.6])])
+
+ # AM_AUX_DIR_EXPAND -*- Autoconf -*-
+
+Only in twinkle-0.3.2: autom4te.cache
+diff -ru --ignore-matching-lines='^#' twinkle-0.3.2.orig/src/Makefile.in twinkle-0.3.2/src/Makefile.in
+--- twinkle-0.3.2.orig/src/Makefile.in 2005-10-22 22:09:40.000000000 +1000
++++ twinkle-0.3.2/src/Makefile.in 2005-11-07 21:32:45.000000000 +1100
+@@ -15,8 +15,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libtwinkle_a_SOURCES) $(twinkle_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -241,6 +239,7 @@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+diff -ru --ignore-matching-lines='^#' twinkle-0.3.2.orig/src/audio/Makefile.in twinkle-0.3.2/src/audio/Makefile.in
+--- twinkle-0.3.2.orig/src/audio/Makefile.in 2005-10-22 22:09:41.000000000 +1000
++++ twinkle-0.3.2/src/audio/Makefile.in 2005-11-07 21:32:45.000000000 +1100
+@@ -14,8 +14,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libaudio_a_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -222,6 +220,7 @@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+diff -ru --ignore-matching-lines='^#' twinkle-0.3.2.orig/src/audio/gsm/Makefile.in twinkle-0.3.2/src/audio/gsm/Makefile.in
+--- twinkle-0.3.2.orig/src/audio/gsm/Makefile.in 2005-10-22 22:09:41.000000000 +1000
++++ twinkle-0.3.2/src/audio/gsm/Makefile.in 2005-11-07 21:32:46.000000000 +1100
+@@ -14,8 +14,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libgsm_a_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -217,6 +215,7 @@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+diff -ru --ignore-matching-lines='^#' twinkle-0.3.2.orig/src/audits/Makefile.in twinkle-0.3.2/src/audits/Makefile.in
+--- twinkle-0.3.2.orig/src/audits/Makefile.in 2005-10-22 22:09:41.000000000 +1000
++++ twinkle-0.3.2/src/audits/Makefile.in 2005-11-07 21:32:46.000000000 +1100
+@@ -14,8 +14,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libaudits_a_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -210,6 +208,7 @@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+diff -ru --ignore-matching-lines='^#' twinkle-0.3.2.orig/src/parser/Makefile.am twinkle-0.3.2/src/parser/Makefile.am
+--- twinkle-0.3.2.orig/src/parser/Makefile.am 2005-10-21 04:15:07.000000000 +1000
++++ twinkle-0.3.2/src/parser/Makefile.am 2005-11-07 21:31:36.000000000 +1100
+@@ -7,7 +7,7 @@
+ # With the -O2 flag g++ crashes. The -O2 flag is stripped from
+ # CXXFLAGS by configure.
+
+-CXXFLAGS = @PARSER_CXXFLAGS@
++# CXXFLAGS = @PARSER_CXXFLAGS@
+
+ # This target is only for testing the parser in isolation
+ # noinst_PROGRAMS = sipparse
+diff -ru --ignore-matching-lines='^#' twinkle-0.3.2.orig/src/parser/Makefile.in twinkle-0.3.2/src/parser/Makefile.in
+--- twinkle-0.3.2.orig/src/parser/Makefile.in 2005-10-22 22:09:41.000000000 +1000
++++ twinkle-0.3.2/src/parser/Makefile.in 2005-11-07 21:32:47.000000000 +1100
+@@ -14,8 +14,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libsipparser_a_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -124,11 +122,7 @@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+-
+-# The output of bison cannot be compiled with the -O2 flag.
+-# With the -O2 flag g++ crashes. The -O2 flag is stripped from
+-# CXXFLAGS by configure.
+-CXXFLAGS = @PARSER_CXXFLAGS@
++CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DCOPIDL = @DCOPIDL@
+ DCOPIDL2CPP = @DCOPIDL2CPP@
+@@ -246,6 +240,7 @@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -316,6 +311,12 @@
+ AM_YFLAGS = -d
+ AM_LFLAGS = -is
+
++# The output of bison cannot be compiled with the -O2 flag.
++# With the -O2 flag g++ crashes. The -O2 flag is stripped from
++# CXXFLAGS by configure.
++
++# CXXFLAGS = @PARSER_CXXFLAGS@
++
+ # This target is only for testing the parser in isolation
+ # noinst_PROGRAMS = sipparse
+
+Only in twinkle-0.3.2/src/parser: Makefile.in.orig
+Only in twinkle-0.3.2/src/parser: Makefile.in.rej
+diff -ru --ignore-matching-lines='^#' twinkle-0.3.2.orig/src/sdp/Makefile.in twinkle-0.3.2/src/sdp/Makefile.in
+--- twinkle-0.3.2.orig/src/sdp/Makefile.in 2005-10-22 22:09:42.000000000 +1000
++++ twinkle-0.3.2/src/sdp/Makefile.in 2005-11-07 21:32:47.000000000 +1100
+@@ -14,8 +14,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libsdpparser_a_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -214,6 +212,7 @@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+diff -ru --ignore-matching-lines='^#' twinkle-0.3.2.orig/src/sockets/Makefile.in twinkle-0.3.2/src/sockets/Makefile.in
+--- twinkle-0.3.2.orig/src/sockets/Makefile.in 2005-10-22 22:09:42.000000000 +1000
++++ twinkle-0.3.2/src/sockets/Makefile.in 2005-11-07 21:32:47.000000000 +1100
+@@ -14,8 +14,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libsocket_a_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -211,6 +209,7 @@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+diff -ru --ignore-matching-lines='^#' twinkle-0.3.2.orig/src/stun/Makefile.in twinkle-0.3.2/src/stun/Makefile.in
+--- twinkle-0.3.2.orig/src/stun/Makefile.in 2005-10-22 22:09:42.000000000 +1000
++++ twinkle-0.3.2/src/stun/Makefile.in 2005-11-07 21:32:48.000000000 +1100
+@@ -14,8 +14,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libstun_a_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -211,6 +209,7 @@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+diff -ru --ignore-matching-lines='^#' twinkle-0.3.2.orig/src/threads/Makefile.in twinkle-0.3.2/src/threads/Makefile.in
+--- twinkle-0.3.2.orig/src/threads/Makefile.in 2005-10-22 22:09:42.000000000 +1000
++++ twinkle-0.3.2/src/threads/Makefile.in 2005-11-07 21:32:48.000000000 +1100
+@@ -14,8 +14,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libthread_a_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -211,6 +209,7 @@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
projects / gentoo.git / commitdiff