mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-13 10:06:33 +01:00
upgrade to glibmm 2.16
git-svn-id: svn://localhost/ardour2/branches/3.0@5303 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis
parent
5b97b13766
commit
e916ac2821
211 changed files with 26478 additions and 4168 deletions
|
|
@ -1,8 +1,8 @@
|
|||
# Makefile.in generated by automake 1.10 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.10.1 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
||||
# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
||||
# 2003, 2004, 2005, 2006, 2007, 2008 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.
|
||||
|
|
@ -38,6 +38,7 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
|
|||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/scripts/c_std.m4 \
|
||||
$(top_srcdir)/scripts/cxx.m4 $(top_srcdir)/scripts/cxx_std.m4 \
|
||||
$(top_srcdir)/scripts/dk-feature.m4 \
|
||||
$(top_srcdir)/scripts/docgen.m4 \
|
||||
$(top_srcdir)/scripts/glibmm_check_perl.m4 \
|
||||
$(top_srcdir)/scripts/macros.m4 \
|
||||
|
|
@ -47,7 +48,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
|||
$(ACLOCAL_M4)
|
||||
mkinstalldirs = $(install_sh) -d
|
||||
CONFIG_HEADER = $(top_builddir)/config.h \
|
||||
$(top_builddir)/glib/glibmmconfig.h
|
||||
$(top_builddir)/glib/glibmmconfig.h \
|
||||
$(top_builddir)/gio/giommconfig.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
SOURCES =
|
||||
DIST_SOURCES =
|
||||
|
|
@ -84,6 +86,7 @@ DEPDIR = @DEPDIR@
|
|||
DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@
|
||||
DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
|
||||
DLLTOOL = @DLLTOOL@
|
||||
DSYMUTIL = @DSYMUTIL@
|
||||
ECHO = @ECHO@
|
||||
ECHO_C = @ECHO_C@
|
||||
ECHO_N = @ECHO_N@
|
||||
|
|
@ -92,6 +95,8 @@ EGREP = @EGREP@
|
|||
EXEEXT = @EXEEXT@
|
||||
F77 = @F77@
|
||||
FFLAGS = @FFLAGS@
|
||||
GIOMM_CFLAGS = @GIOMM_CFLAGS@
|
||||
GIOMM_LIBS = @GIOMM_LIBS@
|
||||
GLIBMM_CFLAGS = @GLIBMM_CFLAGS@
|
||||
GLIBMM_LIBS = @GLIBMM_LIBS@
|
||||
GLIBMM_MAJOR_VERSION = @GLIBMM_MAJOR_VERSION@
|
||||
|
|
@ -99,6 +104,7 @@ GLIBMM_MICRO_VERSION = @GLIBMM_MICRO_VERSION@
|
|||
GLIBMM_MINOR_VERSION = @GLIBMM_MINOR_VERSION@
|
||||
GLIBMM_RELEASE = @GLIBMM_RELEASE@
|
||||
GLIBMM_VERSION = @GLIBMM_VERSION@
|
||||
GMMPROC_DIR = @GMMPROC_DIR@
|
||||
GREP = @GREP@
|
||||
GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
|
||||
GTHREAD_LIBS = @GTHREAD_LIBS@
|
||||
|
|
@ -120,6 +126,7 @@ M4 = @M4@
|
|||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MKDIR_P = @MKDIR_P@
|
||||
NMEDIT = @NMEDIT@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
PACKAGE = @PACKAGE@
|
||||
|
|
@ -132,6 +139,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
|
|||
PERL_PATH = @PERL_PATH@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
RANLIB = @RANLIB@
|
||||
SED = @SED@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
STRIP = @STRIP@
|
||||
|
|
@ -185,6 +193,7 @@ sharedstatedir = @sharedstatedir@
|
|||
srcdir = @srcdir@
|
||||
sysconfdir = @sysconfdir@
|
||||
target_alias = @target_alias@
|
||||
top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
#! /bin/sh
|
||||
# depcomp - compile a program generating dependencies as side-effects
|
||||
|
||||
scriptversion=2006-10-15.18
|
||||
scriptversion=2007-03-29.01
|
||||
|
||||
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
|
||||
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
|
||||
# Foundation, Inc.
|
||||
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -215,34 +215,39 @@ aix)
|
|||
# current directory. Also, the AIX compiler puts `$object:' at the
|
||||
# start of each line; $object doesn't have directory information.
|
||||
# Version 6 uses the directory in both cases.
|
||||
stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
|
||||
tmpdepfile="$stripped.u"
|
||||
dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
|
||||
test "x$dir" = "x$object" && dir=
|
||||
base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
|
||||
if test "$libtool" = yes; then
|
||||
tmpdepfile1=$dir$base.u
|
||||
tmpdepfile2=$base.u
|
||||
tmpdepfile3=$dir.libs/$base.u
|
||||
"$@" -Wc,-M
|
||||
else
|
||||
tmpdepfile1=$dir$base.u
|
||||
tmpdepfile2=$dir$base.u
|
||||
tmpdepfile3=$dir$base.u
|
||||
"$@" -M
|
||||
fi
|
||||
stat=$?
|
||||
|
||||
if test -f "$tmpdepfile"; then :
|
||||
else
|
||||
stripped=`echo "$stripped" | sed 's,^.*/,,'`
|
||||
tmpdepfile="$stripped.u"
|
||||
fi
|
||||
|
||||
if test $stat -eq 0; then :
|
||||
else
|
||||
rm -f "$tmpdepfile"
|
||||
rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
|
||||
exit $stat
|
||||
fi
|
||||
|
||||
for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
|
||||
do
|
||||
test -f "$tmpdepfile" && break
|
||||
done
|
||||
if test -f "$tmpdepfile"; then
|
||||
outname="$stripped.o"
|
||||
# Each line is of the form `foo.o: dependent.h'.
|
||||
# Do two passes, one to just change these to
|
||||
# `$object: dependent.h' and one to simply `dependent.h:'.
|
||||
sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
|
||||
sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
|
||||
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
|
||||
# That's a tab and a space in the [].
|
||||
sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
|
||||
else
|
||||
# The sourcefile does not contain any dependencies, so just
|
||||
# store a dummy comment line, to avoid errors with the Makefile
|
||||
|
|
|
|||
101
libs/glibmm2/scripts/dk-feature.m4
Normal file
101
libs/glibmm2/scripts/dk-feature.m4
Normal file
|
|
@ -0,0 +1,101 @@
|
|||
## Copyright (c) 2004-2007 Daniel Elstner <daniel.kitta@gmail.com>
|
||||
##
|
||||
## This file is part of danielk's Autostuff.
|
||||
##
|
||||
## danielk's Autostuff is free software; you can redistribute it and/or
|
||||
## modify it under the terms of the GNU General Public License as published
|
||||
## by the Free Software Foundation; either version 2 of the License, or (at
|
||||
## your option) any later version.
|
||||
##
|
||||
## danielk's Autostuff is distributed in the hope that it will be useful, but
|
||||
## WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
## for more details.
|
||||
##
|
||||
## You should have received a copy of the GNU General Public License along
|
||||
## with danielk's Autostuff; if not, write to the Free Software Foundation,
|
||||
## Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
#serial 20070105
|
||||
|
||||
## _DK_SH_VAR_PUSH_DEPTH(depth, variable, [value])
|
||||
##
|
||||
m4_define([_DK_SH_VAR_PUSH_DEPTH],
|
||||
[dnl
|
||||
m4_pushdef([_DK_SH_VAR_DEPTH_$2], [$1])[]dnl
|
||||
dk_save_sh_var_$2_$1=$$2
|
||||
m4_if([$3], [],, [$2=$3
|
||||
])[]dnl
|
||||
])
|
||||
|
||||
## _DK_SH_VAR_POP_DEPTH(depth, variable)
|
||||
##
|
||||
m4_define([_DK_SH_VAR_POP_DEPTH],
|
||||
[dnl
|
||||
$2=$dk_save_sh_var_$2_$1
|
||||
m4_popdef([_DK_SH_VAR_DEPTH_$2])[]dnl
|
||||
])
|
||||
|
||||
## DK_SH_VAR_PUSH(variable, [value])
|
||||
##
|
||||
## Temporarily replace the current value of the shell variable <variable>
|
||||
## with <value> until DK_SH_VAR_POP(<variable>) is invoked to restore the
|
||||
## original value. If <value> is empty, <variable> is left unchanged but
|
||||
## its current value is still saved.
|
||||
##
|
||||
## This macro may safely be used repeatedly on the same shell variable,
|
||||
## as long as each DK_SH_VAR_PUSH(variable) is matched by a corresponding
|
||||
## DK_SH_VAR_POP(variable).
|
||||
##
|
||||
AC_DEFUN([DK_SH_VAR_PUSH],
|
||||
[dnl
|
||||
m4_if([$1],, [AC_FATAL([argument expected])])[]dnl
|
||||
_DK_SH_VAR_PUSH_DEPTH(m4_ifdef([_DK_SH_VAR_DEPTH_$1],
|
||||
[m4_incr(_DK_SH_VAR_DEPTH_$1)],
|
||||
[1]),
|
||||
[$1], [$2])[]dnl
|
||||
])
|
||||
|
||||
## DK_SH_VAR_POP(variable)
|
||||
##
|
||||
## Restore the original value of the shell variable <variable> which it had
|
||||
## before the corresponding invocation of DK_SH_VAR_PUSH(<variable>).
|
||||
##
|
||||
AC_DEFUN([DK_SH_VAR_POP],
|
||||
[dnl
|
||||
m4_if([$1],, [AC_FATAL([argument expected])])[]dnl
|
||||
_DK_SH_VAR_POP_DEPTH(_DK_SH_VAR_DEPTH_$1, [$1])[]dnl
|
||||
])
|
||||
|
||||
## _DK_CHECK_FEATURE_VAR(feature, source, cache var, shell var, cpp define)
|
||||
##
|
||||
m4_define([_DK_CHECK_FEATURE_VAR],
|
||||
[dnl
|
||||
AC_CACHE_CHECK([for $1], [$3],
|
||||
[AC_LINK_IFELSE([$2], [$3=yes], [$3=no])])
|
||||
$4=$$3
|
||||
|
||||
AS_IF([test "x$$4" = xyes],
|
||||
[AC_DEFINE([$5], [1], [Define to 1 if $1 is available.])
|
||||
])[]dnl
|
||||
])
|
||||
|
||||
## DK_CHECK_FEATURE(feature, test source)
|
||||
##
|
||||
## Check for a feature of the C/C++ environment. If compiling and linking
|
||||
## the supplied test program is successful, the configuration header macro
|
||||
## <PACKAGE_TARNAME>_HAVE_<FEATURE> is defined to 1 and "yes" is assigned
|
||||
## to the shell variable <PACKAGE_TARNAME>_FEATURE_<FEATURE>. Otherwise,
|
||||
## <PACKAGE_TARNAME>_FEATURE_<FEATURE> is set to "no".
|
||||
##
|
||||
## This macro is intended to be used in conjunction with AC_LANG_PROGRAM
|
||||
## or AC_LANG_SOURCE.
|
||||
##
|
||||
AC_DEFUN([DK_CHECK_FEATURE],
|
||||
[dnl
|
||||
m4_if([$2],, [AC_FATAL([2 arguments expected])])[]dnl
|
||||
_DK_CHECK_FEATURE_VAR([$1], [$2],
|
||||
m4_quote(AS_TR_SH([dk_cv_feature_$1])),
|
||||
m4_quote(AS_TR_CPP(AC_PACKAGE_TARNAME[_FEATURE_$1])),
|
||||
m4_quote(AS_TR_CPP(AC_PACKAGE_TARNAME[_HAVE_$1])))[]dnl
|
||||
])
|
||||
|
|
@ -10,7 +10,7 @@ AC_CHECK_PROGS(M4, gm4 m4, m4)
|
|||
|
||||
if test "$M4" = "m4"; then
|
||||
AC_MSG_CHECKING(whether m4 is GNU m4)
|
||||
if $M4 --version </dev/null 2>/dev/null | grep '^GNU [Mm]4 ' >/dev/null ; then
|
||||
if $M4 --version </dev/null 2>/dev/null | grep -i '^GNU M4 ' >/dev/null ; then
|
||||
AC_MSG_RESULT(yes)
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue