[Pkg-voip-commits] [twinkle] 49/73: Update patches
Peter Colberg
pc-guest at moszumanska.debian.org
Wed Jan 6 00:31:52 UTC 2016
This is an automated email from the git hooks/post-receive script.
pc-guest pushed a commit to branch master
in repository twinkle.
commit f87a2b24ade223486c0891e58d815f42664c730f
Author: Peter Colberg <peter at colberg.org>
Date: Mon Dec 28 23:33:53 2015 -0500
Update patches
---
debian/patches/boost_regex-mt.patch | 17 -
.../desktop-entry-contains-encoding-key.patch | 15 +-
debian/patches/libgsm.patch | 258 +++-
debian/patches/localetime_r_conflict.diff | 13 -
debian/patches/newer-automake.diff | 1430 --------------------
debian/patches/newer-libccrtp.diff | 22 -
debian/patches/no-qt.diff | 321 -----
debian/patches/series | 6 -
debian/patches/vsnprintf_incompatibility.diff | 102 --
9 files changed, 202 insertions(+), 1982 deletions(-)
diff --git a/debian/patches/boost_regex-mt.patch b/debian/patches/boost_regex-mt.patch
deleted file mode 100644
index 162a308..0000000
--- a/debian/patches/boost_regex-mt.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: twinkle-1.4.2/configure.in
-===================================================================
---- twinkle-1.4.2.orig/configure.in 2013-07-25 11:07:54.160534950 -0400
-+++ twinkle-1.4.2/configure.in 2013-07-25 11:07:59.000000000 -0400
-@@ -294,7 +294,11 @@
- AC_CHECK_LIB(boost_regex-gcc, main, [
- LIBS="-lboost_regex-gcc $LIBS"
- echo "LIBS += -lboost_regex-gcc" >> $QT_INCL_PRO],
-- [AC_MSG_ERROR([libboost_regex library is missing (boost package).])])])
-+ [
-+ AC_CHECK_LIB(boost_regex-mt, main, [
-+ LIBS="-lboost_regex-mt $LIBS"
-+ echo "LIBS += -lboost_regex-mt" >> $QT_INCL_PRO],
-+ [AC_MSG_ERROR([libboost_regex library is missing (boost package).])])])])
-
- ms_CHECK_LRELEASE()
-
diff --git a/debian/patches/desktop-entry-contains-encoding-key.patch b/debian/patches/desktop-entry-contains-encoding-key.patch
index 7254aec..ce03775 100644
--- a/debian/patches/desktop-entry-contains-encoding-key.patch
+++ b/debian/patches/desktop-entry-contains-encoding-key.patch
@@ -1,7 +1,14 @@
-Index: twinkle-1.4.2/twinkle.desktop.in
-===================================================================
---- twinkle-1.4.2.orig/twinkle.desktop.in 2013-07-25 11:07:54.216534010 -0400
-+++ twinkle-1.4.2/twinkle.desktop.in 2013-07-25 11:07:54.208534145 -0400
+Description: Remove deprecated Encoding key from desktop file
+ The Encoding key is deprecated and all strings must be encoded in UTF-8.
+ .
+ http://standards.freedesktop.org/desktop-entry-spec/1.0/apc.html
+Author: Mark Purcell <msp at debian.org>
+Forwarded: https://github.com/LubosD/twinkle/pull/37
+Last-Update: 2008-10-11
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/twinkle.desktop.in
++++ b/twinkle.desktop.in
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
diff --git a/debian/patches/libgsm.patch b/debian/patches/libgsm.patch
index 1574273..0c239c0 100644
--- a/debian/patches/libgsm.patch
+++ b/debian/patches/libgsm.patch
@@ -1,70 +1,194 @@
-Index: twinkle-1.4.2/configure.in
-===================================================================
---- twinkle-1.4.2.orig/configure.in 2013-07-25 11:07:54.264533206 -0400
-+++ twinkle-1.4.2/configure.in 2013-07-25 11:07:54.256533340 -0400
-@@ -195,22 +195,33 @@
-
- # This check does not work on all platforms
- # Check if libgsm is available
--# AC_CHECK_LIB(gsm, sf_open, [
--# AC_CHECK_HEADER(gsm.h, [],
--# [AC_MSG_ERROR([gsm header files missing (gsm.h)])])
--# AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the <libgsm> library.])
--# GSM_LIBS="-lgsm"
--# echo "LIBS += -lgsm" >> $QT_INCL_PRO
--# have_gsm="yes" ], [
--# have_gsm="no"
--# GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
--# echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO ])
--have_gsm="no"
--GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
--echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO
-+AC_CHECK_LIB(gsm, sf_open, [
-+ AC_CHECK_HEADER(gsm.h, [],
-+ [AC_MSG_ERROR([gsm header files missing (gsm.h)])])
-+ AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the <libgsm> library.])
-+ GSM_LIBS="-lgsm"
-+ echo "LIBS += -lgsm" >> $QT_INCL_PRO
-+ have_gsm="yes" ], [
-+ have_gsm="no"
-+ GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
-+ echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO ])
-+#have_gsm="no"
-+#GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
-+#echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO
-
- AC_SUBST(GSM_LIBS)
-
-+# Check if libgsm is available
-+AC_CHECK_LIB(gsm, sf_open, [
-+ AC_CHECK_HEADER(gsm.h, [],
-+ [AC_MSG_ERROR([gsm header files missing (gsm.h)])])
-+ AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the <libgsm> library.])
-+ LIBS="-lgsm $LIBS"
-+ echo "LIBS += -lgsm" >> $QT_INCL_PRO
-+ have_gsm="yes" ], [
-+ have_gsm="no"
-+ echo "$(top_builddir)/src/audio/gsm/libgsm.a" >> $QT_INCL_PRO ])
+Description: Build against packaged gsm library
+ This patch adds a cmake option WITH_GSM that supports building
+ twinkle against the packaged gsm library in Debian.
+Author: Peter Colberg <peter at colberg.org>
+Forwarded: https://github.com/LubosD/twinkle/pull/38
+Last-Update: 2015-12-28
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,6 +14,7 @@ OPTION(WITH_DIAMONDCARD "Enable Diamondcard integration" OFF)
+ OPTION(WITH_QT4 "Enable Qt 4 GUI" OFF)
+ OPTION(WITH_QT5 "Enable Qt 5 GUI" OFF)
+ OPTION(WITH_G729 "Enable G.729A support" OFF)
++OPTION(WITH_GSM "Use external GSM library" OFF)
+
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
+
+@@ -114,6 +115,18 @@ if (WITH_G729)
+ endif (G729_FOUND)
+ endif (WITH_G729)
+
++if (WITH_GSM)
++ find_package(Gsm)
++
++ if (GSM_FOUND)
++ message(STATUS "gsm OK")
++ set(HAVE_GSM TRUE)
++
++ include_directories(${GSM_INCLUDE_DIR})
++ else (GSM_FOUND)
++ message(FATAL_ERROR "gsm not found!")
++ endif (GSM_FOUND)
++endif (WITH_GSM)
+
+ check_include_file(unistd.h HAVE_UNISTD_H)
+ check_include_file(linux/types.h HAVE_LINUX_TYPES_H)
+new file mode 100644
+--- /dev/null
++++ b/cmake/FindGsm.cmake
+@@ -0,0 +1,17 @@
++FIND_PATH(GSM_INCLUDE_DIR gsm/gsm.h)
++FIND_LIBRARY(GSM_LIBRARY NAMES gsm)
++
++IF(GSM_INCLUDE_DIR AND GSM_LIBRARY)
++ SET(GSM_FOUND TRUE)
++ENDIF(GSM_INCLUDE_DIR AND GSM_LIBRARY)
++
++IF(GSM_FOUND)
++ IF (NOT Gsm_FIND_QUIETLY)
++ MESSAGE(STATUS "Found gsm includes: ${GSM_INCLUDE_DIR}/gsm/config.h")
++ MESSAGE(STATUS "Found gsm library: ${GSM_LIBRARY}")
++ ENDIF (NOT Gsm_FIND_QUIETLY)
++ELSE(GSM_FOUND)
++ IF (Gsm_FIND_REQUIRED)
++ MESSAGE(FATAL_ERROR "Could NOT find gsm development files")
++ ENDIF (Gsm_FIND_REQUIRED)
++ENDIF(GSM_FOUND)
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -3,7 +3,9 @@ project(libtwinkle)
+ include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
+
+ add_subdirectory(audio)
+-add_subdirectory(audio/gsm/src)
++if (NOT WITH_GSM)
++ add_subdirectory(audio/gsm/src)
++endif (NOT WITH_GSM)
+ add_subdirectory(audits)
+ add_subdirectory(im)
+ add_subdirectory(mwi)
+@@ -54,11 +56,9 @@ set(LIBTWINKLE_SRCS
+
+ add_library(libtwinkle OBJECT ${LIBTWINKLE_SRCS})
+
+-add_executable(twinkle-console
+- main.cpp
++set(twinkle_OBJS
+ $<TARGET_OBJECTS:libtwinkle>
+ $<TARGET_OBJECTS:libtwinkle-audio>
+- $<TARGET_OBJECTS:libtwinkle-gsm>
+ $<TARGET_OBJECTS:libtwinkle-audits>
+ $<TARGET_OBJECTS:libtwinkle-im>
+ $<TARGET_OBJECTS:libtwinkle-mwi>
+@@ -71,15 +71,40 @@ add_executable(twinkle-console
+ $<TARGET_OBJECTS:libtwinkle-threads>
+ $<TARGET_OBJECTS:libtwinkle-utils>
+ )
++if (NOT WITH_GSM)
++ list(APPEND twinkle_OBJS $<TARGET_OBJECTS:libtwinkle-gsm>)
++endif (NOT WITH_GSM)
+
- # Check if ALSA is available
- AC_CHECK_LIB(asound, main, [
- AC_CHECK_HEADER(alsa/asoundlib.h, [],
-@@ -348,3 +359,4 @@
- AC_MSG_RESULT([Speex: $have_speex])
- AC_MSG_RESULT([iLBC: $have_ilbc])
- AC_MSG_RESULT([ZRTP: $have_zrtp])
-+AC_MSG_RESULT([Libgsm dynamic link: $have_gsm])
-Index: twinkle-1.4.2/src/twinkle_config.h.in
-===================================================================
---- twinkle-1.4.2.orig/src/twinkle_config.h.in 2013-07-25 11:07:54.264533206 -0400
-+++ twinkle-1.4.2/src/twinkle_config.h.in 2013-07-25 11:07:54.256533340 -0400
-@@ -19,6 +19,9 @@
- /* Define to 1 if you have the <history.h> header file. */
- #undef HAVE_HISTORY_H
-
-+/* Define to 1 if you have the <libgsm> library. */
-+#undef HAVE_GSM
++add_executable(twinkle-console
++ main.cpp
++ ${twinkle_OBJS}
++)
+
- /* Define to 1 if you have the <ilbc> library. */
- #undef HAVE_ILBC
++set(twinkle_LIBS
++ -lpthread
++ -lresolv
++ ${LibMagic_LIBRARY}
++ ${LIBXML2_LIBRARIES}
++ ${Readline_LIBRARY}
++ ${ILBC_LIBRARIES}
++ ${SPEEX_LIBRARIES}
++ ${ZRTPCPP_LIBRARIES}
++ ${CCRTP_LIBRARIES}
++ ${COMMONCPP_LIBRARIES}
++ ${UCOMMON_LIBRARIES}
++ ${LIBSNDFILE_LIBRARY}
++ ${ALSA_LIBRARY}
++ ${G729_LIBRARY}
++)
++if (WITH_GSM)
++ list(APPEND twinkle_LIBS ${GSM_LIBRARY})
++endif (WITH_GSM)
+
+ if (WITH_QT4 OR WITH_QT5)
+ add_subdirectory(gui)
+ endif (WITH_QT4 OR WITH_QT5)
+
+-target_link_libraries(twinkle-console -lpthread -lresolv ${LibMagic_LIBRARY} ${LIBXML2_LIBRARIES}
+- ${Readline_LIBRARY} ${ILBC_LIBRARIES} ${SPEEX_LIBRARIES} ${ZRTPCPP_LIBRARIES}
+- ${CCRTP_LIBRARIES} ${COMMONCPP_LIBRARIES} ${UCOMMON_LIBRARIES} ${LIBSNDFILE_LIBRARY}
+- ${ALSA_LIBRARY} ${G729_LIBRARY})
++target_link_libraries(twinkle-console ${twinkle_LIBS})
+
+ install(TARGETS twinkle-console DESTINATION bin)
+
+--- a/src/audio/audio_tx.h
++++ b/src/audio/audio_tx.h
+@@ -30,11 +30,16 @@
+ #include "rtp_telephone_event.h"
+ #include "user.h"
+ #include "threads/mutex.h"
+-#include "gsm/inc/gsm.h"
+ #include "audio_device.h"
+ #include "twinkle_rtp_session.h"
+ #include "twinkle_config.h"
+
++#ifdef HAVE_GSM
++#include <gsm/gsm.h>
++#else
++#include "gsm/inc/gsm.h"
++#endif
++
+ using namespace std;
+ using namespace ost;
+
+--- a/src/gui/CMakeLists.txt
++++ b/src/gui/CMakeLists.txt
+@@ -111,30 +111,14 @@ set(TWINKLE_GUI-SRCS
+ osd.cpp
+ incoming_call_popup.cpp
+
+- $<TARGET_OBJECTS:libtwinkle>
+- $<TARGET_OBJECTS:libtwinkle-audio>
+- $<TARGET_OBJECTS:libtwinkle-gsm>
+- $<TARGET_OBJECTS:libtwinkle-audits>
+- $<TARGET_OBJECTS:libtwinkle-im>
+- $<TARGET_OBJECTS:libtwinkle-mwi>
+- $<TARGET_OBJECTS:libtwinkle-parser>
+- $<TARGET_OBJECTS:libtwinkle-patterns>
+- $<TARGET_OBJECTS:libtwinkle-presence>
+- $<TARGET_OBJECTS:libtwinkle-sdp>
+- $<TARGET_OBJECTS:libtwinkle-sockets>
+- $<TARGET_OBJECTS:libtwinkle-stun>
+- $<TARGET_OBJECTS:libtwinkle-threads>
+- $<TARGET_OBJECTS:libtwinkle-utils>
++ ${twinkle_OBJS}
+ ${twinkle_UIS}
+ ${twinkle_QRC}
+ ${twinkle_LANG}
+ )
+
+ add_executable(twinkle ${TWINKLE_GUI-SRCS})
+-target_link_libraries(twinkle -lpthread -lresolv ${LibMagic_LIBRARY} ${LIBXML2_LIBRARIES}
+- ${Readline_LIBRARY} ${ILBC_LIBRARIES} ${SPEEX_LIBRARIES} ${ZRTPCPP_LIBRARIES}
+- ${CCRTP_LIBRARIES} ${COMMONCPP_LIBRARIES} ${UCOMMON_LIBRARIES} ${LIBSNDFILE_LIBRARY}
+- ${ALSA_LIBRARY} ${qt_LIBS} ${G729_LIBRARY})
++target_link_libraries(twinkle ${twinkle_LIBS} ${qt_LIBS})
+
+ install(TARGETS twinkle DESTINATION bin)
+ install(FILES ${twinkle_LANG} DESTINATION share/twinkle/lang)
+--- a/twinkle_config.h.in
++++ b/twinkle_config.h.in
+@@ -3,6 +3,7 @@
+ #cmakedefine HAVE_ILBC
+ #cmakedefine HAVE_ZRTP
+ #cmakedefine HAVE_BCG729
++#cmakedefine HAVE_GSM
+ #cmakedefine HAVE_UNISTD_H
+ #cmakedefine HAVE_LINUX_TYPES_H
diff --git a/debian/patches/localetime_r_conflict.diff b/debian/patches/localetime_r_conflict.diff
deleted file mode 100644
index 3fbc2eb..0000000
--- a/debian/patches/localetime_r_conflict.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: twinkle-1.4.2/src/log.cpp
-===================================================================
---- twinkle-1.4.2.orig/src/log.cpp 2009-01-18 09:35:28.000000000 -0500
-+++ twinkle-1.4.2/src/log.cpp 2013-07-25 11:43:08.901209713 -0400
-@@ -161,7 +161,7 @@
-
- gettimeofday(&t, NULL);
- date = t.tv_sec;
-- localtime_r(&date, &tm);
-+ ost::localtime_r(&date, &tm);
-
- *log_stream << "+++ ";
- *log_stream << tm.tm_mday;
diff --git a/debian/patches/newer-automake.diff b/debian/patches/newer-automake.diff
deleted file mode 100644
index 87aadeb..0000000
--- a/debian/patches/newer-automake.diff
+++ /dev/null
@@ -1,1430 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -1,4 +1,4 @@
--AC_INIT(src/phone.h)
-+AC_INIT(twinkle,[1.4.2])
- AC_CANONICAL_SYSTEM
- AM_CONFIG_HEADER(src/twinkle_config.h)
-
-@@ -18,7 +18,7 @@
- AC_HELP_STRING([--enable-ilbc-cpp], [your ilbc library is built for C++ instead of C]),
- [ac_cv_ilbc_cpp=$enableval], [ac_cv_ilbc_cpp=no])
-
--AM_INIT_AUTOMAKE(twinkle,"1.4.2")
-+AM_INIT_AUTOMAKE
- AC_DEFINE(VERSION_DATE,["February 25 2009"],[Version release date])
- AC_PROG_CC
- AC_PROG_CXX
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -1,7 +1,7 @@
--# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
-+
-+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
-
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -11,6 +11,15 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
-
-+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
-+m4_ifndef([AC_AUTOCONF_VERSION],
-+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
-+[m4_warning([this file was generated for autoconf 2.69.
-+You have another version of autoconf. It may work, but is not guaranteed to.
-+If you have problems, you may need to regenerate the build system entirely.
-+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-+
- dnl Copyright (C) 2000-2003 Open Source Telecom Corporation.
- dnl
- dnl This program is free software; you can redistribute it and/or modify
-@@ -239,7 +248,7 @@
- dnl #undef HAVE_FOX_FX_H
- dnl END ACCONFIG
-
--# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
-+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -249,26 +258,43 @@
- # ----------------------------
- # Automake X.Y traces this macro to ensure aclocal.m4 has been
- # generated from the m4 files accompanying Automake X.Y.
--AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-+# (This private macro should not be called outside this file.)
-+AC_DEFUN([AM_AUTOMAKE_VERSION],
-+[am__api_version='1.14'
-+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-+dnl require some minimum version. Point them to the right macro.
-+m4_if([$1], [1.14.1], [],
-+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-+])
-+
-+# _AM_AUTOCONF_VERSION(VERSION)
-+# -----------------------------
-+# aclocal traces this macro to find the Autoconf version.
-+# This is a private macro too. Using m4_define simplifies
-+# the logic in aclocal, which can simply ignore this definition.
-+m4_define([_AM_AUTOCONF_VERSION], [])
-
- # AM_SET_CURRENT_AUTOMAKE_VERSION
- # -------------------------------
--# Call AM_AUTOMAKE_VERSION so it can be traced.
--# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-- [AM_AUTOMAKE_VERSION([1.9.6])])
-+[AM_AUTOMAKE_VERSION([1.14.1])dnl
-+m4_ifndef([AC_AUTOCONF_VERSION],
-+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-
- # AM_AUX_DIR_EXPAND -*- Autoconf -*-
-
--# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
- # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
--# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
--# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-+# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to
-+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
- #
- # Of course, Automake must honor this variable whenever it calls a
- # tool from the auxiliary directory. The problem is that $srcdir (and
-@@ -287,7 +313,7 @@
- #
- # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
- # are both prefixed by $srcdir. In an in-source build this is usually
--# harmless because $srcdir is `.', but things will broke when you
-+# harmless because $srcdir is '.', but things will broke when you
- # start a VPATH build or use an absolute $srcdir.
- #
- # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-@@ -313,24 +339,24 @@
-
- # AM_CONDITIONAL -*- Autoconf -*-
-
--# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
--# Free Software Foundation, Inc.
-+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
--# serial 7
--
- # AM_CONDITIONAL(NAME, SHELL-CONDITION)
- # -------------------------------------
- # Define a conditional.
- AC_DEFUN([AM_CONDITIONAL],
--[AC_PREREQ(2.52)dnl
-- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
-- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
--AC_SUBST([$1_TRUE])
--AC_SUBST([$1_FALSE])
-+[AC_PREREQ([2.52])dnl
-+ m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
-+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-+AC_SUBST([$1_TRUE])dnl
-+AC_SUBST([$1_FALSE])dnl
-+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-+m4_define([_AM_COND_VALUE_$1], [$2])dnl
- if $2; then
- $1_TRUE=
- $1_FALSE='#'
-@@ -344,17 +370,14 @@
- Usually this means the macro was only invoked conditionally.]])
- fi])])
-
--
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
--# Free Software Foundation, Inc.
-+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
--# serial 8
-
--# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
- # written in clear, in which case automake, when reading aclocal.m4,
- # will think it sees a *use*, and therefore will trigger all it's
- # C support machinery. Also note that it means that autoscan, seeing
-@@ -364,7 +387,7 @@
- # _AM_DEPENDENCIES(NAME)
- # ----------------------
- # See how the compiler implements dependency checking.
--# NAME is "CC", "CXX", "GCJ", or "OBJC".
-+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
- # We try a few techniques and use that to set a single cache variable.
- #
- # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-@@ -377,11 +400,13 @@
- AC_REQUIRE([AM_MAKE_INCLUDE])dnl
- AC_REQUIRE([AM_DEP_TRACK])dnl
-
--ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
-- [$1], CXX, [depcc="$CXX" am_compiler_list=],
-- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
-- [depcc="$$1" am_compiler_list=])
-+m4_if([$1], [CC], [depcc="$CC" am_compiler_list=],
-+ [$1], [CXX], [depcc="$CXX" am_compiler_list=],
-+ [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-+ [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
-+ [$1], [UPC], [depcc="$UPC" am_compiler_list=],
-+ [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
-+ [depcc="$$1" am_compiler_list=])
-
- AC_CACHE_CHECK([dependency style of $depcc],
- [am_cv_$1_dependencies_compiler_type],
-@@ -389,8 +414,9 @@
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
-- # making a dummy file named `D' -- because `-MD' means `put the output
-- # in D'.
-+ # making a dummy file named 'D' -- because '-MD' means "put the output
-+ # in D".
-+ rm -rf conftest.dir
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
-@@ -408,6 +434,16 @@
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
- fi
-+ am__universal=false
-+ m4_case([$1], [CC],
-+ [case " $depcc " in #(
-+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
-+ esac],
-+ [CXX],
-+ [case " $depcc " in #(
-+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
-+ esac])
-+
- for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
-@@ -419,34 +455,49 @@
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
-- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-- # Solaris 8's {/usr,}/bin/sh.
-- touch sub/conftst$i.h
-+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-+ # Solaris 10 /bin/sh.
-+ echo '/* dummy */' > sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
-+ # mode. It turns out that the SunPro C++ compiler does not properly
-+ # handle '-M -o', and we need to detect this. Also, some Intel
-+ # versions had trouble with output in subdirs.
-+ am__obj=sub/conftest.${OBJEXT-o}
-+ am__minus_obj="-o $am__obj"
- case $depmode in
-+ gcc)
-+ # This depmode causes a compiler race in universal mode.
-+ test "$am__universal" = false || continue
-+ ;;
- nosideeffect)
-- # after this tag, mechanisms are not by side-effect, so they'll
-- # only be used when explicitly requested
-+ # After this tag, mechanisms are not by side-effect, so they'll
-+ # only be used when explicitly requested.
- if test "x$enable_dependency_tracking" = xyes; then
- continue
- else
- break
- fi
- ;;
-+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-+ # This compiler won't grok '-c -o', but also, the minuso test has
-+ # not run yet. These depmodes are late enough in the game, and
-+ # so weak that their functioning should not be impacted.
-+ am__obj=conftest.${OBJEXT-o}
-+ am__minus_obj=
-+ ;;
- none) break ;;
- esac
-- # We check with `-c' and `-o' for the sake of the "dashmstdout"
-- # mode. It turns out that the SunPro C++ compiler does not properly
-- # handle `-M -o', and we need to detect this.
- if depmode=$depmode \
-- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+ source=sub/conftest.c object=$am__obj \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
- >/dev/null 2>conftest.err &&
-+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
-@@ -479,7 +530,7 @@
- # AM_SET_DEPDIR
- # -------------
- # Choose a directory name for dependency files.
--# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
- AC_DEFUN([AM_SET_DEPDIR],
- [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
- AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-@@ -489,69 +540,85 @@
- # AM_DEP_TRACK
- # ------------
- AC_DEFUN([AM_DEP_TRACK],
--[AC_ARG_ENABLE(dependency-tracking,
--[ --disable-dependency-tracking speeds up one-time build
-- --enable-dependency-tracking do not reject slow dependency extractors])
-+[AC_ARG_ENABLE([dependency-tracking], [dnl
-+AS_HELP_STRING(
-+ [--enable-dependency-tracking],
-+ [do not reject slow dependency extractors])
-+AS_HELP_STRING(
-+ [--disable-dependency-tracking],
-+ [speeds up one-time build])])
- if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
-+ am__nodep='_no'
- fi
- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
--AC_SUBST([AMDEPBACKSLASH])
-+AC_SUBST([AMDEPBACKSLASH])dnl
-+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-+AC_SUBST([am__nodep])dnl
-+_AM_SUBST_NOTMAKE([am__nodep])dnl
- ])
-
- # Generate code to set up dependency tracking. -*- Autoconf -*-
-
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
--# Free Software Foundation, Inc.
-+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
--#serial 3
-
- # _AM_OUTPUT_DEPENDENCY_COMMANDS
- # ------------------------------
- AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
--[for mf in $CONFIG_FILES; do
-- # Strip MF so we end up with the name of the file.
-- mf=`echo "$mf" | sed -e 's/:.*$//'`
-- # Check whether this is an Automake generated Makefile or not.
-- # We used to match only the files named `Makefile.in', but
-- # some people rename them; so instead we look at the file content.
-- # Grep'ing the first line is not enough: some people post-process
-- # each Makefile.in and add a new line on top of each file to say so.
-- # So let's grep whole file.
-- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-- dirpart=`AS_DIRNAME("$mf")`
-- else
-- continue
-- fi
-- # Extract the definition of DEPDIR, am__include, and am__quote
-- # from the Makefile without running `make'.
-- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-- test -z "$DEPDIR" && continue
-- am__include=`sed -n 's/^am__include = //p' < "$mf"`
-- test -z "am__include" && continue
-- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-- # When using ansi2knr, U may be empty or an underscore; expand it
-- U=`sed -n 's/^U = //p' < "$mf"`
-- # Find all dependency output files, they are included files with
-- # $(DEPDIR) in their names. We invoke sed twice because it is the
-- # simplest approach to changing $(DEPDIR) to its actual value in the
-- # expansion.
-- for file in `sed -n "
-- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-- # Make sure the directory exists.
-- test -f "$dirpart/$file" && continue
-- fdir=`AS_DIRNAME(["$file"])`
-- AS_MKDIR_P([$dirpart/$fdir])
-- # echo "creating $dirpart/$file"
-- echo '# dummy' > "$dirpart/$file"
-+[{
-+ # Older Autoconf quotes --file arguments for eval, but not when files
-+ # are listed without --file. Let's play safe and only enable the eval
-+ # if we detect the quoting.
-+ case $CONFIG_FILES in
-+ *\'*) eval set x "$CONFIG_FILES" ;;
-+ *) set x $CONFIG_FILES ;;
-+ esac
-+ shift
-+ for mf
-+ do
-+ # Strip MF so we end up with the name of the file.
-+ mf=`echo "$mf" | sed -e 's/:.*$//'`
-+ # Check whether this is an Automake generated Makefile or not.
-+ # We used to match only the files named 'Makefile.in', but
-+ # some people rename them; so instead we look at the file content.
-+ # Grep'ing the first line is not enough: some people post-process
-+ # each Makefile.in and add a new line on top of each file to say so.
-+ # Grep'ing the whole file is not good either: AIX grep has a line
-+ # limit of 2048, but all sed's we know have understand at least 4000.
-+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-+ dirpart=`AS_DIRNAME("$mf")`
-+ else
-+ continue
-+ fi
-+ # Extract the definition of DEPDIR, am__include, and am__quote
-+ # from the Makefile without running 'make'.
-+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+ test -z "$DEPDIR" && continue
-+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+ test -z "$am__include" && continue
-+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+ # Find all dependency output files, they are included files with
-+ # $(DEPDIR) in their names. We invoke sed twice because it is the
-+ # simplest approach to changing $(DEPDIR) to its actual value in the
-+ # expansion.
-+ for file in `sed -n "
-+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
-+ # Make sure the directory exists.
-+ test -f "$dirpart/$file" && continue
-+ fdir=`AS_DIRNAME(["$file"])`
-+ AS_MKDIR_P([$dirpart/$fdir])
-+ # echo "creating $dirpart/$file"
-+ echo '# dummy' > "$dirpart/$file"
-+ done
- done
--done
-+}
- ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-@@ -560,7 +627,7 @@
- # This macro should only be invoked once -- use via AC_REQUIRE.
- #
- # This code is only required when automatic dependency tracking
--# is enabled. FIXME. This creates each `.P' file that we will
-+# is enabled. FIXME. This creates each '.P' file that we will
- # need in order to bootstrap the dependency handling code.
- AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AC_CONFIG_COMMANDS([depfiles],
-@@ -568,32 +635,23 @@
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
- ])
-
--# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 8
--
--# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
--AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
--
- # Do all the work for Automake. -*- Autoconf -*-
-
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
--# Free Software Foundation, Inc.
-+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
--# serial 12
--
- # This macro actually does too much. Some checks are only needed if
- # your package does certain things. But this isn't really a big deal.
-
-+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
-+m4_define([AC_PROG_CC],
-+m4_defn([AC_PROG_CC])
-+[_AM_PROG_CC_C_O
-+])
-+
- # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
- # AM_INIT_AUTOMAKE([OPTIONS])
- # -----------------------------------------------
-@@ -606,16 +664,20 @@
- # arguments mandatory, and then we can depend on a new Autoconf
- # release and drop the old call support.
- AC_DEFUN([AM_INIT_AUTOMAKE],
--[AC_PREREQ([2.58])dnl
-+[AC_PREREQ([2.65])dnl
- dnl Autoconf wants to disallow AM_ names. We explicitly allow
- dnl the ones we care about.
- m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
- AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
- AC_REQUIRE([AC_PROG_INSTALL])dnl
--# test to see if srcdir already configured
--if test "`cd $srcdir && pwd`" != "`pwd`" &&
-- test -f $srcdir/config.status; then
-- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+if test "`cd $srcdir && pwd`" != "`pwd`"; then
-+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-+ # is not polluted with repeated "-I."
-+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-+ # test to see if srcdir already configured
-+ if test -f $srcdir/config.status; then
-+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+ fi
- fi
-
- # test whether we have cygpath
-@@ -631,48 +693,121 @@
- # Define the identity of the package.
- dnl Distinguish between old-style and new-style calls.
- m4_ifval([$2],
--[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
-+[AC_DIAGNOSE([obsolete],
-+ [$0: two- and three-arguments forms are deprecated.])
-+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
- [_AM_SET_OPTIONS([$1])dnl
-+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-+m4_if(
-+ m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
-+ [ok:ok],,
-+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
- _AM_IF_OPTION([no-define],,
--[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
-+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
-
- # Some tools Automake needs.
- AC_REQUIRE([AM_SANITY_CHECK])dnl
- AC_REQUIRE([AC_ARG_PROGRAM])dnl
--AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
--AM_MISSING_PROG(AUTOCONF, autoconf)
--AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
--AM_MISSING_PROG(AUTOHEADER, autoheader)
--AM_MISSING_PROG(MAKEINFO, makeinfo)
--AM_PROG_INSTALL_SH
--AM_PROG_INSTALL_STRIP
--AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
-+AM_MISSING_PROG([AUTOCONF], [autoconf])
-+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
-+AM_MISSING_PROG([AUTOHEADER], [autoheader])
-+AM_MISSING_PROG([MAKEINFO], [makeinfo])
-+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-+# For better backward compatibility. To be removed once Automake 1.9.x
-+# dies out for good. For more background, see:
-+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
-+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
- # We need awk for the "check" target. The system "awk" is bad on
- # some platforms.
- AC_REQUIRE([AC_PROG_AWK])dnl
- AC_REQUIRE([AC_PROG_MAKE_SET])dnl
- AC_REQUIRE([AM_SET_LEADING_DOT])dnl
- _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-- [_AM_PROG_TAR([v7])])])
-+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-+ [_AM_PROG_TAR([v7])])])
- _AM_IF_OPTION([no-dependencies],,
- [AC_PROVIDE_IFELSE([AC_PROG_CC],
-- [_AM_DEPENDENCIES(CC)],
-- [define([AC_PROG_CC],
-- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-+ [_AM_DEPENDENCIES([CC])],
-+ [m4_define([AC_PROG_CC],
-+ m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
- AC_PROVIDE_IFELSE([AC_PROG_CXX],
-- [_AM_DEPENDENCIES(CXX)],
-- [define([AC_PROG_CXX],
-- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
--])
-+ [_AM_DEPENDENCIES([CXX])],
-+ [m4_define([AC_PROG_CXX],
-+ m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
-+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-+ [_AM_DEPENDENCIES([OBJC])],
-+ [m4_define([AC_PROG_OBJC],
-+ m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
-+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
-+ [_AM_DEPENDENCIES([OBJCXX])],
-+ [m4_define([AC_PROG_OBJCXX],
-+ m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
- ])
-+AC_REQUIRE([AM_SILENT_RULES])dnl
-+dnl The testsuite driver may need to know about EXEEXT, so add the
-+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
-+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
-+AC_CONFIG_COMMANDS_PRE(dnl
-+[m4_provide_if([_AM_COMPILER_EXEEXT],
-+ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-+
-+# POSIX will say in a future version that running "rm -f" with no argument
-+# is OK; and we want to be able to make that assumption in our Makefile
-+# recipes. So use an aggressive probe to check that the usage we want is
-+# actually supported "in the wild" to an acceptable degree.
-+# See automake bug#10828.
-+# To make any issue more visible, cause the running configure to be aborted
-+# by default if the 'rm' program in use doesn't match our expectations; the
-+# user can still override this though.
-+if rm -f && rm -fr && rm -rf; then : OK; else
-+ cat >&2 <<'END'
-+Oops!
-+
-+Your 'rm' program seems unable to run without file operands specified
-+on the command line, even when the '-f' option is present. This is contrary
-+to the behaviour of most rm programs out there, and not conforming with
-+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-+
-+Please tell bug-automake at gnu.org about your system, including the value
-+of your $PATH and any error possibly output before this message. This
-+can help us improve future automake versions.
-
-+END
-+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-+ echo 'Configuration will proceed anyway, since you have set the' >&2
-+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-+ echo >&2
-+ else
-+ cat >&2 <<'END'
-+Aborting the configuration process, to ensure you take notice of the issue.
-+
-+You can download and install GNU coreutils to get an 'rm' implementation
-+that behaves properly: <http://www.gnu.org/software/coreutils/>.
-+
-+If you want to complete the configuration process using your problematic
-+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-+to "yes", and re-run configure.
-+
-+END
-+ AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
-+ fi
-+fi])
-+
-+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
-+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-+dnl mangled by Autoconf and run in a shell conditional statement.
-+m4_define([_AC_COMPILER_EXEEXT],
-+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-
- # When config.status generates a header, we must update the stamp-h file.
- # This file resides in the same directory as the config header
-@@ -683,18 +818,19 @@
- # our stamp files there.
- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
- [# Compute $1's index in $config_headers.
-+_am_arg=$1
- _am_stamp_count=1
- for _am_header in $config_headers :; do
- case $_am_header in
-- $1 | $1:* )
-+ $_am_arg | $_am_arg:* )
- break ;;
- * )
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
- esac
- done
--echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-
--# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -705,17 +841,22 @@
- # Define $install_sh.
- AC_DEFUN([AM_PROG_INSTALL_SH],
- [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--install_sh=${install_sh-"$am_aux_dir/install-sh"}
--AC_SUBST(install_sh)])
-+if test x"${install_sh}" != xset; then
-+ case $am_aux_dir in
-+ *\ * | *\ *)
-+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-+ *)
-+ install_sh="\${SHELL} $am_aux_dir/install-sh"
-+ esac
-+fi
-+AC_SUBST([install_sh])])
-
--# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
--# serial 2
--
- # Check whether the underlying file-system supports filenames
- # with a leading dot. For instance MS-DOS doesn't.
- AC_DEFUN([AM_SET_LEADING_DOT],
-@@ -731,14 +872,12 @@
-
- # Check to see how 'make' treats includes. -*- Autoconf -*-
-
--# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
--# serial 3
--
- # AM_MAKE_INCLUDE()
- # -----------------
- # Check to see how make treats includes.
-@@ -746,7 +885,7 @@
- [am_make=${MAKE-make}
- cat > confinc << 'END'
- am__doit:
-- @echo done
-+ @echo this is the am__doit target
- .PHONY: am__doit
- END
- # If we don't find an include directive, just comment out the code.
-@@ -756,24 +895,24 @@
- _am_result=none
- # First try GNU make style include.
- echo "include confinc" > confmf
--# We grep out `Entering directory' and `Leaving directory'
--# messages which can occur if `w' ends up in MAKEFLAGS.
--# In particular we don't look at `^make:' because GNU make might
--# be invoked under some other name (usually "gmake"), in which
--# case it prints its new name instead of `make'.
--if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-- am__include=include
-- am__quote=
-- _am_result=GNU
--fi
-+# Ignore all kinds of additional output from 'make'.
-+case `$am_make -s -f confmf 2> /dev/null` in #(
-+*the\ am__doit\ target*)
-+ am__include=include
-+ am__quote=
-+ _am_result=GNU
-+ ;;
-+esac
- # Now try BSD make style include.
- if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
-- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-- am__include=.include
-- am__quote="\""
-- _am_result=BSD
-- fi
-+ case `$am_make -s -f confmf 2> /dev/null` in #(
-+ *the\ am__doit\ target*)
-+ am__include=.include
-+ am__quote="\""
-+ _am_result=BSD
-+ ;;
-+ esac
- fi
- AC_SUBST([am__include])
- AC_SUBST([am__quote])
-@@ -783,15 +922,12 @@
-
- # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-
--# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
--# Free Software Foundation, Inc.
-+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
--# serial 4
--
- # AM_MISSING_PROG(NAME, PROGRAM)
- # ------------------------------
- AC_DEFUN([AM_MISSING_PROG],
-@@ -799,112 +935,83 @@
- $1=${$1-"${am_missing_run}$2"}
- AC_SUBST($1)])
-
--
- # AM_MISSING_HAS_RUN
- # ------------------
--# Define MISSING if not defined so far and test if it supports --run.
--# If it does, set am_missing_run to use it, otherwise, to nothing.
-+# Define MISSING if not defined so far and test if it is modern enough.
-+# If it is, set am_missing_run to use it, otherwise, to nothing.
- AC_DEFUN([AM_MISSING_HAS_RUN],
- [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-+AC_REQUIRE_AUX_FILE([missing])dnl
-+if test x"${MISSING+set}" != xset; then
-+ case $am_aux_dir in
-+ *\ * | *\ *)
-+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-+ *)
-+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
-+ esac
-+fi
- # Use eval to expand $SHELL
--if eval "$MISSING --run true"; then
-- am_missing_run="$MISSING --run "
-+if eval "$MISSING --is-lightweight"; then
-+ am_missing_run="$MISSING "
- else
- am_missing_run=
-- AC_MSG_WARN([`missing' script is too old or missing])
-+ AC_MSG_WARN(['missing' script is too old or missing])
- fi
- ])
-
--# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
-+# -*- Autoconf -*-
-+# Obsolete and "removed" macros, that must however still report explicit
-+# error messages when used, to smooth transition.
-+#
-+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
--# AM_PROG_MKDIR_P
--# ---------------
--# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
--#
--# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
--# created by `make install' are always world readable, even if the
--# installer happens to have an overly restrictive umask (e.g. 077).
--# This was a mistake. There are at least two reasons why we must not
--# use `-m 0755':
--# - it causes special bits like SGID to be ignored,
--# - it may be too restrictive (some setups expect 775 directories).
--#
--# Do not use -m 0755 and let people choose whatever they expect by
--# setting umask.
--#
--# We cannot accept any implementation of `mkdir' that recognizes `-p'.
--# Some implementations (such as Solaris 8's) are not thread-safe: if a
--# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
--# concurrently, both version can detect that a/ is missing, but only
--# one can create it and the other will error out. Consequently we
--# restrict ourselves to GNU make (using the --version option ensures
--# this.)
--AC_DEFUN([AM_PROG_MKDIR_P],
--[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-- # We used to keeping the `.' as first argument, in order to
-- # allow $(mkdir_p) to be used without argument. As in
-- # $(mkdir_p) $(somedir)
-- # where $(somedir) is conditionally defined. However this is wrong
-- # for two reasons:
-- # 1. if the package is installed by a user who cannot write `.'
-- # make install will fail,
-- # 2. the above comment should most certainly read
-- # $(mkdir_p) $(DESTDIR)$(somedir)
-- # so it does not work when $(somedir) is undefined and
-- # $(DESTDIR) is not.
-- # To support the latter case, we have to write
-- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-- # so the `.' trick is pointless.
-- mkdir_p='mkdir -p --'
--else
-- # On NextStep and OpenStep, the `mkdir' command does not
-- # recognize any option. It will interpret all options as
-- # directories to create, and then abort because `.' already
-- # exists.
-- for d in ./-p ./--version;
-- do
-- test -d $d && rmdir $d
-- done
-- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-- if test -f "$ac_aux_dir/mkinstalldirs"; then
-- mkdir_p='$(mkinstalldirs)'
-- else
-- mkdir_p='$(install_sh) -d'
-- fi
--fi
--AC_SUBST([mkdir_p])])
-+AC_DEFUN([AM_CONFIG_HEADER],
-+[AC_DIAGNOSE([obsolete],
-+['$0': this macro is obsolete.
-+You should use the 'AC][_CONFIG_HEADERS' macro instead.])dnl
-+AC_CONFIG_HEADERS($@)])
-+
-+AC_DEFUN([AM_PROG_CC_STDC],
-+[AC_PROG_CC
-+am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
-+AC_DIAGNOSE([obsolete],
-+['$0': this macro is obsolete.
-+You should simply use the 'AC][_PROG_CC' macro instead.
-+Also, your code should no longer depend upon 'am_cv_prog_cc_stdc',
-+but upon 'ac_cv_prog_cc_stdc'.])])
-+
-+AC_DEFUN([AM_C_PROTOTYPES],
-+ [AC_FATAL([automatic de-ANSI-fication support has been removed])])
-+AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
-
- # Helper functions for option handling. -*- Autoconf -*-
-
--# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
--# serial 3
--
- # _AM_MANGLE_OPTION(NAME)
- # -----------------------
- AC_DEFUN([_AM_MANGLE_OPTION],
- [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
- # _AM_SET_OPTION(NAME)
--# ------------------------------
-+# --------------------
- # Set option NAME. Presently that only means defining a flag for this option.
- AC_DEFUN([_AM_SET_OPTION],
--[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
-
- # _AM_SET_OPTIONS(OPTIONS)
--# ----------------------------------
-+# ------------------------
- # OPTIONS is a space-separated list of Automake options.
- AC_DEFUN([_AM_SET_OPTIONS],
--[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
- # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
- # -------------------------------------------
-@@ -912,47 +1019,126 @@
- AC_DEFUN([_AM_IF_OPTION],
- [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
--# Check to make sure that the build environment is sane. -*- Autoconf -*-
-+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# _AM_PROG_CC_C_O
-+# ---------------
-+# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC
-+# to automatically call this.
-+AC_DEFUN([_AM_PROG_CC_C_O],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+AC_REQUIRE_AUX_FILE([compile])dnl
-+AC_LANG_PUSH([C])dnl
-+AC_CACHE_CHECK(
-+ [whether $CC understands -c and -o together],
-+ [am_cv_prog_cc_c_o],
-+ [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
-+ # Make sure it works both with $CC and with simple cc.
-+ # Following AC_PROG_CC_C_O, we do the test twice because some
-+ # compilers refuse to overwrite an existing .o file with -o,
-+ # though they will create one.
-+ am_cv_prog_cc_c_o=yes
-+ for am_i in 1 2; do
-+ if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
-+ && test -f conftest2.$ac_objext; then
-+ : OK
-+ else
-+ am_cv_prog_cc_c_o=no
-+ break
-+ fi
-+ done
-+ rm -f core conftest*
-+ unset am_i])
-+if test "$am_cv_prog_cc_c_o" != yes; then
-+ # Losing compiler, so override with the script.
-+ # FIXME: It is wrong to rewrite CC.
-+ # But if we don't then we get into trouble of one sort or another.
-+ # A longer-term fix would be to have automake use am__CC in this case,
-+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-+ CC="$am_aux_dir/compile $CC"
-+fi
-+AC_LANG_POP([C])])
-+
-+# For backward compatibility.
-+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-
--# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
--# Free Software Foundation, Inc.
-+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
--# serial 4
-+# AM_RUN_LOG(COMMAND)
-+# -------------------
-+# Run COMMAND, save the exit status in ac_status, and log it.
-+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
-+AC_DEFUN([AM_RUN_LOG],
-+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
-+ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-+ (exit $ac_status); }])
-+
-+# Check to make sure that the build environment is sane. -*- Autoconf -*-
-+
-+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
- # AM_SANITY_CHECK
- # ---------------
- AC_DEFUN([AM_SANITY_CHECK],
- [AC_MSG_CHECKING([whether build environment is sane])
--# Just in case
--sleep 1
--echo timestamp > conftest.file
--# Do `set' in a subshell so we don't clobber the current shell's
-+# Reject unsafe characters in $srcdir or the absolute working directory
-+# name. Accept space and tab only in the latter.
-+am_lf='
-+'
-+case `pwd` in
-+ *[[\\\"\#\$\&\'\`$am_lf]]*)
-+ AC_MSG_ERROR([unsafe absolute working directory name]);;
-+esac
-+case $srcdir in
-+ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
-+ AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
-+esac
-+
-+# Do 'set' in a subshell so we don't clobber the current shell's
- # arguments. Must try -L first in case configure is actually a
- # symlink; some systems play weird games with the mod time of symlinks
- # (eg FreeBSD returns the mod time of the symlink's containing
- # directory).
- if (
-- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-- if test "$[*]" = "X"; then
-- # -L didn't work.
-- set X `ls -t $srcdir/configure conftest.file`
-- fi
-- rm -f conftest.file
-- if test "$[*]" != "X $srcdir/configure conftest.file" \
-- && test "$[*]" != "X conftest.file $srcdir/configure"; then
--
-- # If neither matched, then we have a broken ls. This can happen
-- # if, for instance, CONFIG_SHELL is bash and it inherits a
-- # broken ls alias from the environment. This has actually
-- # happened. Such a system could not be considered "sane".
-- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
--alias in your environment])
-- fi
--
-+ am_has_slept=no
-+ for am_try in 1 2; do
-+ echo "timestamp, slept: $am_has_slept" > conftest.file
-+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-+ if test "$[*]" = "X"; then
-+ # -L didn't work.
-+ set X `ls -t "$srcdir/configure" conftest.file`
-+ fi
-+ if test "$[*]" != "X $srcdir/configure conftest.file" \
-+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
-+
-+ # If neither matched, then we have a broken ls. This can happen
-+ # if, for instance, CONFIG_SHELL is bash and it inherits a
-+ # broken ls alias from the environment. This has actually
-+ # happened. Such a system could not be considered "sane".
-+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-+ alias in your environment])
-+ fi
-+ if test "$[2]" = conftest.file || test $am_try -eq 2; then
-+ break
-+ fi
-+ # Just in case.
-+ sleep 1
-+ am_has_slept=yes
-+ done
- test "$[2]" = conftest.file
- )
- then
-@@ -962,9 +1148,85 @@
- AC_MSG_ERROR([newly created file is older than distributed files!
- Check your system clock])
- fi
--AC_MSG_RESULT(yes)])
-+AC_MSG_RESULT([yes])
-+# If we didn't sleep, we still need to ensure time stamps of config.status and
-+# generated files are strictly newer.
-+am_sleep_pid=
-+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
-+ ( sleep 1 ) &
-+ am_sleep_pid=$!
-+fi
-+AC_CONFIG_COMMANDS_PRE(
-+ [AC_MSG_CHECKING([that generated files are newer than configure])
-+ if test -n "$am_sleep_pid"; then
-+ # Hide warnings about reused PIDs.
-+ wait $am_sleep_pid 2>/dev/null
-+ fi
-+ AC_MSG_RESULT([done])])
-+rm -f conftest.file
-+])
-
--# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-+# Copyright (C) 2009-2013 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_SILENT_RULES([DEFAULT])
-+# --------------------------
-+# Enable less verbose build rules; with the default set to DEFAULT
-+# ("yes" being less verbose, "no" or empty being verbose).
-+AC_DEFUN([AM_SILENT_RULES],
-+[AC_ARG_ENABLE([silent-rules], [dnl
-+AS_HELP_STRING(
-+ [--enable-silent-rules],
-+ [less verbose build output (undo: "make V=1")])
-+AS_HELP_STRING(
-+ [--disable-silent-rules],
-+ [verbose build output (undo: "make V=0")])dnl
-+])
-+case $enable_silent_rules in @%:@ (((
-+ yes) AM_DEFAULT_VERBOSITY=0;;
-+ no) AM_DEFAULT_VERBOSITY=1;;
-+ *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
-+esac
-+dnl
-+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
-+dnl do not support nested variable expansions.
-+dnl See automake bug#9928 and bug#10237.
-+am_make=${MAKE-make}
-+AC_CACHE_CHECK([whether $am_make supports nested variables],
-+ [am_cv_make_support_nested_variables],
-+ [if AS_ECHO([['TRUE=$(BAR$(V))
-+BAR0=false
-+BAR1=true
-+V=1
-+am__doit:
-+ @$(TRUE)
-+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
-+ am_cv_make_support_nested_variables=yes
-+else
-+ am_cv_make_support_nested_variables=no
-+fi])
-+if test $am_cv_make_support_nested_variables = yes; then
-+ dnl Using '$V' instead of '$(V)' breaks IRIX make.
-+ AM_V='$(V)'
-+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-+else
-+ AM_V=$AM_DEFAULT_VERBOSITY
-+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-+fi
-+AC_SUBST([AM_V])dnl
-+AM_SUBST_NOTMAKE([AM_V])dnl
-+AC_SUBST([AM_DEFAULT_V])dnl
-+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
-+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
-+AM_BACKSLASH='\'
-+AC_SUBST([AM_BACKSLASH])dnl
-+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
-+])
-+
-+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -972,40 +1234,55 @@
-
- # AM_PROG_INSTALL_STRIP
- # ---------------------
--# One issue with vendor `install' (even GNU) is that you can't
-+# One issue with vendor 'install' (even GNU) is that you can't
- # specify the program used to strip binaries. This is especially
- # annoying in cross-compiling environments, where the build's strip
- # is unlikely to handle the host's binaries.
- # Fortunately install-sh will honor a STRIPPROG variable, so we
--# always use install-sh in `make install-strip', and initialize
-+# always use install-sh in "make install-strip", and initialize
- # STRIPPROG with the value of the STRIP variable (set by the user).
- AC_DEFUN([AM_PROG_INSTALL_STRIP],
- [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
--# Installed binaries are usually stripped using `strip' when the user
--# run `make install-strip'. However `strip' might not be the right
-+# Installed binaries are usually stripped using 'strip' when the user
-+# run "make install-strip". However 'strip' might not be the right
- # tool to use in cross-compilation environments, therefore Automake
--# will honor the `STRIP' environment variable to overrule this program.
--dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-+# will honor the 'STRIP' environment variable to overrule this program.
-+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
- if test "$cross_compiling" != no; then
- AC_CHECK_TOOL([STRIP], [strip], :)
- fi
--INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
- AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-+# Copyright (C) 2006-2013 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# _AM_SUBST_NOTMAKE(VARIABLE)
-+# ---------------------------
-+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-+# This macro is traced by Automake.
-+AC_DEFUN([_AM_SUBST_NOTMAKE])
-+
-+# AM_SUBST_NOTMAKE(VARIABLE)
-+# --------------------------
-+# Public sister of _AM_SUBST_NOTMAKE.
-+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-+
- # Check how to create a tarball. -*- Autoconf -*-
-
--# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-+# Copyright (C) 2004-2013 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
--# serial 2
--
- # _AM_PROG_TAR(FORMAT)
- # --------------------
- # Check how to create a tarball in format FORMAT.
--# FORMAT should be one of `v7', `ustar', or `pax'.
-+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
- #
- # Substitute a variable $(am__tar) that is a command
- # writing to stdout a FORMAT-tarball containing the directory
-@@ -1015,78 +1292,116 @@
- # Substitute a variable $(am__untar) that extract such
- # a tarball read from stdin.
- # $(am__untar) < result.tar
-+#
- AC_DEFUN([_AM_PROG_TAR],
--[# Always define AMTAR for backward compatibility.
--AM_MISSING_PROG([AMTAR], [tar])
--m4_if([$1], [v7],
-- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-- [m4_case([$1], [ustar],, [pax],,
-- [m4_fatal([Unknown tar format])])
--AC_MSG_CHECKING([how to create a $1 tar archive])
--# Loop over all known methods to create a tar archive until one works.
-+[# Always define AMTAR for backward compatibility. Yes, it's still used
-+# in the wild :-( We should find a proper way to deprecate it ...
-+AC_SUBST([AMTAR], ['$${TAR-tar}'])
-+
-+# We'll loop over all known methods to create a tar archive until one works.
- _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
--_am_tools=${am_cv_prog_tar_$1-$_am_tools}
--# Do not fold the above two line into one, because Tru64 sh and
--# Solaris sh will not grok spaces in the rhs of `-'.
--for _am_tool in $_am_tools
--do
-- case $_am_tool in
-- gnutar)
-- for _am_tar in tar gnutar gtar;
-- do
-- AM_RUN_LOG([$_am_tar --version]) && break
-- done
-- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-- am__untar="$_am_tar -xf -"
-- ;;
-- plaintar)
-- # Must skip GNU tar: if it does not support --format= it doesn't create
-- # ustar tarball either.
-- (tar --version) >/dev/null 2>&1 && continue
-- am__tar='tar chf - "$$tardir"'
-- am__tar_='tar chf - "$tardir"'
-- am__untar='tar xf -'
-- ;;
-- pax)
-- am__tar='pax -L -x $1 -w "$$tardir"'
-- am__tar_='pax -L -x $1 -w "$tardir"'
-- am__untar='pax -r'
-- ;;
-- cpio)
-- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-- am__untar='cpio -i -H $1 -d'
-- ;;
-- none)
-- am__tar=false
-- am__tar_=false
-- am__untar=false
-- ;;
-- esac
-
-- # If the value was cached, stop now. We just wanted to have am__tar
-- # and am__untar set.
-- test -n "${am_cv_prog_tar_$1}" && break
-+m4_if([$1], [v7],
-+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
-
-- # tar/untar a dummy directory, and stop if the command works
-- rm -rf conftest.dir
-- mkdir conftest.dir
-- echo GrepMe > conftest.dir/file
-- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-+ [m4_case([$1],
-+ [ustar],
-+ [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
-+ # There is notably a 21 bits limit for the UID and the GID. In fact,
-+ # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
-+ # and bug#13588).
-+ am_max_uid=2097151 # 2^21 - 1
-+ am_max_gid=$am_max_uid
-+ # The $UID and $GID variables are not portable, so we need to resort
-+ # to the POSIX-mandated id(1) utility. Errors in the 'id' calls
-+ # below are definitely unexpected, so allow the users to see them
-+ # (that is, avoid stderr redirection).
-+ am_uid=`id -u || echo unknown`
-+ am_gid=`id -g || echo unknown`
-+ AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
-+ if test $am_uid -le $am_max_uid; then
-+ AC_MSG_RESULT([yes])
-+ else
-+ AC_MSG_RESULT([no])
-+ _am_tools=none
-+ fi
-+ AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
-+ if test $am_gid -le $am_max_gid; then
-+ AC_MSG_RESULT([yes])
-+ else
-+ AC_MSG_RESULT([no])
-+ _am_tools=none
-+ fi],
-+
-+ [pax],
-+ [],
-+
-+ [m4_fatal([Unknown tar format])])
-+
-+ AC_MSG_CHECKING([how to create a $1 tar archive])
-+
-+ # Go ahead even if we have the value already cached. We do so because we
-+ # need to set the values for the 'am__tar' and 'am__untar' variables.
-+ _am_tools=${am_cv_prog_tar_$1-$_am_tools}
-+
-+ for _am_tool in $_am_tools; do
-+ case $_am_tool in
-+ gnutar)
-+ for _am_tar in tar gnutar gtar; do
-+ AM_RUN_LOG([$_am_tar --version]) && break
-+ done
-+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-+ am__untar="$_am_tar -xf -"
-+ ;;
-+ plaintar)
-+ # Must skip GNU tar: if it does not support --format= it doesn't create
-+ # ustar tarball either.
-+ (tar --version) >/dev/null 2>&1 && continue
-+ am__tar='tar chf - "$$tardir"'
-+ am__tar_='tar chf - "$tardir"'
-+ am__untar='tar xf -'
-+ ;;
-+ pax)
-+ am__tar='pax -L -x $1 -w "$$tardir"'
-+ am__tar_='pax -L -x $1 -w "$tardir"'
-+ am__untar='pax -r'
-+ ;;
-+ cpio)
-+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-+ am__untar='cpio -i -H $1 -d'
-+ ;;
-+ none)
-+ am__tar=false
-+ am__tar_=false
-+ am__untar=false
-+ ;;
-+ esac
-+
-+ # If the value was cached, stop now. We just wanted to have am__tar
-+ # and am__untar set.
-+ test -n "${am_cv_prog_tar_$1}" && break
-+
-+ # tar/untar a dummy directory, and stop if the command works.
-+ rm -rf conftest.dir
-+ mkdir conftest.dir
-+ echo GrepMe > conftest.dir/file
-+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-+ rm -rf conftest.dir
-+ if test -s conftest.tar; then
-+ AM_RUN_LOG([$am__untar <conftest.tar])
-+ AM_RUN_LOG([cat conftest.dir/file])
-+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-+ fi
-+ done
- rm -rf conftest.dir
-- if test -s conftest.tar; then
-- AM_RUN_LOG([$am__untar <conftest.tar])
-- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-- fi
--done
--rm -rf conftest.dir
-
--AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
--AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-+ AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-+ AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-+
- AC_SUBST([am__tar])
- AC_SUBST([am__untar])
- ]) # _AM_PROG_TAR
-
--m4_include([m4/vl_lib_readline.m4])
- m4_include([acinclude.m4])
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -5,7 +5,7 @@
- noinst_SCRIPTS = twinkle.desktop
-
- pkgdata_DATA = data/ringback.wav data/ringtone.wav \
-- data/providers.csv \
-+ data/providers.csv
-
- EXTRA_DIST = src/gui/*.ui src/gui/*.h src/gui/*.cpp src/gui/Makefile \
- src/gui/twinkle.pro src/gui/images/* \
diff --git a/debian/patches/newer-libccrtp.diff b/debian/patches/newer-libccrtp.diff
deleted file mode 100644
index 9d07b3d..0000000
--- a/debian/patches/newer-libccrtp.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: twinkle-1.4.2/configure.in
-===================================================================
---- twinkle-1.4.2.orig/configure.in 2013-07-25 11:09:16.000000000 -0400
-+++ twinkle-1.4.2/configure.in 2013-07-25 11:11:59.512418187 -0400
-@@ -66,7 +66,7 @@
-
- export PKG_CONFIG_PATH
-
--PKG_CHECK_MODULES(CCRTP, libccrtp1 >= 1.6.0)
-+PKG_CHECK_MODULES(CCRTP, libccrtp >= 1.6.0)
-
- PKG_CHECK_MODULES(XML2, libxml-2.0)
- # AC_CHECK_HEADER(libxml/tree.h, [],
-@@ -136,7 +136,7 @@
- #echo "INCLUDEPATH += `$CCGNU2_CONFIG --includes`" | sed -e s/-I//g > $QT_INCL_PRO
- # libccrtp1(ccrtp) depend from libccgnu2(commoncpp2) and
- # should include above flags !
--echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libccrtp1`" | sed -e s/-I//g >> $QT_INCL_PRO
-+echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libccrtp`" | sed -e s/-I//g >> $QT_INCL_PRO
- echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libxml-2.0`" | sed -e s/-I//g >> $QT_INCL_PRO
-
- # get libraries specified on command line
diff --git a/debian/patches/no-qt.diff b/debian/patches/no-qt.diff
deleted file mode 100644
index 009a20c..0000000
--- a/debian/patches/no-qt.diff
+++ /dev/null
@@ -1,321 +0,0 @@
-Index: twinkle-1.4.2/configure.in
-===================================================================
---- twinkle-1.4.2.orig/configure.in 2013-07-25 12:51:51.420537460 -0400
-+++ twinkle-1.4.2/configure.in 2013-07-25 12:51:51.416537528 -0400
-@@ -2,14 +2,6 @@
- AC_CANONICAL_SYSTEM
- AM_CONFIG_HEADER(src/twinkle_config.h)
-
--AC_ARG_ENABLE(qt-check,
-- AC_HELP_STRING([--disable-qt-check], [do not check Qt installation]),
-- [ac_cv_qt_check=$enableval], [ac_cv_qt_check=yes])
--
--AC_ARG_WITH(kde,
-- AC_HELP_STRING([--without-kde], [do not compile KDE features]),
-- [ac_cv_kde=$withval], [ac_cv_kde=yes])
--
- AC_ARG_WITH(ilbc,
- AC_HELP_STRING([--without-ilbc], [do not compile iLBC]),
- [ac_cv_ilbc=$withval], [ac_cv_ilbc=yes])
-@@ -49,137 +41,20 @@
- # This also sets the cc++2 include directory in CXXFLAGS
- OST_CCXX2_VERSION(1.6.0,,exit)
-
--# Temporarily add some default directories to PKG_CONFIG_PATH such that
--# the user will not be burdened with setting PKG_CONFIG_PATH
--OLD_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
--PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig
--
--if test "x${prefix}" != "xNONE"
--then
-- PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${prefix}/lib/pkgconfig
--fi
--
--if test -n "$QTDIR"
--then
-- PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$QTDIR/lib/pkgconfig
--fi
--
--export PKG_CONFIG_PATH
--
- PKG_CHECK_MODULES(CCRTP, libccrtp >= 1.6.0)
-
- PKG_CHECK_MODULES(XML2, libxml-2.0)
- # AC_CHECK_HEADER(libxml/tree.h, [],
- # [AC_MSG_ERROR([libxml2 header files missing (libxml2-devel package)])])
-
--if test "x$ac_cv_qt_check" = "xyes"
--then
-- PKG_CHECK_MODULES(QT, qt-mt >= 3.3.0 qt-mt < 4.0)
--fi
--
--# Restore the original value of PKG_CONFIG_PATH
--PKG_CONFIG_PATH=$OLD_PKG_CONFIG_PATH
--export PKG_CONFIG_PATH
--
--# Check if QTDIR variable is set
--AC_MSG_CHECKING([value of \$QTDIR])
--if test -n "$QTDIR"
--then
-- AC_MSG_RESULT([$QTDIR])
--else
-- AC_MSG_RESULT([not set])
-- AC_MSG_ERROR([Set \$QTDIR to the Qt directory, eg. /usr/lib/qt3])
--fi
--
--AC_MSG_CHECKING([for qmake])
--if test -x $QTDIR/bin/qmake
--then
-- AC_MSG_RESULT([yes])
--else
-- AC_MSG_RESULT([no])
-- AC_MSG_ERROR([Cannot find qmake in \$QTDIR/bin. \$QTDIR is incorrect.])
--fi
--
--# Without this macro, compiling on non-kde systems does not work
--AC_PATH_QT
--
--# Check if lrelease is available
--AC_CHECK_PROG(have_lrelease, lrelease, yes, no)
--if test "x$have_lrelease" = "xno"
--then
-- AC_MSG_ERROR([lrelease is missing (qt3-devel-tools package)])
--fi
--
--dnl Create a Qt include project file for platform dependend variables
--dnl This file will be included by the project file in the gui directory
--dnl Determine include files and dynamic libs.
--dnl Creation of qtccxxincl.pro is good to be in AC_CONFIG_COMMANDS
--dnl macro so that config.status to be able to create it too.
--dnl In this case we benefit from more ac_xxx variables.
--dnl Disadvantage is autoconf don't group commands with same tag
--dnl and we should use different tags. In result AC_OUTPUT will
--dnl show all of them.
--QT_INCL_PRO=qtccxxincl.pro
--AC_MSG_NOTICE([creating $QT_INCL_PRO (include project file for Qt)])
--
--# first set include path to generated files
--echo "INCLUDEPATH += `pwd`/src" > $QT_INCL_PRO
--# next get includes specified on command line
--(
--set -- $CPPFLAGS
--while test -n "$1"; do
-- echo $1
-- shift
--done
--) | grep '^-I' | sed -e 's|^-I||' | xargs echo INCLUDEPATH += >> $QT_INCL_PRO
--
--#echo "INCLUDEPATH += `$CCGNU2_CONFIG --includes`" | sed -e s/-I//g > $QT_INCL_PRO
--# libccrtp1(ccrtp) depend from libccgnu2(commoncpp2) and
--# should include above flags !
--echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libccrtp`" | sed -e s/-I//g >> $QT_INCL_PRO
--echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libxml-2.0`" | sed -e s/-I//g >> $QT_INCL_PRO
--
--# get libraries specified on command line
--echo $LDFLAGS | xargs echo LIBS += >> $QT_INCL_PRO
--
--echo "LIBS += `$CCGNU2_CONFIG --stdlibs`" >> $QT_INCL_PRO
--echo "LIBS += $CCRTP_LIBS" >> $QT_INCL_PRO
--echo "LIBS += $XML2_LIBS" >> $QT_INCL_PRO
--
--# Check if KDE is available
--if test "x$ac_cv_kde" = "xyes"
--then
-- AC_CHECK_PROG(have_kde, kde-config, yes, no)
--else
-- have_kde="no"
--fi
--
--if test "x$have_kde" = "xyes"
--then
-- KDE_SET_PREFIX
-- AC_PATH_KDE
--
-- AC_CHECK_FILES(${kde_includes}/kapplication.h,
-- [],
-- [AC_MSG_ERROR([kde header files missing (kdelibs3-devel package)])])
-- AC_DEFINE(HAVE_KDE, 1, [Define to 1 if you have KDE.])
-- echo "INCLUDEPATH += ${kde_includes}" >> $QT_INCL_PRO
-- echo "LIBS += -L${kde_libraries} -lkdecore -lkdeui" >> $QT_INCL_PRO
-- echo "LIBS += -L${TWINKLE_KDE_PREFIX}/lib -lkabc" >> $QT_INCL_PRO
--else
-- include_x11_FALSE="yes"
-- include_ARTS_FALSE="yes"
-- AC_PREFIX_DEFAULT(${prefix:-/usr/local})
--fi
--
- # Check for libbbind or libresolv. libbind is preferred as libresolv gives
- # GLIBC_PRIVATE on Fedora.
- AC_CHECK_LIB(bind, main, [
- LIBS="-lbind $LIBS"
-- echo "LIBS += -lbind" >> $QT_INCL_PRO],
-+ ],
- [
- LIBS="-lresolv $LIBS"
-- echo "LIBS += -lresolv" >> $QT_INCL_PRO])
-+ ])
-
- # Check if sndfile library is available
- AC_CHECK_HEADER(sndfile.h, [],
-@@ -200,35 +75,21 @@
- [AC_MSG_ERROR([gsm header files missing (gsm.h)])])
- AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the <libgsm> library.])
- GSM_LIBS="-lgsm"
-- echo "LIBS += -lgsm" >> $QT_INCL_PRO
- have_gsm="yes" ], [
- have_gsm="no"
- GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
-- echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO ])
-+ ])
- #have_gsm="no"
- #GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
--#echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO
-
- AC_SUBST(GSM_LIBS)
-
--# Check if libgsm is available
--AC_CHECK_LIB(gsm, sf_open, [
-- AC_CHECK_HEADER(gsm.h, [],
-- [AC_MSG_ERROR([gsm header files missing (gsm.h)])])
-- AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the <libgsm> library.])
-- LIBS="-lgsm $LIBS"
-- echo "LIBS += -lgsm" >> $QT_INCL_PRO
-- have_gsm="yes" ], [
-- have_gsm="no"
-- echo "$(top_builddir)/src/audio/gsm/libgsm.a" >> $QT_INCL_PRO ])
--
- # Check if ALSA is available
- AC_CHECK_LIB(asound, main, [
- AC_CHECK_HEADER(alsa/asoundlib.h, [],
- [AC_MSG_ERROR([alsa header files missing (alsa-devel package)])])
- AC_DEFINE(HAVE_LIBASOUND, 1, [Define to 1 if you have the <libasound> library.])
- LIBS="-lasound $LIBS"
-- echo "LIBS += -lasound" >> $QT_INCL_PRO
- have_libasound="yes"
- ], [have_libasound="no"])
-
-@@ -243,8 +104,6 @@
- [AC_MSG_ERROR([speexdsp header files missing])])
- AC_DEFINE(HAVE_SPEEX, 1, [Define to 1 if you have the <speex> library.])
- LIBS="-lspeex -lspeexdsp $LIBS"
-- echo "LIBS += -lspeex" >> $QT_INCL_PRO
-- echo "LIBS += -lspeexdsp" >> $QT_INCL_PRO
- have_speex="yes"
- ], [have_speex="no"])
- ], [have_speex="no"])
-@@ -260,7 +119,6 @@
- [AC_MSG_ERROR([ilbc header files missing])])
- AC_DEFINE(HAVE_ILBC, 1, [Define to 1 if you have the <ilbc> library.])
- LIBS="-lilbc $LIBS"
-- echo "LIBS += -lilbc" >> $QT_INCL_PRO
- have_ilbc="yes"
- ], [have_ilbc="no"])
-
-@@ -281,7 +139,6 @@
- [AC_MSG_ERROR([zrtp header files missing])])
- AC_DEFINE(HAVE_ZRTP, 1, [Define to 1 if you have the <libzrtpcpp> library.])
- LIBS="-lzrtpcpp $LIBS"
-- echo "LIBS += -lzrtpcpp" >> $QT_INCL_PRO
- have_zrtp="yes"
- ], [have_zrtp="no"])
- else
-@@ -300,44 +157,17 @@
- [AC_MSG_ERROR([boost/regex.h missing (boost-devel package)])])
- AC_CHECK_LIB(boost_regex, main, [
- LIBS="-lboost_regex $LIBS"
-- echo "LIBS += -lboost_regex" >> $QT_INCL_PRO],
-+ ],
- [
- AC_CHECK_LIB(boost_regex-gcc, main, [
- LIBS="-lboost_regex-gcc $LIBS"
-- echo "LIBS += -lboost_regex-gcc" >> $QT_INCL_PRO],
-+ ],
- [
- AC_CHECK_LIB(boost_regex-mt, main, [
- LIBS="-lboost_regex-mt $LIBS"
-- echo "LIBS += -lboost_regex-mt" >> $QT_INCL_PRO],
-+ ],
- [AC_MSG_ERROR([libboost_regex library is missing (boost package).])])])])
-
--ms_CHECK_LRELEASE()
--
--dnl $QTDIR/bin/qmake -o src/gui/Makefile src/gui/twinkle.pro
--dnl Command above is incorrect because srcdir may differ from builddir
--dnl
--dnl $QTDIR/bin/qmake -o src/gui/Makefile $srcdir/src/gui/twinkle.pro
--dnl Command above although is correct in both cases, i.e. when srcdir
--dnl is equal or differ from builddir will not generate proper Makefile.
--dnl Reason is unknown.
--dnl
--dnl The sed command adds the KDE3 libraries in front of the LIB path.
--dnl This is needed to correctly build on a KDE4 system. Otherwise
--dnl gcc will link against KDE4 libraries.
--AC_CONFIG_COMMANDS([src/gui/Makefile],
-- [
-- $QTDIR/bin/qmake -o src/gui/Makefile $srcdir/src/gui/twinkle.pro
-- echo "distdir:" >> src/gui/Makefile
-- echo "check:" >> src/gui/Makefile
--
-- if test -n "$kde_libraries"
-- then
-- sed -i -e "s|\(LIBS *= \)|\1-L${kde_libraries} |" src/gui/Makefile
-- fi
-- ],
-- [kde_libraries=${kde_libraries}]
--)
--
- dnl Next is useless. See comments in src/parser/Makefile.am .
- dnl # Strip the -O2 flag from CXXFLAGS for building the SIP parser.
- dnl # g++ cannot compile the generated C code from bison with -O2 or -Os
-@@ -348,7 +178,7 @@
- AC_OUTPUT(Makefile src/Makefile src/audio/Makefile src/audio/gsm/Makefile \
- src/audits/Makefile src/sdp/Makefile src/parser/Makefile \
- src/sockets/Makefile src/stun/Makefile src/threads/Makefile \
-- src/gui/lang/Makefile src/mwi/Makefile src/im/Makefile \
-+ src/mwi/Makefile src/im/Makefile \
- src/patterns/Makefile src/utils/Makefile src/presence/Makefile \
- twinkle.spec)
-
-Index: twinkle-1.4.2/Makefile.am
-===================================================================
---- twinkle-1.4.2.orig/Makefile.am 2013-07-25 12:51:51.420537460 -0400
-+++ twinkle-1.4.2/Makefile.am 2013-07-25 12:51:51.416537528 -0400
-@@ -1,19 +1,11 @@
--# The Makefile for the Qt-part of the program is created by qmake.
--# That Makefile builts the executable.
--# So here the executable is defined as a script such that it will
--# only be installed and not built.
--
- ACLOCAL_AMFLAGS = -I m4
-
- pkglangdir = $(pkgdatadir)/lang
-
--bin_SCRIPTS = src/gui/twinkle
- noinst_SCRIPTS = twinkle.desktop
-
- pkgdata_DATA = data/ringback.wav data/ringtone.wav \
- data/providers.csv \
-- src/gui/images/twinkle16.png src/gui/images/twinkle32.png \
-- src/gui/images/twinkle48.png
-
- EXTRA_DIST = src/gui/*.ui src/gui/*.h src/gui/*.cpp src/gui/Makefile \
- src/gui/twinkle.pro src/gui/images/* \
-Index: twinkle-1.4.2/src/Makefile.am
-===================================================================
---- twinkle-1.4.2.orig/src/Makefile.am 2013-07-25 12:51:51.420537460 -0400
-+++ twinkle-1.4.2/src/Makefile.am 2013-07-25 12:52:02.036357776 -0400
-@@ -2,7 +2,7 @@
-
- AM_CPPFLAGS = -Wall $(CCRTP_CFLAGS) $(XML2_CFLAGS) -DDATADIR=\"$(pkgdatadir)\"
-
--noinst_PROGRAMS = twinkle
-+bin_PROGRAMS = twinkle
-
- noinst_LIBRARIES = libtwinkle.a
-
-@@ -101,4 +101,4 @@
- userintf.h\
- util.h
-
--SUBDIRS = audio audits im mwi parser patterns presence sdp sockets stun threads utils . gui gui/lang
-+SUBDIRS = audio audits im mwi parser patterns presence sdp sockets stun threads utils .
diff --git a/debian/patches/series b/debian/patches/series
index 44380cb..554bef8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,2 @@
-boost_regex-mt.patch
desktop-entry-contains-encoding-key.patch
libgsm.patch
-newer-libccrtp.diff
-no-qt.diff
-localetime_r_conflict.diff
-vsnprintf_incompatibility.diff
-newer-automake.diff
diff --git a/debian/patches/vsnprintf_incompatibility.diff b/debian/patches/vsnprintf_incompatibility.diff
deleted file mode 100644
index e7a093c..0000000
--- a/debian/patches/vsnprintf_incompatibility.diff
+++ /dev/null
@@ -1,102 +0,0 @@
-Index: twinkle-1.4.2/acinclude.m4
-===================================================================
---- twinkle-1.4.2.orig/acinclude.m4 2013-07-25 12:01:11.000000000 -0400
-+++ twinkle-1.4.2/acinclude.m4 2013-07-25 12:03:05.000000000 -0400
-@@ -829,32 +829,7 @@
- #endif
- ])
-
--AC_CHECK_FUNCS([vsnprintf snprintf])
--
--AH_VERBATIM(_TRU64,[
--/*
-- * On HP-UX, the declaration of vsnprintf() is needed every time !
-- */
--
--#if !defined(HAVE_VSNPRINTF) || defined(hpux)
--#if __STDC__
--#include <stdarg.h>
--#include <stdlib.h>
--#else
--#include <varargs.h>
--#endif
--#ifdef __cplusplus
--extern "C"
--#endif
--int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
--#ifdef __cplusplus
--extern "C"
--#endif
--int snprintf(char *str, size_t n, char const *fmt, ...);
--#endif
--])
--
--])
-+AC_CHECK_FUNCS([snprintf])
-
- dnl ------------------------------------------------------------------------
- dnl Find the header files and libraries for X-Windows. Extended the
-@@ -2156,7 +2131,7 @@
- kde_cv_proto_$1=no
- else
- case "$1" in
-- setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-+ setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|strlcpy|strlcat)
- kde_cv_proto_$1="yes - in libkdefakes"
- ;;
- *)
-Index: twinkle-1.4.2/src/twinkle_config.h.in
-===================================================================
---- twinkle-1.4.2.orig/src/twinkle_config.h.in 2013-07-25 12:03:36.000000000 -0400
-+++ twinkle-1.4.2/src/twinkle_config.h.in 2013-07-25 12:05:13.019259521 -0400
-@@ -91,9 +91,6 @@
- /* Define if you have a STL implementation by SGI */
- #undef HAVE_SGI_STL
-
--/* Define to 1 if you have the `snprintf' function. */
--#undef HAVE_SNPRINTF
--
- /* Define to 1 if you have the <speex> library. */
- #undef HAVE_SPEEX
-
-@@ -142,9 +139,6 @@
- /* Define to 1 if you have the <unistd.h> header file. */
- #undef HAVE_UNISTD_H
-
--/* Define to 1 if you have the `vsnprintf' function. */
--#undef HAVE_VSNPRINTF
--
- /* Define to 1 if you have the <libzrtpcpp> library. */
- #undef HAVE_ZRTP
-
-@@ -275,30 +269,6 @@
- #endif
-
-
--
--/*
-- * On HP-UX, the declaration of vsnprintf() is needed every time !
-- */
--
--#if !defined(HAVE_VSNPRINTF) || defined(hpux)
--#if __STDC__
--#include <stdarg.h>
--#include <stdlib.h>
--#else
--#include <varargs.h>
--#endif
--#ifdef __cplusplus
--extern "C"
--#endif
--int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
--#ifdef __cplusplus
--extern "C"
--#endif
--int snprintf(char *str, size_t n, char const *fmt, ...);
--#endif
--
--
--
- #if defined(__SVR4) && !defined(__svr4__)
- #define __svr4__ 1
- #endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/twinkle.git
More information about the Pkg-voip-commits
mailing list