From 2b822611ff786fb00c63555a9ab9575f9133030c Mon Sep 17 00:00:00 2001 From: corsepiu Date: Fri, 13 Mar 2009 12:10:57 +0000 Subject: [PATCH] New. --- linphone-2.1.1-configure.patch | 1024 ++++++++++++++++++++++++++++ linphone-2.1.1-mediastreamer.patch | 187 +++++ linphone-2.1.1-oRTP.patch | 28 + 3 files changed, 1239 insertions(+) create mode 100644 linphone-2.1.1-configure.patch create mode 100644 linphone-2.1.1-mediastreamer.patch create mode 100644 linphone-2.1.1-oRTP.patch diff --git a/linphone-2.1.1-configure.patch b/linphone-2.1.1-configure.patch new file mode 100644 index 0000000..0cc466b --- /dev/null +++ b/linphone-2.1.1-configure.patch @@ -0,0 +1,1024 @@ +diff -Naur linphone-2.1.1.orig/configure.in linphone-2.1.1/configure.in +--- linphone-2.1.1.orig/configure.in 2008-02-13 08:59:44.000000000 +0100 ++++ linphone-2.1.1/configure.in 2009-03-13 08:34:53.000000000 +0100 +@@ -24,16 +24,14 @@ + AC_CONFIG_HEADER(config.h) + + AC_SUBST([mkdir_p]) +-AC_ISC_POSIX +-AC_PROG_CC +-AC_C_INLINE + AM_PROG_CC_STDC ++AM_PROG_CC_C_O ++AC_C_INLINE + AC_HEADER_STDC + dnl localization tools +-ifdef([IT_PROG_INTLTOOL],[IT_PROG_INTLTOOL],[AC_PROG_INTLTOOL]) ++IT_PROG_INTLTOOL + dnl Initialize libtool + AC_PROG_LIBTOOL +-AM_PROG_LIBTOOL + AC_ENABLE_SHARED(yes) + AC_ENABLE_STATIC(no) + dnl Add the languages which your application supports here. +@@ -275,7 +273,6 @@ + + if test "$GCC$strictness" = "yesyes" ; then + STRICT_OPTIONS="-Wall -Wp,-D_FORTIFY_SOURCE=2" +- STRICT_OPTIONS="$STRICT_OPTIONS -Werror" + CFLAGS="$CFLAGS -fno-strict-aliasing" + fi + +@@ -332,7 +329,6 @@ + + AC_OUTPUT([ + Makefile +-m4/Makefile + po/Makefile.in + pixmaps/Makefile + ipkg/Makefile +diff -Naur linphone-2.1.1.orig/m4/Makefile.am linphone-2.1.1/m4/Makefile.am +--- linphone-2.1.1.orig/m4/Makefile.am 2007-01-19 23:24:00.000000000 +0100 ++++ linphone-2.1.1/m4/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +@@ -1,2 +0,0 @@ +-EXTRA_DIST= $(shell cd $(srcdir) && ls *.m4) +- +diff -Naur linphone-2.1.1.orig/m4/Makefile.in linphone-2.1.1/m4/Makefile.in +--- linphone-2.1.1.orig/m4/Makefile.in 2008-02-13 10:16:47.000000000 +0100 ++++ linphone-2.1.1/m4/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +@@ -1,405 +0,0 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. +-# @configure_input@ +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. +-# This Makefile.in 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. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +-@SET_MAKE@ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ +-VPATH = @srcdir@ +-pkgdatadir = $(datadir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = @build@ +-host_triplet = @host@ +-subdir = m4 +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/exosip.m4 \ +- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ +- $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \ +- $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ +- $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/ortp.m4 \ +- $(top_srcdir)/m4/osip.m4 $(top_srcdir)/m4/po.m4 \ +- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = @ACLOCAL@ +-ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ +-AMTAR = @AMTAR@ +-AR = @AR@ +-ARMBUILD_FALSE = @ARMBUILD_FALSE@ +-ARMBUILD_TRUE = @ARMBUILD_TRUE@ +-AUTOCONF = @AUTOCONF@ +-AUTOHEADER = @AUTOHEADER@ +-AUTOMAKE = @AUTOMAKE@ +-AWK = @AWK@ +-BUILD_CONSOLE_FALSE = @BUILD_CONSOLE_FALSE@ +-BUILD_CONSOLE_TRUE = @BUILD_CONSOLE_TRUE@ +-BUILD_GNOME_APPLET_FALSE = @BUILD_GNOME_APPLET_FALSE@ +-BUILD_GNOME_APPLET_TRUE = @BUILD_GNOME_APPLET_TRUE@ +-BUILD_GTK_FALSE = @BUILD_GTK_FALSE@ +-BUILD_GTK_TRUE = @BUILD_GTK_TRUE@ +-BUILD_MEDIA_API_FALSE = @BUILD_MEDIA_API_FALSE@ +-BUILD_MEDIA_API_TRUE = @BUILD_MEDIA_API_TRUE@ +-BUILD_TRUESPEECH_FALSE = @BUILD_TRUESPEECH_FALSE@ +-BUILD_TRUESPEECH_TRUE = @BUILD_TRUESPEECH_TRUE@ +-CC = @CC@ +-CCDEPMODE = @CCDEPMODE@ +-CFLAGS = @CFLAGS@ +-CPP = @CPP@ +-CPPFLAGS = @CPPFLAGS@ +-CXX = @CXX@ +-CXXCPP = @CXXCPP@ +-CXXDEPMODE = @CXXDEPMODE@ +-CXXFLAGS = @CXXFLAGS@ +-CYGPATH_W = @CYGPATH_W@ +-DATADIRNAME = @DATADIRNAME@ +-DEFS = @DEFS@ +-DEPDIR = @DEPDIR@ +-ECHO = @ECHO@ +-ECHO_C = @ECHO_C@ +-ECHO_N = @ECHO_N@ +-ECHO_T = @ECHO_T@ +-EGREP = @EGREP@ +-ENABLE_MANUAL_FALSE = @ENABLE_MANUAL_FALSE@ +-ENABLE_MANUAL_TRUE = @ENABLE_MANUAL_TRUE@ +-EXEEXT = @EXEEXT@ +-EXOSIP_CFLAGS = @EXOSIP_CFLAGS@ +-EXOSIP_LIBS = @EXOSIP_LIBS@ +-EXTERNAL_ORTP_FALSE = @EXTERNAL_ORTP_FALSE@ +-EXTERNAL_ORTP_TRUE = @EXTERNAL_ORTP_TRUE@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ +-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +-GMSGFMT = @GMSGFMT@ +-GMSGFMT_015 = @GMSGFMT_015@ +-GNOME_APPLETS_CFLAGS = @GNOME_APPLETS_CFLAGS@ +-GNOME_APPLETS_LIBS = @GNOME_APPLETS_LIBS@ +-GREP = @GREP@ +-INSTALL_DATA = @INSTALL_DATA@ +-INSTALL_PROGRAM = @INSTALL_PROGRAM@ +-INSTALL_SCRIPT = @INSTALL_SCRIPT@ +-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +-INTLLIBS = @INTLLIBS@ +-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ +-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ +-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ +-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ +-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ +-INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ +-INTLTOOL_PERL = @INTLTOOL_PERL@ +-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ +-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ +-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ +-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ +-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ +-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ +-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ +-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ +-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ +-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ +-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ +-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +-IPV6_CFLAGS = @IPV6_CFLAGS@ +-LDFLAGS = @LDFLAGS@ +-LIBGTK_CFLAGS = @LIBGTK_CFLAGS@ +-LIBGTK_LIBS = @LIBGTK_LIBS@ +-LIBICONV = @LIBICONV@ +-LIBINTL = @LIBINTL@ +-LIBLINPHONE_SO_VERSION = @LIBLINPHONE_SO_VERSION@ +-LIBOBJS = @LIBOBJS@ +-LIBS = @LIBS@ +-LIBTOOL = @LIBTOOL@ +-LINPHONE_CFLAGS = @LINPHONE_CFLAGS@ +-LINPHONE_LIBS = @LINPHONE_LIBS@ +-LINPHONE_VERSION = @LINPHONE_VERSION@ +-LN_S = @LN_S@ +-LTLIBICONV = @LTLIBICONV@ +-LTLIBINTL = @LTLIBINTL@ +-LTLIBOBJS = @LTLIBOBJS@ +-MAKEINFO = @MAKEINFO@ +-MS2_VERSION = @MS2_VERSION@ +-MSGFMT = @MSGFMT@ +-MSGFMT_015 = @MSGFMT_015@ +-MSGMERGE = @MSGMERGE@ +-OBJEXT = @OBJEXT@ +-ORTP_CFLAGS = @ORTP_CFLAGS@ +-ORTP_LIBS = @ORTP_LIBS@ +-ORTP_VERSION = @ORTP_VERSION@ +-OSIP_CFLAGS = @OSIP_CFLAGS@ +-OSIP_LIBS = @OSIP_LIBS@ +-PACKAGE = @PACKAGE@ +-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +-PACKAGE_NAME = @PACKAGE_NAME@ +-PACKAGE_STRING = @PACKAGE_STRING@ +-PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_VERSION = @PACKAGE_VERSION@ +-PATH_SEPARATOR = @PATH_SEPARATOR@ +-PKG_CONFIG = @PKG_CONFIG@ +-POSUB = @POSUB@ +-RANLIB = @RANLIB@ +-READLINE_CFLAGS = @READLINE_CFLAGS@ +-READLINE_LIBS = @READLINE_LIBS@ +-SED = @SED@ +-SET_MAKE = @SET_MAKE@ +-SHELL = @SHELL@ +-SPEEX_CFLAGS = @SPEEX_CFLAGS@ +-SPEEX_LIBS = @SPEEX_LIBS@ +-STRICT_OPTIONS = @STRICT_OPTIONS@ +-STRIP = @STRIP@ +-TRUESPEECH_CFLAGS = @TRUESPEECH_CFLAGS@ +-USE_NLS = @USE_NLS@ +-VERSION = @VERSION@ +-XGETTEXT = @XGETTEXT@ +-XGETTEXT_015 = @XGETTEXT_015@ +-ac_ct_CC = @ac_ct_CC@ +-ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +-am__include = @am__include@ +-am__leading_dot = @am__leading_dot@ +-am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ +-bindir = @bindir@ +-build = @build@ +-build_alias = @build_alias@ +-build_cpu = @build_cpu@ +-build_os = @build_os@ +-build_vendor = @build_vendor@ +-datadir = @datadir@ +-datarootdir = @datarootdir@ +-docdir = @docdir@ +-dvidir = @dvidir@ +-exec_prefix = @exec_prefix@ +-have_sgmltools = @have_sgmltools@ +-host = @host@ +-host_alias = @host_alias@ +-host_cpu = @host_cpu@ +-host_os = @host_os@ +-host_vendor = @host_vendor@ +-htmldir = @htmldir@ +-includedir = @includedir@ +-infodir = @infodir@ +-install_sh = @install_sh@ +-libdir = @libdir@ +-libexecdir = @libexecdir@ +-localedir = @localedir@ +-localstatedir = @localstatedir@ +-mandir = @mandir@ +-mkdir_p = @mkdir_p@ +-oldincludedir = @oldincludedir@ +-pdfdir = @pdfdir@ +-prefix = @prefix@ +-program_transform_name = @program_transform_name@ +-psdir = @psdir@ +-sbindir = @sbindir@ +-sharedstatedir = @sharedstatedir@ +-subdirs = @subdirs@ +-sysconfdir = @sysconfdir@ +-target_alias = @target_alias@ +-EXTRA_DIST = $(shell cd $(srcdir) && ls *.m4) +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu m4/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-mostlyclean-libtool: +- -rm -f *.lo +- +-clean-libtool: +- -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ +- if test -d $$d/$$file; then \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile +-installdirs: +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic clean-libtool mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-exec-am: +- +-install-info: install-info-am +- +-install-man: +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic mostlyclean-libtool +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-info-am +- +-.PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-exec install-exec-am \ +- install-info install-info-am install-man install-strip \ +- installcheck installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ +- uninstall-info-am +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +diff -Naur linphone-2.1.1.orig/Makefile.am linphone-2.1.1/Makefile.am +--- linphone-2.1.1.orig/Makefile.am 2007-11-05 14:33:36.000000000 +0100 ++++ linphone-2.1.1/Makefile.am 2009-03-13 08:34:53.000000000 +0100 +@@ -9,7 +9,7 @@ + ORTP_DIR = oRTP + endif + +-SUBDIRS = m4 pixmaps po ipkg $(ORTP_DIR) mediastreamer2\ ++SUBDIRS = pixmaps po ipkg $(ORTP_DIR) mediastreamer2\ + media_api coreapi console gtk share + + +@@ -20,7 +20,6 @@ + README.arm \ + autogen.sh \ + linphone.spec.in linphone.spec +-ACLOCAL_FLAGS=-I$(top_srcdir)/m4 + + DISTCLEANFILES= intltool-extract intltool-merge intltool-update po/stamp-it po/.intltool-merge-cache + +diff -Naur linphone-2.1.1.orig/po/Makefile.in.in linphone-2.1.1/po/Makefile.in.in +--- linphone-2.1.1.orig/po/Makefile.in.in 2007-01-17 11:15:53.000000000 +0100 ++++ linphone-2.1.1/po/Makefile.in.in 2009-03-13 08:34:53.000000000 +0100 +@@ -1,402 +1,216 @@ +-# Makefile for PO directory in any package using GNU gettext. +-# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper ++# Makefile for program source directory in GNU NLS utilities package. ++# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper ++# Copyright (C) 2004-2008 Rodney Dawes + # +-# This file can be copied and used freely without restrictions. It can +-# be used in projects which are not available under the GNU General Public +-# License but which still want to provide support for the GNU gettext +-# functionality. +-# Please note that the actual code of GNU gettext is covered by the GNU +-# General Public License and is *not* in the public domain. ++# This file may be copied and used freely without restrictions. It may ++# be used in projects which are not available under a GNU Public License, ++# but which still want to provide support for the GNU gettext functionality. + # +-# Origin: gettext-0.16 ++# - Modified by Owen Taylor to use GETTEXT_PACKAGE ++# instead of PACKAGE and to look for po2tbl in ./ not in intl/ ++# ++# - Modified by jacob berkman to install ++# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize ++# ++# - Modified by Rodney Dawes for use with intltool ++# ++# We have the following line for use by intltoolize: ++# INTLTOOL_MAKEFILE + ++GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + PACKAGE = @PACKAGE@ + VERSION = @VERSION@ +-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + + SHELL = /bin/sh +-@SET_MAKE@ + + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ ++top_builddir = @top_builddir@ + VPATH = @srcdir@ + + prefix = @prefix@ + exec_prefix = @exec_prefix@ +-datarootdir = @datarootdir@ + datadir = @datadir@ +-localedir = @localedir@ +-gettextsrcdir = $(datadir)/gettext/po ++datarootdir = @datarootdir@ ++libdir = @libdir@ ++DATADIRNAME = @DATADIRNAME@ ++itlocaledir = $(prefix)/$(DATADIRNAME)/locale ++subdir = po ++install_sh = @install_sh@ ++# Automake >= 1.8 provides @mkdir_p@. ++# Until it can be supposed, use the safe fallback: ++mkdir_p = $(install_sh) -d + + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + +-# We use $(mkdir_p). +-# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as +-# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions, +-# @install_sh@ does not start with $(SHELL), so we add it. +-# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined +-# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake +-# versions, $(mkinstalldirs) and $(install_sh) are unused. +-mkinstalldirs = $(SHELL) @install_sh@ -d +-install_sh = $(SHELL) @install_sh@ +-MKDIR_P = @MKDIR_P@ +-mkdir_p = @mkdir_p@ +- +-GMSGFMT_ = @GMSGFMT@ +-GMSGFMT_no = @GMSGFMT@ +-GMSGFMT_yes = @GMSGFMT_015@ +-GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT)) +-MSGFMT_ = @MSGFMT@ +-MSGFMT_no = @MSGFMT@ +-MSGFMT_yes = @MSGFMT_015@ +-MSGFMT = $(MSGFMT_$(USE_MSGCTXT)) +-XGETTEXT_ = @XGETTEXT@ +-XGETTEXT_no = @XGETTEXT@ +-XGETTEXT_yes = @XGETTEXT_015@ +-XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT)) +-MSGMERGE = msgmerge +-MSGMERGE_UPDATE = @MSGMERGE@ --update +-MSGINIT = msginit +-MSGCONV = msgconv +-MSGFILTER = msgfilter +- +-POFILES = @POFILES@ +-GMOFILES = @GMOFILES@ +-UPDATEPOFILES = @UPDATEPOFILES@ +-DUMMYPOFILES = @DUMMYPOFILES@ +-DISTFILES.common = Makefile.in.in remove-potcdate.sin \ +-$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3) +-DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \ +-$(POFILES) $(GMOFILES) \ +-$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3) ++GMSGFMT = @GMSGFMT@ ++MSGFMT = @MSGFMT@ ++XGETTEXT = @XGETTEXT@ ++INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ ++INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ ++MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist ++GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot + +-POTFILES = \ ++ALL_LINGUAS = @ALL_LINGUAS@ ++ ++PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi) + +-CATALOGS = @CATALOGS@ ++USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi) + +-# Makevars gets inserted here. (Don't remove this line!) ++USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) ++ ++POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) ++ ++DISTFILES = Makefile.in.in POTFILES.in $(POFILES) ++EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS ++ ++POTFILES = \ ++# This comment gets stripped out ++ ++CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done) + + .SUFFIXES: +-.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update ++.SUFFIXES: .po .pox .gmo .mo .msg .cat ++ ++.po.pox: ++ $(MAKE) $(GETTEXT_PACKAGE).pot ++ $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox + + .po.mo: +- @echo "$(MSGFMT) -c -o $@ $<"; \ +- $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@ ++ $(MSGFMT) -o $@ $< + + .po.gmo: +- @lang=`echo $* | sed -e 's,.*/,,'`; \ +- test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ +- echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \ +- cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo +- +-.sin.sed: +- sed -e '/^#/d' $< > t-$@ +- mv t-$@ $@ ++ file=`echo $* | sed 's,.*/,,'`.gmo \ ++ && rm -f $$file && $(GMSGFMT) -o $$file $< ++ ++.po.cat: ++ sed -f ../intl/po2msg.sed < $< > $*.msg \ ++ && rm -f $@ && gencat $@ $*.msg + + + all: all-@USE_NLS@ + +-all-yes: stamp-po ++all-yes: $(CATALOGS) + all-no: + +-# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no +-# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because +-# we don't want to bother translators with empty POT files). We assume that +-# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty. +-# In this case, stamp-po is a nop (i.e. a phony target). +- +-# stamp-po is a timestamp denoting the last time at which the CATALOGS have +-# been loosely updated. Its purpose is that when a developer or translator +-# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS, +-# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent +-# invocations of "make" will do nothing. This timestamp would not be necessary +-# if updating the $(CATALOGS) would always touch them; however, the rule for +-# $(POFILES) has been designed to not touch files that don't need to be +-# changed. +-stamp-po: $(srcdir)/$(DOMAIN).pot +- test ! -f $(srcdir)/$(DOMAIN).pot || \ +- test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) +- @test ! -f $(srcdir)/$(DOMAIN).pot || { \ +- echo "touch stamp-po" && \ +- echo timestamp > stamp-poT && \ +- mv stamp-poT stamp-po; \ +- } +- +-# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update', +-# otherwise packages like GCC can not be built if only parts of the source +-# have been downloaded. +- +-# This target rebuilds $(DOMAIN).pot; it is an expensive operation. +-# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed. +-$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed +- if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \ +- msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \ +- else \ +- msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \ +- fi; \ +- $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ +- --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \ +- --files-from=$(srcdir)/POTFILES.in \ +- --copyright-holder='$(COPYRIGHT_HOLDER)' \ +- --msgid-bugs-address="$$msgid_bugs_address" +- test ! -f $(DOMAIN).po || { \ +- if test -f $(srcdir)/$(DOMAIN).pot; then \ +- sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ +- sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ +- if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ +- rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ +- else \ +- rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \ +- mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ +- fi; \ +- else \ +- mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ +- fi; \ +- } +- +-# This rule has no dependencies: we don't need to update $(DOMAIN).pot at +-# every "make" invocation, only create it when it is missing. +-# Only "make $(DOMAIN).pot-update" or "make dist" will force an update. +-$(srcdir)/$(DOMAIN).pot: +- $(MAKE) $(DOMAIN).pot-update +- +-# This target rebuilds a PO file if $(DOMAIN).pot has changed. +-# Note that a PO file is not touched if it doesn't need to be changed. +-$(POFILES): $(srcdir)/$(DOMAIN).pot +- @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ +- if test -f "$(srcdir)/$${lang}.po"; then \ +- test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ +- echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \ +- cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \ +- else \ +- $(MAKE) $${lang}.po-create; \ +- fi +- ++$(GETTEXT_PACKAGE).pot: $(POTFILES) ++ $(GENPOT) + +-install: install-exec install-data +-install-exec: ++install: install-data + install-data: install-data-@USE_NLS@ +- if test "$(PACKAGE)" = "gettext-tools"; then \ +- $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ +- for file in $(DISTFILES.common) Makevars.template; do \ +- $(INSTALL_DATA) $(srcdir)/$$file \ +- $(DESTDIR)$(gettextsrcdir)/$$file; \ +- done; \ +- for file in Makevars; do \ +- rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ +- done; \ +- else \ +- : ; \ +- fi + install-data-no: all + install-data-yes: all +- $(mkdir_p) $(DESTDIR)$(datadir) +- @catalogs='$(CATALOGS)'; \ +- for cat in $$catalogs; do \ +- cat=`basename $$cat`; \ +- lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ +- dir=$(localedir)/$$lang/LC_MESSAGES; \ +- $(mkdir_p) $(DESTDIR)$$dir; \ +- if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \ +- $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ +- echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ +- for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ +- if test -n "$$lc"; then \ +- if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ +- link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \ +- mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ +- mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ +- (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ +- for file in *; do \ +- if test -f $$file; then \ +- ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \ +- fi; \ +- done); \ +- rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ +- else \ +- if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ +- :; \ +- else \ +- rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ +- mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ +- fi; \ +- fi; \ +- rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ +- ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \ +- ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \ +- cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ +- echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \ ++ linguas="$(USE_LINGUAS)"; \ ++ for lang in $$linguas; do \ ++ dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ ++ $(mkdir_p) $$dir; \ ++ if test -r $$lang.gmo; then \ ++ $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ ++ echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \ ++ else \ ++ $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ ++ echo "installing $(srcdir)/$$lang.gmo as" \ ++ "$$dir/$(GETTEXT_PACKAGE).mo"; \ ++ fi; \ ++ if test -r $$lang.gmo.m; then \ ++ $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \ ++ echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \ ++ else \ ++ if test -r $(srcdir)/$$lang.gmo.m ; then \ ++ $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \ ++ $$dir/$(GETTEXT_PACKAGE).mo.m; \ ++ echo "installing $(srcdir)/$$lang.gmo.m as" \ ++ "$$dir/$(GETTEXT_PACKAGE).mo.m"; \ ++ else \ ++ true; \ + fi; \ +- done; \ ++ fi; \ + done + +-install-strip: install +- +-installdirs: installdirs-exec installdirs-data +-installdirs-exec: +-installdirs-data: installdirs-data-@USE_NLS@ +- if test "$(PACKAGE)" = "gettext-tools"; then \ +- $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ +- else \ +- : ; \ +- fi +-installdirs-data-no: +-installdirs-data-yes: +- $(mkdir_p) $(DESTDIR)$(datadir) +- @catalogs='$(CATALOGS)'; \ +- for cat in $$catalogs; do \ +- cat=`basename $$cat`; \ +- lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ +- dir=$(localedir)/$$lang/LC_MESSAGES; \ +- $(mkdir_p) $(DESTDIR)$$dir; \ +- for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ +- if test -n "$$lc"; then \ +- if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ +- link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \ +- mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ +- mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ +- (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ +- for file in *; do \ +- if test -f $$file; then \ +- ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \ +- fi; \ +- done); \ +- rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ +- else \ +- if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ +- :; \ +- else \ +- rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ +- mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ +- fi; \ +- fi; \ +- fi; \ +- done; \ +- done ++# Empty stubs to satisfy archaic automake needs ++dvi info tags TAGS ID: + + # Define this as empty until I found a useful application. +-installcheck: ++install-exec installcheck: + +-uninstall: uninstall-exec uninstall-data +-uninstall-exec: +-uninstall-data: uninstall-data-@USE_NLS@ +- if test "$(PACKAGE)" = "gettext-tools"; then \ +- for file in $(DISTFILES.common) Makevars.template; do \ +- rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ +- done; \ +- else \ +- : ; \ +- fi +-uninstall-data-no: +-uninstall-data-yes: +- catalogs='$(CATALOGS)'; \ +- for cat in $$catalogs; do \ +- cat=`basename $$cat`; \ +- lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ +- for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \ +- rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ +- done; \ ++uninstall: ++ linguas="$(USE_LINGUAS)"; \ ++ for lang in $$linguas; do \ ++ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ ++ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ + done + +-check: all +- +-info dvi ps pdf html tags TAGS ctags CTAGS ID: ++check: all $(GETTEXT_PACKAGE).pot ++ rm -f missing notexist ++ srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m ++ if [ -r missing -o -r notexist ]; then \ ++ exit 1; \ ++ fi + + mostlyclean: +- rm -f remove-potcdate.sed +- rm -f stamp-poT +- rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po +- rm -fr *.o ++ rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp ++ rm -f .intltool-merge-cache + + clean: mostlyclean + + distclean: clean +- rm -f Makefile Makefile.in POTFILES *.mo ++ rm -f Makefile Makefile.in POTFILES stamp-it ++ rm -f *.mo *.msg *.cat *.cat.m *.gmo + + maintainer-clean: distclean + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." +- rm -f stamp-po $(GMOFILES) ++ rm -f Makefile.in.in + +-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) +-dist distdir: +- $(MAKE) update-po +- @$(MAKE) dist2 +-# This is a separate target because 'update-po' must be executed before. +-dist2: stamp-po $(DISTFILES) ++distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) ++dist distdir: $(DISTFILES) + dists="$(DISTFILES)"; \ +- if test "$(PACKAGE)" = "gettext-tools"; then \ +- dists="$$dists Makevars.template"; \ +- fi; \ +- if test -f $(srcdir)/$(DOMAIN).pot; then \ +- dists="$$dists $(DOMAIN).pot stamp-po"; \ +- fi; \ +- if test -f $(srcdir)/ChangeLog; then \ +- dists="$$dists ChangeLog"; \ +- fi; \ +- for i in 0 1 2 3 4 5 6 7 8 9; do \ +- if test -f $(srcdir)/ChangeLog.$$i; then \ +- dists="$$dists ChangeLog.$$i"; \ +- fi; \ ++ extra_dists="$(EXTRA_DISTFILES)"; \ ++ for file in $$extra_dists; do \ ++ test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \ + done; \ +- if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \ + for file in $$dists; do \ +- if test -f $$file; then \ +- cp -p $$file $(distdir) || exit 1; \ +- else \ +- cp -p $(srcdir)/$$file $(distdir) || exit 1; \ +- fi; \ ++ test -f $$file || file="$(srcdir)/$$file"; \ ++ ln $$file $(distdir) 2> /dev/null \ ++ || cp -p $$file $(distdir); \ + done + + update-po: Makefile +- $(MAKE) $(DOMAIN).pot-update +- test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES) +- $(MAKE) update-gmo +- +-# General rule for creating PO files. +- +-.nop.po-create: +- @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \ +- echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \ +- exit 1 +- +-# General rule for updating PO files. +- +-.nop.po-update: +- @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \ +- if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \ ++ $(MAKE) $(GETTEXT_PACKAGE).pot + tmpdir=`pwd`; \ +- echo "$$lang:"; \ +- test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ +- echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ +- cd $(srcdir); \ +- if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \ +- if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ +- rm -f $$tmpdir/$$lang.new.po; \ +- else \ +- if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ +- :; \ +- else \ +- echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ +- exit 1; \ ++ linguas="$(USE_LINGUAS)"; \ ++ for lang in $$linguas; do \ ++ echo "$$lang:"; \ ++ result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \ ++ if $$result; then \ ++ if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ ++ rm -f $$tmpdir/$$lang.new.po; \ ++ else \ ++ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ ++ :; \ ++ else \ ++ echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ ++ rm -f $$tmpdir/$$lang.new.po; \ ++ exit 1; \ ++ fi; \ + fi; \ ++ else \ ++ echo "msgmerge for $$lang.gmo failed!"; \ ++ rm -f $$tmpdir/$$lang.new.po; \ + fi; \ +- else \ +- echo "msgmerge for $$lang.po failed!" 1>&2; \ +- rm -f $$tmpdir/$$lang.new.po; \ +- fi +- +-$(DUMMYPOFILES): ++ done + +-update-gmo: Makefile $(GMOFILES) +- @: ++Makefile POTFILES: stamp-it ++ @if test ! -f $@; then \ ++ rm -f stamp-it; \ ++ $(MAKE) stamp-it; \ ++ fi + +-Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@ ++stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in + cd $(top_builddir) \ +- && $(SHELL) ./config.status $(subdir)/$@.in po-directories +- +-force: ++ && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \ ++ $(SHELL) ./config.status + + # Tell versions [3.59,3.63) of GNU make not to export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/linphone-2.1.1-mediastreamer.patch b/linphone-2.1.1-mediastreamer.patch new file mode 100644 index 0000000..3cb0749 --- /dev/null +++ b/linphone-2.1.1-mediastreamer.patch @@ -0,0 +1,187 @@ +diff -Naur linphone-2.1.1.orig/mediastreamer2/acinclude.m4 linphone-2.1.1/mediastreamer2/acinclude.m4 +--- linphone-2.1.1.orig/mediastreamer2/acinclude.m4 2007-12-14 12:17:57.000000000 +0100 ++++ linphone-2.1.1/mediastreamer2/acinclude.m4 2009-03-13 08:37:11.000000000 +0100 +@@ -1,3 +1,4 @@ ++dnl -*- autoconf -*- + AC_DEFUN([MS_CHECK_DEP],[ + dnl $1=dependency description + dnl $2=dependency short name, will be suffixed with _CFLAGS and _LIBS +@@ -7,7 +8,7 @@ + dnl $6=lib to check + dnl $7=function to check in library + +- NAME=$2 ++ dep_name=$2 + dep_headersdir=$3 + dep_libsdir=$4 + dep_header=$5 +@@ -15,31 +16,31 @@ + dep_funclib=$7 + other_libs=$8 + +- if test "$dep_headersdir" != "/usr/include" ; then +- eval ${NAME}_CFLAGS=\"-I$dep_headersdir \" +- fi +- eval ${NAME}_LIBS=\"-L$dep_libsdir -l$dep_lib\" +- + CPPFLAGS_save=$CPPFLAGS + LDFLAGS_save=$LDFLAGS +- CPPFLAGS="-I$dep_headersdir " +- LDFLAGS="-L$dep_libsdir " ++ LIBS_save=$LIBS ++ CPPFLAGS=`echo "-I$dep_headersdir"|sed -e "s:-I/usr/include[\ ]*$::"` ++ LIBS="-l$dep_lib" ++ LDFLAGS=`echo "-L$dep_libsdir"|sed -e "s:-L/usr/lib\(64\)*[\ ]*::"` + ++ $2_CFLAGS="$CPPFLAGS" ++ $2_LIBS="$LDFLAGS $LIBS" ++ + AC_CHECK_HEADERS([$dep_header],[AC_CHECK_LIB([$dep_lib],[$dep_funclib],found=yes,found=no, [$other_libs]) + ],found=no) + + if test "$found" = "yes" ; then +- eval ${NAME}_found=yes +- AC_SUBST($2_CFLAGS) +- AC_SUBST($2_LIBS) ++ eval $2_found=yes + else +- eval ${NAME}_found=no +- eval ${NAME}_CFLAGS= +- eval ${NAME}_LIBS= ++ eval $2_found=no ++ eval $2_CFLAGS= ++ eval $2_LIBS= + fi ++ AC_SUBST($2_CFLAGS) ++ AC_SUBST($2_LIBS) + CPPFLAGS=$CPPFLAGS_save + LDFLAGS=$LDFLAGS_save +- ++ LIBS=$LIBS_save + ]) + + +@@ -72,28 +73,56 @@ + AC_MSG_ERROR([Could not find ffmpeg headers and library. This is mandatory for video support]) + fi + ++ dnl check for new/old ffmpeg header file layout ++ CPPFLAGS_save=$CPPFLAGS ++ CPPFLAGS="$FFMPEG_CFLAGS $CPPFLAGS" ++ AC_CHECK_HEADERS(libavcodec/avcodec.h) ++ CPPFLAGS=$CPPFLAGS_save ++ + dnl to workaround a bug on debian and ubuntu, check if libavcodec needs -lvorbisenc to compile + AC_CHECK_LIB(avcodec,avcodec_register_all, novorbis=yes , [ + LIBS="$LIBS -lvorbisenc" + ], $FFMPEG_LIBS ) + +- dnl check if sws_scale is available +- AC_CHECK_LIB(avcodec,sws_scale, have_sws_scale=yes , have_sws_scale=no, +- $FFMPEG_LIBS ) +- if test x$have_sws_scale = xno ; then +- PKG_CHECK_MODULES(SWSCALE, [libswscale >= 0.5.0 ], need_swscale=yes, need_swscale=no) +- fi +- +- MS_CHECK_DEP([SDL],[SDL],[${libsdldir}/include],[${libsdldir}/lib],[SDL/SDL.h],[SDL],[SDL_Init]) +- if test "$SDL_found" = "no" ; then +- AC_MSG_ERROR([Could not find libsdl headers and library. This is mandatory for video support]) ++ dnl when swscale feature is not provided by ++ dnl libswscale, its features are swallowed by ++ dnl libavcodec, but without swscale.h and without any ++ dnl declaration into avcodec.h (this is to be ++ dnl considered as an ffmpeg bug). ++ dnl ++ dnl #if defined(HAVE_LIBAVCODEC_AVCODEC_H) && !defined(HAVE_LIBSWSCALE_SWSCALE_H) ++ dnl # include "swscale.h" // private linhone swscale.h ++ dnl #endif ++ CPPFLAGS_save=$CPPFLAGS ++ CPPFLAGS="$FFMPEG_CFLAGS $CPPFLAGS" ++ AC_CHECK_HEADERS(libswscale/swscale.h) ++ CPPFLAGS=$CPPFLAGS_save ++ ++ PKG_CHECK_MODULES(SWSCALE, [libswscale >= 0.5.0 ], [echo "We have libswscale"], ++ [echo "We don't have libswscale, let's hope its symbols are in libavcodec"] ) ++ ++ if test "$libsdldir" != "none" ; then ++ MS_CHECK_DEP([SDL],[SDL],[${libsdldir}/include],[${libsdldir}/lib],[SDL/SDL.h],[SDL],[SDL_Init]) ++ if test "$SDL_found" = "no" ; then ++ AC_MSG_ERROR([Could not find libsdl headers and library. This is mandatory for video support]) ++ fi + fi + + PKG_CHECK_MODULES(THEORA, [theora >= 1.0alpha7 ], [have_theora=yes], + [have_theora=no]) +- +- VIDEO_CFLAGS=" $FFMPEG_CFLAGS $SDL_CFLAGS -DVIDEO_ENABLED " +- VIDEO_LIBS=" $FFMPEG_LIBS $SWSCALE_LIBS $SDL_LIBS" ++ AC_CHECK_HEADERS(X11/Xlib.h) ++ ++ VIDEO_CFLAGS=" $FFMPEG_CFLAGS -DVIDEO_ENABLED" ++ VIDEO_LIBS=" $FFMPEG_LIBS $SWSCALE_LIBS" ++ ++ if test "$SDL_found" = "yes" ; then ++ VIDEO_CFLAGS="$VIDEO_CFLAGS $SDL_CFLAGS -DHAVE_SDL" ++ VIDEO_LIBS="$VIDEO_LIBS $SDL_LIBS" ++ fi ++ ++ if test "${ac_cv_header_X11_Xlib_h}" = "yes" ; then ++ VIDEO_LIBS="$VIDEO_LIBS -lX11" ++ fi + fi + + AC_SUBST(VIDEO_CFLAGS) +diff -Naur linphone-2.1.1.orig/mediastreamer2/configure.ac linphone-2.1.1/mediastreamer2/configure.ac +--- linphone-2.1.1.orig/mediastreamer2/configure.ac 2008-01-18 23:12:55.000000000 +0100 ++++ linphone-2.1.1/mediastreamer2/configure.ac 2009-03-13 08:37:11.000000000 +0100 +@@ -109,10 +109,6 @@ + CFLAGS="$CFLAGS -D_BIGENDIAN " + fi + +-if test $GCC = yes && test $wall_werror = yes; then +- CFLAGS="$CFLAGS -Werror " +-fi +- + macosx_found=no + + dnl add thread flags +diff -Naur linphone-2.1.1.orig/mediastreamer2/src/ice.c linphone-2.1.1/mediastreamer2/src/ice.c +--- linphone-2.1.1.orig/mediastreamer2/src/ice.c 2007-10-18 22:05:10.000000000 +0200 ++++ linphone-2.1.1/mediastreamer2/src/ice.c 2009-03-13 08:37:11.000000000 +0100 +@@ -25,6 +25,10 @@ + #include + #endif + ++#ifndef NI_MAXHOST ++#define NI_MAXHOST 1025 ++#endif ++ + #include "mediastreamer2/ice.h" + #include "mediastreamer2/mscommon.h" + +diff -Naur linphone-2.1.1.orig/mediastreamer2/src/Makefile.am linphone-2.1.1/mediastreamer2/src/Makefile.am +--- linphone-2.1.1.orig/mediastreamer2/src/Makefile.am 2008-01-01 01:05:54.000000000 +0100 ++++ linphone-2.1.1/mediastreamer2/src/Makefile.am 2009-03-13 08:37:11.000000000 +0100 +@@ -121,7 +121,7 @@ + AM_CFLAGS+=$(VIDEO_CFLAGS) + endif + +-imgdir=$(datadir)/images/ ++imgdir=$(datadir)/images/linphone/ + + img_DATA=nowebcamCIF.jpg + +diff -Naur linphone-2.1.1.orig/mediastreamer2/src/nowebcam.c linphone-2.1.1/mediastreamer2/src/nowebcam.c +--- linphone-2.1.1.orig/mediastreamer2/src/nowebcam.c 2007-12-14 14:37:56.000000000 +0100 ++++ linphone-2.1.1/mediastreamer2/src/nowebcam.c 2009-03-13 08:37:11.000000000 +0100 +@@ -83,8 +83,8 @@ + mblk_t *ms_load_nowebcam(MSVideoSize *reqsize, int idx){ + char tmp[256]; + if (idx<0) +- snprintf(tmp, sizeof(tmp), "%s/images/%s.jpg", PACKAGE_DATA_DIR, NOWEBCAM_JPG); ++ snprintf(tmp, sizeof(tmp), "%s/images/linphone/%s.jpg", PACKAGE_DATA_DIR, NOWEBCAM_JPG); + else +- snprintf(tmp, sizeof(tmp), "%s/images/%s%i.jpg", PACKAGE_DATA_DIR, NOWEBCAM_JPG, idx); ++ snprintf(tmp, sizeof(tmp), "%s/images/linphone/%s%i.jpg", PACKAGE_DATA_DIR, NOWEBCAM_JPG, idx); + return ms_load_jpeg_as_yuv(tmp,reqsize); + } diff --git a/linphone-2.1.1-oRTP.patch b/linphone-2.1.1-oRTP.patch new file mode 100644 index 0000000..38fbfef --- /dev/null +++ b/linphone-2.1.1-oRTP.patch @@ -0,0 +1,28 @@ +diff -Naur linphone-2.1.1.orig/oRTP/Makefile.am linphone-2.1.1/oRTP/Makefile.am +--- linphone-2.1.1.orig/oRTP/Makefile.am 2007-10-18 22:05:10.000000000 +0200 ++++ linphone-2.1.1/oRTP/Makefile.am 2009-03-13 08:38:34.000000000 +0100 +@@ -12,14 +12,13 @@ + if HAVE_DOXYGEN + + # doxdir & pkgdocdir are not always defined by automake +-docdir=$(datadir)/doc + pkgdocdir=$(docdir)/$(PACKAGE)-$(VERSION) + doc_htmldir=$(pkgdocdir)/html + + doc_html_DATA = $(top_builddir)/doc/html/html.tar + + $(doc_html_DATA): $(top_builddir)/doc/html/index.html +- cd $(