diff --git a/sflphone-client-gnome/src/actions.c b/sflphone-client-gnome/src/actions.c
index 9a46aec00d75d52c5424aef6f5a9fa19afc312ab..02c8f215d334bc3a2a079b0ee2b3ca3af47c3fe5 100644
--- a/sflphone-client-gnome/src/actions.c
+++ b/sflphone-client-gnome/src/actions.c
@@ -832,7 +832,6 @@ sflphone_set_current_account()
void
sflphone_fill_codec_list()
{
-
codec_list_clear();
gchar** codecs = (gchar**)dbus_codec_list();
@@ -845,7 +844,9 @@ sflphone_fill_codec_list()
codec_t * c = g_new0(codec_t, 1);
c->_payload = atoi(*order);
details = (gchar **)dbus_codec_details(c->_payload);
+
//DEBUG("Codec details: %s / %s / %s / %s",details[0],details[1],details[2],details[3]);
+
c->name = details[0];
c->is_active = TRUE;
c->sample_rate = atoi(details[1]);
@@ -857,7 +858,7 @@ sflphone_fill_codec_list()
for(pl=codecs; *codecs; codecs++)
{
details = (gchar **)dbus_codec_details(atoi(*codecs));
- if(codec_list_get(details[0])!=NULL){
+ if(codec_list_get_by_payload(atoi(*codecs))!=NULL){
// does nothing - the codec is already in the list, so is active.
}
else{
diff --git a/sflphone-client-gnome/src/codeclist.c b/sflphone-client-gnome/src/codeclist.c
index 1978022146ecc325eb38cc7c8d3b31fde4dcf1dc..ea9fa22ade1e8dc0f5177834974ecb3c831e23b5 100644
--- a/sflphone-client-gnome/src/codeclist.c
+++ b/sflphone-client-gnome/src/codeclist.c
@@ -62,14 +62,16 @@ codec_list_clear ()
void
codec_list_add(codec_t * c)
{
+ g_print ("add %s codec\n", c->name);
g_queue_push_tail (codecQueue, (gpointer *) c);
}
-void
-codec_set_active(gchar* name)
+
+void
+codec_set_active(codec_t * c)
{
- codec_t * c = codec_list_get(name);
+
if(c)
{
DEBUG("%s set active", c->name);
@@ -78,9 +80,9 @@ codec_set_active(gchar* name)
}
void
-codec_set_inactive(gchar* name)
+codec_set_inactive(codec_t * c)
{
- codec_t * c = codec_list_get(name);
+
if(c)
c->is_active = FALSE;
}
@@ -92,7 +94,7 @@ codec_list_get_size()
}
codec_t*
-codec_list_get( const gchar* name)
+codec_list_get_by_name( const gchar* name)
{
GList * c = g_queue_find_custom(codecQueue, name, is_name_codecstruct);
if(c)
@@ -101,6 +103,16 @@ codec_list_get( const gchar* name)
return NULL;
}
+codec_t*
+codec_list_get_by_payload( const int payload)
+{
+ GList * c = g_queue_find_custom(codecQueue, payload, is_payload_codecstruct);
+ if(c)
+ return (codec_t *)c->data;
+ else
+ return NULL;
+}
+
codec_t*
codec_list_get_nth(guint index)
{
@@ -121,6 +133,7 @@ codec_set_prefered_order(guint index)
void
codec_list_move_codec_up(guint index)
{
+ printf("Codec list Size: %i \n",codec_list_get_size());
if(index != 0)
{
gpointer codec = g_queue_pop_nth(codecQueue, index);
@@ -140,6 +153,7 @@ codec_list_move_codec_up(guint index)
void
codec_list_move_codec_down(guint index)
{
+ printf("Codec list Size: %i \n",codec_list_get_size());
if(index != codecQueue->length)
{
gpointer codec = g_queue_pop_nth(codecQueue, index);
diff --git a/sflphone-client-gnome/src/codeclist.h b/sflphone-client-gnome/src/codeclist.h
index 671060c68d2af585ace6570f45c0f5f98e3c7946..e825e148c90c0ecc0b50674168af0e68fb93eeed 100644
--- a/sflphone-client-gnome/src/codeclist.h
+++ b/sflphone-client-gnome/src/codeclist.h
@@ -66,13 +66,13 @@ void codec_list_add(codec_t * c);
* Set a codec active. An active codec will be used for codec negociation
* @param name The string description of the codec
*/
-void codec_set_active(gchar* name);
+void codec_set_active(codec_t * c);
/**
* Set a codec inactive. An active codec won't be used for codec negociation
* @param name The string description of the codec
*/
-void codec_set_inactive(gchar* name);
+void codec_set_inactive(codec_t * c);
/**
* Return the number of codecs in the list
@@ -85,7 +85,7 @@ guint codec_list_get_size();
* @param name The string description of the codec
* @return codec_t* A codec or NULL
*/
-codec_t * codec_list_get(const gchar * name);
+codec_t * codec_list_get_by_name(const gchar * name);
/**
* Return the codec at the nth position in the list
@@ -117,4 +117,6 @@ void codec_list_move_codec_down(guint index);
*/
void codec_list_update_to_daemon();
+codec_t* codec_list_get_by_payload( const int payload);
+
#endif
diff --git a/sflphone-client-gnome/src/config/audioconf.c b/sflphone-client-gnome/src/config/audioconf.c
index 44cd9c104f5a6e5128932402e4173bb02940a282..82a324f689d3f95b98f23167a863514b3c4d73c8 100644
--- a/sflphone-client-gnome/src/config/audioconf.c
+++ b/sflphone-client-gnome/src/config/audioconf.c
@@ -374,6 +374,8 @@ codec_active_toggled(GtkCellRendererToggle *renderer UNUSED, gchar *path, gpoint
GtkTreeModel *model;
gboolean active;
char* name;
+ char* srate;
+ codec_t* codec;
// Get path of clicked codec active toggle box
treePath = gtk_tree_path_new_from_string(path);
@@ -384,9 +386,18 @@ codec_active_toggled(GtkCellRendererToggle *renderer UNUSED, gchar *path, gpoint
gtk_tree_model_get(model, &iter,
COLUMN_CODEC_ACTIVE, &active,
COLUMN_CODEC_NAME, &name,
+ COLUMN_CODEC_FREQUENCY, &srate,
-1);
- DEBUG("%s", name);
+ printf("%s, %s\n", name, srate);
+
+ // codec_list_get_by_name(name);
+ if ((strcmp(name,"speex")==0) && (strcmp(srate,"8 kHz")==0))
+ codec = codec_list_get_by_payload(110);
+ else if ((strcmp(name,"speex")==0) && (strcmp(srate,"16 kHz")==0))
+ codec = codec_list_get_by_payload(111);
+ else
+ codec = codec_list_get_by_name(name);
// Toggle active value
active = !active;
@@ -400,9 +411,9 @@ codec_active_toggled(GtkCellRendererToggle *renderer UNUSED, gchar *path, gpoint
// Modify codec queue to represent change
if(active)
- codec_set_active(name);
+ codec_set_active(codec);
else
- codec_set_inactive(name);
+ codec_set_inactive(codec);
// Perpetuate changes to the deamon
codec_list_update_to_daemon();
diff --git a/sflphone-common/autom4te.cache/output.2 b/sflphone-common/autom4te.cache/output.2
index 859423ccd067336d5f016ecac34d35c19000f077..268ecbefcb899aa24f9a3791a0b248fae1dc6eac 100644
--- a/sflphone-common/autom4te.cache/output.2
+++ b/sflphone-common/autom4te.cache/output.2
@@ -1,7 +1,7 @@
@%:@! /bin/sh
@%:@ From configure.ac Revision.
@%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.61 for SFLphone 0.9.4.
+@%:@ Generated by GNU Autoconf 2.61 for SFLphone 0.9.5~beta.
@%:@
@%:@ Report bugs to <sflphoneteam@savoirfairelinux.com>.
@%:@
@@ -726,8 +726,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='SFLphone'
PACKAGE_TARNAME='sflphone'
-PACKAGE_VERSION='0.9.4'
-PACKAGE_STRING='SFLphone 0.9.4'
+PACKAGE_VERSION='0.9.5~beta'
+PACKAGE_STRING='SFLphone 0.9.5~beta'
PACKAGE_BUGREPORT='sflphoneteam@savoirfairelinux.com'
# Factoring default headers for most tests.
@@ -804,6 +804,29 @@ LIBS
build_alias
host_alias
target_alias
+INSTALL_PROGRAM
+INSTALL_SCRIPT
+INSTALL_DATA
+am__isrc
+CYGPATH_W
+PACKAGE
+VERSION
+ACLOCAL
+AUTOCONF
+AUTOMAKE
+AUTOHEADER
+MAKEINFO
+install_sh
+STRIP
+INSTALL_STRIP_PROGRAM
+mkdir_p
+AWK
+SET_MAKE
+am__leading_dot
+AMTAR
+am__tar
+am__untar
+LIBTOOL
build
build_cpu
build_vendor
@@ -812,11 +835,6 @@ host
host_cpu
host_vendor
host_os
-target
-target_cpu
-target_vendor
-target_os
-LIBTOOL
CC
CFLAGS
LDFLAGS
@@ -824,6 +842,15 @@ CPPFLAGS
ac_ct_CC
EXEEXT
OBJEXT
+DEPDIR
+am__include
+am__quote
+AMDEP_TRUE
+AMDEP_FALSE
+AMDEPBACKSLASH
+CCDEPMODE
+am__fastdepCC_TRUE
+am__fastdepCC_FALSE
SED
GREP
EGREP
@@ -834,7 +861,6 @@ ac_ct_DUMPBIN
NM
LN_S
AR
-STRIP
RANLIB
lt_ECHO
DSYMUTIL
@@ -843,35 +869,6 @@ LIPO
OTOOL
OTOOL64
CPP
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-CYGPATH_W
-PACKAGE
-VERSION
-ACLOCAL
-AUTOCONF
-AUTOMAKE
-AUTOHEADER
-MAKEINFO
-install_sh
-INSTALL_STRIP_PROGRAM
-mkdir_p
-AWK
-SET_MAKE
-am__leading_dot
-AMTAR
-am__tar
-am__untar
-DEPDIR
-am__include
-am__quote
-AMDEP_TRUE
-AMDEP_FALSE
-AMDEPBACKSLASH
-CCDEPMODE
-am__fastdepCC_TRUE
-am__fastdepCC_FALSE
PKGADD_PKG
PKGADD_NAME
PKGADD_VENDOR
@@ -925,14 +922,12 @@ BUILD_SPEEX_TRUE
BUILD_SPEEX_FALSE
ENABLE_SPEEXDSP_TRUE
ENABLE_SPEEXDSP_FALSE
+BUILD_CELT_TRUE
+BUILD_CELT_FALSE
BUILD_ILBC_TRUE
BUILD_ILBC_FALSE
USE_IAX_TRUE
USE_IAX_FALSE
-LIBREADLINE
-LIB_DNSSD
-USE_ZEROCONF_TRUE
-USE_ZEROCONF_FALSE
DOXYGEN
DOT
DOC_TRUE
@@ -1488,7 +1483,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures SFLphone 0.9.4 to adapt to many kinds of systems.
+\`configure' configures SFLphone 0.9.5~beta to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1553,13 +1548,12 @@ Program names:
System types:
--build=BUILD configure for building on BUILD [guessed]
--host=HOST cross-compile to build programs to run on HOST [BUILD]
- --target=TARGET configure for building compilers for TARGET [HOST]
_ACEOF
fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of SFLphone 0.9.4:";;
+ short | recursive ) echo "Configuration of SFLphone 0.9.5~beta:";;
esac
cat <<\_ACEOF
@@ -1570,11 +1564,9 @@ Optional Features:
--enable-static@<:@=PKGS@:>@ build static libraries @<:@default=yes@:>@
--enable-fast-install@<:@=PKGS@:>@
optimize for fast installation @<:@default=yes@:>@
- --disable-libtool-lock avoid locking (might break parallel builds)
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
- --disable-zeroconf disables libdns_sd (browsing and publishing DNS-SD
- services will not be possible) @<:@default=no@:>@
+ --disable-libtool-lock avoid locking (might break parallel builds)
--enable-doxygen enable documentation generation with doxygen (auto)
--enable-dot use 'dot' to generate graphs in doxygen (auto)
--enable-html-docs enable HTML generation with doxygen (yes)
@@ -1586,16 +1578,14 @@ Optional Packages:
--with-pic try to use only PIC/non-PIC objects @<:@default=use
both@:>@
--with-gnu-ld assume the C compiler uses GNU ld @<:@default=no@:>@
- --with-debug Set 'full' to enable debugging information
- @<:@default=no@:>@
--with-build-libdbus-cxx
For cross compilation: path to libdbus-cxx which was
compiled for the 'build' system.
--without-gsm disable support for gsm codec
--without-speex disable support for speex codec
+ --without-celt disable support for celt codec
--without-ilbc disable support for the ilbc codec
--without-iax2 disable support for the iax2 protocol
- --with-readline=DIR look for the readline library in DIR
Some influential environment variables:
CC C compiler command
@@ -1709,7 +1699,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-SFLphone configure 0.9.4
+SFLphone configure 0.9.5~beta
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1725,7 +1715,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by SFLphone $as_me 0.9.4, which was
+It was created by SFLphone $as_me 0.9.5~beta, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2082,6 +2072,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+am__api_version='1.10'
+
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
if test -f "$ac_dir/install-sh"; then
@@ -2113,175 +2105,216 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
- { (exit 1); exit 1; }; }
-
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
-if test "${ac_cv_build+set}" = set; then
+# Find a good install program. We prefer a C program (faster),
+# so one script is as good as another. But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+if test -z "$INSTALL"; then
+if test "${ac_cv_path_install+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
- ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
- { (exit 1); exit 1; }; }
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
- { (exit 1); exit 1; }; };;
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in
+ ./ | .// | /cC/* | \
+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+ /usr/ucb/* ) ;;
+ *)
+ # OSF1 and SCO ODT 3.0 have their own names for install.
+ # Don't use installbsd from OSF since it installs stuff as root
+ # by default.
+ for ac_prog in ginstall scoinst install; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if test $ac_prog = install &&
+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # AIX install. It has an incompatible calling convention.
+ :
+ elif test $ac_prog = install &&
+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # program-specific install script used by HP pwplus--don't use.
+ :
+ else
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+ break 3
+ fi
+ fi
+ done
+ done
+ ;;
esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
+done
+IFS=$as_save_IFS
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
-if test "${ac_cv_host+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "x$host_alias" = x; then
- ac_cv_host=$ac_cv_build
-else
- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-fi
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
- { (exit 1); exit 1; }; };;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-{ echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
-if test "${ac_cv_target+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "x$target_alias" = x; then
- ac_cv_target=$ac_cv_host
-else
- ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
- { (exit 1); exit 1; }; }
+ if test "${ac_cv_path_install+set}" = set; then
+ INSTALL=$ac_cv_path_install
+ else
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for INSTALL within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+ INSTALL=$ac_install_sh
+ fi
fi
+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6; }
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6; }
-case $ac_cv_target in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
-echo "$as_me: error: invalid value of canonical target" >&2;}
- { (exit 1); exit 1; }; };;
-esac
-target=$ac_cv_target
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_target
-shift
-target_cpu=$1
-target_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-target_os=$*
-IFS=$ac_save_IFS
-case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
- test "$program_prefix$program_suffix$program_transform_name" = \
- NONENONEs,x,x, &&
- program_prefix=${target_alias}-
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# 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".
+ { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
+alias in your environment" >&5
+echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
+alias in your environment" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
-case `pwd` in
- *\ * | *\ *)
- { echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
-esac
-
-
-
-macro_version='2.2.4'
-macro_revision='1.2976'
-
-
-
-
+ test "$2" = conftest.file
+ )
+then
+ # Ok.
+ :
+else
+ { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+Check your system clock" >&5
+echo "$as_me: error: newly created file is older than distributed files!
+Check your system clock" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+test "$program_prefix" != NONE &&
+ program_transform_name="s&^&$program_prefix&;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+ program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+# Double any \ or $. echo might interpret backslashes.
+# By default was `s,x,x', remove it if useless.
+cat <<\_ACEOF >conftest.sed
+s/[\\$]/&&/g;s/;s,x,x,$//
+_ACEOF
+program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+rm -f conftest.sed
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
-
-
-
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+ am_missing_run="$MISSING --run "
+else
+ am_missing_run=
+ { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+fi
+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+if test -z "$MKDIR_P"; then
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in mkdir gmkdir; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+ 'mkdir (GNU coreutils) '* | \
+ 'mkdir (coreutils) '* | \
+ 'mkdir (fileutils) '4.1*)
+ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+ break 3;;
+ esac
+ done
+ done
+done
+IFS=$as_save_IFS
+fi
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ MKDIR_P="$ac_cv_path_mkdir -p"
+ else
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for MKDIR_P within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+ test -d ./--version && rmdir ./--version
+ MKDIR_P="$ac_install_sh -d"
+ fi
+fi
+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+echo "${ECHO_T}$MKDIR_P" >&6; }
-ltmain="$ac_aux_dir/ltmain.sh"
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+ [\\/$]* | ?:[\\/]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
+for ac_prog in gawk mawk nawk awk
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_AWK+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
+ if test -n "$AWK"; then
+ ac_cv_prog_AWK="$AWK" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -2290,7 +2323,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
+ ac_cv_prog_AWK="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -2300,28 +2333,127 @@ IFS=$as_save_IFS
fi
fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+ { echo "$as_me:$LINENO: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6; }
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
fi
+ test -n "$AWK" && break
+done
+
+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+ @echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+ *@@@%%%=?*=@@@%%%*)
+ eval ac_cv_prog_make_${ac_make}_set=yes;;
+ *)
+ eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ SET_MAKE=
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+ am__leading_dot=.
+else
+ am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+ # is not polluted with repeated "-I."
+ am__isrc=' -I$(srcdir)'
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+ if (cygpath --version) >/dev/null 2>/dev/null; then
+ CYGPATH_W='cygpath -w'
+ else
+ CYGPATH_W=echo
+ fi
+fi
+
+
+# Define the identity of the package.
+ PACKAGE=SFLphone
+ VERSION=0.9.5~beta
+
+
+cat >>confdefs.h <<_ACEOF
+@%:@define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+@%:@define VERSION "$VERSION"
+_ACEOF
+
+# Some tools Automake needs.
+
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+
+
+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+
+
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
+
+
+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+
+
+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+
+# 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.
+if test "$cross_compiling" != no; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+ if test -n "$STRIP"; then
+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -2330,7 +2462,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="gcc"
+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -2340,45 +2472,28 @@ IFS=$as_save_IFS
fi
fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+ { echo "$as_me:$LINENO: result: $STRIP" >&5
+echo "${ECHO_T}$STRIP" >&6; }
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
fi
- if test "x$ac_ct_CC" = x; then
- CC=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
- CC=$ac_ct_CC
- fi
-else
- CC="$ac_cv_prog_CC"
-fi
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+ ac_ct_STRIP=$STRIP
+ # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
+ if test -n "$ac_ct_STRIP"; then
+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -2387,7 +2502,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
+ ac_cv_prog_ac_ct_STRIP="strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -2397,21 +2512,233 @@ IFS=$as_save_IFS
fi
fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
fi
-
- fi
-fi
-if test -z "$CC"; then
- # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
+ if test "x$ac_ct_STRIP" = x; then
+ STRIP=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ STRIP=$ac_ct_STRIP
+ fi
+else
+ STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
+# We need awk for the "check" target. The system "awk" is bad on
+# some platforms.
+# Always define AMTAR for backward compatibility.
+
+AMTAR=${AMTAR-"${am_missing_run}tar"}
+
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+
+
+
+
+
+ac_config_headers="$ac_config_headers config.h"
+
+
+
+
+
+case `pwd` in
+ *\ * | *\ *)
+ { echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+esac
+
+
+
+macro_version='2.2.4'
+macro_revision='1.2976'
+
+
+
+
+
+
+
+
+
+
+
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+ { (exit 1); exit 1; }; }
+
+{ echo "$as_me:$LINENO: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+if test "${ac_cv_build+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+ { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+ { (exit 1); exit 1; }; }
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+echo "$as_me: error: invalid value of canonical build" >&2;}
+ { (exit 1); exit 1; }; };;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ echo "$as_me:$LINENO: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+if test "${ac_cv_host+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test "x$host_alias" = x; then
+ ac_cv_host=$ac_cv_build
+else
+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+echo "$as_me: error: invalid value of canonical host" >&2;}
+ { (exit 1); exit 1; }; };;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+ @echo done
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
+am__include="#"
+am__quote=
+_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
+# 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
+fi
+
+
+{ echo "$as_me:$LINENO: result: $_am_result" >&5
+echo "${ECHO_T}$_am_result" >&6; }
+rm -f confinc confmf
+
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then
+ enableval=$enable_dependency_tracking;
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
+fi
+ if test "x$enable_dependency_tracking" != xno; then
+ AMDEP_TRUE=
+ AMDEP_FALSE='#'
+else
+ AMDEP_TRUE='#'
+ AMDEP_FALSE=
+fi
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
@@ -2420,7 +2747,6 @@ else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
- ac_prog_rejected=no
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
@@ -2428,11 +2754,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
- fi
- ac_cv_prog_CC="cc"
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -2440,18 +2762,6 @@ done
done
IFS=$as_save_IFS
-if test $ac_prog_rejected = yes; then
- # We found a bogon in the path, so make sure we never use it.
- set dummy $ac_cv_prog_CC
- shift
- if test $@%:@ != 0; then
- # We chose a different compiler from the bogus one.
- # However, it has the same basename, so the bogon will be chosen
- # first if we set CC to just the basename; use the full file name.
- shift
- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
- fi
-fi
fi
fi
CC=$ac_cv_prog_CC
@@ -2465,19 +2775,17 @@ fi
fi
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- for ac_prog in cl.exe
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+if test -z "$ac_cv_prog_CC"; then
+ ac_ct_CC=$CC
+ # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -2486,7 +2794,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+ ac_cv_prog_ac_ct_CC="gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -2496,7 +2804,163 @@ IFS=$as_save_IFS
fi
fi
-CC=$ac_cv_prog_CC
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
+else
+ CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ fi
+fi
+if test -z "$CC"; then
+ # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+ ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+ fi
+ ac_cv_prog_CC="cc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+ # We found a bogon in the path, so make sure we never use it.
+ set dummy $ac_cv_prog_CC
+ shift
+ if test $@%:@ != 0; then
+ # We chose a different compiler from the bogus one.
+ # However, it has the same basename, so the bogon will be chosen
+ # first if we set CC to just the basename; use the full file name.
+ shift
+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+ fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in cl.exe
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
if test -n "$CC"; then
{ echo "$as_me:$LINENO: result: $CC" >&5
echo "${ECHO_T}$CC" >&6; }
@@ -3186,66 +3650,174 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
-if test "${ac_cv_path_SED+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
- for ac_i in 1 2 3 4 5 6 7; do
- ac_script="$ac_script$as_nl$ac_script"
- done
- echo "$ac_script" | sed 99q >conftest.sed
- $as_unset ac_script || ac_script=
- # Extract the first word of "sed gsed" to use in msg output
-if test -z "$SED"; then
-set dummy sed gsed; ac_prog_name=$2
-if test "${ac_cv_path_SED+set}" = set; then
+depcc="$CC" am_compiler_list=
+
+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_path_SED_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in sed gsed; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
- # Check for GNU ac_path_SED and select it if it is found.
- # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
-*GNU*)
- ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-*)
- ac_count=0
- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- echo '' >> "conftest.nl"
- "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- ac_count=`expr $ac_count + 1`
- if test $ac_count -gt ${ac_path_SED_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_SED="$ac_path_SED"
- ac_path_SED_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # 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'.
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
+ am_cv_CC_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+ fi
+ 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
+ # we should not choose a depcomp mode which is confused by this.
+ #
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+ : > 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
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- $ac_path_SED_found && break 3
- done
-done
+ case $depmode in
+ nosideeffect)
+ # 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
+ ;;
+ 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} \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} 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 &&
+ ${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
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+ am_cv_CC_dependencies_compiler_type=$depmode
+ break
+ fi
+ fi
+ done
+
+ cd ..
+ rm -rf conftest.dir
+else
+ am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+ if
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+ am__fastdepCC_TRUE=
+ am__fastdepCC_FALSE='#'
+else
+ am__fastdepCC_TRUE='#'
+ am__fastdepCC_FALSE=
+fi
+
+
+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
+if test "${ac_cv_path_SED+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+ for ac_i in 1 2 3 4 5 6 7; do
+ ac_script="$ac_script$as_nl$ac_script"
+ done
+ echo "$ac_script" | sed 99q >conftest.sed
+ $as_unset ac_script || ac_script=
+ # Extract the first word of "sed gsed" to use in msg output
+if test -z "$SED"; then
+set dummy sed gsed; ac_prog_name=$2
+if test "${ac_cv_path_SED+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_path_SED_found=false
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in sed gsed; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+ # Check for GNU ac_path_SED and select it if it is found.
+ # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+ ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+ ac_count=0
+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ echo '' >> "conftest.nl"
+ "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ ac_count=`expr $ac_count + 1`
+ if test $ac_count -gt ${ac_path_SED_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_SED="$ac_path_SED"
+ ac_path_SED_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+
+ $ac_path_SED_found && break 3
+ done
+done
done
IFS=$as_save_IFS
@@ -10384,203 +10956,89 @@ CC="$lt_save_CC"
-test "$program_prefix" != NONE &&
- program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
- program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $. echo might interpret backslashes.
-# By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm -f conftest.sed
-
-am__api_version="1.9"
-# Find a good install program. We prefer a C program (faster),
-# so one script is as good as another. But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
- ./ | .// | /cC/* | \
- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
- /usr/ucb/* ) ;;
+ cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+ @echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+ *@@@%%%=?*=@@@%%%*)
+ eval ac_cv_prog_make_${ac_make}_set=yes;;
*)
- # OSF1 and SCO ODT 3.0 have their own names for install.
- # Don't use installbsd from OSF since it installs stuff as root
- # by default.
- for ac_prog in ginstall scoinst install; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
- if test $ac_prog = install &&
- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
- :
- elif test $ac_prog = install &&
- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # program-specific install script used by HP pwplus--don't use.
- :
- else
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
- break 3
- fi
- fi
- done
- done
- ;;
+ eval ac_cv_prog_make_${ac_make}_set=no;;
esac
-done
-IFS=$as_save_IFS
-
-
+rm -f conftest.make
fi
- if test "${ac_cv_path_install+set}" = set; then
- INSTALL=$ac_cv_path_install
- else
- # As a last resort, use the slow shell script. Don't cache a
- # value for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the value is a relative name.
- INSTALL=$ac_install_sh
- fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ SET_MAKE=
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ SET_MAKE="MAKE=${MAKE-make}"
fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# 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
+ac_config_files="$ac_config_files Makefile"
- # 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".
- { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
-alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
-alias in your environment" >&2;}
- { (exit 1); exit 1; }; }
- fi
+ac_config_files="$ac_config_files libs/Makefile libs/stund/Makefile libs/utilspp/Makefile libs/utilspp/functor/Makefile libs/utilspp/singleton/Makefile libs/dbus-c++/Makefile libs/dbus-c++/src/Makefile libs/dbus-c++/tools/Makefile libs/dbus-c++/data/Makefile libs/iax2/Makefile"
- test "$2" = conftest.file
- )
-then
- # Ok.
- :
-else
- { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
- { (exit 1); exit 1; }; }
-fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+
+ac_config_files="$ac_config_files src/Makefile src/audio/Makefile src/audio/codecs/Makefile src/audio/codecs/ilbc/Makefile src/config/Makefile src/dbus/Makefile src/plug-in/audiorecorder/Makefile src/plug-in/Makefile src/plug-in/test/Makefile src/hooks/Makefile"
+
+
+ ac_config_files="$ac_config_files test/Makefile"
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
-else
- am_missing_run=
- { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-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
-for ac_prog in gawk mawk nawk awk
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
+ac_config_files="$ac_config_files po/Makefile ringtones/Makefile"
+
+
+ac_config_files="$ac_config_files man/Makefile"
+
+
+ac_config_files="$ac_config_files doc/Makefile doc/doxygen/Makefile"
+
+
+ac_config_files="$ac_config_files platform/suse.spec platform/fedora.spec"
+
+
+
+LIBS="$LIBS -lstdc++"
+
+PKGADD_PKG="SFLphone"
+PKGADD_NAME="SFLphone - a SIP client and daemon"
+PKGADD_VENDOR="http://www.sflphone.org/"
+
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test -n "$AWK"; then
- ac_cv_prog_AWK="$AWK" # Let the user override the test.
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -10589,7 +11047,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AWK="$ac_prog"
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -10599,188 +11057,28 @@ IFS=$as_save_IFS
fi
fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
- { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
- test -n "$AWK" && break
-done
-
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
- @echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
- *@@@%%%=?*=@@@%%%*)
- eval ac_cv_prog_make_${ac_make}_set=yes;;
- *)
- eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- SET_MAKE=
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
- SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
- am__leading_dot=.
-else
- am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
- @echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
-am__include="#"
-am__quote=
-_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
-# 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
-fi
-
-
-{ echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
- enableval=$enable_dependency_tracking;
fi
-if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
-fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
- AMDEP_TRUE=
- AMDEP_FALSE='#'
-else
- AMDEP_TRUE='#'
- AMDEP_FALSE=
-fi
-
-
-
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
- { (exit 1); exit 1; }; }
-fi
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
- if (cygpath --version) >/dev/null 2>/dev/null; then
- CYGPATH_W='cygpath -w'
- else
- CYGPATH_W=echo
- fi
fi
-
-
-# Define the identity of the package.
- PACKAGE='sflphone'
- VERSION='0.9.4'
-
-
-cat >>confdefs.h <<_ACEOF
-@%:@define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-@%:@define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-
-# 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.
-if test "$cross_compiling" != no; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
+if test -z "$ac_cv_prog_CC"; then
+ ac_ct_CC=$CC
+ # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test -n "$STRIP"; then
- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -10789,7 +11087,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+ ac_cv_prog_ac_ct_CC="gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -10799,57 +11097,17 @@ IFS=$as_save_IFS
fi
fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
- { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
- ac_ct_STRIP=$STRIP
- # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_STRIP"; then
- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_STRIP="strip"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
- { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
fi
- if test "x$ac_ct_STRIP" = x; then
- STRIP=":"
+ if test "x$ac_ct_CC" = x; then
+ CC=""
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10861,212 +11119,16 @@ whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf@gnu.org." >&2;}
ac_tool_warned=yes ;;
esac
- STRIP=$ac_ct_STRIP
- fi
-else
- STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-
-
-
-
-depcc="$CC" am_compiler_list=
-
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # 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'.
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
- # We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
-
- am_cv_CC_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+ CC=$ac_ct_CC
fi
- 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
- # we should not choose a depcomp mode which is confused by this.
- #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- : > 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
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
- case $depmode in
- nosideeffect)
- # 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
- ;;
- 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} \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} 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
- # that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
- # icc: Command line warning: ignoring option '-M'; no argument required
- # The diagnosis changed in icc 8.0:
- # icc: Command line remark: option '-MP' not supported
- if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_CC_dependencies_compiler_type=$depmode
- break
- fi
- fi
- done
-
- cd ..
- rm -rf conftest.dir
-else
- am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-
-
-if
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
- am__fastdepCC_TRUE=
- am__fastdepCC_FALSE='#'
-else
- am__fastdepCC_TRUE='#'
- am__fastdepCC_FALSE=
-fi
-
-
-
-
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
- @echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
- *@@@%%%=?*=@@@%%%*)
- eval ac_cv_prog_make_${ac_make}_set=yes;;
- *)
- eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- SET_MAKE=
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- SET_MAKE="MAKE=${MAKE-make}"
+ CC="$ac_cv_prog_CC"
fi
-
-
-
-ac_config_files="$ac_config_files Makefile"
-
-ac_config_files="$ac_config_files libs/Makefile libs/stund/Makefile libs/utilspp/Makefile libs/utilspp/functor/Makefile libs/utilspp/singleton/Makefile libs/dbus-c++/Makefile libs/dbus-c++/src/Makefile libs/dbus-c++/tools/Makefile libs/dbus-c++/data/Makefile"
-
-
-ac_config_files="$ac_config_files src/Makefile src/audio/Makefile src/audio/codecs/Makefile src/audio/codecs/ilbc/Makefile src/config/Makefile src/dbus/Makefile src/plug-in/audiorecorder/Makefile src/plug-in/Makefile src/plug-in/test/Makefile src/hooks/Makefile"
-
-
- ac_config_files="$ac_config_files test/Makefile"
-
-
-
-ac_config_files="$ac_config_files po/Makefile ringtones/Makefile"
-
-
-ac_config_files="$ac_config_files man/Makefile"
-
-
-ac_config_files="$ac_config_files doc/Makefile doc/doxygen/Makefile"
-
-
-ac_config_files="$ac_config_files platform/suse.spec platform/fedora.spec"
-
-
-
-LIBS="$LIBS -lstdc++"
-
-PKGADD_PKG="SFLphone"
-PKGADD_NAME="SFLphone - a SIP client and daemon"
-PKGADD_VENDOR="http://www.sflphone.org/"
-
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
@@ -11082,104 +11144,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
- if test "x$ac_ct_CC" = x; then
- CC=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
- CC=$ac_ct_CC
- fi
-else
- CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -11735,22 +11700,115 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
+depcc="$CC" am_compiler_list=
+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # 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'.
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
-
-# Check whether --with-debug was given.
-if test "${with_debug+set}" = set; then
- withval=$with_debug; with_debug=${withval}
+ am_cv_CC_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+ fi
+ 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
+ # we should not choose a depcomp mode which is confused by this.
+ #
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+ : > 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
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+ case $depmode in
+ nosideeffect)
+ # 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
+ ;;
+ 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} \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} 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 &&
+ ${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
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+ am_cv_CC_dependencies_compiler_type=$depmode
+ break
+ fi
+ fi
+ done
+
+ cd ..
+ rm -rf conftest.dir
else
- with_debug=no
-
+ am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+ if
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+ am__fastdepCC_TRUE=
+ am__fastdepCC_FALSE='#'
+else
+ am__fastdepCC_TRUE='#'
+ am__fastdepCC_FALSE=
fi
- if test "x$with_debug" = "xfull" -o "x$with_debug" = "xyes"; then
- CXXFLAGS="$CXXFLAGS -g"
- CPPFLAGS="$CPPFLAGS -DSFLDEBUG"
- fi
+SFL_CXX_WITH_DEBUG
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -12115,43 +12173,151 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
+depcc="$CXX" am_compiler_list=
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
- if test -n "$CCC"; then
- CXX=$CCC
- else
- if test -n "$ac_tool_prefix"; then
- for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then
+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test -n "$CXX"; then
- ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # 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'.
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
+
+ am_cv_CXX_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+ fi
+ 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
+ # we should not choose a depcomp mode which is confused by this.
+ #
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+ : > 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
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+ case $depmode in
+ nosideeffect)
+ # 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
+ ;;
+ 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} \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} 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 &&
+ ${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
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+ am_cv_CXX_dependencies_compiler_type=$depmode
+ break
+ fi
+ fi
+ done
+
+ cd ..
+ rm -rf conftest.dir
+else
+ am_cv_CXX_dependencies_compiler_type=none
+fi
+
+fi
+{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+
+ if
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+ am__fastdepCXX_TRUE=
+ am__fastdepCXX_FALSE='#'
+else
+ am__fastdepCXX_TRUE='#'
+ am__fastdepCXX_FALSE=
+fi
+
+
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test -z "$CXX"; then
+ if test -n "$CCC"; then
+ CXX=$CCC
+ else
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$CXX"; then
+ ac_cv_prog_CXX="$CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
fi
fi
@@ -12547,6 +12713,7 @@ else
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} 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 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -12576,9 +12743,7 @@ fi
echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
-
-if
+ if
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
am__fastdepCXX_TRUE=
@@ -15739,115 +15904,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-depcc="$CXX" am_compiler_list=
-
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # 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'.
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
- # We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
-
- am_cv_CXX_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
- fi
- 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
- # we should not choose a depcomp mode which is confused by this.
- #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- : > 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
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
- case $depmode in
- nosideeffect)
- # 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
- ;;
- 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} \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} 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
- # that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
- # icc: Command line warning: ignoring option '-M'; no argument required
- # The diagnosis changed in icc 8.0:
- # icc: Command line remark: option '-MP' not supported
- if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_CXX_dependencies_compiler_type=$depmode
- break
- fi
- fi
- done
-
- cd ..
- rm -rf conftest.dir
-else
- am_cv_CXX_dependencies_compiler_type=none
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
-
-
-if
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
- am__fastdepCXX_TRUE=
- am__fastdepCXX_FALSE='#'
-else
- am__fastdepCXX_TRUE='#'
- am__fastdepCXX_FALSE=
-fi
-
-
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -21315,9 +21371,7 @@ echo "${ECHO_T}yes" >&6; }
fi
-
-
-if test 1 = 1; then
+ if test 1 = 1; then
ENABLE_GLIB_TRUE=
ENABLE_GLIB_FALSE='#'
else
@@ -21386,9 +21440,7 @@ fi
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
-
-
-if test 0 = 1; then
+ if test 0 = 1; then
HAVE_GTKMM_TRUE=
HAVE_GTKMM_FALSE='#'
else
@@ -21398,9 +21450,7 @@ fi
elif test $pkg_failed = untried; then
-
-
-if test 0 = 1; then
+ if test 0 = 1; then
HAVE_GTKMM_TRUE=
HAVE_GTKMM_FALSE='#'
else
@@ -21414,9 +21464,7 @@ else
gtkmm_LIBS=$pkg_cv_gtkmm_LIBS
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
-
-
-if test 1 = 1; then
+ if test 1 = 1; then
HAVE_GTKMM_TRUE=
HAVE_GTKMM_FALSE='#'
else
@@ -21428,9 +21476,7 @@ fi
else
-
-
-if test 0 = 1; then
+ if test 0 = 1; then
ENABLE_GLIB_TRUE=
ENABLE_GLIB_FALSE='#'
else
@@ -21438,9 +21484,7 @@ else
ENABLE_GLIB_FALSE=
fi
-
-
-if test 0 = 1; then
+ if test 0 = 1; then
HAVE_GTKMM_TRUE=
HAVE_GTKMM_FALSE='#'
else
@@ -21900,9 +21944,7 @@ fi
# For the tools/, we need libdbus-c++ for the "build" architecture as well
-
-
-if test "$cross_compiling" = "yes"; then
+ if test "$cross_compiling" = "yes"; then
CROSS_COMPILING_TRUE=
CROSS_COMPILING_FALSE='#'
else
@@ -22279,9 +22321,7 @@ cat >>confdefs.h <<\_ACEOF
@%:@define HAVE_GSM test "x$with_gsm" = "xyes"
_ACEOF
-
-
-if test "x$with_gsm" = "xyes" ; then
+ if test "x$with_gsm" = "xyes" ; then
BUILD_GSM_TRUE=
BUILD_GSM_FALSE='#'
else
@@ -22747,13 +22787,6 @@ else
fi
-if test $HAVE_SPEEXDSP="no"; then
- echo $HAVE_SPEEXDSP;
- { echo "$as_me:$LINENO: WARNING: The silence detection in speex could not have been enabled" >&5
-echo "$as_me: WARNING: The silence detection in speex could not have been enabled" >&2;}
-fi
-
-
fi
@@ -22762,9 +22795,7 @@ cat >>confdefs.h <<\_ACEOF
@%:@define HAVE_SPEEX test "x$with_speex" = "xyes"
_ACEOF
-
-
-if test "x$with_speex" = "xyes" ; then
+ if test "x$with_speex" = "xyes" ; then
BUILD_SPEEX_TRUE=
BUILD_SPEEX_FALSE='#'
else
@@ -22772,9 +22803,7 @@ else
BUILD_SPEEX_FALSE=
fi
-
-
-if test $HAVE_SPEEXDSP = yes; then
+ if test $HAVE_SPEEXDSP = yes; then
ENABLE_SPEEXDSP_TRUE=
ENABLE_SPEEXDSP_FALSE='#'
else
@@ -22784,48 +22813,30 @@ fi
-# Check whether --with-ilbc was given.
-if test "${with_ilbc+set}" = set; then
- withval=$with_ilbc;
+# check for libgsm1 (doesn't use pkg-config)
+
+# Check whether --with-celt was given.
+if test "${with_celt+set}" = set; then
+ withval=$with_celt;
else
- with_ilbc=no
+ with_celt=yes
fi
-
-
-if test "x$with_ilbc" = "xyes" ; then
- BUILD_ILBC_TRUE=
- BUILD_ILBC_FALSE='#'
-else
- BUILD_ILBC_TRUE='#'
- BUILD_ILBC_FALSE=
-fi
-
-
-
-# Check whether --with-iax2 was given.
-if test "${with_iax2+set}" = set; then
- withval=$with_iax2;
-else
- with_iax2=yes
-fi
-
-
-LIBIAX2=
-if test "x$with_iax2" != xno; then
- if test "${ac_cv_header_iax2_iax_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for iax2/iax.h" >&5
-echo $ECHO_N "checking for iax2/iax.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_iax2_iax_h+set}" = set; then
+LIBCELT=
+if test "x$with_celt" != xno; then
+ if test "${ac_cv_header_celt_celt_h+set}" = set; then
+ { echo "$as_me:$LINENO: checking for celt/celt.h" >&5
+echo $ECHO_N "checking for celt/celt.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_celt_celt_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_iax2_iax_h" >&5
-echo "${ECHO_T}$ac_cv_header_iax2_iax_h" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_header_celt_celt_h" >&5
+echo "${ECHO_T}$ac_cv_header_celt_celt_h" >&6; }
else
# Is the header compilable?
-{ echo "$as_me:$LINENO: checking iax2/iax.h usability" >&5
-echo $ECHO_N "checking iax2/iax.h usability... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking celt/celt.h usability" >&5
+echo $ECHO_N "checking celt/celt.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -22833,7 +22844,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-@%:@include <iax2/iax.h>
+@%:@include <celt/celt.h>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
@@ -22865,15 +22876,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-{ echo "$as_me:$LINENO: checking iax2/iax.h presence" >&5
-echo $ECHO_N "checking iax2/iax.h presence... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking celt/celt.h presence" >&5
+echo $ECHO_N "checking celt/celt.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-@%:@include <iax2/iax.h>
+@%:@include <celt/celt.h>
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
@@ -22906,25 +22917,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
yes:no: )
- { echo "$as_me:$LINENO: WARNING: iax2/iax.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: iax2/iax.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: iax2/iax.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: iax2/iax.h: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: celt/celt.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: celt/celt.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: celt/celt.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: celt/celt.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: iax2/iax.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: iax2/iax.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: iax2/iax.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: iax2/iax.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: iax2/iax.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: iax2/iax.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: iax2/iax.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: iax2/iax.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: iax2/iax.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: iax2/iax.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: iax2/iax.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: iax2/iax.h: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: celt/celt.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: celt/celt.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: celt/celt.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: celt/celt.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: celt/celt.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: celt/celt.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: celt/celt.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: celt/celt.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: celt/celt.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: celt/celt.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: celt/celt.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: celt/celt.h: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
@%:@@%:@ ------------------------------------------------ @%:@@%:@
@%:@@%:@ Report this to sflphoneteam@savoirfairelinux.com @%:@@%:@
@@ -22933,36 +22944,36 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-{ echo "$as_me:$LINENO: checking for iax2/iax.h" >&5
-echo $ECHO_N "checking for iax2/iax.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_iax2_iax_h+set}" = set; then
+{ echo "$as_me:$LINENO: checking for celt/celt.h" >&5
+echo $ECHO_N "checking for celt/celt.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_celt_celt_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_header_iax2_iax_h=$ac_header_preproc
+ ac_cv_header_celt_celt_h=$ac_header_preproc
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_iax2_iax_h" >&5
-echo "${ECHO_T}$ac_cv_header_iax2_iax_h" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_header_celt_celt_h" >&5
+echo "${ECHO_T}$ac_cv_header_celt_celt_h" >&6; }
fi
-if test $ac_cv_header_iax2_iax_h = yes; then
+if test $ac_cv_header_celt_celt_h = yes; then
:
else
- { { echo "$as_me:$LINENO: error: Unable to find the libiax2 headers. You may need to install sflphone-iax2-dev package. You may use --without-iax2 to compile without iax2 protocol support.
+ { { echo "$as_me:$LINENO: error: Unable to find the libcelt headers. You may use --without-celt to compile without celt codec support.
See \`config.log' for more details." >&5
-echo "$as_me: error: Unable to find the libiax2 headers. You may need to install sflphone-iax2-dev package. You may use --without-iax2 to compile without iax2 protocol support.
+echo "$as_me: error: Unable to find the libcelt headers. You may use --without-celt to compile without celt codec support.
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
fi
-
-{ echo "$as_me:$LINENO: checking for iax_init in -liax2" >&5
-echo $ECHO_N "checking for iax_init in -liax2... $ECHO_C" >&6; }
-if test "${ac_cv_lib_iax2_iax_init+set}" = set; then
+
+{ echo "$as_me:$LINENO: checking for celt_decode in -lcelt" >&5
+echo $ECHO_N "checking for celt_decode in -lcelt... $ECHO_C" >&6; }
+if test "${ac_cv_lib_celt_celt_decode+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-liax2 $LIBS"
+LIBS="-lcelt $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -22976,11 +22987,11 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
-char iax_init ();
+char celt_decode ();
int
main ()
{
-return iax_init ();
+return celt_decode ();
;
return 0;
}
@@ -23003,253 +23014,96 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- ac_cv_lib_iax2_iax_init=yes
+ ac_cv_lib_celt_celt_decode=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_iax2_iax_init=no
+ ac_cv_lib_celt_celt_decode=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_iax2_iax_init" >&5
-echo "${ECHO_T}$ac_cv_lib_iax2_iax_init" >&6; }
-if test $ac_cv_lib_iax2_iax_init = yes; then
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_celt_celt_decode" >&5
+echo "${ECHO_T}$ac_cv_lib_celt_celt_decode" >&6; }
+if test $ac_cv_lib_celt_celt_decode = yes; then
cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_LIBIAX2 1
+@%:@define HAVE_LIBCELT 1
_ACEOF
- LIBS="-liax2 $LIBS"
+ LIBS="-lcelt $LIBS"
else
- { { echo "$as_me:$LINENO: error: libiax2 link test failed. You may use --without-iax2 to compile without iax2 protocol support.
+ { { echo "$as_me:$LINENO: error: libcelt link test failed. You may use --without-celt to compile without celt codec support.
See \`config.log' for more details." >&5
-echo "$as_me: error: libiax2 link test failed. You may use --without-iax2 to compile without iax2 protocol support.
+echo "$as_me: error: libcelt link test failed. You may use --without-celt to compile without celt codec support.
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
fi
-
-
+
+
fi
cat >>confdefs.h <<\_ACEOF
-@%:@define HAVE_IAX test "x$with_iax2" = "xyes"
+@%:@define HAVE_CELT test "x$with_celt" = "xyes"
_ACEOF
-
-
-if test "x$with_iax2" = "xyes" ; then
- USE_IAX_TRUE=
- USE_IAX_FALSE='#'
+ if test "x$with_celt" = "xyes" ; then
+ BUILD_CELT_TRUE=
+ BUILD_CELT_FALSE='#'
else
- USE_IAX_TRUE='#'
- USE_IAX_FALSE=
+ BUILD_CELT_TRUE='#'
+ BUILD_CELT_FALSE=
fi
-
-# Check whether --with-readline was given.
-if test "${with_readline+set}" = set; then
- withval=$with_readline; _do_readline=$withval
+# Check whether --with-ilbc was given.
+if test "${with_ilbc+set}" = set; then
+ withval=$with_ilbc;
else
- _do_readline=yes
+ with_ilbc=no
fi
- if test "$_do_readline" != "no" ; then
- if test -d "$withval" ; then
- CPPFLAGS="${CPPFLAGS} -I$withval/include"
- LDFLAGS="${LDFLAGS} -L$withval/lib"
- fi
-
- for _termcap in "" "-ltermcap" "-lcurses" "-lncurses" ; do
- _readline_save_libs=$LIBS
- _combo="-lreadline${_termcap:+ $_termcap}"
- LIBS="$LIBS $_combo"
-
- { echo "$as_me:$LINENO: checking whether readline via \"$_combo\" is present and sane" >&5
-echo $ECHO_N "checking whether readline via \"$_combo\" is present and sane... $ECHO_C" >&6; }
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <stdio.h>
-#include <readline/readline.h>
-#include <readline/history.h>
-
-int
-main ()
-{
-
-add_history("foobar");
-rl_catch_signals=0;
-rl_inhibit_completion=0;
-rl_attempted_completion_function=NULL;
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- _found_readline=yes
+ if test "x$with_ilbc" = "xyes" ; then
+ BUILD_ILBC_TRUE=
+ BUILD_ILBC_FALSE='#'
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- _found_readline=no
+ BUILD_ILBC_TRUE='#'
+ BUILD_ILBC_FALSE=
fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-
- { echo "$as_me:$LINENO: result: $_found_readline" >&5
-echo "${ECHO_T}$_found_readline" >&6; }
-
- LIBS=$_readline_save_libs
-
- if test $_found_readline = yes ; then
-
-cat >>confdefs.h <<\_ACEOF
-@%:@define HAVE_LIBREADLINE 1
-_ACEOF
-
- LIBREADLINE=$_combo
-
- break
- fi
- done
-
- unset _termcap
- unset _readline_save_libs
- unset _combo
- unset _found_readline
- fi
-# Check whether --enable-zeroconf was given.
-if test "${enable_zeroconf+set}" = set; then
- enableval=$enable_zeroconf; without_zeroconf=$enableval
+# Check whether --with-iax2 was given.
+if test "${with_iax2+set}" = set; then
+ withval=$with_iax2;
else
- without_zeroconf="no"
-
+ with_iax2=yes
fi
-if test "x$without_zeroconf" = "xno"; then
- { echo "$as_me:$LINENO: checking for DNS-SD support" >&5
-echo $ECHO_N "checking for DNS-SD support... $ECHO_C" >&6; }
- save_dnssdtest_LIBS="$LIBS"
- save_dnssdtest_LDFLAGS="$LDFLAGS"
- save_dnssdtest_CPPFLAGS="$CPPFLAGS"
- LDFLAGS="$all_libraries $LDFLAGS"
- CPPFLAGS="$CPPFLAGS $all_includes"
- case $host_os in
- darwin*) LIBS="" ;;
- *) LIBS="-ldns_sd" ;;
- esac
- have_libdns_sd="no"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
- #include <dns_sd.h>
-
-
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
-
+
cat >>confdefs.h <<\_ACEOF
-@%:@define HAVE_DNSSD 1
+@%:@define HAVE_IAX test "x$with_iax2" = "xyes"
_ACEOF
- case $host_os in
- darwin*) LIB_DNSSD="" ;;
- *) LIB_DNSSD="-ldns_sd" ;;
- esac
- have_libdns_sd="yes"
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- LIB_DNSSD=""
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- CPPFLAGS=$save_dnssdtest_CPPFLAGS
- LDFLAGS=$save_dnssdtest_LDFLAGS
- LIBS=$save_dnssdtest_LIBS
-fi
-
-
-
-if test "$have_libdns_sd" = "yes"; then
- USE_ZEROCONF_TRUE=
- USE_ZEROCONF_FALSE='#'
+ if test "x$with_iax2" = "xyes" ; then
+ USE_IAX_TRUE=
+ USE_IAX_FALSE='#'
else
- USE_ZEROCONF_TRUE='#'
- USE_ZEROCONF_FALSE=
+ USE_IAX_TRUE='#'
+ USE_IAX_FALSE=
fi
-
-
# check for doxygen, mostly stolen from http://log4cpp.sourceforge.net/
# ----------------------------------------------------------------------------
@@ -23373,9 +23227,7 @@ fi
fi
fi
-
-
-if test x$enable_doc = xyes; then
+ if test x$enable_doc = xyes; then
DOC_TRUE=
DOC_FALSE='#'
else
@@ -23394,9 +23246,7 @@ echo "$as_me: error: could not find dot" >&2;}
else
enable_dot=yes
fi
-
-
-if test x$enable_doc = xtrue; then
+ if test x$enable_doc = xtrue; then
ENABLE_DOXYGEN_TRUE=
ENABLE_DOXYGEN_FALSE='#'
else
@@ -23501,37 +23351,7 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then branch to the quote section. Otherwise,
-# look for a macro that doesn't take arguments.
-ac_script='
-t clear
-:clear
-s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g
-t quote
-s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g
-t quote
-b any
-:quote
-s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g
-s/\[/\\&/g
-s/\]/\\&/g
-s/\$/$$/g
-H
-:any
-${
- g
- s/^\n//
- s/\n/ /g
- p
-}
-'
-DEFS=`sed -n "$ac_script" confdefs.h`
-
+DEFS=-DHAVE_CONFIG_H
ac_libobjs=
ac_ltlibobjs=
@@ -23563,6 +23383,13 @@ echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -23640,6 +23467,13 @@ echo "$as_me: error: conditional \"ENABLE_SPEEXDSP\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${BUILD_CELT_TRUE}" && test -z "${BUILD_CELT_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"BUILD_CELT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"BUILD_CELT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${BUILD_ILBC_TRUE}" && test -z "${BUILD_ILBC_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"BUILD_ILBC\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -23654,13 +23488,6 @@ echo "$as_me: error: conditional \"USE_IAX\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-if test -z "${USE_ZEROCONF_TRUE}" && test -z "${USE_ZEROCONF_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"USE_ZEROCONF\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_ZEROCONF\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
if test -z "${DOC_TRUE}" && test -z "${DOC_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"DOC\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -23975,7 +23802,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by SFLphone $as_me 0.9.4, which was
+This file was extended by SFLphone $as_me 0.9.5~beta, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -23992,6 +23819,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
# Files that config.status was made for.
config_files="$ac_config_files"
+config_headers="$ac_config_headers"
config_commands="$ac_config_commands"
_ACEOF
@@ -24010,10 +23838,15 @@ Usage: $0 [OPTIONS] [FILE]...
--recheck update $as_me by reconfiguring in the same conditions
--file=FILE[:TEMPLATE]
instantiate the configuration file FILE
+ --header=FILE[:TEMPLATE]
+ instantiate the configuration header FILE
Configuration files:
$config_files
+Configuration headers:
+$config_headers
+
Configuration commands:
$config_commands
@@ -24022,7 +23855,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-SFLphone config.status 0.9.4
+SFLphone config.status 0.9.5~beta
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -24033,6 +23866,7 @@ gives unlimited permission to copy, distribute and modify it."
ac_pwd='$ac_pwd'
srcdir='$srcdir'
INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
@@ -24066,7 +23900,16 @@ do
$ac_shift
CONFIG_FILES="$CONFIG_FILES $ac_optarg"
ac_need_defaults=false;;
- --he | --h | --help | --hel | -h )
+ --header | --heade | --head | --hea )
+ $ac_shift
+ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+ ac_need_defaults=false;;
+ --he | --h)
+ # Conflict between --help and --header
+ { echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2
+ { (exit 1); exit 1; }; };;
+ --help | --hel | -h )
echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil | --si | --s)
@@ -24116,6 +23959,7 @@ cat >>$CONFIG_STATUS <<_ACEOF
#
# INIT-COMMANDS
#
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
# The HP-UX ksh and POSIX shell print the target directory to stdout
@@ -24465,7 +24309,6 @@ fi
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
_ACEOF
@@ -24475,8 +24318,9 @@ cat >>$CONFIG_STATUS <<\_ACEOF
for ac_config_target in $ac_config_targets
do
case $ac_config_target in
- "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+ "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"libs/Makefile") CONFIG_FILES="$CONFIG_FILES libs/Makefile" ;;
"libs/stund/Makefile") CONFIG_FILES="$CONFIG_FILES libs/stund/Makefile" ;;
@@ -24487,6 +24331,7 @@ do
"libs/dbus-c++/src/Makefile") CONFIG_FILES="$CONFIG_FILES libs/dbus-c++/src/Makefile" ;;
"libs/dbus-c++/tools/Makefile") CONFIG_FILES="$CONFIG_FILES libs/dbus-c++/tools/Makefile" ;;
"libs/dbus-c++/data/Makefile") CONFIG_FILES="$CONFIG_FILES libs/dbus-c++/data/Makefile" ;;
+ "libs/iax2/Makefile") CONFIG_FILES="$CONFIG_FILES libs/iax2/Makefile" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"src/audio/Makefile") CONFIG_FILES="$CONFIG_FILES src/audio/Makefile" ;;
"src/audio/codecs/Makefile") CONFIG_FILES="$CONFIG_FILES src/audio/codecs/Makefile" ;;
@@ -24519,6 +24364,7 @@ done
# bizarre bug on SunOS 4.1.3.
if $ac_need_defaults; then
test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+ test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
fi
@@ -24603,6 +24449,29 @@ LIBS!$LIBS$ac_delim
build_alias!$build_alias$ac_delim
host_alias!$host_alias$ac_delim
target_alias!$target_alias$ac_delim
+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+INSTALL_DATA!$INSTALL_DATA$ac_delim
+am__isrc!$am__isrc$ac_delim
+CYGPATH_W!$CYGPATH_W$ac_delim
+PACKAGE!$PACKAGE$ac_delim
+VERSION!$VERSION$ac_delim
+ACLOCAL!$ACLOCAL$ac_delim
+AUTOCONF!$AUTOCONF$ac_delim
+AUTOMAKE!$AUTOMAKE$ac_delim
+AUTOHEADER!$AUTOHEADER$ac_delim
+MAKEINFO!$MAKEINFO$ac_delim
+install_sh!$install_sh$ac_delim
+STRIP!$STRIP$ac_delim
+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
+mkdir_p!$mkdir_p$ac_delim
+AWK!$AWK$ac_delim
+SET_MAKE!$SET_MAKE$ac_delim
+am__leading_dot!$am__leading_dot$ac_delim
+AMTAR!$AMTAR$ac_delim
+am__tar!$am__tar$ac_delim
+am__untar!$am__untar$ac_delim
+LIBTOOL!$LIBTOOL$ac_delim
build!$build$ac_delim
build_cpu!$build_cpu$ac_delim
build_vendor!$build_vendor$ac_delim
@@ -24611,11 +24480,6 @@ host!$host$ac_delim
host_cpu!$host_cpu$ac_delim
host_vendor!$host_vendor$ac_delim
host_os!$host_os$ac_delim
-target!$target$ac_delim
-target_cpu!$target_cpu$ac_delim
-target_vendor!$target_vendor$ac_delim
-target_os!$target_os$ac_delim
-LIBTOOL!$LIBTOOL$ac_delim
CC!$CC$ac_delim
CFLAGS!$CFLAGS$ac_delim
LDFLAGS!$LDFLAGS$ac_delim
@@ -24623,6 +24487,15 @@ CPPFLAGS!$CPPFLAGS$ac_delim
ac_ct_CC!$ac_ct_CC$ac_delim
EXEEXT!$EXEEXT$ac_delim
OBJEXT!$OBJEXT$ac_delim
+DEPDIR!$DEPDIR$ac_delim
+am__include!$am__include$ac_delim
+am__quote!$am__quote$ac_delim
+AMDEP_TRUE!$AMDEP_TRUE$ac_delim
+AMDEP_FALSE!$AMDEP_FALSE$ac_delim
+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
+CCDEPMODE!$CCDEPMODE$ac_delim
+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
SED!$SED$ac_delim
GREP!$GREP$ac_delim
EGREP!$EGREP$ac_delim
@@ -24633,36 +24506,9 @@ ac_ct_DUMPBIN!$ac_ct_DUMPBIN$ac_delim
NM!$NM$ac_delim
LN_S!$LN_S$ac_delim
AR!$AR$ac_delim
-STRIP!$STRIP$ac_delim
RANLIB!$RANLIB$ac_delim
lt_ECHO!$lt_ECHO$ac_delim
DSYMUTIL!$DSYMUTIL$ac_delim
-NMEDIT!$NMEDIT$ac_delim
-LIPO!$LIPO$ac_delim
-OTOOL!$OTOOL$ac_delim
-OTOOL64!$OTOOL64$ac_delim
-CPP!$CPP$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-CYGPATH_W!$CYGPATH_W$ac_delim
-PACKAGE!$PACKAGE$ac_delim
-VERSION!$VERSION$ac_delim
-ACLOCAL!$ACLOCAL$ac_delim
-AUTOCONF!$AUTOCONF$ac_delim
-AUTOMAKE!$AUTOMAKE$ac_delim
-AUTOHEADER!$AUTOHEADER$ac_delim
-MAKEINFO!$MAKEINFO$ac_delim
-install_sh!$install_sh$ac_delim
-INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-mkdir_p!$mkdir_p$ac_delim
-AWK!$AWK$ac_delim
-SET_MAKE!$SET_MAKE$ac_delim
-am__leading_dot!$am__leading_dot$ac_delim
-AMTAR!$AMTAR$ac_delim
-am__tar!$am__tar$ac_delim
-am__untar!$am__untar$ac_delim
-DEPDIR!$DEPDIR$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -24704,14 +24550,11 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-am__include!$am__include$ac_delim
-am__quote!$am__quote$ac_delim
-AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-CCDEPMODE!$CCDEPMODE$ac_delim
-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
+NMEDIT!$NMEDIT$ac_delim
+LIPO!$LIPO$ac_delim
+OTOOL!$OTOOL$ac_delim
+OTOOL64!$OTOOL64$ac_delim
+CPP!$CPP$ac_delim
PKGADD_PKG!$PKGADD_PKG$ac_delim
PKGADD_NAME!$PKGADD_NAME$ac_delim
PKGADD_VENDOR!$PKGADD_VENDOR$ac_delim
@@ -24765,14 +24608,12 @@ BUILD_SPEEX_TRUE!$BUILD_SPEEX_TRUE$ac_delim
BUILD_SPEEX_FALSE!$BUILD_SPEEX_FALSE$ac_delim
ENABLE_SPEEXDSP_TRUE!$ENABLE_SPEEXDSP_TRUE$ac_delim
ENABLE_SPEEXDSP_FALSE!$ENABLE_SPEEXDSP_FALSE$ac_delim
+BUILD_CELT_TRUE!$BUILD_CELT_TRUE$ac_delim
+BUILD_CELT_FALSE!$BUILD_CELT_FALSE$ac_delim
BUILD_ILBC_TRUE!$BUILD_ILBC_TRUE$ac_delim
BUILD_ILBC_FALSE!$BUILD_ILBC_FALSE$ac_delim
USE_IAX_TRUE!$USE_IAX_TRUE$ac_delim
USE_IAX_FALSE!$USE_IAX_FALSE$ac_delim
-LIBREADLINE!$LIBREADLINE$ac_delim
-LIB_DNSSD!$LIB_DNSSD$ac_delim
-USE_ZEROCONF_TRUE!$USE_ZEROCONF_TRUE$ac_delim
-USE_ZEROCONF_FALSE!$USE_ZEROCONF_FALSE$ac_delim
DOXYGEN!$DOXYGEN$ac_delim
DOT!$DOT$ac_delim
DOC_TRUE!$DOC_TRUE$ac_delim
@@ -24789,7 +24630,7 @@ SFLPHONE_LIBS!$SFLPHONE_LIBS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 83; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 78; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -24846,7 +24687,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF
fi # test -n "$CONFIG_FILES"
-for ac_tag in :F $CONFIG_FILES :C $CONFIG_COMMANDS
+for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS
do
case $ac_tag in
:[FHLC]) ac_mode=$ac_tag; continue;;
@@ -24930,7 +24771,387 @@ echo X"$ac_file" |
q
}
s/.*/./; q'`
- { as_dir="$ac_dir"
+ { as_dir="$ac_dir"
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ { (exit 1); exit 1; }; }; }
+ ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ # A ".." for each directory in $ac_dir_suffix.
+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+ case $ac_top_builddir_sub in
+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+ esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+ .) # We are building in place.
+ ac_srcdir=.
+ ac_top_srcdir=$ac_top_builddir_sub
+ ac_abs_top_srcdir=$ac_pwd ;;
+ [\\/]* | ?:[\\/]* ) # Absolute name.
+ ac_srcdir=$srcdir$ac_dir_suffix;
+ ac_top_srcdir=$srcdir
+ ac_abs_top_srcdir=$srcdir ;;
+ *) # Relative name.
+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_build_prefix$srcdir
+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+ case $ac_mode in
+ :F)
+ #
+ # CONFIG_FILE
+ #
+
+ case $INSTALL in
+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+ esac
+ ac_MKDIR_P=$MKDIR_P
+ case $MKDIR_P in
+ [\\/$]* | ?:[\\/]* ) ;;
+ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+ esac
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+
+case `sed -n '/datarootdir/ {
+ p
+ q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p
+' $ac_file_inputs` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF
+ ac_datarootdir_hack='
+ s&@datadir@&$datadir&g
+ s&@docdir@&$docdir&g
+ s&@infodir@&$infodir&g
+ s&@localedir@&$localedir&g
+ s&@mandir@&$mandir&g
+ s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF
+ sed "$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s&@configure_input@&$configure_input&;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
+$ac_datarootdir_hack
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined. Please make sure it is defined." >&5
+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined. Please make sure it is defined." >&2;}
+
+ rm -f "$tmp/stdin"
+ case $ac_file in
+ -) cat "$tmp/out"; rm -f "$tmp/out";;
+ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
+ esac
+ ;;
+ :H)
+ #
+ # CONFIG_HEADER
+ #
+_ACEOF
+
+# Transform confdefs.h into a sed script `conftest.defines', that
+# substitutes the proper values into config.h.in to produce config.h.
+rm -f conftest.defines conftest.tail
+# First, append a space to every undef/define line, to ease matching.
+echo 's/$/ /' >conftest.defines
+# Then, protect against being on the right side of a sed subst, or in
+# an unquoted here document, in config.status. If some macros were
+# called several times there might be several #defines for the same
+# symbol, which is useless. But do not sort them, since the last
+# AC_DEFINE must be honored.
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
+# NAME is the cpp macro being defined, VALUE is the value it is being given.
+# PARAMS is the parameter list in the macro definition--in most cases, it's
+# just an empty string.
+ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
+ac_dB='\\)[ (].*,\\1define\\2'
+ac_dC=' '
+ac_dD=' ,'
+
+uniq confdefs.h |
+ sed -n '
+ t rset
+ :rset
+ s/^[ ]*#[ ]*define[ ][ ]*//
+ t ok
+ d
+ :ok
+ s/[\\&,]/\\&/g
+ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
+ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
+ ' >>conftest.defines
+
+# Remove the space that was appended to ease matching.
+# Then replace #undef with comments. This is necessary, for
+# example, in the case of _POSIX_SOURCE, which is predefined and required
+# on some systems where configure will not decide to define it.
+# (The regexp can be short, since the line contains either #define or #undef.)
+echo 's/ $//
+s,^[ #]*u.*,/* & */,' >>conftest.defines
+
+# Break up conftest.defines:
+ac_max_sed_lines=50
+
+# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
+# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
+# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
+# et cetera.
+ac_in='$ac_file_inputs'
+ac_out='"$tmp/out1"'
+ac_nxt='"$tmp/out2"'
+
+while :
+do
+ # Write a here document:
+ cat >>$CONFIG_STATUS <<_ACEOF
+ # First, check the format of the line:
+ cat >"\$tmp/defines.sed" <<\\CEOF
+/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
+/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
+b
+:def
+_ACEOF
+ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
+ echo 'CEOF
+ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
+ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
+ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
+ grep . conftest.tail >/dev/null || break
+ rm -f conftest.defines
+ mv conftest.tail conftest.defines
+done
+rm -f conftest.defines conftest.tail
+
+echo "ac_result=$ac_in" >>$CONFIG_STATUS
+cat >>$CONFIG_STATUS <<\_ACEOF
+ if test x"$ac_file" != x-; then
+ echo "/* $configure_input */" >"$tmp/config.h"
+ cat "$ac_result" >>"$tmp/config.h"
+ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
+ { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+ rm -f $ac_file
+ mv "$tmp/config.h" $ac_file
+ fi
+ else
+ echo "/* $configure_input */"
+ cat "$ac_result"
+ fi
+ rm -f "$tmp/out12"
+# Compute $ac_file's index in $config_headers.
+_am_arg=$ac_file
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+ case $_am_header in
+ $_am_arg | $_am_arg:* )
+ break ;;
+ * )
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+ esac
+done
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$_am_arg" : 'X\(//\)[^/]' \| \
+ X"$_am_arg" : 'X\(//\)$' \| \
+ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$_am_arg" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
+
+ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
+echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+ esac
+
+
+ case $ac_file$ac_mode in
+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || 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.
+ # 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" ||
+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$mf" : 'X\(//\)[^/]' \| \
+ X"$mf" : 'X\(//\)$' \| \
+ X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$mf" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ 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_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$file" : 'X\(//\)[^/]' \| \
+ X"$file" : 'X\(//\)$' \| \
+ X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$file" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ { as_dir=$dirpart/$fdir
case $as_dir in #(
-*) as_dir=./$as_dir;;
esac
@@ -24971,130 +25192,11 @@ echo X"$as_dir" |
} || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
echo "$as_me: error: cannot create directory $as_dir" >&2;}
{ (exit 1); exit 1; }; }; }
- ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
- # A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
- case $ac_top_builddir_sub in
- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
- esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
- .) # We are building in place.
- ac_srcdir=.
- ac_top_srcdir=$ac_top_builddir_sub
- ac_abs_top_srcdir=$ac_pwd ;;
- [\\/]* | ?:[\\/]* ) # Absolute name.
- ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir
- ac_abs_top_srcdir=$srcdir ;;
- *) # Relative name.
- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_build_prefix$srcdir
- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
- case $ac_mode in
- :F)
- #
- # CONFIG_FILE
- #
-
- case $INSTALL in
- [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
- *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
- esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-
-case `sed -n '/datarootdir/ {
- p
- q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p
-' $ac_file_inputs` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
- { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
- ac_datarootdir_hack='
- s&@datadir@&$datadir&g
- s&@docdir@&$docdir&g
- s&@infodir@&$infodir&g
- s&@localedir@&$localedir&g
- s&@mandir@&$mandir&g
- s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
- sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-$ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
- { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined." >&2;}
-
- rm -f "$tmp/stdin"
- case $ac_file in
- -) cat "$tmp/out"; rm -f "$tmp/out";;
- *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
- esac
- ;;
-
-
- :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
+done
;;
- esac
-
-
- case $ac_file$ac_mode in
"libtool":C)
# See if we are running on zsh, and set the options which allow our
@@ -25893,129 +25995,6 @@ compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
# ### END LIBTOOL TAG CONFIG: CXX
_LT_EOF
- ;;
- "depfiles":C) test x"$AMDEP_TRUE" != x"" || 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" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$mf" : 'X\(//\)[^/]' \| \
- X"$mf" : 'X\(//\)$' \| \
- X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$mf" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- 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_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$file" : 'X\(//\)[^/]' \| \
- X"$file" : 'X\(//\)$' \| \
- X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- { as_dir=$dirpart/$fdir
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
-done
;;
esac
diff --git a/sflphone-common/autom4te.cache/traces.2 b/sflphone-common/autom4te.cache/traces.2
index 9d652c671928690d501718250d427fb180693d3c..4efbf50919073cd63f5814da844b326732f56477 100644
--- a/sflphone-common/autom4te.cache/traces.2
+++ b/sflphone-common/autom4te.cache/traces.2
@@ -1,3 +1,612 @@
+m4trace:/usr/share/aclocal/argz.m4:12: -1- AC_DEFUN([gl_FUNC_ARGZ], [gl_PREREQ_ARGZ
+
+AC_CHECK_HEADERS([argz.h], [], [], [AC_INCLUDES_DEFAULT])
+
+AC_CHECK_TYPES([error_t],
+ [],
+ [AC_DEFINE([error_t], [int],
+ [Define to a type to use for `error_t' if it is not otherwise available.])
+ AC_DEFINE([__error_t_defined], [1], [Define so that glibc/gnulib argp.h
+ does not typedef error_t.])],
+ [#if defined(HAVE_ARGZ_H)
+# include <argz.h>
+#endif])
+
+ARGZ_H=
+AC_CHECK_FUNCS([argz_add argz_append argz_count argz_create_sep argz_insert \
+ argz_next argz_stringify], [], [ARGZ_H=argz.h; AC_LIBOBJ([argz])])
+
+dnl if have system argz functions, allow forced use of
+dnl libltdl-supplied implementation (and default to do so
+dnl on "known bad" systems). Could use a runtime check, but
+dnl (a) detecting malloc issues is notoriously unreliable
+dnl (b) only known system that declares argz functions,
+dnl provides them, yet they are broken, is cygwin
+dnl releases prior to 16-Mar-2007 (1.5.24 and earlier)
+dnl So, it's more straightforward simply to special case
+dnl this for known bad systems.
+AS_IF([test -z "$ARGZ_H"],
+ [AC_CACHE_CHECK(
+ [if argz actually works],
+ [lt_cv_sys_argz_works],
+ [[case $host_os in #(
+ *cygwin*)
+ lt_cv_sys_argz_works=no
+ if test "$cross_compiling" != no; then
+ lt_cv_sys_argz_works="guessing no"
+ else
+ lt_sed_extract_leading_digits='s/^\([0-9\.]*\).*/\1/'
+ save_IFS=$IFS
+ IFS=-.
+ set x `uname -r | sed -e "$lt_sed_extract_leading_digits"`
+ IFS=$save_IFS
+ lt_os_major=${2-0}
+ lt_os_minor=${3-0}
+ lt_os_micro=${4-0}
+ if test "$lt_os_major" -gt 1 \
+ || { test "$lt_os_major" -eq 1 \
+ && { test "$lt_os_minor" -gt 5 \
+ || { test "$lt_os_minor" -eq 5 \
+ && test "$lt_os_micro" -gt 24; }; }; }; then
+ lt_cv_sys_argz_works=yes
+ fi
+ fi
+ ;; #(
+ *) lt_cv_sys_argz_works=yes ;;
+ esac]])
+ AS_IF([test $lt_cv_sys_argz_works = yes],
+ [AC_DEFINE([HAVE_WORKING_ARGZ], 1,
+ [This value is set to 1 to indicate that the system argz facility works])],
+ [ARGZ_H=argz.h
+ AC_LIBOBJ([argz])])])
+
+AC_SUBST([ARGZ_H])
+])
+m4trace:/usr/share/aclocal/argz.m4:79: -1- AC_DEFUN([gl_PREREQ_ARGZ], [:])
+m4trace:/usr/share/aclocal/ltdl.m4:16: -1- AC_DEFUN([LT_CONFIG_LTDL_DIR], [AC_BEFORE([$0], [LTDL_INIT])
+_$0($*)
+])
+m4trace:/usr/share/aclocal/ltdl.m4:68: -1- AC_DEFUN([LTDL_CONVENIENCE], [AC_BEFORE([$0], [LTDL_INIT])dnl
+dnl Although the argument is deprecated and no longer documented,
+dnl LTDL_CONVENIENCE used to take a DIRECTORY orgument, if we have one
+dnl here make sure it is the same as any other declaration of libltdl's
+dnl location! This also ensures lt_ltdl_dir is set when configure.ac is
+dnl not yet using an explicit LT_CONFIG_LTDL_DIR.
+m4_ifval([$1], [_LT_CONFIG_LTDL_DIR([$1])])dnl
+_$0()
+])
+m4trace:/usr/share/aclocal/ltdl.m4:81: -1- AU_DEFUN([AC_LIBLTDL_CONVENIENCE], [_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])])
+_LTDL_CONVENIENCE])
+m4trace:/usr/share/aclocal/ltdl.m4:81: -1- AC_DEFUN([AC_LIBLTDL_CONVENIENCE], [AC_DIAGNOSE([obsolete], [The macro `AC_LIBLTDL_CONVENIENCE' is obsolete.
+You should run autoupdate.])dnl
+_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])])
+_LTDL_CONVENIENCE])
+m4trace:/usr/share/aclocal/ltdl.m4:124: -1- AC_DEFUN([LTDL_INSTALLABLE], [AC_BEFORE([$0], [LTDL_INIT])dnl
+dnl Although the argument is deprecated and no longer documented,
+dnl LTDL_INSTALLABLE used to take a DIRECTORY orgument, if we have one
+dnl here make sure it is the same as any other declaration of libltdl's
+dnl location! This also ensures lt_ltdl_dir is set when configure.ac is
+dnl not yet using an explicit LT_CONFIG_LTDL_DIR.
+m4_ifval([$1], [_LT_CONFIG_LTDL_DIR([$1])])dnl
+_$0()
+])
+m4trace:/usr/share/aclocal/ltdl.m4:137: -1- AU_DEFUN([AC_LIBLTDL_INSTALLABLE], [_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])])
+_LTDL_INSTALLABLE])
+m4trace:/usr/share/aclocal/ltdl.m4:137: -1- AC_DEFUN([AC_LIBLTDL_INSTALLABLE], [AC_DIAGNOSE([obsolete], [The macro `AC_LIBLTDL_INSTALLABLE' is obsolete.
+You should run autoupdate.])dnl
+_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])])
+_LTDL_INSTALLABLE])
+m4trace:/usr/share/aclocal/ltdl.m4:213: -1- AC_DEFUN([_LT_LIBOBJ], [
+ m4_pattern_allow([^_LT_LIBOBJS$])
+ AS_LITERAL_IF([$1], [_LT_LIBSOURCES([$1.c])])dnl
+ _LT_LIBOBJS="$_LT_LIBOBJS $1.$ac_objext"
+])
+m4trace:/usr/share/aclocal/ltdl.m4:224: -1- AC_DEFUN([_LT_LIBSOURCES], [
+ m4_foreach([_LTNAME], [$1], [
+ m4_syscmd([test -r "$lt_libobj_prefix]_LTNAME[" ||
+ test -z "$lt_libobj_prefix" ||
+ test ! -d "$lt_libobj_prefix"])dnl
+ m4_if(m4_sysval, [0], [],
+ [AC_FATAL([missing $lt_libobj_prefix/]_LTNAME)])
+ ])
+])
+m4trace:/usr/share/aclocal/ltdl.m4:242: -1- AC_DEFUN([LTDL_INIT], [dnl Parse OPTIONS
+_LT_SET_OPTIONS([$0], [$1])
+
+dnl We need to keep our own list of libobjs separate from our parent project,
+dnl and the easiest way to do that is redefine the AC_LIBOBJs macro while
+dnl we look for our own LIBOBJs. Definitions in ltdl-libobj.m4.
+m4_pushdef([AC_LIBOBJ], m4_defn([_LT_LIBOBJ]))
+m4_pushdef([AC_LIBSOURCES], m4_defn([_LT_LIBSOURCES]))
+
+dnl If not otherwise defined, default to the 1.5.x compatible subproject mode:
+m4_if(_LTDL_MODE, [],
+ [m4_define([_LTDL_MODE], m4_default([$2], [subproject]))
+ m4_if([-1], [m4_bregexp(_LTDL_MODE, [\(subproject\|\(non\)?recursive\)])],
+ [m4_fatal([unknown libltdl mode: ]_LTDL_MODE)])])
+
+AC_ARG_WITH([included_ltdl],
+ [AS_HELP_STRING([--with-included-ltdl],
+ [use the GNU ltdl sources included here])])
+
+if test "x$with_included_ltdl" != xyes; then
+ # We are not being forced to use the included libltdl sources, so
+ # decide whether there is a useful installed version we can use.
+ AC_CHECK_HEADER([ltdl.h],
+ [AC_CHECK_DECL([lt_dlinterface_register],
+ [AC_CHECK_LIB([ltdl], [lt_dlinterface_register],
+ [with_included_ltdl=no],
+ [with_included_ltdl=yes])],
+ [with_included_ltdl=yes],
+ [AC_INCLUDES_DEFAULT
+ #include <ltdl.h>])],
+ [with_included_ltdl=yes],
+ [AC_INCLUDES_DEFAULT]
+ )
+fi
+
+dnl If neither LT_CONFIG_LTDL_DIR, LTDL_CONVENIENCE nor LTDL_INSTALLABLE
+dnl was called yet, then for old times' sake, we assume libltdl is in an
+dnl eponymous directory:
+AC_PROVIDE_IFELSE([LT_CONFIG_LTDL_DIR], [], [_LT_CONFIG_LTDL_DIR([libltdl])])
+
+AC_ARG_WITH([ltdl_include],
+ [AS_HELP_STRING([--with-ltdl-include=DIR],
+ [use the ltdl headers installed in DIR])])
+
+if test -n "$with_ltdl_include"; then
+ if test -f "$with_ltdl_include/ltdl.h"; then :
+ else
+ AC_MSG_ERROR([invalid ltdl include directory: `$with_ltdl_include'])
+ fi
+else
+ with_ltdl_include=no
+fi
+
+AC_ARG_WITH([ltdl_lib],
+ [AS_HELP_STRING([--with-ltdl-lib=DIR],
+ [use the libltdl.la installed in DIR])])
+
+if test -n "$with_ltdl_lib"; then
+ if test -f "$with_ltdl_lib/libltdl.la"; then :
+ else
+ AC_MSG_ERROR([invalid ltdl library directory: `$with_ltdl_lib'])
+ fi
+else
+ with_ltdl_lib=no
+fi
+
+case ,$with_included_ltdl,$with_ltdl_include,$with_ltdl_lib, in
+ ,yes,no,no,)
+ m4_case(m4_default(_LTDL_TYPE, [convenience]),
+ [convenience], [_LTDL_CONVENIENCE],
+ [installable], [_LTDL_INSTALLABLE],
+ [m4_fatal([unknown libltdl build type: ]_LTDL_TYPE)])
+ ;;
+ ,no,no,no,)
+ # If the included ltdl is not to be used, then use the
+ # preinstalled libltdl we found.
+ AC_DEFINE([HAVE_LTDL], [1],
+ [Define this if a modern libltdl is already installed])
+ LIBLTDL=-lltdl
+ LTDLDEPS=
+ LTDLINCL=
+ ;;
+ ,no*,no,*)
+ AC_MSG_ERROR([`--with-ltdl-include' and `--with-ltdl-lib' options must be used together])
+ ;;
+ *) with_included_ltdl=no
+ LIBLTDL="-L$with_ltdl_lib -lltdl"
+ LTDLDEPS=
+ LTDLINCL="-I$with_ltdl_include"
+ ;;
+esac
+INCLTDL="$LTDLINCL"
+
+# Report our decision...
+AC_MSG_CHECKING([where to find libltdl headers])
+AC_MSG_RESULT([$LTDLINCL])
+AC_MSG_CHECKING([where to find libltdl library])
+AC_MSG_RESULT([$LIBLTDL])
+
+_LTDL_SETUP
+
+dnl restore autoconf definition.
+m4_popdef([AC_LIBOBJ])
+m4_popdef([AC_LIBSOURCES])
+
+AC_CONFIG_COMMANDS_PRE([
+ _ltdl_libobjs=
+ _ltdl_ltlibobjs=
+ if test -n "$_LT_LIBOBJS"; then
+ # Remove the extension.
+ _lt_sed_drop_objext='s/\.o$//;s/\.obj$//'
+ for i in `for i in $_LT_LIBOBJS; do echo "$i"; done | sed "$_lt_sed_drop_objext" | sort -u`; do
+ _ltdl_libobjs="$_ltdl_libobjs $lt_libobj_prefix$i.$ac_objext"
+ _ltdl_ltlibobjs="$_ltdl_ltlibobjs $lt_libobj_prefix$i.lo"
+ done
+ fi
+ AC_SUBST([ltdl_LIBOBJS], [$_ltdl_libobjs])
+ AC_SUBST([ltdl_LTLIBOBJS], [$_ltdl_ltlibobjs])
+])
+
+# Only expand once:
+m4_define([LTDL_INIT])
+])
+m4trace:/usr/share/aclocal/ltdl.m4:368: -1- AU_DEFUN([AC_LIB_LTDL], [LTDL_INIT($@)])
+m4trace:/usr/share/aclocal/ltdl.m4:368: -1- AC_DEFUN([AC_LIB_LTDL], [AC_DIAGNOSE([obsolete], [The macro `AC_LIB_LTDL' is obsolete.
+You should run autoupdate.])dnl
+LTDL_INIT($@)])
+m4trace:/usr/share/aclocal/ltdl.m4:369: -1- AU_DEFUN([AC_WITH_LTDL], [LTDL_INIT($@)])
+m4trace:/usr/share/aclocal/ltdl.m4:369: -1- AC_DEFUN([AC_WITH_LTDL], [AC_DIAGNOSE([obsolete], [The macro `AC_WITH_LTDL' is obsolete.
+You should run autoupdate.])dnl
+LTDL_INIT($@)])
+m4trace:/usr/share/aclocal/ltdl.m4:370: -1- AU_DEFUN([LT_WITH_LTDL], [LTDL_INIT($@)])
+m4trace:/usr/share/aclocal/ltdl.m4:370: -1- AC_DEFUN([LT_WITH_LTDL], [AC_DIAGNOSE([obsolete], [The macro `LT_WITH_LTDL' is obsolete.
+You should run autoupdate.])dnl
+LTDL_INIT($@)])
+m4trace:/usr/share/aclocal/ltdl.m4:383: -1- AC_DEFUN([_LTDL_SETUP], [AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_SYS_MODULE_EXT])dnl
+AC_REQUIRE([LT_SYS_MODULE_PATH])dnl
+AC_REQUIRE([LT_SYS_DLSEARCH_PATH])dnl
+AC_REQUIRE([LT_LIB_DLLOAD])dnl
+AC_REQUIRE([LT_SYS_SYMBOL_USCORE])dnl
+AC_REQUIRE([LT_FUNC_DLSYM_USCORE])dnl
+AC_REQUIRE([LT_SYS_DLOPEN_DEPLIBS])dnl
+AC_REQUIRE([gl_FUNC_ARGZ])dnl
+
+m4_require([_LT_CHECK_OBJDIR])dnl
+m4_require([_LT_HEADER_DLFCN])dnl
+m4_require([_LT_CHECK_DLPREOPEN])dnl
+m4_require([_LT_DECL_SED])dnl
+
+# lt_cv_dlopen_self gets defined by LT_SYS_DLOPEN_SELF, called by LT_INIT
+if test "$lt_cv_dlopen_self" = yes; then
+ AC_DEFINE([LTDL_DLOPEN_SELF_WORKS], [1],
+ [Define if dlopen(NULL) is able to resolve symbols from the main program.])
+fi
+
+dnl Don't require this, or it will be expanded earlier than the code
+dnl that sets the variables it relies on:
+_LT_ENABLE_INSTALL
+
+dnl _LTDL_MODE specific code must be called at least once:
+_LTDL_MODE_DISPATCH
+
+# In order that ltdl.c can compile, find out the first AC_CONFIG_HEADERS
+# the user used. This is so that ltdl.h can pick up the parent projects
+# config.h file, The first file in AC_CONFIG_HEADERS must contain the
+# definitions required by ltdl.c.
+# FIXME: Remove use of undocumented AC_LIST_HEADERS (2.59 compatibility).
+AC_CONFIG_COMMANDS_PRE([dnl
+m4_pattern_allow([^LT_CONFIG_H$])dnl
+m4_ifset([AH_HEADER],
+ [LT_CONFIG_H=AH_HEADER],
+ [m4_ifset([AC_LIST_HEADERS],
+ [LT_CONFIG_H=`echo "AC_LIST_HEADERS" | $SED 's,^[[ ]]*,,;s,[[ :]].*$,,'`],
+ [])])])
+AC_SUBST([LT_CONFIG_H])
+
+AC_CHECK_HEADERS([unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h dirent.h],
+ [], [], [AC_INCLUDES_DEFAULT])
+
+AC_CHECK_FUNCS([closedir opendir readdir], [], [AC_LIBOBJ([lt__dirent])])
+AC_CHECK_FUNCS([strlcat strlcpy], [], [AC_LIBOBJ([lt__strl])])
+
+name=ltdl
+LTDLOPEN=`eval "\\$ECHO \"$libname_spec\""`
+AC_SUBST([LTDLOPEN])
+])
+m4trace:/usr/share/aclocal/ltdl.m4:457: -1- AC_DEFUN([LT_SYS_DLOPEN_DEPLIBS], [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
+ [lt_cv_sys_dlopen_deplibs],
+ [# PORTME does your system automatically load deplibs for dlopen?
+ # or its logical equivalent (e.g. shl_load for HP-UX < 11)
+ # For now, we just catch OSes we know something about -- in the
+ # future, we'll try test this programmatically.
+ lt_cv_sys_dlopen_deplibs=unknown
+ case $host_os in
+ aix3*|aix4.1.*|aix4.2.*)
+ # Unknown whether this is true for these versions of AIX, but
+ # we want this `case' here to explicitly catch those versions.
+ lt_cv_sys_dlopen_deplibs=unknown
+ ;;
+ aix[[4-9]]*)
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ amigaos*)
+ case $host_cpu in
+ powerpc)
+ lt_cv_sys_dlopen_deplibs=no
+ ;;
+ esac
+ ;;
+ darwin*)
+ # Assuming the user has installed a libdl from somewhere, this is true
+ # If you are looking for one http://www.opendarwin.org/projects/dlcompat
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ freebsd* | dragonfly*)
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ gnu* | linux* | k*bsd*-gnu)
+ # GNU and its variants, using gnu ld.so (Glibc)
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ hpux10*|hpux11*)
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ interix*)
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ irix[[12345]]*|irix6.[[01]]*)
+ # Catch all versions of IRIX before 6.2, and indicate that we don't
+ # know how it worked for any of those versions.
+ lt_cv_sys_dlopen_deplibs=unknown
+ ;;
+ irix*)
+ # The case above catches anything before 6.2, and it's known that
+ # at 6.2 and later dlopen does load deplibs.
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ netbsd* | netbsdelf*-gnu)
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ openbsd*)
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ osf[[1234]]*)
+ # dlopen did load deplibs (at least at 4.x), but until the 5.x series,
+ # it did *not* use an RPATH in a shared library to find objects the
+ # library depends on, so we explicitly say `no'.
+ lt_cv_sys_dlopen_deplibs=no
+ ;;
+ osf5.0|osf5.0a|osf5.1)
+ # dlopen *does* load deplibs and with the right loader patch applied
+ # it even uses RPATH in a shared library to search for shared objects
+ # that the library depends on, but there's no easy way to know if that
+ # patch is installed. Since this is the case, all we can really
+ # say is unknown -- it depends on the patch being installed. If
+ # it is, this changes to `yes'. Without it, it would be `no'.
+ lt_cv_sys_dlopen_deplibs=unknown
+ ;;
+ osf*)
+ # the two cases above should catch all versions of osf <= 5.1. Read
+ # the comments above for what we know about them.
+ # At > 5.1, deplibs are loaded *and* any RPATH in a shared library
+ # is used to find them so we can finally say `yes'.
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ qnx*)
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ solaris*)
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ libltdl_cv_sys_dlopen_deplibs=yes
+ ;;
+ esac
+ ])
+if test "$lt_cv_sys_dlopen_deplibs" != yes; then
+ AC_DEFINE([LTDL_DLOPEN_DEPLIBS], [1],
+ [Define if the OS needs help to load dependent libraries for dlopen().])
+fi
+])
+m4trace:/usr/share/aclocal/ltdl.m4:556: -1- AU_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS], [m4_if($#, 0, [LT_SYS_DLOPEN_DEPLIBS], [LT_SYS_DLOPEN_DEPLIBS($@)])])
+m4trace:/usr/share/aclocal/ltdl.m4:556: -1- AC_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS], [AC_DIAGNOSE([obsolete], [The macro `AC_LTDL_SYS_DLOPEN_DEPLIBS' is obsolete.
+You should run autoupdate.])dnl
+m4_if($#, 0, [LT_SYS_DLOPEN_DEPLIBS], [LT_SYS_DLOPEN_DEPLIBS($@)])])
+m4trace:/usr/share/aclocal/ltdl.m4:563: -1- AC_DEFUN([LT_SYS_MODULE_EXT], [m4_require([_LT_SYS_DYNAMIC_LINKER])dnl
+AC_CACHE_CHECK([which extension is used for runtime loadable modules],
+ [libltdl_cv_shlibext],
+[
+module=yes
+eval libltdl_cv_shlibext=$shrext_cmds
+ ])
+if test -n "$libltdl_cv_shlibext"; then
+ m4_pattern_allow([LT_MODULE_EXT])dnl
+ AC_DEFINE_UNQUOTED([LT_MODULE_EXT], ["$libltdl_cv_shlibext"],
+ [Define to the extension used for runtime loadable modules, say, ".so".])
+fi
+])
+m4trace:/usr/share/aclocal/ltdl.m4:579: -1- AU_DEFUN([AC_LTDL_SHLIBEXT], [m4_if($#, 0, [LT_SYS_MODULE_EXT], [LT_SYS_MODULE_EXT($@)])])
+m4trace:/usr/share/aclocal/ltdl.m4:579: -1- AC_DEFUN([AC_LTDL_SHLIBEXT], [AC_DIAGNOSE([obsolete], [The macro `AC_LTDL_SHLIBEXT' is obsolete.
+You should run autoupdate.])dnl
+m4_if($#, 0, [LT_SYS_MODULE_EXT], [LT_SYS_MODULE_EXT($@)])])
+m4trace:/usr/share/aclocal/ltdl.m4:586: -1- AC_DEFUN([LT_SYS_MODULE_PATH], [m4_require([_LT_SYS_DYNAMIC_LINKER])dnl
+AC_CACHE_CHECK([which variable specifies run-time module search path],
+ [lt_cv_module_path_var], [lt_cv_module_path_var="$shlibpath_var"])
+if test -n "$lt_cv_module_path_var"; then
+ m4_pattern_allow([LT_MODULE_PATH_VAR])dnl
+ AC_DEFINE_UNQUOTED([LT_MODULE_PATH_VAR], ["$lt_cv_module_path_var"],
+ [Define to the name of the environment variable that determines the run-time module search path.])
+fi
+])
+m4trace:/usr/share/aclocal/ltdl.m4:598: -1- AU_DEFUN([AC_LTDL_SHLIBPATH], [m4_if($#, 0, [LT_SYS_MODULE_PATH], [LT_SYS_MODULE_PATH($@)])])
+m4trace:/usr/share/aclocal/ltdl.m4:598: -1- AC_DEFUN([AC_LTDL_SHLIBPATH], [AC_DIAGNOSE([obsolete], [The macro `AC_LTDL_SHLIBPATH' is obsolete.
+You should run autoupdate.])dnl
+m4_if($#, 0, [LT_SYS_MODULE_PATH], [LT_SYS_MODULE_PATH($@)])])
+m4trace:/usr/share/aclocal/ltdl.m4:605: -1- AC_DEFUN([LT_SYS_DLSEARCH_PATH], [m4_require([_LT_SYS_DYNAMIC_LINKER])dnl
+AC_CACHE_CHECK([for the default library search path],
+ [lt_cv_sys_dlsearch_path],
+ [lt_cv_sys_dlsearch_path="$sys_lib_dlsearch_path_spec"])
+if test -n "$lt_cv_sys_dlsearch_path"; then
+ sys_dlsearch_path=
+ for dir in $lt_cv_sys_dlsearch_path; do
+ if test -z "$sys_dlsearch_path"; then
+ sys_dlsearch_path="$dir"
+ else
+ sys_dlsearch_path="$sys_dlsearch_path$PATH_SEPARATOR$dir"
+ fi
+ done
+ m4_pattern_allow([LT_DLSEARCH_PATH])dnl
+ AC_DEFINE_UNQUOTED([LT_DLSEARCH_PATH], ["$sys_dlsearch_path"],
+ [Define to the system default library search path.])
+fi
+])
+m4trace:/usr/share/aclocal/ltdl.m4:626: -1- AU_DEFUN([AC_LTDL_SYSSEARCHPATH], [m4_if($#, 0, [LT_SYS_DLSEARCH_PATH], [LT_SYS_DLSEARCH_PATH($@)])])
+m4trace:/usr/share/aclocal/ltdl.m4:626: -1- AC_DEFUN([AC_LTDL_SYSSEARCHPATH], [AC_DIAGNOSE([obsolete], [The macro `AC_LTDL_SYSSEARCHPATH' is obsolete.
+You should run autoupdate.])dnl
+m4_if($#, 0, [LT_SYS_DLSEARCH_PATH], [LT_SYS_DLSEARCH_PATH($@)])])
+m4trace:/usr/share/aclocal/ltdl.m4:652: -1- AC_DEFUN([LT_LIB_DLLOAD], [m4_pattern_allow([^LT_DLLOADERS$])
+LT_DLLOADERS=
+AC_SUBST([LT_DLLOADERS])
+
+AC_LANG_PUSH([C])
+
+LIBADD_DLOPEN=
+AC_SEARCH_LIBS([dlopen], [dl],
+ [AC_DEFINE([HAVE_LIBDL], [1],
+ [Define if you have the libdl library or equivalent.])
+ if test "$ac_cv_search_dlopen" != "none required" ; then
+ LIBADD_DLOPEN="-ldl"
+ fi
+ libltdl_cv_lib_dl_dlopen="yes"
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"],
+ [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#if HAVE_DLFCN_H
+# include <dlfcn.h>
+#endif
+ ]], [[dlopen(0, 0);]])],
+ [AC_DEFINE([HAVE_LIBDL], [1],
+ [Define if you have the libdl library or equivalent.])
+ libltdl_cv_func_dlopen="yes"
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"],
+ [AC_CHECK_LIB([svld], [dlopen],
+ [AC_DEFINE([HAVE_LIBDL], [1],
+ [Define if you have the libdl library or equivalent.])
+ LIBADD_DLOPEN="-lsvld" libltdl_cv_func_dlopen="yes"
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"])])])
+if test x"$libltdl_cv_func_dlopen" = xyes || test x"$libltdl_cv_lib_dl_dlopen" = xyes
+then
+ lt_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBADD_DLOPEN"
+ AC_CHECK_FUNCS([dlerror])
+ LIBS="$lt_save_LIBS"
+fi
+AC_SUBST([LIBADD_DLOPEN])
+
+LIBADD_SHL_LOAD=
+AC_CHECK_FUNC([shl_load],
+ [AC_DEFINE([HAVE_SHL_LOAD], [1],
+ [Define if you have the shl_load function.])
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}shl_load.la"],
+ [AC_CHECK_LIB([dld], [shl_load],
+ [AC_DEFINE([HAVE_SHL_LOAD], [1],
+ [Define if you have the shl_load function.])
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}shl_load.la"
+ LIBADD_SHL_LOAD="-ldld"])])
+AC_SUBST([LIBADD_SHL_LOAD])
+
+case $host_os in
+darwin[[1567]].*)
+# We only want this for pre-Mac OS X 10.4.
+ AC_CHECK_FUNC([_dyld_func_lookup],
+ [AC_DEFINE([HAVE_DYLD], [1],
+ [Define if you have the _dyld_func_lookup function.])
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dyld.la"])
+ ;;
+beos*)
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}load_add_on.la"
+ ;;
+cygwin* | mingw* | os2* | pw32*)
+ AC_CHECK_DECLS([cygwin_conv_path], [], [], [[#include <sys/cygwin.h>]])
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}loadlibrary.la"
+ ;;
+esac
+
+AC_CHECK_LIB([dld], [dld_link],
+ [AC_DEFINE([HAVE_DLD], [1],
+ [Define if you have the GNU dld library.])
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dld_link.la"])
+AC_SUBST([LIBADD_DLD_LINK])
+
+m4_pattern_allow([^LT_DLPREOPEN$])
+LT_DLPREOPEN=
+if test -n "$LT_DLLOADERS"
+then
+ for lt_loader in $LT_DLLOADERS; do
+ LT_DLPREOPEN="$LT_DLPREOPEN-dlpreopen $lt_loader "
+ done
+ AC_DEFINE([HAVE_LIBDLLOADER], [1],
+ [Define if libdlloader will be built on this platform])
+fi
+AC_SUBST([LT_DLPREOPEN])
+
+dnl This isn't used anymore, but set it for backwards compatibility
+LIBADD_DL="$LIBADD_DLOPEN $LIBADD_SHL_LOAD"
+AC_SUBST([LIBADD_DL])
+
+AC_LANG_POP
+])
+m4trace:/usr/share/aclocal/ltdl.m4:745: -1- AU_DEFUN([AC_LTDL_DLLIB], [m4_if($#, 0, [LT_LIB_DLLOAD], [LT_LIB_DLLOAD($@)])])
+m4trace:/usr/share/aclocal/ltdl.m4:745: -1- AC_DEFUN([AC_LTDL_DLLIB], [AC_DIAGNOSE([obsolete], [The macro `AC_LTDL_DLLIB' is obsolete.
+You should run autoupdate.])dnl
+m4_if($#, 0, [LT_LIB_DLLOAD], [LT_LIB_DLLOAD($@)])])
+m4trace:/usr/share/aclocal/ltdl.m4:753: -1- AC_DEFUN([LT_SYS_SYMBOL_USCORE], [m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+AC_CACHE_CHECK([for _ prefix in compiled symbols],
+ [lt_cv_sys_symbol_underscore],
+ [lt_cv_sys_symbol_underscore=no
+ cat > conftest.$ac_ext <<_LT_EOF
+void nm_test_func(){}
+int main(){nm_test_func;return 0;}
+_LT_EOF
+ if AC_TRY_EVAL(ac_compile); then
+ # Now try to grab the symbols.
+ ac_nlist=conftest.nm
+ if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
+ # See whether the symbols have a leading underscore.
+ if grep '^. _nm_test_func' "$ac_nlist" >/dev/null; then
+ lt_cv_sys_symbol_underscore=yes
+ else
+ if grep '^. nm_test_func ' "$ac_nlist" >/dev/null; then
+ :
+ else
+ echo "configure: cannot find nm_test_func in $ac_nlist" >&AS_MESSAGE_LOG_FD
+ fi
+ fi
+ else
+ echo "configure: cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+ fi
+ else
+ echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD
+ cat conftest.c >&AS_MESSAGE_LOG_FD
+ fi
+ rm -rf conftest*
+ ])
+ sys_symbol_underscore=$lt_cv_sys_symbol_underscore
+ AC_SUBST([sys_symbol_underscore])
+])
+m4trace:/usr/share/aclocal/ltdl.m4:790: -1- AU_DEFUN([AC_LTDL_SYMBOL_USCORE], [m4_if($#, 0, [LT_SYS_SYMBOL_USCORE], [LT_SYS_SYMBOL_USCORE($@)])])
+m4trace:/usr/share/aclocal/ltdl.m4:790: -1- AC_DEFUN([AC_LTDL_SYMBOL_USCORE], [AC_DIAGNOSE([obsolete], [The macro `AC_LTDL_SYMBOL_USCORE' is obsolete.
+You should run autoupdate.])dnl
+m4_if($#, 0, [LT_SYS_SYMBOL_USCORE], [LT_SYS_SYMBOL_USCORE($@)])])
+m4trace:/usr/share/aclocal/ltdl.m4:797: -1- AC_DEFUN([LT_FUNC_DLSYM_USCORE], [AC_REQUIRE([LT_SYS_SYMBOL_USCORE])dnl
+if test x"$lt_cv_sys_symbol_underscore" = xyes; then
+ if test x"$libltdl_cv_func_dlopen" = xyes ||
+ test x"$libltdl_cv_lib_dl_dlopen" = xyes ; then
+ AC_CACHE_CHECK([whether we have to add an underscore for dlsym],
+ [libltdl_cv_need_uscore],
+ [libltdl_cv_need_uscore=unknown
+ save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBADD_DLOPEN"
+ _LT_TRY_DLOPEN_SELF(
+ [libltdl_cv_need_uscore=no], [libltdl_cv_need_uscore=yes],
+ [], [libltdl_cv_need_uscore=cross])
+ LIBS="$save_LIBS"
+ ])
+ fi
+fi
+
+if test x"$libltdl_cv_need_uscore" = xyes; then
+ AC_DEFINE([NEED_USCORE], [1],
+ [Define if dlsym() requires a leading underscore in symbol names.])
+fi
+])
+m4trace:/usr/share/aclocal/ltdl.m4:822: -1- AU_DEFUN([AC_LTDL_DLSYM_USCORE], [m4_if($#, 0, [LT_FUNC_DLSYM_USCORE], [LT_FUNC_DLSYM_USCORE($@)])])
+m4trace:/usr/share/aclocal/ltdl.m4:822: -1- AC_DEFUN([AC_LTDL_DLSYM_USCORE], [AC_DIAGNOSE([obsolete], [The macro `AC_LTDL_DLSYM_USCORE' is obsolete.
+You should run autoupdate.])dnl
+m4_if($#, 0, [LT_FUNC_DLSYM_USCORE], [LT_FUNC_DLSYM_USCORE($@)])])
m4trace:/usr/share/aclocal/pkg.m4:26: -1- AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
@@ -83,18 +692,28 @@ else
ifelse([$3], , :, [$3])
fi[]dnl
])
-m4trace:/usr/share/aclocal-1.9/amversion.m4:13: -1- AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-m4trace:/usr/share/aclocal-1.9/amversion.m4:19: -1- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], [AM_AUTOMAKE_VERSION([1.9.6])])
-m4trace:/usr/share/aclocal-1.9/auxdir.m4:47: -1- AC_DEFUN([AM_AUX_DIR_EXPAND], [dnl Rely on autoconf to set up CDPATH properly.
+m4trace:/usr/share/aclocal-1.10/amversion.m4:14: -1- AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.10'
+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.10.1], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+m4trace:/usr/share/aclocal-1.10/amversion.m4:33: -1- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], [AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
+m4trace:/usr/share/aclocal-1.10/auxdir.m4:47: -1- AC_DEFUN([AM_AUX_DIR_EXPAND], [dnl Rely on autoconf to set up CDPATH properly.
AC_PREREQ([2.50])dnl
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
])
-m4trace:/usr/share/aclocal-1.9/cond.m4:15: -1- AC_DEFUN([AM_CONDITIONAL], [AC_PREREQ(2.52)dnl
+m4trace:/usr/share/aclocal-1.10/cond.m4:15: -1- 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_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
if $2; then
$1_TRUE=
$1_FALSE='#'
@@ -107,7 +726,7 @@ AC_CONFIG_COMMANDS_PRE(
AC_MSG_ERROR([[conditional "$1" was never defined.
Usually this means the macro was only invoked conditionally.]])
fi])])
-m4trace:/usr/share/aclocal-1.9/depend.m4:29: -1- AC_DEFUN([_AM_DEPENDENCIES], [AC_REQUIRE([AM_SET_DEPDIR])dnl
+m4trace:/usr/share/aclocal-1.10/depend.m4:28: -1- AC_DEFUN([_AM_DEPENDENCIES], [AC_REQUIRE([AM_SET_DEPDIR])dnl
AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
AC_REQUIRE([AM_MAKE_INCLUDE])dnl
AC_REQUIRE([AM_DEP_TRACK])dnl
@@ -115,6 +734,7 @@ 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], UPC, [depcc="$UPC" am_compiler_list=],
[$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
[depcc="$$1" am_compiler_list=])
@@ -180,6 +800,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} 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 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -209,10 +830,10 @@ AM_CONDITIONAL([am__fastdep$1], [
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_$1_dependencies_compiler_type" = gcc3])
])
-m4trace:/usr/share/aclocal-1.9/depend.m4:138: -1- AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+m4trace:/usr/share/aclocal-1.10/depend.m4:139: -1- AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
])
-m4trace:/usr/share/aclocal-1.9/depend.m4:146: -1- AC_DEFUN([AM_DEP_TRACK], [AC_ARG_ENABLE(dependency-tracking,
+m4trace:/usr/share/aclocal-1.10/depend.m4:147: -1- 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])
if test "x$enable_dependency_tracking" != xno; then
@@ -220,9 +841,10 @@ if test "x$enable_dependency_tracking" != xno; then
AMDEPBACKSLASH='\'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
])
-m4trace:/usr/share/aclocal-1.9/depout.m4:14: -1- AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [for mf in $CONFIG_FILES; do
+m4trace:/usr/share/aclocal-1.10/depout.m4:14: -1- 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.
@@ -230,8 +852,9 @@ m4trace:/usr/share/aclocal-1.9/depout.m4:14: -1- AC_DEFUN([_AM_OUTPUT_DEPENDENCY
# 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
+ # 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
@@ -261,20 +884,28 @@ m4trace:/usr/share/aclocal-1.9/depout.m4:14: -1- AC_DEFUN([_AM_OUTPUT_DEPENDENCY
done
done
])
-m4trace:/usr/share/aclocal-1.9/depout.m4:63: -1- AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles],
+m4trace:/usr/share/aclocal-1.10/depout.m4:64: -1- AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles],
[test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
])
-m4trace:/usr/share/aclocal-1.9/init.m4:26: -1- AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.58])dnl
+m4trace:/usr/share/aclocal-1.10/header.m4:12: -1- AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+m4trace:/usr/share/aclocal-1.10/header.m4:12: -1- AC_DEFUN([AM_CONFIG_HEADER], [AC_DIAGNOSE([obsolete], [The macro `AM_CONFIG_HEADER' is obsolete.
+You should run autoupdate.])dnl
+AC_CONFIG_HEADERS($@)])
+m4trace:/usr/share/aclocal-1.10/init.m4:26: -1- AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.60])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
@@ -294,6 +925,9 @@ m4_ifval([$2],
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], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+ [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
@@ -329,23 +963,28 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
[_AM_DEPENDENCIES(CXX)],
[define([AC_PROG_CXX],
defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+ [_AM_DEPENDENCIES(OBJC)],
+ [define([AC_PROG_OBJC],
+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
])
])
-m4trace:/usr/share/aclocal-1.9/init.m4:102: -1- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers.
+m4trace:/usr/share/aclocal-1.10/init.m4:113: -1- 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])
-m4trace:/usr/share/aclocal-1.9/install-sh.m4:11: -1- AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+m4trace:/usr/share/aclocal-1.10/install-sh.m4:11: -1- AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
AC_SUBST(install_sh)])
-m4trace:/usr/share/aclocal-1.9/lead-dot.m4:12: -1- AC_DEFUN([AM_SET_LEADING_DOT], [rm -rf .tst 2>/dev/null
+m4trace:/usr/share/aclocal-1.10/lead-dot.m4:12: -1- AC_DEFUN([AM_SET_LEADING_DOT], [rm -rf .tst 2>/dev/null
mkdir .tst 2>/dev/null
if test -d .tst; then
am__leading_dot=.
@@ -354,7 +993,7 @@ else
fi
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
-m4trace:/usr/share/aclocal-1.9/make.m4:14: -1- AC_DEFUN([AM_MAKE_INCLUDE], [am_make=${MAKE-make}
+m4trace:/usr/share/aclocal-1.10/make.m4:14: -1- AC_DEFUN([AM_MAKE_INCLUDE], [am_make=${MAKE-make}
cat > confinc << 'END'
am__doit:
@echo done
@@ -391,10 +1030,11 @@ AC_SUBST([am__quote])
AC_MSG_RESULT([$_am_result])
rm -f confinc confmf
])
-m4trace:/usr/share/aclocal-1.9/missing.m4:14: -1- AC_DEFUN([AM_MISSING_PROG], [AC_REQUIRE([AM_MISSING_HAS_RUN])
+m4trace:/usr/share/aclocal-1.10/missing.m4:14: -1- AC_DEFUN([AM_MISSING_PROG], [AC_REQUIRE([AM_MISSING_HAS_RUN])
$1=${$1-"${am_missing_run}$2"}
AC_SUBST($1)])
-m4trace:/usr/share/aclocal-1.9/missing.m4:24: -1- AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+m4trace:/usr/share/aclocal-1.10/missing.m4:24: -1- AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
# Use eval to expand $SHELL
if eval "$MISSING --run true"; then
@@ -404,49 +1044,31 @@ else
AC_MSG_WARN([`missing' script is too old or missing])
fi
])
-m4trace:/usr/share/aclocal-1.9/mkdirp.m4:30: -1- 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])])
-m4trace:/usr/share/aclocal-1.9/options.m4:13: -1- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-m4trace:/usr/share/aclocal-1.9/options.m4:19: -1- AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-m4trace:/usr/share/aclocal-1.9/options.m4:25: -1- AC_DEFUN([_AM_SET_OPTIONS], [AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-m4trace:/usr/share/aclocal-1.9/options.m4:31: -1- AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-m4trace:/usr/share/aclocal-1.9/runlog.m4:12: -1- AC_DEFUN([AM_RUN_LOG], [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+m4trace:/usr/share/aclocal-1.10/mkdirp.m4:11: -1- AC_DEFUN([AM_PROG_MKDIR_P], [AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+ [[\\/$]]* | ?:[[\\/]]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
+m4trace:/usr/share/aclocal-1.10/options.m4:13: -1- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+m4trace:/usr/share/aclocal-1.10/options.m4:19: -1- AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+m4trace:/usr/share/aclocal-1.10/options.m4:25: -1- AC_DEFUN([_AM_SET_OPTIONS], [AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+m4trace:/usr/share/aclocal-1.10/options.m4:31: -1- AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+m4trace:/usr/share/aclocal-1.10/runlog.m4:12: -1- 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); }])
-m4trace:/usr/share/aclocal-1.9/sanity.m4:14: -1- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane])
+m4trace:/usr/share/aclocal-1.10/sanity.m4:14: -1- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane])
# Just in case
sleep 1
echo timestamp > conftest.file
@@ -483,7 +1105,7 @@ else
Check your system clock])
fi
AC_MSG_RESULT(yes)])
-m4trace:/usr/share/aclocal-1.9/strip.m4:17: -1- AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+m4trace:/usr/share/aclocal-1.10/strip.m4:17: -1- 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
# tool to use in cross-compilation environments, therefore Automake
@@ -492,9 +1114,10 @@ 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])])
-m4trace:/usr/share/aclocal-1.9/tar.m4:24: -1- AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility.
+m4trace:/usr/share/aclocal-1.10/substnot.m4:12: -1- AC_DEFUN([_AM_SUBST_NOTMAKE])
+m4trace:/usr/share/aclocal-1.10/tar.m4:24: -1- 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 -'],
@@ -1476,69 +2099,6 @@ m4trace:m4/lt~obsolete.m4:89: -1- AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])
m4trace:m4/lt~obsolete.m4:90: -1- AC_DEFUN([_LT_AC_LANG_RC_CONFIG])
m4trace:m4/lt~obsolete.m4:91: -1- AC_DEFUN([AC_LIBTOOL_CONFIG])
m4trace:m4/lt~obsolete.m4:92: -1- AC_DEFUN([_LT_AC_FILE_LTDLL_C])
-m4trace:m4/readline.m4:13: -1- AC_DEFUN([GNUPG_CHECK_READLINE], [
- AC_ARG_WITH(readline,
- AS_HELP_STRING([--with-readline=DIR],
- [look for the readline library in DIR]),
- [_do_readline=$withval],[_do_readline=yes])
-
- if test "$_do_readline" != "no" ; then
- if test -d "$withval" ; then
- CPPFLAGS="${CPPFLAGS} -I$withval/include"
- LDFLAGS="${LDFLAGS} -L$withval/lib"
- fi
-
- for _termcap in "" "-ltermcap" "-lcurses" "-lncurses" ; do
- _readline_save_libs=$LIBS
- _combo="-lreadline${_termcap:+ $_termcap}"
- LIBS="$LIBS $_combo"
-
- AC_MSG_CHECKING([whether readline via "$_combo" is present and sane])
-
- AC_LINK_IFELSE(AC_LANG_PROGRAM([
-#include <stdio.h>
-#include <readline/readline.h>
-#include <readline/history.h>
-],[
-add_history("foobar");
-rl_catch_signals=0;
-rl_inhibit_completion=0;
-rl_attempted_completion_function=NULL;
-]),_found_readline=yes,_found_readline=no)
-
- AC_MSG_RESULT([$_found_readline])
-
- LIBS=$_readline_save_libs
-
- if test $_found_readline = yes ; then
- AC_DEFINE(HAVE_LIBREADLINE,1,
- [Define to 1 if you have a fully functional readline library.])
- AC_SUBST(LIBREADLINE,$_combo)
- break
- fi
- done
-
- unset _termcap
- unset _readline_save_libs
- unset _combo
- unset _found_readline
- fi
-])
-m4trace:m4/sfl-internal.m4:1: -1- AC_DEFUN([SFL_CXX_WITH_DEBUG], [
-
- AC_ARG_WITH(debug,
- AS_HELP_STRING(
- [--with-debug],
- [Set 'full' to enable debugging information @<:@default=no@:>@]
- ),
- [with_debug=${withval}],
- [with_debug=no]
- )
- if test "x$with_debug" = "xfull" -o "x$with_debug" = "xyes"; then
- CXXFLAGS="$CXXFLAGS -g"
- CPPFLAGS="$CPPFLAGS -DSFLDEBUG"
- fi
-])
m4trace:configure.ac:5: -1- m4_pattern_forbid([^_?A[CHUM]_])
m4trace:configure.ac:5: -1- m4_pattern_forbid([_AC_])
m4trace:configure.ac:5: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
@@ -1588,150 +2148,59 @@ m4trace:configure.ac:5: -1- m4_pattern_allow([^LIBS$])
m4trace:configure.ac:5: -1- m4_pattern_allow([^build_alias$])
m4trace:configure.ac:5: -1- m4_pattern_allow([^host_alias$])
m4trace:configure.ac:5: -1- m4_pattern_allow([^target_alias$])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^build$])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^build_cpu$])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^build_vendor$])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^build_os$])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^host$])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^host_cpu$])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^host_vendor$])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^host_os$])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^target$])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^target_cpu$])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^target_vendor$])
-m4trace:configure.ac:10: -1- m4_pattern_allow([^target_os$])
-m4trace:configure.ac:13: -1- m4_pattern_allow([^PACKAGE_VERSION$])
-m4trace:configure.ac:15: -1- AM_PROG_LIBTOOL
-m4trace:configure.ac:15: -1- _m4_warn([obsolete], [The macro `AM_PROG_LIBTOOL' is obsolete.
-You should run autoupdate.], [m4/libtool.m4:103: AM_PROG_LIBTOOL is expanded from...
-configure.ac:15: the top level])
-m4trace:configure.ac:15: -1- LT_INIT
-m4trace:configure.ac:15: -1- m4_pattern_forbid([^_?LT_[A-Z_]+$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])
-m4trace:configure.ac:15: -1- LTOPTIONS_VERSION
-m4trace:configure.ac:15: -1- LTSUGAR_VERSION
-m4trace:configure.ac:15: -1- LTVERSION_VERSION
-m4trace:configure.ac:15: -1- LTOBSOLETE_VERSION
-m4trace:configure.ac:15: -1- _LT_PROG_LTMAIN
-m4trace:configure.ac:15: -1- m4_pattern_allow([^LIBTOOL$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^CFLAGS$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^LDFLAGS$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^ac_ct_CC$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^EXEEXT$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^OBJEXT$])
-m4trace:configure.ac:15: -1- LT_PATH_LD
-m4trace:configure.ac:15: -1- m4_pattern_allow([^SED$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^SED$])
-m4trace:configure.ac:15: -1- AC_PROG_EGREP
-m4trace:configure.ac:15: -1- m4_pattern_allow([^GREP$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^GREP$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^EGREP$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^EGREP$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^FGREP$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^FGREP$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^GREP$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^LD$])
-m4trace:configure.ac:15: -1- LT_PATH_NM
-m4trace:configure.ac:15: -1- m4_pattern_allow([^DUMPBIN$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^ac_ct_DUMPBIN$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^DUMPBIN$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^NM$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^LN_S$])
-m4trace:configure.ac:15: -1- LT_CMD_MAX_LEN
-m4trace:configure.ac:15: -1- m4_pattern_allow([^AR$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^STRIP$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^RANLIB$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([LT_OBJDIR])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^LT_OBJDIR$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^lt_ECHO$])
-m4trace:configure.ac:15: -1- _LT_CC_BASENAME([$compiler])
-m4trace:configure.ac:15: -1- _LT_PATH_TOOL_PREFIX([${ac_tool_prefix}file], [/usr/bin$PATH_SEPARATOR$PATH])
-m4trace:configure.ac:15: -1- _LT_PATH_TOOL_PREFIX([file], [/usr/bin$PATH_SEPARATOR$PATH])
-m4trace:configure.ac:15: -1- LT_SUPPORTED_TAG([CC])
-m4trace:configure.ac:15: -1- _LT_COMPILER_BOILERPLATE
-m4trace:configure.ac:15: -1- _LT_LINKER_BOILERPLATE
-m4trace:configure.ac:15: -1- _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], [lt_cv_prog_compiler_rtti_exceptions], [-fno-rtti -fno-exceptions], [], [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, )="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, ) -fno-rtti -fno-exceptions"])
-m4trace:configure.ac:15: -1- _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, ) works], [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, )], [$_LT_TAGVAR(lt_prog_compiler_pic, )@&t@m4_if([],[],[ -DPIC],[m4_if([],[CXX],[ -DPIC],[])])], [], [case $_LT_TAGVAR(lt_prog_compiler_pic, ) in
- "" | " "*) ;;
- *) _LT_TAGVAR(lt_prog_compiler_pic, )=" $_LT_TAGVAR(lt_prog_compiler_pic, )" ;;
- esac], [_LT_TAGVAR(lt_prog_compiler_pic, )=
- _LT_TAGVAR(lt_prog_compiler_can_build_shared, )=no])
-m4trace:configure.ac:15: -1- _LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], [lt_cv_prog_compiler_static_works], [$lt_tmp_static_flag], [], [_LT_TAGVAR(lt_prog_compiler_static, )=])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^DSYMUTIL$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^NMEDIT$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^LIPO$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^OTOOL$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^OTOOL64$])
-m4trace:configure.ac:15: -1- LT_SYS_DLOPEN_SELF
-m4trace:configure.ac:15: -1- m4_pattern_allow([^CPP$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^CPP$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^STDC_HEADERS$])
-m4trace:configure.ac:21: -1- AM_INIT_AUTOMAKE([-Wno-portability])
-m4trace:configure.ac:21: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
-m4trace:configure.ac:21: -1- AM_SET_CURRENT_AUTOMAKE_VERSION
-m4trace:configure.ac:21: -1- AM_AUTOMAKE_VERSION([1.9.6])
-m4trace:configure.ac:21: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
-m4trace:configure.ac:21: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
-m4trace:configure.ac:21: -1- m4_pattern_allow([^INSTALL_DATA$])
-m4trace:configure.ac:21: -1- m4_pattern_allow([^CYGPATH_W$])
-m4trace:configure.ac:21: -1- _AM_SET_OPTIONS([-Wno-portability])
-m4trace:configure.ac:21: -1- _AM_SET_OPTION([-Wno-portability])
-m4trace:configure.ac:21: -2- _AM_MANGLE_OPTION([-Wno-portability])
-m4trace:configure.ac:21: -1- _m4_warn([obsolete], [The macro `AC_FOREACH' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:196: AC_FOREACH is expanded from...
-/usr/share/aclocal-1.9/options.m4:25: _AM_SET_OPTIONS is expanded from...
-/usr/share/aclocal-1.9/init.m4:26: AM_INIT_AUTOMAKE is expanded from...
-configure.ac:21: the top level])
-m4trace:configure.ac:21: -1- m4_pattern_allow([^PACKAGE$])
-m4trace:configure.ac:21: -1- m4_pattern_allow([^VERSION$])
-m4trace:configure.ac:21: -1- _AM_IF_OPTION([no-define], [], [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+m4trace:configure.ac:9: -1- AM_INIT_AUTOMAKE([SFLphone], [0.9.5~beta])
+m4trace:configure.ac:9: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
+m4trace:configure.ac:9: -1- AM_SET_CURRENT_AUTOMAKE_VERSION
+m4trace:configure.ac:9: -1- AM_AUTOMAKE_VERSION([1.10.1])
+m4trace:configure.ac:9: -1- _AM_AUTOCONF_VERSION([2.61])
+m4trace:configure.ac:9: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
+m4trace:configure.ac:9: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
+m4trace:configure.ac:9: -1- m4_pattern_allow([^INSTALL_DATA$])
+m4trace:configure.ac:9: -1- m4_pattern_allow([^am__isrc$])
+m4trace:configure.ac:9: -1- _AM_SUBST_NOTMAKE([am__isrc])
+m4trace:configure.ac:9: -1- m4_pattern_allow([^CYGPATH_W$])
+m4trace:configure.ac:9: -1- m4_pattern_allow([^PACKAGE$])
+m4trace:configure.ac:9: -1- m4_pattern_allow([^VERSION$])
+m4trace:configure.ac:9: -1- _AM_IF_OPTION([no-define], [], [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])
-m4trace:configure.ac:21: -2- _AM_MANGLE_OPTION([no-define])
-m4trace:configure.ac:21: -1- m4_pattern_allow([^PACKAGE$])
-m4trace:configure.ac:21: -1- m4_pattern_allow([^VERSION$])
-m4trace:configure.ac:21: -1- AM_SANITY_CHECK
-m4trace:configure.ac:21: -1- AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
-m4trace:configure.ac:21: -1- AM_MISSING_HAS_RUN
-m4trace:configure.ac:21: -1- AM_AUX_DIR_EXPAND
-m4trace:configure.ac:21: -1- m4_pattern_allow([^ACLOCAL$])
-m4trace:configure.ac:21: -1- AM_MISSING_PROG([AUTOCONF], [autoconf])
-m4trace:configure.ac:21: -1- m4_pattern_allow([^AUTOCONF$])
-m4trace:configure.ac:21: -1- AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
-m4trace:configure.ac:21: -1- m4_pattern_allow([^AUTOMAKE$])
-m4trace:configure.ac:21: -1- AM_MISSING_PROG([AUTOHEADER], [autoheader])
-m4trace:configure.ac:21: -1- m4_pattern_allow([^AUTOHEADER$])
-m4trace:configure.ac:21: -1- AM_MISSING_PROG([MAKEINFO], [makeinfo])
-m4trace:configure.ac:21: -1- m4_pattern_allow([^MAKEINFO$])
-m4trace:configure.ac:21: -1- AM_PROG_INSTALL_SH
-m4trace:configure.ac:21: -1- m4_pattern_allow([^install_sh$])
-m4trace:configure.ac:21: -1- AM_PROG_INSTALL_STRIP
-m4trace:configure.ac:21: -1- m4_pattern_allow([^STRIP$])
-m4trace:configure.ac:21: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$])
-m4trace:configure.ac:21: -1- AM_PROG_MKDIR_P
-m4trace:configure.ac:21: -1- m4_pattern_allow([^mkdir_p$])
-m4trace:configure.ac:21: -1- m4_pattern_allow([^AWK$])
-m4trace:configure.ac:21: -1- m4_pattern_allow([^SET_MAKE$])
-m4trace:configure.ac:21: -1- AM_SET_LEADING_DOT
-m4trace:configure.ac:21: -1- m4_pattern_allow([^am__leading_dot$])
-m4trace:configure.ac:21: -1- _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+m4trace:configure.ac:9: -2- _AM_MANGLE_OPTION([no-define])
+m4trace:configure.ac:9: -1- m4_pattern_allow([^PACKAGE$])
+m4trace:configure.ac:9: -1- m4_pattern_allow([^VERSION$])
+m4trace:configure.ac:9: -1- AM_SANITY_CHECK
+m4trace:configure.ac:9: -1- AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+m4trace:configure.ac:9: -1- AM_MISSING_HAS_RUN
+m4trace:configure.ac:9: -1- AM_AUX_DIR_EXPAND
+m4trace:configure.ac:9: -1- m4_pattern_allow([^ACLOCAL$])
+m4trace:configure.ac:9: -1- AM_MISSING_PROG([AUTOCONF], [autoconf])
+m4trace:configure.ac:9: -1- m4_pattern_allow([^AUTOCONF$])
+m4trace:configure.ac:9: -1- AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+m4trace:configure.ac:9: -1- m4_pattern_allow([^AUTOMAKE$])
+m4trace:configure.ac:9: -1- AM_MISSING_PROG([AUTOHEADER], [autoheader])
+m4trace:configure.ac:9: -1- m4_pattern_allow([^AUTOHEADER$])
+m4trace:configure.ac:9: -1- AM_MISSING_PROG([MAKEINFO], [makeinfo])
+m4trace:configure.ac:9: -1- m4_pattern_allow([^MAKEINFO$])
+m4trace:configure.ac:9: -1- AM_PROG_INSTALL_SH
+m4trace:configure.ac:9: -1- m4_pattern_allow([^install_sh$])
+m4trace:configure.ac:9: -1- AM_PROG_INSTALL_STRIP
+m4trace:configure.ac:9: -1- m4_pattern_allow([^STRIP$])
+m4trace:configure.ac:9: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$])
+m4trace:configure.ac:9: -1- AM_PROG_MKDIR_P
+m4trace:configure.ac:9: -1- m4_pattern_allow([^mkdir_p$])
+m4trace:configure.ac:9: -1- m4_pattern_allow([^AWK$])
+m4trace:configure.ac:9: -1- m4_pattern_allow([^SET_MAKE$])
+m4trace:configure.ac:9: -1- AM_SET_LEADING_DOT
+m4trace:configure.ac:9: -1- m4_pattern_allow([^am__leading_dot$])
+m4trace:configure.ac:9: -1- _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
[_AM_PROG_TAR([v7])])])
-m4trace:configure.ac:21: -2- _AM_MANGLE_OPTION([tar-ustar])
-m4trace:configure.ac:21: -1- _AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], [_AM_PROG_TAR([v7])])
-m4trace:configure.ac:21: -2- _AM_MANGLE_OPTION([tar-pax])
-m4trace:configure.ac:21: -1- _AM_PROG_TAR([v7])
-m4trace:configure.ac:21: -1- AM_MISSING_PROG([AMTAR], [tar])
-m4trace:configure.ac:21: -1- m4_pattern_allow([^AMTAR$])
-m4trace:configure.ac:21: -1- m4_pattern_allow([^am__tar$])
-m4trace:configure.ac:21: -1- m4_pattern_allow([^am__untar$])
-m4trace:configure.ac:21: -1- _AM_IF_OPTION([no-dependencies], [], [AC_PROVIDE_IFELSE([AC_PROG_CC],
+m4trace:configure.ac:9: -2- _AM_MANGLE_OPTION([tar-ustar])
+m4trace:configure.ac:9: -1- _AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], [_AM_PROG_TAR([v7])])
+m4trace:configure.ac:9: -2- _AM_MANGLE_OPTION([tar-pax])
+m4trace:configure.ac:9: -1- _AM_PROG_TAR([v7])
+m4trace:configure.ac:9: -1- AM_MISSING_PROG([AMTAR], [tar])
+m4trace:configure.ac:9: -1- m4_pattern_allow([^AMTAR$])
+m4trace:configure.ac:9: -1- m4_pattern_allow([^am__tar$])
+m4trace:configure.ac:9: -1- m4_pattern_allow([^am__untar$])
+m4trace:configure.ac:9: -1- _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
@@ -1739,264 +2208,372 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
[_AM_DEPENDENCIES(CXX)],
[define([AC_PROG_CXX],
defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+ [_AM_DEPENDENCIES(OBJC)],
+ [define([AC_PROG_OBJC],
+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
])
-m4trace:configure.ac:21: -2- _AM_MANGLE_OPTION([no-dependencies])
-m4trace:configure.ac:21: -1- _AM_DEPENDENCIES([CC])
-m4trace:configure.ac:21: -1- AM_SET_DEPDIR
-m4trace:configure.ac:21: -1- m4_pattern_allow([^DEPDIR$])
-m4trace:configure.ac:21: -1- AM_OUTPUT_DEPENDENCY_COMMANDS
-m4trace:configure.ac:21: -1- AM_MAKE_INCLUDE
-m4trace:configure.ac:21: -1- m4_pattern_allow([^am__include$])
-m4trace:configure.ac:21: -1- m4_pattern_allow([^am__quote$])
-m4trace:configure.ac:21: -1- AM_DEP_TRACK
-m4trace:configure.ac:21: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-m4trace:configure.ac:21: -1- m4_pattern_allow([^AMDEP_TRUE$])
-m4trace:configure.ac:21: -1- m4_pattern_allow([^AMDEP_FALSE$])
-m4trace:configure.ac:21: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
-m4trace:configure.ac:21: -1- m4_pattern_allow([^CCDEPMODE$])
-m4trace:configure.ac:21: -1- AM_CONDITIONAL([am__fastdepCC], [
+m4trace:configure.ac:9: -2- _AM_MANGLE_OPTION([no-dependencies])
+m4trace:configure.ac:10: -1- AM_CONFIG_HEADER([config.h])
+m4trace:configure.ac:10: -1- _m4_warn([obsolete], [The macro `AM_CONFIG_HEADER' is obsolete.
+You should run autoupdate.], [/usr/share/aclocal-1.10/header.m4:12: AM_CONFIG_HEADER is expanded from...
+configure.ac:10: the top level])
+m4trace:configure.ac:16: -1- m4_pattern_allow([^PACKAGE_VERSION$])
+m4trace:configure.ac:18: -1- AM_PROG_LIBTOOL
+m4trace:configure.ac:18: -1- _m4_warn([obsolete], [The macro `AM_PROG_LIBTOOL' is obsolete.
+You should run autoupdate.], [m4/libtool.m4:103: AM_PROG_LIBTOOL is expanded from...
+configure.ac:18: the top level])
+m4trace:configure.ac:18: -1- LT_INIT
+m4trace:configure.ac:18: -1- m4_pattern_forbid([^_?LT_[A-Z_]+$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])
+m4trace:configure.ac:18: -1- LTOPTIONS_VERSION
+m4trace:configure.ac:18: -1- LTSUGAR_VERSION
+m4trace:configure.ac:18: -1- LTVERSION_VERSION
+m4trace:configure.ac:18: -1- LTOBSOLETE_VERSION
+m4trace:configure.ac:18: -1- _LT_PROG_LTMAIN
+m4trace:configure.ac:18: -1- m4_pattern_allow([^LIBTOOL$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^build$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^build_cpu$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^build_vendor$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^build_os$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^host$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^host_cpu$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^host_vendor$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^host_os$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^CFLAGS$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^ac_ct_CC$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^EXEEXT$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^OBJEXT$])
+m4trace:configure.ac:18: -1- _AM_DEPENDENCIES([CC])
+m4trace:configure.ac:18: -1- AM_SET_DEPDIR
+m4trace:configure.ac:18: -1- m4_pattern_allow([^DEPDIR$])
+m4trace:configure.ac:18: -1- AM_OUTPUT_DEPENDENCY_COMMANDS
+m4trace:configure.ac:18: -1- AM_MAKE_INCLUDE
+m4trace:configure.ac:18: -1- m4_pattern_allow([^am__include$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^am__quote$])
+m4trace:configure.ac:18: -1- AM_DEP_TRACK
+m4trace:configure.ac:18: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^AMDEP_TRUE$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^AMDEP_FALSE$])
+m4trace:configure.ac:18: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE])
+m4trace:configure.ac:18: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
+m4trace:configure.ac:18: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^CCDEPMODE$])
+m4trace:configure.ac:18: -1- AM_CONDITIONAL([am__fastdepCC], [
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3])
-m4trace:configure.ac:21: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
-m4trace:configure.ac:21: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
+m4trace:configure.ac:18: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
+m4trace:configure.ac:18: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
+m4trace:configure.ac:18: -1- LT_PATH_LD
+m4trace:configure.ac:18: -1- m4_pattern_allow([^SED$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^SED$])
+m4trace:configure.ac:18: -1- AC_PROG_EGREP
+m4trace:configure.ac:18: -1- m4_pattern_allow([^GREP$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^GREP$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^EGREP$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^EGREP$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^FGREP$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^FGREP$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^GREP$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^LD$])
+m4trace:configure.ac:18: -1- LT_PATH_NM
+m4trace:configure.ac:18: -1- m4_pattern_allow([^DUMPBIN$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^ac_ct_DUMPBIN$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^DUMPBIN$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^NM$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^LN_S$])
+m4trace:configure.ac:18: -1- LT_CMD_MAX_LEN
+m4trace:configure.ac:18: -1- m4_pattern_allow([^AR$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^STRIP$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^RANLIB$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([LT_OBJDIR])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^LT_OBJDIR$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^lt_ECHO$])
+m4trace:configure.ac:18: -1- _LT_CC_BASENAME([$compiler])
+m4trace:configure.ac:18: -1- _LT_PATH_TOOL_PREFIX([${ac_tool_prefix}file], [/usr/bin$PATH_SEPARATOR$PATH])
+m4trace:configure.ac:18: -1- _LT_PATH_TOOL_PREFIX([file], [/usr/bin$PATH_SEPARATOR$PATH])
+m4trace:configure.ac:18: -1- LT_SUPPORTED_TAG([CC])
+m4trace:configure.ac:18: -1- _LT_COMPILER_BOILERPLATE
+m4trace:configure.ac:18: -1- _LT_LINKER_BOILERPLATE
+m4trace:configure.ac:18: -1- _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], [lt_cv_prog_compiler_rtti_exceptions], [-fno-rtti -fno-exceptions], [], [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, )="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, ) -fno-rtti -fno-exceptions"])
+m4trace:configure.ac:18: -1- _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, ) works], [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, )], [$_LT_TAGVAR(lt_prog_compiler_pic, )@&t@m4_if([],[],[ -DPIC],[m4_if([],[CXX],[ -DPIC],[])])], [], [case $_LT_TAGVAR(lt_prog_compiler_pic, ) in
+ "" | " "*) ;;
+ *) _LT_TAGVAR(lt_prog_compiler_pic, )=" $_LT_TAGVAR(lt_prog_compiler_pic, )" ;;
+ esac], [_LT_TAGVAR(lt_prog_compiler_pic, )=
+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, )=no])
+m4trace:configure.ac:18: -1- _LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], [lt_cv_prog_compiler_static_works], [$lt_tmp_static_flag], [], [_LT_TAGVAR(lt_prog_compiler_static, )=])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^DSYMUTIL$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^NMEDIT$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^LIPO$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^OTOOL$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^OTOOL64$])
+m4trace:configure.ac:18: -1- LT_SYS_DLOPEN_SELF
+m4trace:configure.ac:18: -1- m4_pattern_allow([^CPP$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^CPP$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^STDC_HEADERS$])
m4trace:configure.ac:24: -1- m4_pattern_allow([^SET_MAKE$])
-m4trace:configure.ac:79: -1- m4_pattern_allow([^PKGADD_PKG$])
-m4trace:configure.ac:80: -1- m4_pattern_allow([^PKGADD_NAME$])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^PKGADD_VENDOR$])
-m4trace:configure.ac:84: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:84: -1- m4_pattern_allow([^CFLAGS$])
-m4trace:configure.ac:84: -1- m4_pattern_allow([^LDFLAGS$])
-m4trace:configure.ac:84: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:84: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:84: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:84: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:84: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:84: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:84: -1- m4_pattern_allow([^ac_ct_CC$])
-m4trace:configure.ac:85: -1- SFL_CXX_WITH_DEBUG
-m4trace:configure.ac:86: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:86: -1- m4_pattern_allow([^CXXFLAGS$])
-m4trace:configure.ac:86: -1- m4_pattern_allow([^LDFLAGS$])
-m4trace:configure.ac:86: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:86: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:86: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:86: -1- m4_pattern_allow([^ac_ct_CXX$])
-m4trace:configure.ac:86: -1- LT_LANG([CXX])
-m4trace:configure.ac:86: -1- LT_SUPPORTED_TAG([CXX])
-m4trace:configure.ac:86: -1- _LT_PROG_CXX
-m4trace:configure.ac:86: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:86: -1- m4_pattern_allow([^CXXFLAGS$])
-m4trace:configure.ac:86: -1- m4_pattern_allow([^LDFLAGS$])
-m4trace:configure.ac:86: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:86: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:86: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:86: -1- m4_pattern_allow([^ac_ct_CXX$])
-m4trace:configure.ac:86: -1- LT_LANG([CXX])
-m4trace:configure.ac:86: -1- _AM_DEPENDENCIES([CXX])
-m4trace:configure.ac:86: -1- m4_pattern_allow([^CXXDEPMODE$])
-m4trace:configure.ac:86: -1- AM_CONDITIONAL([am__fastdepCXX], [
+m4trace:configure.ac:80: -1- m4_pattern_allow([^PKGADD_PKG$])
+m4trace:configure.ac:81: -1- m4_pattern_allow([^PKGADD_NAME$])
+m4trace:configure.ac:82: -1- m4_pattern_allow([^PKGADD_VENDOR$])
+m4trace:configure.ac:85: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:85: -1- m4_pattern_allow([^CFLAGS$])
+m4trace:configure.ac:85: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:85: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:85: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:85: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:85: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:85: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:85: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:85: -1- m4_pattern_allow([^ac_ct_CC$])
+m4trace:configure.ac:85: -1- _AM_DEPENDENCIES([CC])
+m4trace:configure.ac:85: -1- m4_pattern_allow([^CCDEPMODE$])
+m4trace:configure.ac:85: -1- AM_CONDITIONAL([am__fastdepCC], [
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
+m4trace:configure.ac:85: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
+m4trace:configure.ac:85: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
+m4trace:configure.ac:85: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
+m4trace:configure.ac:85: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^CXXFLAGS$])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^ac_ct_CXX$])
+m4trace:configure.ac:87: -1- _AM_DEPENDENCIES([CXX])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^CXXDEPMODE$])
+m4trace:configure.ac:87: -1- AM_CONDITIONAL([am__fastdepCXX], [
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$])
+m4trace:configure.ac:87: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_TRUE])
+m4trace:configure.ac:87: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE])
+m4trace:configure.ac:87: -1- LT_LANG([CXX])
+m4trace:configure.ac:87: -1- LT_SUPPORTED_TAG([CXX])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^CXXFLAGS$])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^ac_ct_CXX$])
+m4trace:configure.ac:87: -1- _AM_DEPENDENCIES([CXX])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^CXXDEPMODE$])
+m4trace:configure.ac:87: -1- AM_CONDITIONAL([am__fastdepCXX], [
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CXX_dependencies_compiler_type" = gcc3])
-m4trace:configure.ac:86: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$])
-m4trace:configure.ac:86: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$])
-m4trace:configure.ac:86: -1- m4_pattern_allow([^CXXCPP$])
-m4trace:configure.ac:86: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:86: -1- m4_pattern_allow([^CXXCPP$])
-m4trace:configure.ac:86: -1- _LT_COMPILER_BOILERPLATE
-m4trace:configure.ac:86: -1- _LT_LINKER_BOILERPLATE
-m4trace:configure.ac:86: -1- _LT_CC_BASENAME([$compiler])
-m4trace:configure.ac:86: -1- LT_PATH_LD
-m4trace:configure.ac:86: -1- m4_pattern_allow([^LD$])
-m4trace:configure.ac:86: -1- _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, CXX) works], [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, CXX)], [$_LT_TAGVAR(lt_prog_compiler_pic, CXX)@&t@m4_if([CXX],[],[ -DPIC],[m4_if([CXX],[CXX],[ -DPIC],[])])], [], [case $_LT_TAGVAR(lt_prog_compiler_pic, CXX) in
+m4trace:configure.ac:87: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$])
+m4trace:configure.ac:87: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_TRUE])
+m4trace:configure.ac:87: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE])
+m4trace:configure.ac:87: -1- LT_LANG([CXX])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^CXXCPP$])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^CXXCPP$])
+m4trace:configure.ac:87: -1- _LT_COMPILER_BOILERPLATE
+m4trace:configure.ac:87: -1- _LT_LINKER_BOILERPLATE
+m4trace:configure.ac:87: -1- _LT_CC_BASENAME([$compiler])
+m4trace:configure.ac:87: -1- LT_PATH_LD
+m4trace:configure.ac:87: -1- m4_pattern_allow([^LD$])
+m4trace:configure.ac:87: -1- _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, CXX) works], [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, CXX)], [$_LT_TAGVAR(lt_prog_compiler_pic, CXX)@&t@m4_if([CXX],[],[ -DPIC],[m4_if([CXX],[CXX],[ -DPIC],[])])], [], [case $_LT_TAGVAR(lt_prog_compiler_pic, CXX) in
"" | " "*) ;;
*) _LT_TAGVAR(lt_prog_compiler_pic, CXX)=" $_LT_TAGVAR(lt_prog_compiler_pic, CXX)" ;;
esac], [_LT_TAGVAR(lt_prog_compiler_pic, CXX)=
_LT_TAGVAR(lt_prog_compiler_can_build_shared, CXX)=no])
-m4trace:configure.ac:86: -1- _LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], [lt_cv_prog_compiler_static_works_CXX], [$lt_tmp_static_flag], [], [_LT_TAGVAR(lt_prog_compiler_static, CXX)=])
-m4trace:configure.ac:86: -1- _AM_DEPENDENCIES([CXX])
-m4trace:configure.ac:86: -1- m4_pattern_allow([^CXXDEPMODE$])
-m4trace:configure.ac:86: -1- AM_CONDITIONAL([am__fastdepCXX], [
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_CXX_dependencies_compiler_type" = gcc3])
-m4trace:configure.ac:86: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$])
-m4trace:configure.ac:86: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$])
-m4trace:configure.ac:87: -1- m4_pattern_allow([^CPP$])
-m4trace:configure.ac:87: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:87: -1- m4_pattern_allow([^CPP$])
-m4trace:configure.ac:88: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
-m4trace:configure.ac:88: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
-m4trace:configure.ac:88: -1- m4_pattern_allow([^INSTALL_DATA$])
-m4trace:configure.ac:89: -1- m4_pattern_allow([^LN_S$])
-m4trace:configure.ac:90: -1- m4_pattern_allow([^SET_MAKE$])
-m4trace:configure.ac:92: -1- AC_PROG_LIBTOOL
-m4trace:configure.ac:92: -1- _m4_warn([obsolete], [The macro `AC_PROG_LIBTOOL' is obsolete.
+m4trace:configure.ac:87: -1- _LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], [lt_cv_prog_compiler_static_works_CXX], [$lt_tmp_static_flag], [], [_LT_TAGVAR(lt_prog_compiler_static, CXX)=])
+m4trace:configure.ac:88: -1- m4_pattern_allow([^CPP$])
+m4trace:configure.ac:88: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:88: -1- m4_pattern_allow([^CPP$])
+m4trace:configure.ac:89: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
+m4trace:configure.ac:89: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
+m4trace:configure.ac:89: -1- m4_pattern_allow([^INSTALL_DATA$])
+m4trace:configure.ac:90: -1- m4_pattern_allow([^LN_S$])
+m4trace:configure.ac:91: -1- m4_pattern_allow([^SET_MAKE$])
+m4trace:configure.ac:93: -1- AC_PROG_LIBTOOL
+m4trace:configure.ac:93: -1- _m4_warn([obsolete], [The macro `AC_PROG_LIBTOOL' is obsolete.
You should run autoupdate.], [m4/libtool.m4:102: AC_PROG_LIBTOOL is expanded from...
-configure.ac:92: the top level])
-m4trace:configure.ac:92: -1- LT_INIT
-m4trace:configure.ac:101: -1- m4_pattern_allow([^HAVE_ALLOCA_H$])
-m4trace:configure.ac:101: -1- m4_pattern_allow([^HAVE_ALLOCA$])
-m4trace:configure.ac:101: -1- m4_pattern_allow([^ALLOCA$])
-m4trace:configure.ac:101: -1- m4_pattern_allow([^C_ALLOCA$])
-m4trace:configure.ac:101: -1- m4_pattern_allow([^CRAY_STACKSEG_END$])
-m4trace:configure.ac:101: -1- m4_pattern_allow([^STACK_DIRECTION$])
-m4trace:configure.ac:102: -1- m4_pattern_allow([^STDC_HEADERS$])
-m4trace:configure.ac:108: -1- m4_pattern_allow([^STAT_MACROS_BROKEN$])
-m4trace:configure.ac:109: -1- m4_pattern_allow([^HAVE__BOOL$])
-m4trace:configure.ac:109: -1- m4_pattern_allow([^HAVE_STDBOOL_H$])
-m4trace:configure.ac:110: -1- m4_pattern_allow([^const$])
-m4trace:configure.ac:112: -1- m4_pattern_allow([^pid_t$])
-m4trace:configure.ac:113: -1- m4_pattern_allow([^size_t$])
-m4trace:configure.ac:114: -1- m4_pattern_allow([^TIME_WITH_SYS_TIME$])
-m4trace:configure.ac:115: -1- m4_pattern_allow([^volatile$])
-m4trace:configure.ac:116: -1- m4_pattern_allow([^HAVE_PTRDIFF_T$])
-m4trace:configure.ac:121: -1- m4_pattern_allow([^uid_t$])
-m4trace:configure.ac:121: -1- m4_pattern_allow([^gid_t$])
-m4trace:configure.ac:121: -1- m4_pattern_allow([^HAVE_CHOWN$])
-m4trace:configure.ac:122: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:123: -1- m4_pattern_allow([^HAVE_WORKING_VFORK$])
-m4trace:configure.ac:123: -1- m4_pattern_allow([^vfork$])
-m4trace:configure.ac:123: -1- m4_pattern_allow([^HAVE_WORKING_FORK$])
-m4trace:configure.ac:125: -1- m4_pattern_allow([^HAVE_MALLOC$])
-m4trace:configure.ac:125: -1- m4_pattern_allow([^HAVE_MALLOC$])
-m4trace:configure.ac:125: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:125: -1- m4_pattern_allow([^malloc$])
+configure.ac:93: the top level])
+m4trace:configure.ac:93: -1- LT_INIT
+m4trace:configure.ac:102: -1- m4_pattern_allow([^HAVE_ALLOCA_H$])
+m4trace:configure.ac:102: -1- m4_pattern_allow([^HAVE_ALLOCA$])
+m4trace:configure.ac:102: -1- m4_pattern_allow([^ALLOCA$])
+m4trace:configure.ac:102: -1- m4_pattern_allow([^C_ALLOCA$])
+m4trace:configure.ac:102: -1- m4_pattern_allow([^CRAY_STACKSEG_END$])
+m4trace:configure.ac:102: -1- m4_pattern_allow([^STACK_DIRECTION$])
+m4trace:configure.ac:103: -1- m4_pattern_allow([^STDC_HEADERS$])
+m4trace:configure.ac:109: -1- m4_pattern_allow([^STAT_MACROS_BROKEN$])
+m4trace:configure.ac:110: -1- m4_pattern_allow([^HAVE__BOOL$])
+m4trace:configure.ac:110: -1- m4_pattern_allow([^HAVE_STDBOOL_H$])
+m4trace:configure.ac:111: -1- m4_pattern_allow([^const$])
+m4trace:configure.ac:113: -1- m4_pattern_allow([^pid_t$])
+m4trace:configure.ac:114: -1- m4_pattern_allow([^size_t$])
+m4trace:configure.ac:115: -1- m4_pattern_allow([^TIME_WITH_SYS_TIME$])
+m4trace:configure.ac:116: -1- m4_pattern_allow([^volatile$])
+m4trace:configure.ac:117: -1- m4_pattern_allow([^HAVE_PTRDIFF_T$])
+m4trace:configure.ac:122: -1- m4_pattern_allow([^uid_t$])
+m4trace:configure.ac:122: -1- m4_pattern_allow([^gid_t$])
+m4trace:configure.ac:122: -1- m4_pattern_allow([^HAVE_CHOWN$])
+m4trace:configure.ac:123: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:124: -1- m4_pattern_allow([^HAVE_WORKING_VFORK$])
+m4trace:configure.ac:124: -1- m4_pattern_allow([^vfork$])
+m4trace:configure.ac:124: -1- m4_pattern_allow([^HAVE_WORKING_FORK$])
+m4trace:configure.ac:126: -1- m4_pattern_allow([^HAVE_MALLOC$])
+m4trace:configure.ac:126: -1- m4_pattern_allow([^HAVE_MALLOC$])
m4trace:configure.ac:126: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:127: -1- m4_pattern_allow([^HAVE_REALLOC$])
-m4trace:configure.ac:127: -1- m4_pattern_allow([^HAVE_REALLOC$])
+m4trace:configure.ac:126: -1- m4_pattern_allow([^malloc$])
m4trace:configure.ac:127: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:127: -1- m4_pattern_allow([^realloc$])
-m4trace:configure.ac:128: -1- m4_pattern_allow([^SELECT_TYPE_ARG1$])
-m4trace:configure.ac:128: -1- m4_pattern_allow([^SELECT_TYPE_ARG234$])
-m4trace:configure.ac:128: -1- m4_pattern_allow([^SELECT_TYPE_ARG5$])
-m4trace:configure.ac:129: -1- m4_pattern_allow([^RETSIGTYPE$])
-m4trace:configure.ac:130: -1- m4_pattern_allow([^LSTAT_FOLLOWS_SLASHED_SYMLINK$])
-m4trace:configure.ac:130: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:130: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:130: -1- m4_pattern_allow([^HAVE_STAT_EMPTY_STRING_BUG$])
-m4trace:configure.ac:131: -1- AC_DEFUN([_AC_Header_utime_h], [m4_divert_text([INIT_PREPARE],
+m4trace:configure.ac:128: -1- m4_pattern_allow([^HAVE_REALLOC$])
+m4trace:configure.ac:128: -1- m4_pattern_allow([^HAVE_REALLOC$])
+m4trace:configure.ac:128: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:128: -1- m4_pattern_allow([^realloc$])
+m4trace:configure.ac:129: -1- m4_pattern_allow([^SELECT_TYPE_ARG1$])
+m4trace:configure.ac:129: -1- m4_pattern_allow([^SELECT_TYPE_ARG234$])
+m4trace:configure.ac:129: -1- m4_pattern_allow([^SELECT_TYPE_ARG5$])
+m4trace:configure.ac:130: -1- m4_pattern_allow([^RETSIGTYPE$])
+m4trace:configure.ac:131: -1- m4_pattern_allow([^LSTAT_FOLLOWS_SLASHED_SYMLINK$])
+m4trace:configure.ac:131: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:131: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:131: -1- m4_pattern_allow([^HAVE_STAT_EMPTY_STRING_BUG$])
+m4trace:configure.ac:132: -1- AC_DEFUN([_AC_Header_utime_h], [m4_divert_text([INIT_PREPARE],
[ac_header_list="$ac_header_list AC_Header"])
_AC_HEADERS_EXPANSION])
-m4trace:configure.ac:131: -1- m4_pattern_allow([^HAVE_UTIME_NULL$])
-m4trace:configure.ac:132: -1- m4_pattern_allow([^HAVE_DOPRNT$])
-m4trace:configure.ac:143: -1- PKG_PROG_PKG_CONFIG
-m4trace:configure.ac:143: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4trace:configure.ac:143: -1- m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-m4trace:configure.ac:143: -1- m4_pattern_allow([^PKG_CONFIG$])
-m4trace:configure.ac:143: -1- m4_pattern_allow([^PKG_CONFIG$])
-m4trace:configure.ac:146: -1- PKG_CHECK_MODULES([SIP], [libpj-sfl], [have_libpj=true], [have_libpj=false])
-m4trace:configure.ac:146: -1- m4_pattern_allow([^SIP_CFLAGS$])
-m4trace:configure.ac:146: -1- m4_pattern_allow([^SIP_LIBS$])
-m4trace:configure.ac:146: -1- PKG_CHECK_EXISTS([libpj-sfl], [pkg_cv_[]SIP_CFLAGS=`$PKG_CONFIG --[]cflags "libpj-sfl" 2>/dev/null`], [pkg_failed=yes])
-m4trace:configure.ac:146: -1- PKG_CHECK_EXISTS([libpj-sfl], [pkg_cv_[]SIP_LIBS=`$PKG_CONFIG --[]libs "libpj-sfl" 2>/dev/null`], [pkg_failed=yes])
-m4trace:configure.ac:146: -1- _PKG_SHORT_ERRORS_SUPPORTED
-m4trace:configure.ac:150: -1- m4_pattern_allow([^SIP_CFLAGS$])
-m4trace:configure.ac:154: -1- PKG_CHECK_MODULES([UUID], [uuid >= ${UUID_MIN_VERSION}])
-m4trace:configure.ac:154: -1- m4_pattern_allow([^UUID_CFLAGS$])
-m4trace:configure.ac:154: -1- m4_pattern_allow([^UUID_LIBS$])
-m4trace:configure.ac:154: -1- PKG_CHECK_EXISTS([uuid >= ${UUID_MIN_VERSION}], [pkg_cv_[]UUID_CFLAGS=`$PKG_CONFIG --[]cflags "uuid >= ${UUID_MIN_VERSION}" 2>/dev/null`], [pkg_failed=yes])
-m4trace:configure.ac:154: -1- PKG_CHECK_EXISTS([uuid >= ${UUID_MIN_VERSION}], [pkg_cv_[]UUID_LIBS=`$PKG_CONFIG --[]libs "uuid >= ${UUID_MIN_VERSION}" 2>/dev/null`], [pkg_failed=yes])
-m4trace:configure.ac:154: -1- _PKG_SHORT_ERRORS_SUPPORTED
+m4trace:configure.ac:132: -1- m4_pattern_allow([^HAVE_UTIME_NULL$])
+m4trace:configure.ac:133: -1- m4_pattern_allow([^HAVE_DOPRNT$])
+m4trace:configure.ac:144: -1- PKG_PROG_PKG_CONFIG
+m4trace:configure.ac:144: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4trace:configure.ac:144: -1- m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+m4trace:configure.ac:144: -1- m4_pattern_allow([^PKG_CONFIG$])
+m4trace:configure.ac:144: -1- m4_pattern_allow([^PKG_CONFIG$])
+m4trace:configure.ac:147: -1- PKG_CHECK_MODULES([SIP], [libpj-sfl], [have_libpj=true], [have_libpj=false])
+m4trace:configure.ac:147: -1- m4_pattern_allow([^SIP_CFLAGS$])
+m4trace:configure.ac:147: -1- m4_pattern_allow([^SIP_LIBS$])
+m4trace:configure.ac:147: -1- PKG_CHECK_EXISTS([libpj-sfl], [pkg_cv_[]SIP_CFLAGS=`$PKG_CONFIG --[]cflags "libpj-sfl" 2>/dev/null`], [pkg_failed=yes])
+m4trace:configure.ac:147: -1- PKG_CHECK_EXISTS([libpj-sfl], [pkg_cv_[]SIP_LIBS=`$PKG_CONFIG --[]libs "libpj-sfl" 2>/dev/null`], [pkg_failed=yes])
+m4trace:configure.ac:147: -1- _PKG_SHORT_ERRORS_SUPPORTED
+m4trace:configure.ac:151: -1- m4_pattern_allow([^SIP_CFLAGS$])
+m4trace:configure.ac:155: -1- PKG_CHECK_MODULES([UUID], [uuid >= ${UUID_MIN_VERSION}])
m4trace:configure.ac:155: -1- m4_pattern_allow([^UUID_CFLAGS$])
-m4trace:configure.ac:156: -1- m4_pattern_allow([^UUID_LIBS$])
-m4trace:configure.ac:160: -1- PKG_CHECK_MODULES([ALSA], [alsa >= ${LIBASOUND2_MIN_VERSION}])
-m4trace:configure.ac:160: -1- m4_pattern_allow([^ALSA_CFLAGS$])
-m4trace:configure.ac:160: -1- m4_pattern_allow([^ALSA_LIBS$])
-m4trace:configure.ac:160: -1- PKG_CHECK_EXISTS([alsa >= ${LIBASOUND2_MIN_VERSION}], [pkg_cv_[]ALSA_CFLAGS=`$PKG_CONFIG --[]cflags "alsa >= ${LIBASOUND2_MIN_VERSION}" 2>/dev/null`], [pkg_failed=yes])
-m4trace:configure.ac:160: -1- PKG_CHECK_EXISTS([alsa >= ${LIBASOUND2_MIN_VERSION}], [pkg_cv_[]ALSA_LIBS=`$PKG_CONFIG --[]libs "alsa >= ${LIBASOUND2_MIN_VERSION}" 2>/dev/null`], [pkg_failed=yes])
-m4trace:configure.ac:160: -1- _PKG_SHORT_ERRORS_SUPPORTED
+m4trace:configure.ac:155: -1- m4_pattern_allow([^UUID_LIBS$])
+m4trace:configure.ac:155: -1- PKG_CHECK_EXISTS([uuid >= ${UUID_MIN_VERSION}], [pkg_cv_[]UUID_CFLAGS=`$PKG_CONFIG --[]cflags "uuid >= ${UUID_MIN_VERSION}" 2>/dev/null`], [pkg_failed=yes])
+m4trace:configure.ac:155: -1- PKG_CHECK_EXISTS([uuid >= ${UUID_MIN_VERSION}], [pkg_cv_[]UUID_LIBS=`$PKG_CONFIG --[]libs "uuid >= ${UUID_MIN_VERSION}" 2>/dev/null`], [pkg_failed=yes])
+m4trace:configure.ac:155: -1- _PKG_SHORT_ERRORS_SUPPORTED
+m4trace:configure.ac:156: -1- m4_pattern_allow([^UUID_CFLAGS$])
+m4trace:configure.ac:157: -1- m4_pattern_allow([^UUID_LIBS$])
+m4trace:configure.ac:161: -1- PKG_CHECK_MODULES([ALSA], [alsa >= ${LIBASOUND2_MIN_VERSION}])
m4trace:configure.ac:161: -1- m4_pattern_allow([^ALSA_CFLAGS$])
-m4trace:configure.ac:162: -1- m4_pattern_allow([^ALSA_LIBS$])
-m4trace:configure.ac:166: -1- PKG_CHECK_MODULES([PULSEAUDIO], [libpulse >= ${LIBPULSE_MIN_VERSION}])
-m4trace:configure.ac:166: -1- m4_pattern_allow([^PULSEAUDIO_CFLAGS$])
-m4trace:configure.ac:166: -1- m4_pattern_allow([^PULSEAUDIO_LIBS$])
-m4trace:configure.ac:166: -1- PKG_CHECK_EXISTS([libpulse >= ${LIBPULSE_MIN_VERSION}], [pkg_cv_[]PULSEAUDIO_CFLAGS=`$PKG_CONFIG --[]cflags "libpulse >= ${LIBPULSE_MIN_VERSION}" 2>/dev/null`], [pkg_failed=yes])
-m4trace:configure.ac:166: -1- PKG_CHECK_EXISTS([libpulse >= ${LIBPULSE_MIN_VERSION}], [pkg_cv_[]PULSEAUDIO_LIBS=`$PKG_CONFIG --[]libs "libpulse >= ${LIBPULSE_MIN_VERSION}" 2>/dev/null`], [pkg_failed=yes])
-m4trace:configure.ac:166: -1- _PKG_SHORT_ERRORS_SUPPORTED
+m4trace:configure.ac:161: -1- m4_pattern_allow([^ALSA_LIBS$])
+m4trace:configure.ac:161: -1- PKG_CHECK_EXISTS([alsa >= ${LIBASOUND2_MIN_VERSION}], [pkg_cv_[]ALSA_CFLAGS=`$PKG_CONFIG --[]cflags "alsa >= ${LIBASOUND2_MIN_VERSION}" 2>/dev/null`], [pkg_failed=yes])
+m4trace:configure.ac:161: -1- PKG_CHECK_EXISTS([alsa >= ${LIBASOUND2_MIN_VERSION}], [pkg_cv_[]ALSA_LIBS=`$PKG_CONFIG --[]libs "alsa >= ${LIBASOUND2_MIN_VERSION}" 2>/dev/null`], [pkg_failed=yes])
+m4trace:configure.ac:161: -1- _PKG_SHORT_ERRORS_SUPPORTED
+m4trace:configure.ac:162: -1- m4_pattern_allow([^ALSA_CFLAGS$])
+m4trace:configure.ac:163: -1- m4_pattern_allow([^ALSA_LIBS$])
+m4trace:configure.ac:167: -1- PKG_CHECK_MODULES([PULSEAUDIO], [libpulse >= ${LIBPULSE_MIN_VERSION}])
+m4trace:configure.ac:167: -1- m4_pattern_allow([^PULSEAUDIO_CFLAGS$])
m4trace:configure.ac:167: -1- m4_pattern_allow([^PULSEAUDIO_LIBS$])
-m4trace:configure.ac:168: -1- m4_pattern_allow([^PULSEAUDIO_CFLAGS$])
-m4trace:configure.ac:172: -1- PKG_CHECK_MODULES([SAMPLERATE], [samplerate >= ${LIBSAMPLERATE_MIN_VERSION}])
-m4trace:configure.ac:172: -1- m4_pattern_allow([^SAMPLERATE_CFLAGS$])
-m4trace:configure.ac:172: -1- m4_pattern_allow([^SAMPLERATE_LIBS$])
-m4trace:configure.ac:172: -1- PKG_CHECK_EXISTS([samplerate >= ${LIBSAMPLERATE_MIN_VERSION}], [pkg_cv_[]SAMPLERATE_CFLAGS=`$PKG_CONFIG --[]cflags "samplerate >= ${LIBSAMPLERATE_MIN_VERSION}" 2>/dev/null`], [pkg_failed=yes])
-m4trace:configure.ac:172: -1- PKG_CHECK_EXISTS([samplerate >= ${LIBSAMPLERATE_MIN_VERSION}], [pkg_cv_[]SAMPLERATE_LIBS=`$PKG_CONFIG --[]libs "samplerate >= ${LIBSAMPLERATE_MIN_VERSION}" 2>/dev/null`], [pkg_failed=yes])
-m4trace:configure.ac:172: -1- _PKG_SHORT_ERRORS_SUPPORTED
+m4trace:configure.ac:167: -1- PKG_CHECK_EXISTS([libpulse >= ${LIBPULSE_MIN_VERSION}], [pkg_cv_[]PULSEAUDIO_CFLAGS=`$PKG_CONFIG --[]cflags "libpulse >= ${LIBPULSE_MIN_VERSION}" 2>/dev/null`], [pkg_failed=yes])
+m4trace:configure.ac:167: -1- PKG_CHECK_EXISTS([libpulse >= ${LIBPULSE_MIN_VERSION}], [pkg_cv_[]PULSEAUDIO_LIBS=`$PKG_CONFIG --[]libs "libpulse >= ${LIBPULSE_MIN_VERSION}" 2>/dev/null`], [pkg_failed=yes])
+m4trace:configure.ac:167: -1- _PKG_SHORT_ERRORS_SUPPORTED
+m4trace:configure.ac:168: -1- m4_pattern_allow([^PULSEAUDIO_LIBS$])
+m4trace:configure.ac:169: -1- m4_pattern_allow([^PULSEAUDIO_CFLAGS$])
+m4trace:configure.ac:173: -1- PKG_CHECK_MODULES([SAMPLERATE], [samplerate >= ${LIBSAMPLERATE_MIN_VERSION}])
+m4trace:configure.ac:173: -1- m4_pattern_allow([^SAMPLERATE_CFLAGS$])
m4trace:configure.ac:173: -1- m4_pattern_allow([^SAMPLERATE_LIBS$])
-m4trace:configure.ac:174: -1- m4_pattern_allow([^SAMPLERATE_CFLAGS$])
-m4trace:configure.ac:177: -1- PKG_CHECK_MODULES([CCGNU2], [libccgnu2 >= ${LIBCCGNU2_MIN_VERSION}])
-m4trace:configure.ac:177: -1- m4_pattern_allow([^CCGNU2_CFLAGS$])
-m4trace:configure.ac:177: -1- m4_pattern_allow([^CCGNU2_LIBS$])
-m4trace:configure.ac:177: -1- PKG_CHECK_EXISTS([libccgnu2 >= ${LIBCCGNU2_MIN_VERSION}], [pkg_cv_[]CCGNU2_CFLAGS=`$PKG_CONFIG --[]cflags "libccgnu2 >= ${LIBCCGNU2_MIN_VERSION}" 2>/dev/null`], [pkg_failed=yes])
-m4trace:configure.ac:177: -1- PKG_CHECK_EXISTS([libccgnu2 >= ${LIBCCGNU2_MIN_VERSION}], [pkg_cv_[]CCGNU2_LIBS=`$PKG_CONFIG --[]libs "libccgnu2 >= ${LIBCCGNU2_MIN_VERSION}" 2>/dev/null`], [pkg_failed=yes])
-m4trace:configure.ac:177: -1- _PKG_SHORT_ERRORS_SUPPORTED
+m4trace:configure.ac:173: -1- PKG_CHECK_EXISTS([samplerate >= ${LIBSAMPLERATE_MIN_VERSION}], [pkg_cv_[]SAMPLERATE_CFLAGS=`$PKG_CONFIG --[]cflags "samplerate >= ${LIBSAMPLERATE_MIN_VERSION}" 2>/dev/null`], [pkg_failed=yes])
+m4trace:configure.ac:173: -1- PKG_CHECK_EXISTS([samplerate >= ${LIBSAMPLERATE_MIN_VERSION}], [pkg_cv_[]SAMPLERATE_LIBS=`$PKG_CONFIG --[]libs "samplerate >= ${LIBSAMPLERATE_MIN_VERSION}" 2>/dev/null`], [pkg_failed=yes])
+m4trace:configure.ac:173: -1- _PKG_SHORT_ERRORS_SUPPORTED
+m4trace:configure.ac:174: -1- m4_pattern_allow([^SAMPLERATE_LIBS$])
+m4trace:configure.ac:175: -1- m4_pattern_allow([^SAMPLERATE_CFLAGS$])
+m4trace:configure.ac:178: -1- PKG_CHECK_MODULES([CCGNU2], [libccgnu2 >= ${LIBCCGNU2_MIN_VERSION}])
+m4trace:configure.ac:178: -1- m4_pattern_allow([^CCGNU2_CFLAGS$])
m4trace:configure.ac:178: -1- m4_pattern_allow([^CCGNU2_LIBS$])
-m4trace:configure.ac:179: -1- m4_pattern_allow([^CCGNU2_FLAGS$])
-m4trace:configure.ac:182: -1- PKG_CHECK_MODULES([CCEXT2], [libccext2 >= ${LIBCCEXT2_MIN_VERSION}])
-m4trace:configure.ac:182: -1- m4_pattern_allow([^CCEXT2_CFLAGS$])
-m4trace:configure.ac:182: -1- m4_pattern_allow([^CCEXT2_LIBS$])
-m4trace:configure.ac:182: -1- PKG_CHECK_EXISTS([libccext2 >= ${LIBCCEXT2_MIN_VERSION}], [pkg_cv_[]CCEXT2_CFLAGS=`$PKG_CONFIG --[]cflags "libccext2 >= ${LIBCCEXT2_MIN_VERSION}" 2>/dev/null`], [pkg_failed=yes])
-m4trace:configure.ac:182: -1- PKG_CHECK_EXISTS([libccext2 >= ${LIBCCEXT2_MIN_VERSION}], [pkg_cv_[]CCEXT2_LIBS=`$PKG_CONFIG --[]libs "libccext2 >= ${LIBCCEXT2_MIN_VERSION}" 2>/dev/null`], [pkg_failed=yes])
-m4trace:configure.ac:182: -1- _PKG_SHORT_ERRORS_SUPPORTED
+m4trace:configure.ac:178: -1- PKG_CHECK_EXISTS([libccgnu2 >= ${LIBCCGNU2_MIN_VERSION}], [pkg_cv_[]CCGNU2_CFLAGS=`$PKG_CONFIG --[]cflags "libccgnu2 >= ${LIBCCGNU2_MIN_VERSION}" 2>/dev/null`], [pkg_failed=yes])
+m4trace:configure.ac:178: -1- PKG_CHECK_EXISTS([libccgnu2 >= ${LIBCCGNU2_MIN_VERSION}], [pkg_cv_[]CCGNU2_LIBS=`$PKG_CONFIG --[]libs "libccgnu2 >= ${LIBCCGNU2_MIN_VERSION}" 2>/dev/null`], [pkg_failed=yes])
+m4trace:configure.ac:178: -1- _PKG_SHORT_ERRORS_SUPPORTED
+m4trace:configure.ac:179: -1- m4_pattern_allow([^CCGNU2_LIBS$])
+m4trace:configure.ac:180: -1- m4_pattern_allow([^CCGNU2_FLAGS$])
+m4trace:configure.ac:183: -1- PKG_CHECK_MODULES([CCEXT2], [libccext2 >= ${LIBCCEXT2_MIN_VERSION}])
+m4trace:configure.ac:183: -1- m4_pattern_allow([^CCEXT2_CFLAGS$])
m4trace:configure.ac:183: -1- m4_pattern_allow([^CCEXT2_LIBS$])
-m4trace:configure.ac:184: -1- m4_pattern_allow([^CCEXT2_CFLAGS$])
-m4trace:configure.ac:187: -1- PKG_CHECK_MODULES([CCRTP], [libccrtp1 >= ${LIBCCRT_MIN_VERSION}])
-m4trace:configure.ac:187: -1- m4_pattern_allow([^CCRTP_CFLAGS$])
-m4trace:configure.ac:187: -1- m4_pattern_allow([^CCRTP_LIBS$])
-m4trace:configure.ac:187: -1- PKG_CHECK_EXISTS([libccrtp1 >= ${LIBCCRT_MIN_VERSION}], [pkg_cv_[]CCRTP_CFLAGS=`$PKG_CONFIG --[]cflags "libccrtp1 >= ${LIBCCRT_MIN_VERSION}" 2>/dev/null`], [pkg_failed=yes])
-m4trace:configure.ac:187: -1- PKG_CHECK_EXISTS([libccrtp1 >= ${LIBCCRT_MIN_VERSION}], [pkg_cv_[]CCRTP_LIBS=`$PKG_CONFIG --[]libs "libccrtp1 >= ${LIBCCRT_MIN_VERSION}" 2>/dev/null`], [pkg_failed=yes])
-m4trace:configure.ac:187: -1- _PKG_SHORT_ERRORS_SUPPORTED
+m4trace:configure.ac:183: -1- PKG_CHECK_EXISTS([libccext2 >= ${LIBCCEXT2_MIN_VERSION}], [pkg_cv_[]CCEXT2_CFLAGS=`$PKG_CONFIG --[]cflags "libccext2 >= ${LIBCCEXT2_MIN_VERSION}" 2>/dev/null`], [pkg_failed=yes])
+m4trace:configure.ac:183: -1- PKG_CHECK_EXISTS([libccext2 >= ${LIBCCEXT2_MIN_VERSION}], [pkg_cv_[]CCEXT2_LIBS=`$PKG_CONFIG --[]libs "libccext2 >= ${LIBCCEXT2_MIN_VERSION}" 2>/dev/null`], [pkg_failed=yes])
+m4trace:configure.ac:183: -1- _PKG_SHORT_ERRORS_SUPPORTED
+m4trace:configure.ac:184: -1- m4_pattern_allow([^CCEXT2_LIBS$])
+m4trace:configure.ac:185: -1- m4_pattern_allow([^CCEXT2_CFLAGS$])
+m4trace:configure.ac:188: -1- PKG_CHECK_MODULES([CCRTP], [libccrtp1 >= ${LIBCCRT_MIN_VERSION}])
+m4trace:configure.ac:188: -1- m4_pattern_allow([^CCRTP_CFLAGS$])
m4trace:configure.ac:188: -1- m4_pattern_allow([^CCRTP_LIBS$])
-m4trace:configure.ac:189: -1- m4_pattern_allow([^CCRTP_CFLAGS$])
-m4trace:configure.ac:193: -1- PKG_CHECK_MODULES([dbus], [dbus-1 >= $DBUS_REQUIRED_VERSION], [], [{ { echo "$as_me:$LINENO: error: You need the DBus libraries (version 0.6 or better)
+m4trace:configure.ac:188: -1- PKG_CHECK_EXISTS([libccrtp1 >= ${LIBCCRT_MIN_VERSION}], [pkg_cv_[]CCRTP_CFLAGS=`$PKG_CONFIG --[]cflags "libccrtp1 >= ${LIBCCRT_MIN_VERSION}" 2>/dev/null`], [pkg_failed=yes])
+m4trace:configure.ac:188: -1- PKG_CHECK_EXISTS([libccrtp1 >= ${LIBCCRT_MIN_VERSION}], [pkg_cv_[]CCRTP_LIBS=`$PKG_CONFIG --[]libs "libccrtp1 >= ${LIBCCRT_MIN_VERSION}" 2>/dev/null`], [pkg_failed=yes])
+m4trace:configure.ac:188: -1- _PKG_SHORT_ERRORS_SUPPORTED
+m4trace:configure.ac:189: -1- m4_pattern_allow([^CCRTP_LIBS$])
+m4trace:configure.ac:190: -1- m4_pattern_allow([^CCRTP_CFLAGS$])
+m4trace:configure.ac:194: -1- PKG_CHECK_MODULES([dbus], [dbus-1 >= $DBUS_REQUIRED_VERSION], [], [{ { echo "$as_me:$LINENO: error: You need the DBus libraries (version 0.6 or better)
http://www.freedesktop.org/wiki/Software_2fdbus" >&5
echo "$as_me: error: You need the DBus libraries (version 0.6 or better)
http://www.freedesktop.org/wiki/Software_2fdbus" >&2;}
{ (exit 1); exit 1; }; }
])
-m4trace:configure.ac:193: -1- m4_pattern_allow([^dbus_CFLAGS$])
-m4trace:configure.ac:193: -1- m4_pattern_allow([^dbus_LIBS$])
-m4trace:configure.ac:193: -1- PKG_CHECK_EXISTS([dbus-1 >= $DBUS_REQUIRED_VERSION], [pkg_cv_[]dbus_CFLAGS=`$PKG_CONFIG --[]cflags "dbus-1 >= $DBUS_REQUIRED_VERSION" 2>/dev/null`], [pkg_failed=yes])
-m4trace:configure.ac:193: -1- PKG_CHECK_EXISTS([dbus-1 >= $DBUS_REQUIRED_VERSION], [pkg_cv_[]dbus_LIBS=`$PKG_CONFIG --[]libs "dbus-1 >= $DBUS_REQUIRED_VERSION" 2>/dev/null`], [pkg_failed=yes])
-m4trace:configure.ac:193: -1- _PKG_SHORT_ERRORS_SUPPORTED
-m4trace:configure.ac:197: -1- m4_pattern_allow([^dbus_CFLAGS$])
-m4trace:configure.ac:198: -1- m4_pattern_allow([^dbus_LIBS$])
-m4trace:configure.ac:201: -1- PKG_CHECK_EXISTS([dbus-1 < $DBUS_API_STABLE_VERSION], [AC_DEFINE(DBUS_API_SUBJECT_TO_CHANGE, , [unstable DBus])
-])
-m4trace:configure.ac:201: -1- m4_pattern_allow([^DBUS_API_SUBJECT_TO_CHANGE$])
-m4trace:configure.ac:206: -1- PKG_CHECK_EXISTS([dbus-1 >= $DBUS_THREADS_INIT_DEFAULT_VERSION], [AC_DEFINE(DBUS_HAS_THREADS_INIT_DEFAULT, , [dbus_threads_init_default (needs DBus >= 0.93)])
-])
-m4trace:configure.ac:206: -1- m4_pattern_allow([^DBUS_HAS_THREADS_INIT_DEFAULT$])
-m4trace:configure.ac:211: -1- PKG_CHECK_EXISTS([dbus-1 >= $DBUS_RECURSIVE_MUTEX_VERSION], [AC_DEFINE(DBUS_HAS_RECURSIVE_MUTEX, , [DBus supports recursive mutexes (needs DBus >= 0.95)])
-])
-m4trace:configure.ac:211: -1- m4_pattern_allow([^DBUS_HAS_RECURSIVE_MUTEX$])
-m4trace:configure.ac:216: -1- PKG_CHECK_MODULES([glib], [glib-2.0])
-m4trace:configure.ac:216: -1- m4_pattern_allow([^glib_CFLAGS$])
-m4trace:configure.ac:216: -1- m4_pattern_allow([^glib_LIBS$])
-m4trace:configure.ac:216: -1- PKG_CHECK_EXISTS([glib-2.0], [pkg_cv_[]glib_CFLAGS=`$PKG_CONFIG --[]cflags "glib-2.0" 2>/dev/null`], [pkg_failed=yes])
-m4trace:configure.ac:216: -1- PKG_CHECK_EXISTS([glib-2.0], [pkg_cv_[]glib_LIBS=`$PKG_CONFIG --[]libs "glib-2.0" 2>/dev/null`], [pkg_failed=yes])
-m4trace:configure.ac:216: -1- _PKG_SHORT_ERRORS_SUPPORTED
+m4trace:configure.ac:194: -1- m4_pattern_allow([^dbus_CFLAGS$])
+m4trace:configure.ac:194: -1- m4_pattern_allow([^dbus_LIBS$])
+m4trace:configure.ac:194: -1- PKG_CHECK_EXISTS([dbus-1 >= $DBUS_REQUIRED_VERSION], [pkg_cv_[]dbus_CFLAGS=`$PKG_CONFIG --[]cflags "dbus-1 >= $DBUS_REQUIRED_VERSION" 2>/dev/null`], [pkg_failed=yes])
+m4trace:configure.ac:194: -1- PKG_CHECK_EXISTS([dbus-1 >= $DBUS_REQUIRED_VERSION], [pkg_cv_[]dbus_LIBS=`$PKG_CONFIG --[]libs "dbus-1 >= $DBUS_REQUIRED_VERSION" 2>/dev/null`], [pkg_failed=yes])
+m4trace:configure.ac:194: -1- _PKG_SHORT_ERRORS_SUPPORTED
+m4trace:configure.ac:198: -1- m4_pattern_allow([^dbus_CFLAGS$])
+m4trace:configure.ac:199: -1- m4_pattern_allow([^dbus_LIBS$])
+m4trace:configure.ac:202: -1- PKG_CHECK_EXISTS([dbus-1 < $DBUS_API_STABLE_VERSION], [AC_DEFINE(DBUS_API_SUBJECT_TO_CHANGE, , [unstable DBus])
+])
+m4trace:configure.ac:202: -1- m4_pattern_allow([^DBUS_API_SUBJECT_TO_CHANGE$])
+m4trace:configure.ac:207: -1- PKG_CHECK_EXISTS([dbus-1 >= $DBUS_THREADS_INIT_DEFAULT_VERSION], [AC_DEFINE(DBUS_HAS_THREADS_INIT_DEFAULT, , [dbus_threads_init_default (needs DBus >= 0.93)])
+])
+m4trace:configure.ac:207: -1- m4_pattern_allow([^DBUS_HAS_THREADS_INIT_DEFAULT$])
+m4trace:configure.ac:212: -1- PKG_CHECK_EXISTS([dbus-1 >= $DBUS_RECURSIVE_MUTEX_VERSION], [AC_DEFINE(DBUS_HAS_RECURSIVE_MUTEX, , [DBus supports recursive mutexes (needs DBus >= 0.95)])
+])
+m4trace:configure.ac:212: -1- m4_pattern_allow([^DBUS_HAS_RECURSIVE_MUTEX$])
+m4trace:configure.ac:217: -1- PKG_CHECK_MODULES([glib], [glib-2.0])
m4trace:configure.ac:217: -1- m4_pattern_allow([^glib_CFLAGS$])
-m4trace:configure.ac:218: -1- m4_pattern_allow([^glib_LIBS$])
-m4trace:configure.ac:219: -1- AM_CONDITIONAL([ENABLE_GLIB], [test 1 = 1])
-m4trace:configure.ac:219: -1- m4_pattern_allow([^ENABLE_GLIB_TRUE$])
-m4trace:configure.ac:219: -1- m4_pattern_allow([^ENABLE_GLIB_FALSE$])
-m4trace:configure.ac:221: -2- AM_CONDITIONAL([HAVE_GTKMM], [test 1 = 1])
-m4trace:configure.ac:221: -2- m4_pattern_allow([^HAVE_GTKMM_TRUE$])
-m4trace:configure.ac:221: -2- m4_pattern_allow([^HAVE_GTKMM_FALSE$])
-m4trace:configure.ac:222: -2- AM_CONDITIONAL([HAVE_GTKMM], [test 0 = 1])
+m4trace:configure.ac:217: -1- m4_pattern_allow([^glib_LIBS$])
+m4trace:configure.ac:217: -1- PKG_CHECK_EXISTS([glib-2.0], [pkg_cv_[]glib_CFLAGS=`$PKG_CONFIG --[]cflags "glib-2.0" 2>/dev/null`], [pkg_failed=yes])
+m4trace:configure.ac:217: -1- PKG_CHECK_EXISTS([glib-2.0], [pkg_cv_[]glib_LIBS=`$PKG_CONFIG --[]libs "glib-2.0" 2>/dev/null`], [pkg_failed=yes])
+m4trace:configure.ac:217: -1- _PKG_SHORT_ERRORS_SUPPORTED
+m4trace:configure.ac:218: -1- m4_pattern_allow([^glib_CFLAGS$])
+m4trace:configure.ac:219: -1- m4_pattern_allow([^glib_LIBS$])
+m4trace:configure.ac:220: -1- AM_CONDITIONAL([ENABLE_GLIB], [test 1 = 1])
+m4trace:configure.ac:220: -1- m4_pattern_allow([^ENABLE_GLIB_TRUE$])
+m4trace:configure.ac:220: -1- m4_pattern_allow([^ENABLE_GLIB_FALSE$])
+m4trace:configure.ac:220: -1- _AM_SUBST_NOTMAKE([ENABLE_GLIB_TRUE])
+m4trace:configure.ac:220: -1- _AM_SUBST_NOTMAKE([ENABLE_GLIB_FALSE])
+m4trace:configure.ac:222: -2- AM_CONDITIONAL([HAVE_GTKMM], [test 1 = 1])
m4trace:configure.ac:222: -2- m4_pattern_allow([^HAVE_GTKMM_TRUE$])
m4trace:configure.ac:222: -2- m4_pattern_allow([^HAVE_GTKMM_FALSE$])
-m4trace:configure.ac:220: -1- PKG_CHECK_MODULES([gtkmm], [gtkmm-2.4], [
-
-if test 1 = 1; then
+m4trace:configure.ac:222: -2- _AM_SUBST_NOTMAKE([HAVE_GTKMM_TRUE])
+m4trace:configure.ac:222: -2- _AM_SUBST_NOTMAKE([HAVE_GTKMM_FALSE])
+m4trace:configure.ac:223: -2- AM_CONDITIONAL([HAVE_GTKMM], [test 0 = 1])
+m4trace:configure.ac:223: -2- m4_pattern_allow([^HAVE_GTKMM_TRUE$])
+m4trace:configure.ac:223: -2- m4_pattern_allow([^HAVE_GTKMM_FALSE$])
+m4trace:configure.ac:223: -2- _AM_SUBST_NOTMAKE([HAVE_GTKMM_TRUE])
+m4trace:configure.ac:223: -2- _AM_SUBST_NOTMAKE([HAVE_GTKMM_FALSE])
+m4trace:configure.ac:221: -1- PKG_CHECK_MODULES([gtkmm], [gtkmm-2.4], [ if test 1 = 1; then
HAVE_GTKMM_TRUE=
HAVE_GTKMM_FALSE='#'
else
HAVE_GTKMM_TRUE='#'
HAVE_GTKMM_FALSE=
fi
-], [
-
-if test 0 = 1; then
+], [ if test 0 = 1; then
HAVE_GTKMM_TRUE=
HAVE_GTKMM_FALSE='#'
else
@@ -2005,62 +2582,76 @@ else
fi
])
-m4trace:configure.ac:220: -1- m4_pattern_allow([^gtkmm_CFLAGS$])
-m4trace:configure.ac:220: -1- m4_pattern_allow([^gtkmm_LIBS$])
-m4trace:configure.ac:220: -1- PKG_CHECK_EXISTS([gtkmm-2.4], [pkg_cv_[]gtkmm_CFLAGS=`$PKG_CONFIG --[]cflags "gtkmm-2.4" 2>/dev/null`], [pkg_failed=yes])
-m4trace:configure.ac:220: -1- PKG_CHECK_EXISTS([gtkmm-2.4], [pkg_cv_[]gtkmm_LIBS=`$PKG_CONFIG --[]libs "gtkmm-2.4" 2>/dev/null`], [pkg_failed=yes])
-m4trace:configure.ac:220: -1- _PKG_SHORT_ERRORS_SUPPORTED
-m4trace:configure.ac:224: -1- m4_pattern_allow([^gtkmm_CFLAGS$])
-m4trace:configure.ac:225: -1- m4_pattern_allow([^gtkmm_LIBS$])
-m4trace:configure.ac:227: -1- AM_CONDITIONAL([ENABLE_GLIB], [test 0 = 1])
-m4trace:configure.ac:227: -1- m4_pattern_allow([^ENABLE_GLIB_TRUE$])
-m4trace:configure.ac:227: -1- m4_pattern_allow([^ENABLE_GLIB_FALSE$])
-m4trace:configure.ac:228: -1- AM_CONDITIONAL([HAVE_GTKMM], [test 0 = 1])
-m4trace:configure.ac:228: -1- m4_pattern_allow([^HAVE_GTKMM_TRUE$])
-m4trace:configure.ac:228: -1- m4_pattern_allow([^HAVE_GTKMM_FALSE$])
-m4trace:configure.ac:243: -1- m4_pattern_allow([^xml_CFLAGS$])
-m4trace:configure.ac:244: -1- m4_pattern_allow([^xml_LIBS$])
-m4trace:configure.ac:256: -1- AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = "yes"])
-m4trace:configure.ac:256: -1- m4_pattern_allow([^CROSS_COMPILING_TRUE$])
-m4trace:configure.ac:256: -1- m4_pattern_allow([^CROSS_COMPILING_FALSE$])
-m4trace:configure.ac:264: -1- m4_pattern_allow([^BUILD_LIBDBUS_CXX_DIR$])
-m4trace:configure.ac:270: -1- PKG_CHECK_MODULES([CPPUNIT], [cppunit >= ${CPPUNIT_MIN_VERSION}])
-m4trace:configure.ac:270: -1- m4_pattern_allow([^CPPUNIT_CFLAGS$])
-m4trace:configure.ac:270: -1- m4_pattern_allow([^CPPUNIT_LIBS$])
-m4trace:configure.ac:270: -1- PKG_CHECK_EXISTS([cppunit >= ${CPPUNIT_MIN_VERSION}], [pkg_cv_[]CPPUNIT_CFLAGS=`$PKG_CONFIG --[]cflags "cppunit >= ${CPPUNIT_MIN_VERSION}" 2>/dev/null`], [pkg_failed=yes])
-m4trace:configure.ac:270: -1- PKG_CHECK_EXISTS([cppunit >= ${CPPUNIT_MIN_VERSION}], [pkg_cv_[]CPPUNIT_LIBS=`$PKG_CONFIG --[]libs "cppunit >= ${CPPUNIT_MIN_VERSION}" 2>/dev/null`], [pkg_failed=yes])
-m4trace:configure.ac:270: -1- _PKG_SHORT_ERRORS_SUPPORTED
+m4trace:configure.ac:221: -1- m4_pattern_allow([^gtkmm_CFLAGS$])
+m4trace:configure.ac:221: -1- m4_pattern_allow([^gtkmm_LIBS$])
+m4trace:configure.ac:221: -1- PKG_CHECK_EXISTS([gtkmm-2.4], [pkg_cv_[]gtkmm_CFLAGS=`$PKG_CONFIG --[]cflags "gtkmm-2.4" 2>/dev/null`], [pkg_failed=yes])
+m4trace:configure.ac:221: -1- PKG_CHECK_EXISTS([gtkmm-2.4], [pkg_cv_[]gtkmm_LIBS=`$PKG_CONFIG --[]libs "gtkmm-2.4" 2>/dev/null`], [pkg_failed=yes])
+m4trace:configure.ac:221: -1- _PKG_SHORT_ERRORS_SUPPORTED
+m4trace:configure.ac:225: -1- m4_pattern_allow([^gtkmm_CFLAGS$])
+m4trace:configure.ac:226: -1- m4_pattern_allow([^gtkmm_LIBS$])
+m4trace:configure.ac:228: -1- AM_CONDITIONAL([ENABLE_GLIB], [test 0 = 1])
+m4trace:configure.ac:228: -1- m4_pattern_allow([^ENABLE_GLIB_TRUE$])
+m4trace:configure.ac:228: -1- m4_pattern_allow([^ENABLE_GLIB_FALSE$])
+m4trace:configure.ac:228: -1- _AM_SUBST_NOTMAKE([ENABLE_GLIB_TRUE])
+m4trace:configure.ac:228: -1- _AM_SUBST_NOTMAKE([ENABLE_GLIB_FALSE])
+m4trace:configure.ac:229: -1- AM_CONDITIONAL([HAVE_GTKMM], [test 0 = 1])
+m4trace:configure.ac:229: -1- m4_pattern_allow([^HAVE_GTKMM_TRUE$])
+m4trace:configure.ac:229: -1- m4_pattern_allow([^HAVE_GTKMM_FALSE$])
+m4trace:configure.ac:229: -1- _AM_SUBST_NOTMAKE([HAVE_GTKMM_TRUE])
+m4trace:configure.ac:229: -1- _AM_SUBST_NOTMAKE([HAVE_GTKMM_FALSE])
+m4trace:configure.ac:244: -1- m4_pattern_allow([^xml_CFLAGS$])
+m4trace:configure.ac:245: -1- m4_pattern_allow([^xml_LIBS$])
+m4trace:configure.ac:257: -1- AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = "yes"])
+m4trace:configure.ac:257: -1- m4_pattern_allow([^CROSS_COMPILING_TRUE$])
+m4trace:configure.ac:257: -1- m4_pattern_allow([^CROSS_COMPILING_FALSE$])
+m4trace:configure.ac:257: -1- _AM_SUBST_NOTMAKE([CROSS_COMPILING_TRUE])
+m4trace:configure.ac:257: -1- _AM_SUBST_NOTMAKE([CROSS_COMPILING_FALSE])
+m4trace:configure.ac:265: -1- m4_pattern_allow([^BUILD_LIBDBUS_CXX_DIR$])
+m4trace:configure.ac:271: -1- PKG_CHECK_MODULES([CPPUNIT], [cppunit >= ${CPPUNIT_MIN_VERSION}])
+m4trace:configure.ac:271: -1- m4_pattern_allow([^CPPUNIT_CFLAGS$])
m4trace:configure.ac:271: -1- m4_pattern_allow([^CPPUNIT_LIBS$])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^HAVE_LIBGSM$])
-m4trace:configure.ac:292: -1- m4_pattern_allow([^HAVE_GSM$])
-m4trace:configure.ac:293: -1- AM_CONDITIONAL([BUILD_GSM], [test "x$with_gsm" = "xyes" ])
-m4trace:configure.ac:293: -1- m4_pattern_allow([^BUILD_GSM_TRUE$])
-m4trace:configure.ac:293: -1- m4_pattern_allow([^BUILD_GSM_FALSE$])
-m4trace:configure.ac:302: -1- m4_pattern_allow([^HAVE_LIBSPEEX$])
-m4trace:configure.ac:321: -1- m4_pattern_allow([^HAVE_SPEEX$])
-m4trace:configure.ac:322: -1- AM_CONDITIONAL([BUILD_SPEEX], [test "x$with_speex" = "xyes" ])
-m4trace:configure.ac:322: -1- m4_pattern_allow([^BUILD_SPEEX_TRUE$])
-m4trace:configure.ac:322: -1- m4_pattern_allow([^BUILD_SPEEX_FALSE$])
-m4trace:configure.ac:323: -1- AM_CONDITIONAL([ENABLE_SPEEXDSP], [test $HAVE_SPEEXDSP = yes])
-m4trace:configure.ac:323: -1- m4_pattern_allow([^ENABLE_SPEEXDSP_TRUE$])
-m4trace:configure.ac:323: -1- m4_pattern_allow([^ENABLE_SPEEXDSP_FALSE$])
-m4trace:configure.ac:332: -1- AM_CONDITIONAL([BUILD_ILBC], [test "x$with_ilbc" = "xyes" ])
-m4trace:configure.ac:332: -1- m4_pattern_allow([^BUILD_ILBC_TRUE$])
-m4trace:configure.ac:332: -1- m4_pattern_allow([^BUILD_ILBC_FALSE$])
-m4trace:configure.ac:342: -1- m4_pattern_allow([^HAVE_LIBIAX2$])
-m4trace:configure.ac:352: -1- m4_pattern_allow([^HAVE_IAX$])
-m4trace:configure.ac:353: -1- AM_CONDITIONAL([USE_IAX], [test "x$with_iax2" = "xyes" ])
-m4trace:configure.ac:353: -1- m4_pattern_allow([^USE_IAX_TRUE$])
-m4trace:configure.ac:353: -1- m4_pattern_allow([^USE_IAX_FALSE$])
-m4trace:configure.ac:356: -1- GNUPG_CHECK_READLINE
-m4trace:configure.ac:356: -1- m4_pattern_allow([^HAVE_LIBREADLINE$])
-m4trace:configure.ac:356: -1- m4_pattern_allow([^LIBREADLINE$])
-m4trace:configure.ac:379: -1- m4_pattern_allow([^HAVE_DNSSD$])
-m4trace:configure.ac:402: -1- m4_pattern_allow([^LIB_DNSSD$])
-m4trace:configure.ac:403: -1- AM_CONDITIONAL([USE_ZEROCONF], [test "$have_libdns_sd" = "yes"])
-m4trace:configure.ac:403: -1- m4_pattern_allow([^USE_ZEROCONF_TRUE$])
-m4trace:configure.ac:403: -1- m4_pattern_allow([^USE_ZEROCONF_FALSE$])
-m4trace:configure.ac:409: -1- AC_DEFUN([BB_ENABLE_DOXYGEN], [
+m4trace:configure.ac:271: -1- PKG_CHECK_EXISTS([cppunit >= ${CPPUNIT_MIN_VERSION}], [pkg_cv_[]CPPUNIT_CFLAGS=`$PKG_CONFIG --[]cflags "cppunit >= ${CPPUNIT_MIN_VERSION}" 2>/dev/null`], [pkg_failed=yes])
+m4trace:configure.ac:271: -1- PKG_CHECK_EXISTS([cppunit >= ${CPPUNIT_MIN_VERSION}], [pkg_cv_[]CPPUNIT_LIBS=`$PKG_CONFIG --[]libs "cppunit >= ${CPPUNIT_MIN_VERSION}" 2>/dev/null`], [pkg_failed=yes])
+m4trace:configure.ac:271: -1- _PKG_SHORT_ERRORS_SUPPORTED
+m4trace:configure.ac:272: -1- m4_pattern_allow([^CPPUNIT_LIBS$])
+m4trace:configure.ac:283: -1- m4_pattern_allow([^HAVE_LIBGSM$])
+m4trace:configure.ac:293: -1- m4_pattern_allow([^HAVE_GSM$])
+m4trace:configure.ac:294: -1- AM_CONDITIONAL([BUILD_GSM], [test "x$with_gsm" = "xyes" ])
+m4trace:configure.ac:294: -1- m4_pattern_allow([^BUILD_GSM_TRUE$])
+m4trace:configure.ac:294: -1- m4_pattern_allow([^BUILD_GSM_FALSE$])
+m4trace:configure.ac:294: -1- _AM_SUBST_NOTMAKE([BUILD_GSM_TRUE])
+m4trace:configure.ac:294: -1- _AM_SUBST_NOTMAKE([BUILD_GSM_FALSE])
+m4trace:configure.ac:303: -1- m4_pattern_allow([^HAVE_LIBSPEEX$])
+m4trace:configure.ac:316: -1- m4_pattern_allow([^HAVE_SPEEX$])
+m4trace:configure.ac:317: -1- AM_CONDITIONAL([BUILD_SPEEX], [test "x$with_speex" = "xyes" ])
+m4trace:configure.ac:317: -1- m4_pattern_allow([^BUILD_SPEEX_TRUE$])
+m4trace:configure.ac:317: -1- m4_pattern_allow([^BUILD_SPEEX_FALSE$])
+m4trace:configure.ac:317: -1- _AM_SUBST_NOTMAKE([BUILD_SPEEX_TRUE])
+m4trace:configure.ac:317: -1- _AM_SUBST_NOTMAKE([BUILD_SPEEX_FALSE])
+m4trace:configure.ac:318: -1- AM_CONDITIONAL([ENABLE_SPEEXDSP], [test $HAVE_SPEEXDSP = yes])
+m4trace:configure.ac:318: -1- m4_pattern_allow([^ENABLE_SPEEXDSP_TRUE$])
+m4trace:configure.ac:318: -1- m4_pattern_allow([^ENABLE_SPEEXDSP_FALSE$])
+m4trace:configure.ac:318: -1- _AM_SUBST_NOTMAKE([ENABLE_SPEEXDSP_TRUE])
+m4trace:configure.ac:318: -1- _AM_SUBST_NOTMAKE([ENABLE_SPEEXDSP_FALSE])
+m4trace:configure.ac:330: -1- m4_pattern_allow([^HAVE_LIBCELT$])
+m4trace:configure.ac:340: -1- m4_pattern_allow([^HAVE_CELT$])
+m4trace:configure.ac:341: -1- AM_CONDITIONAL([BUILD_CELT], [test "x$with_celt" = "xyes" ])
+m4trace:configure.ac:341: -1- m4_pattern_allow([^BUILD_CELT_TRUE$])
+m4trace:configure.ac:341: -1- m4_pattern_allow([^BUILD_CELT_FALSE$])
+m4trace:configure.ac:341: -1- _AM_SUBST_NOTMAKE([BUILD_CELT_TRUE])
+m4trace:configure.ac:341: -1- _AM_SUBST_NOTMAKE([BUILD_CELT_FALSE])
+m4trace:configure.ac:350: -1- AM_CONDITIONAL([BUILD_ILBC], [test "x$with_ilbc" = "xyes" ])
+m4trace:configure.ac:350: -1- m4_pattern_allow([^BUILD_ILBC_TRUE$])
+m4trace:configure.ac:350: -1- m4_pattern_allow([^BUILD_ILBC_FALSE$])
+m4trace:configure.ac:350: -1- _AM_SUBST_NOTMAKE([BUILD_ILBC_TRUE])
+m4trace:configure.ac:350: -1- _AM_SUBST_NOTMAKE([BUILD_ILBC_FALSE])
+m4trace:configure.ac:359: -1- m4_pattern_allow([^HAVE_IAX$])
+m4trace:configure.ac:360: -1- AM_CONDITIONAL([USE_IAX], [test "x$with_iax2" = "xyes" ])
+m4trace:configure.ac:360: -1- m4_pattern_allow([^USE_IAX_TRUE$])
+m4trace:configure.ac:360: -1- m4_pattern_allow([^USE_IAX_FALSE$])
+m4trace:configure.ac:360: -1- _AM_SUBST_NOTMAKE([USE_IAX_TRUE])
+m4trace:configure.ac:360: -1- _AM_SUBST_NOTMAKE([USE_IAX_FALSE])
+m4trace:configure.ac:364: -1- AC_DEFUN([BB_ENABLE_DOXYGEN], [
AC_ARG_ENABLE(doxygen, [ --enable-doxygen enable documentation generation with doxygen (auto)])
AC_ARG_ENABLE(dot, [ --enable-dot use 'dot' to generate graphs in doxygen (auto)])
AC_ARG_ENABLE(html-docs, [ --enable-html-docs enable HTML generation with doxygen (yes)], [], [ enable_html_docs=yes])
@@ -2094,24 +2685,29 @@ AC_SUBST(enable_dot)
AC_SUBST(enable_html_docs)
AC_SUBST(enable_latex_docs)
])
-m4trace:configure.ac:445: -1- BB_ENABLE_DOXYGEN
-m4trace:configure.ac:445: -1- m4_pattern_allow([^DOXYGEN$])
-m4trace:configure.ac:445: -1- m4_pattern_allow([^DOT$])
-m4trace:configure.ac:445: -1- AM_CONDITIONAL([DOC], [test x$enable_doc = xyes])
-m4trace:configure.ac:445: -1- m4_pattern_allow([^DOC_TRUE$])
-m4trace:configure.ac:445: -1- m4_pattern_allow([^DOC_FALSE$])
-m4trace:configure.ac:445: -1- AM_CONDITIONAL([ENABLE_DOXYGEN], [test x$enable_doc = xtrue])
-m4trace:configure.ac:445: -1- m4_pattern_allow([^ENABLE_DOXYGEN_TRUE$])
-m4trace:configure.ac:445: -1- m4_pattern_allow([^ENABLE_DOXYGEN_FALSE$])
-m4trace:configure.ac:445: -1- m4_pattern_allow([^enable_dot$])
-m4trace:configure.ac:445: -1- m4_pattern_allow([^enable_html_docs$])
-m4trace:configure.ac:445: -1- m4_pattern_allow([^enable_latex_docs$])
-m4trace:configure.ac:449: -1- m4_pattern_allow([^sflphone_datadir$])
-m4trace:configure.ac:453: -1- m4_pattern_allow([^DBUS_SERVICES_DIR$])
-m4trace:configure.ac:454: -1- m4_pattern_allow([^DBUS_SERVICES_DIR$])
-m4trace:configure.ac:457: -1- m4_pattern_allow([^SFLPHONE_CFLAGS$])
-m4trace:configure.ac:458: -1- m4_pattern_allow([^SFLPHONE_LIBS$])
-m4trace:configure.ac:459: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:459: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.ac:459: -1- _LT_PROG_LTMAIN
-m4trace:configure.ac:459: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
+m4trace:configure.ac:400: -1- BB_ENABLE_DOXYGEN
+m4trace:configure.ac:400: -1- m4_pattern_allow([^DOXYGEN$])
+m4trace:configure.ac:400: -1- m4_pattern_allow([^DOT$])
+m4trace:configure.ac:400: -1- AM_CONDITIONAL([DOC], [test x$enable_doc = xyes])
+m4trace:configure.ac:400: -1- m4_pattern_allow([^DOC_TRUE$])
+m4trace:configure.ac:400: -1- m4_pattern_allow([^DOC_FALSE$])
+m4trace:configure.ac:400: -1- _AM_SUBST_NOTMAKE([DOC_TRUE])
+m4trace:configure.ac:400: -1- _AM_SUBST_NOTMAKE([DOC_FALSE])
+m4trace:configure.ac:400: -1- AM_CONDITIONAL([ENABLE_DOXYGEN], [test x$enable_doc = xtrue])
+m4trace:configure.ac:400: -1- m4_pattern_allow([^ENABLE_DOXYGEN_TRUE$])
+m4trace:configure.ac:400: -1- m4_pattern_allow([^ENABLE_DOXYGEN_FALSE$])
+m4trace:configure.ac:400: -1- _AM_SUBST_NOTMAKE([ENABLE_DOXYGEN_TRUE])
+m4trace:configure.ac:400: -1- _AM_SUBST_NOTMAKE([ENABLE_DOXYGEN_FALSE])
+m4trace:configure.ac:400: -1- m4_pattern_allow([^enable_dot$])
+m4trace:configure.ac:400: -1- m4_pattern_allow([^enable_html_docs$])
+m4trace:configure.ac:400: -1- m4_pattern_allow([^enable_latex_docs$])
+m4trace:configure.ac:404: -1- m4_pattern_allow([^sflphone_datadir$])
+m4trace:configure.ac:408: -1- m4_pattern_allow([^DBUS_SERVICES_DIR$])
+m4trace:configure.ac:409: -1- m4_pattern_allow([^DBUS_SERVICES_DIR$])
+m4trace:configure.ac:412: -1- m4_pattern_allow([^SFLPHONE_CFLAGS$])
+m4trace:configure.ac:413: -1- m4_pattern_allow([^SFLPHONE_LIBS$])
+m4trace:configure.ac:414: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:414: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.ac:414: -1- _AC_AM_CONFIG_HEADER_HOOK([$ac_file])
+m4trace:configure.ac:414: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
+m4trace:configure.ac:414: -1- _LT_PROG_LTMAIN
diff --git a/sflphone-common/configure.ac b/sflphone-common/configure.ac
index 61f85264c8731efe2fe61bd99efdae62f56cd39d..ae0f806ec15c7ecb6340374bc178f5baea9432ae 100644
--- a/sflphone-common/configure.ac
+++ b/sflphone-common/configure.ac
@@ -317,6 +317,8 @@ AC_DEFINE([HAVE_SPEEX], test "x$with_speex" = "xyes", [Define if you have libspe
AM_CONDITIONAL(BUILD_SPEEX, test "x$with_speex" = "xyes" )
AM_CONDITIONAL(ENABLE_SPEEXDSP, test $HAVE_SPEEXDSP = yes)
+
+
dnl Check for ilbc support
AC_ARG_WITH([ilbc],
[AS_HELP_STRING([--without-ilbc],
diff --git a/sflphone-common/src/audio/audiortp.cpp b/sflphone-common/src/audio/audiortp.cpp
index e483830cce819875d72de31937997a7c294244a5..1fb9847d14021a1506e4c338cb24ab3e7b9f34da 100644
--- a/sflphone-common/src/audio/audiortp.cpp
+++ b/sflphone-common/src/audio/audiortp.cpp
@@ -358,31 +358,64 @@ AudioRtpRTX::sendSessionFromMic(int timestamp)
if (!_audiocodec) { _debug(" !ARTP: No audiocodec available for mic\n"); return; }
// we have to get 20ms of data from the mic *20/1000 = /50
- int maxBytesToGet = _layerSampleRate * _layerFrameSize * sizeof(SFLDataFormat) / 1000;
+ // int maxBytesToGet = _layerSampleRate * _layerFrameSize * sizeof(SFLDataFormat) / 1000;
+
+ // compute codec framesize in ms
+ float fixed_codec_framesize = ((float)_audiocodec->getFrameSize() * 1000.0) / (float)_audiocodec->getClockRate();
+ _debug("fixed_codec_framesize: %i \n", (int)fixed_codec_framesize);
+
+ int maxBytesToGet = (int)((float)_layerSampleRate * fixed_codec_framesize * (float)sizeof(SFLDataFormat) / 1000.0);
+ _debug("maxBytesToGet %i \n", maxBytesToGet);
+
// available bytes inside ringbuffer
int availBytesFromMic = audiolayer->canGetMic();
-
+ _debug("availBytesFromMic: %i \n", availBytesFromMic);
// take the lowest
+ // int bytesAvail = (availBytesFromMic < maxBytesToGet) ? availBytesFromMic : maxBytesToGet;
+
int bytesAvail = (availBytesFromMic < maxBytesToGet) ? availBytesFromMic : maxBytesToGet;
+
+ if (bytesAvail == 0)
+ return;
+
// Get bytes from micRingBuffer to data_from_mic
//_debug("get data from mic\n");
int nbSample = audiolayer->getMic( micData , bytesAvail ) / sizeof(SFLDataFormat);
- int nb_sample_up = nbSample;
+ _debug("nb of sample from mic %i \n", nbSample);
+
+ int compSize = 0;
+ // test if resampling is required
+ if (_audiocodec->getClockRate() != _layerSampleRate) {
- // Store the length of the mic buffer in samples for recording
- _nSamplesMic = nbSample;
+ int nb_sample_up = nbSample;
+ _debug("_nbSample audiolayer->getMic(): %i \n", nbSample);
+
- int nbSamplesMax = _layerFrameSize * _audiocodec->getClockRate() / 1000;
+ // Store the length of the mic buffer in samples for recording
+ _nSamplesMic = nbSample;
- //_debug("resample data = %i\n", nb_sample_up);
- nbSample = reSampleData(_audiocodec->getClockRate(), nb_sample_up, DOWN_SAMPLING);
+ _debug("_audiocodec->getClockRate(): %i \n", _audiocodec->getClockRate());
+ int nbSamplesMax = _layerFrameSize * _audiocodec->getClockRate() / 1000;
+ _debug("_nbSamplesMax %i\n", nbSamplesMax);
+
+ _debug("resample data = %i\n", nb_sample_up);
+ nbSample = reSampleData(_audiocodec->getClockRate(), nb_sample_up, DOWN_SAMPLING);
+
+ if ( nbSample < nbSamplesMax - 10 ) { // if only 10 is missing, it's ok
+ // fill end with 0...
+ memset( micDataConverted + nbSample, 0, (nbSamplesMax-nbSample)*sizeof(int16));
+ nbSample = nbSamplesMax;
+ }
+ compSize = _audiocodec->codecEncode( micDataEncoded, micDataConverted, nbSample*sizeof(int16));
+
+ } else {
+
+ int nbSamplesMax = 512;
+ // no resampling required
+ compSize = _audiocodec->codecEncode( micDataEncoded, micData, nbSample*sizeof(int16));
- if ( nbSample < nbSamplesMax - 10 ) { // if only 10 is missing, it's ok
- // fill end with 0...
- memset( micDataConverted + nbSample, 0, (nbSamplesMax-nbSample)*sizeof(int16));
- nbSample = nbSamplesMax;
}
- int compSize = _audiocodec->codecEncode( micDataEncoded , micDataConverted , nbSample*sizeof(int16));
+
// encode divise by two
// Send encoded audio sample over the network
if (compSize > nbSamplesMax) { _debug("! ARTP: %d should be %d\n", compSize, nbSamplesMax);}
@@ -430,16 +463,16 @@ AudioRtpRTX::receiveSessionForSpkr (int& countTime)
unsigned char* spkrData = (unsigned char*)adu->getData(); // data in char
unsigned int size = adu->getSize(); // size in char
- // printf("AudioRtpRTX::receiveSessionForSpkr() Size of data from %i \n",size);
+ printf("AudioRtpRTX::receiveSessionForSpkr() Size of data from %i \n",size);
// Decode data with relevant codec
unsigned int max = (unsigned int)(_codecSampleRate * _layerFrameSize / 1000);
- if ( size > max ) {
- _debug("We have received from RTP a packet larger than expected: %d VS %d\n", size, max);
- _debug("The packet size has been cropped\n");
- size=max;
- }
+ // if ( size > max ) {
+ // _debug("We have received from RTP a packet larger than expected: %d VS %d\n", size, max);
+ // _debug("The packet size has been cropped\n");
+ // size=max;
+ // }
if (_audiocodec != NULL) {
@@ -448,26 +481,33 @@ AudioRtpRTX::receiveSessionForSpkr (int& countTime)
//buffer _receiveDataDecoded ----> short int or int16, coded on 2 bytes
int nbInt16 = expandedSize / sizeof(int16);
//nbInt16 represents the number of samples we just decoded
- if ((unsigned int)nbInt16 > max) {
- _debug("We have decoded an RTP packet larger than expected: %d VS %d. Cropping.\n", nbInt16, max);
- nbInt16=max;
- }
+ // if ((unsigned int)nbInt16 > max) {
+ // _debug("We have decoded an RTP packet larger than expected: %d VS %d. Cropping.\n", nbInt16, max);
+ // nbInt16=max;
+ // }
int nbSample = nbInt16;
- // Do sample rate conversion
- int nb_sample_down = nbSample;
- nbSample = reSampleData(_codecSampleRate , nb_sample_down, UP_SAMPLING);
+ if (_audiocodec->getClockRate() != _layerSampleRate) {
-#ifdef DATAFORMAT_IS_FLOAT
-#else
-#endif
+ // Do sample rate conversion
+ int nb_sample_down = nbSample;
+ nbSample = reSampleData(_codecSampleRate , nb_sample_down, UP_SAMPLING);
- // Stor the number of samples for recording
- _nSamplesSpkr = nbSample;
+ // #ifdef DATAFORMAT_IS_FLOAT
+ // #else
+ // #endif
- //audiolayer->playSamples( spkrDataConverted, nbSample * sizeof(SFLDataFormat), true);
- audiolayer->putMain (spkrDataConverted, nbSample * sizeof(SFLDataFormat));
+ // Stor the number of samples for recording
+ _nSamplesSpkr = nbSample;
+ //audiolayer->playSamples( spkrDataConverted, nbSample * sizeof(SFLDataFormat), true);
+ audiolayer->putMain (spkrDataConverted, nbSample * sizeof(SFLDataFormat));
+ } else {
+
+ // Stor the number of samples for recording
+ _nSamplesSpkr = nbSample;
+ audiolayer->putMain (spkrDataDecoded, nbSample * sizeof(SFLDataFormat));
+ }
// Notify (with a beep) an incoming call when there is already a call
countTime += time->getSecond();
@@ -565,7 +605,7 @@ AudioRtpRTX::run () {
if(sessionWaiting == 1){
// _debug("Record TWO buffer \n");
- _ca->recAudio.recData(spkrDataConverted,micData,_nSamplesSpkr,_nSamplesMic);
+ _ca->recAudio.recData(spkrDataDecoded,micData,_nSamplesSpkr,_nSamplesMic);
}
else {
// _debug("Record ONE buffer \n");
diff --git a/sflphone-common/src/audio/codecs/Makefile.am b/sflphone-common/src/audio/codecs/Makefile.am
index abdc514293ec94c13c0a5fd93c4eb44583963916..e9a43dc1db92d8005311860dab7be808214b5812 100644
--- a/sflphone-common/src/audio/codecs/Makefile.am
+++ b/sflphone-common/src/audio/codecs/Makefile.am
@@ -14,12 +14,21 @@ SPEEXDSP=-DHAVE_SPEEXDSP_LIB
endif
if BUILD_SPEEX
-SPEEX_LIB=libcodec_speex.so
-libcodec_speex_so_SOURCES = speexcodec.cpp
-libcodec_speex_so_CFLAGS = -fPIC -g -Wall
-libcodec_speex_so_CXXFLAGS = -fPIC -g -Wall $(SPEEXDSP)
-libcodec_speex_so_LDFLAGS = --shared -lc -lspeex $(SPEEX_NIMP)
-INSTALL_SPEEX_RULE = install-libcodec_speex_so
+SPEEX_NB_LIB = libcodec_speex_nb.so
+libcodec_speex_nb_so_SOURCES = speexcodec_nb.cpp
+libcodec_speex_nb_so_CFLAGS = -fPIC -g -Wall
+libcodec_speex_nb_so_CXXFLAGS = -fPIC -g -Wall $(SPEEXDSP)
+libcodec_speex_nb_so_LDFLAGS = --shared -lc -lspeex $(SPEEX_NIMP)
+INSTALL_SPEEX_NB_RULE = install-libcodec_speex_nb_so
+endif
+
+if BUILD_SPEEX
+SPEEX_WB_LIB = libcodec_speex_wb.so
+libcodec_speex_wb_so_SOURCES = speexcodec_wb.cpp
+libcodec_speex_wb_so_CFLAGS = -fPIC -g -Wall
+libcodec_speex_wb_so_CXXFLAGS = -fPIC -g -Wall $(SPEEXDSP)
+libcodec_speex_wb_so_LDFLAGS = --shared -lc -lspeex $(SPEEX_NIMP)
+INSTALL_SPEEX_WB_RULE = install-libcodec_speex_wb_so
endif
if BUILD_ILBC
@@ -32,7 +41,7 @@ INSTALL_ILBC_RULE = install-libcodec_ilbc_so
SUBDIRS = ilbc
endif
-noinst_PROGRAMS = libcodec_ulaw.so libcodec_alaw.so $(GSM_LIB) $(SPEEX_LIB) $(ILBC_LIB)
+noinst_PROGRAMS = libcodec_ulaw.so libcodec_alaw.so $(GSM_LIB) $(SPEEX_NB_LIB) $(SPEEX_WB_LIB) $(ILBC_LIB)
noinst_HEADERS = audiocodec.h
@@ -48,8 +57,8 @@ libcodec_alaw_so_LDFLAGS = --shared -lc
-install-exec-local: install-libcodec_ulaw_so install-libcodec_alaw_so $(INSTALL_GSM_RULE) $(INSTALL_SPEEX_RULE) $(INSTALL_ILBC_RULE)
-uninstall-local: uninstall-libcodec_ulaw_so uninstall-libcodec_alaw_so uninstall-libcodec_gsm_so uninstall-libcodec_speex_so
+install-exec-local: install-libcodec_ulaw_so install-libcodec_alaw_so $(INSTALL_GSM_RULE) $(INSTALL_SPEEX_NB_RULE) $(INSTALL_SPEEX_WB_RULE) $(INSTALL_ILBC_RULE)
+uninstall-local: uninstall-libcodec_ulaw_so uninstall-libcodec_alaw_so uninstall-libcodec_gsm_so uninstall-libcodec_speex_nb_so uninstall-libcodec_speex_wb_so
install-libcodec_ulaw_so: libcodec_ulaw.so
mkdir -p $(sflcodecdir)
@@ -58,8 +67,10 @@ install-libcodec_alaw_so: libcodec_alaw.so
$(INSTALL_PROGRAM) libcodec_alaw.so $(sflcodecdir)
install-libcodec_gsm_so: libcodec_gsm.so
$(INSTALL_PROGRAM) libcodec_gsm.so $(sflcodecdir)
-install-libcodec_speex_so: libcodec_speex.so
- $(INSTALL_PROGRAM) libcodec_speex.so $(sflcodecdir)
+install-libcodec_speex_nb_so: libcodec_speex_nb.so
+ $(INSTALL_PROGRAM) libcodec_speex_nb.so $(sflcodecdir)
+install-libcodec_speex_wb_so: libcodec_speex_wb.so
+ $(INSTALL_PROGRAM) libcodec_speex_wb.so $(sflcodecdir)
install-libcodec_ilbc_so: libcodec_ilbc.so
$(INSTALL_PROGRAM) libcodec_ilbc.so $(sflcodecdir)
@@ -70,8 +81,10 @@ uninstall-libcodec_alaw_so:
rm -f $(sflcodecdir)/libcodec_alaw.so
uninstall-libcodec_gsm_so:
rm -f $(sflcodecdir)/libcodec_gsm.so
-uninstall-libcodec_speex_so:
- rm -f $(sflcodecdir)/libcodec_speex.so
+uninstall-libcodec_speex_nb_so:
+ rm -f $(sflcodecdir)/libcodec_speex_nb.so
+uninstall-libcodec_speex_wb_so:
+ rm -f $(sflcodecdir)/libcodec_speex_wb.so
rm -rf $(sflcodecdir)
uninstall-libcodec_ilbc_so:
rm -f $(sflcodecdir)/libcodec_ilbc.so
diff --git a/sflphone-common/src/audio/codecs/alaw.cpp b/sflphone-common/src/audio/codecs/alaw.cpp
index 807d518bab0880b579c09f9ba5505f607d27af54..8949836b6db847d447cfb3abb022914cfc5cb816 100644
--- a/sflphone-common/src/audio/codecs/alaw.cpp
+++ b/sflphone-common/src/audio/codecs/alaw.cpp
@@ -28,6 +28,7 @@ public:
: AudioCodec(payload, "PCMA")
{
_clockRate = 8000;
+ _frameSize = 160; // 20 ms at 8kHz
_channel = 1;
_bitrate = 64;
_bandwidth = 80;
diff --git a/sflphone-common/src/audio/codecs/audiocodec.h b/sflphone-common/src/audio/codecs/audiocodec.h
index 3b7101a1967cdf3ba2c264ad53c8b92e54c0a394..f465463b9037dac85a8799bae80ad1d7824b20cb 100644
--- a/sflphone-common/src/audio/codecs/audiocodec.h
+++ b/sflphone-common/src/audio/codecs/audiocodec.h
@@ -16,6 +16,9 @@ protected:
/** Number of channel 1 = mono, 2 = stereo */
unsigned int _channel;
+ /** codec frame size */
+ unsigned int _frameSize;
+
/** Bitrate */
double _bitrate;
/** Bandwidth */
@@ -59,6 +62,7 @@ public:
int getPayload( void ) { return _payload; }
bool hasDynamicPayload( void ) { return _hasDynamicPayload; }
unsigned int getClockRate( void ) { return _clockRate; }
+ unsigned int getFrameSize( void ) { return _frameSize; }
unsigned int getChannel( void ) { return _channel; }
bool getState( void ) { return _state; }
void setState(bool b) { _state = b; }
diff --git a/sflphone-common/src/audio/codecs/speexcodec.cpp b/sflphone-common/src/audio/codecs/speexcodec_nb.cpp
similarity index 94%
rename from sflphone-common/src/audio/codecs/speexcodec.cpp
rename to sflphone-common/src/audio/codecs/speexcodec_nb.cpp
index a2442cbfe869a26af242f4f6b67cbf7ec0326c3b..b2bfb7a07f54b2c5a86ab59c00434ea0a101cd4c 100644
--- a/sflphone-common/src/audio/codecs/speexcodec.cpp
+++ b/sflphone-common/src/audio/codecs/speexcodec_nb.cpp
@@ -36,6 +36,7 @@ class Speex : public AudioCodec{
_preprocess_state()
{
_clockRate = 8000;
+ _frameSize = 160; // 20 ms at 8kHz
_channel = 1;
_bitrate = 0;
_bandwidth = 0;
@@ -47,9 +48,12 @@ class Speex : public AudioCodec{
void initSpeex() {
+ int _samplingRate = 8000;
+
// 8000 HZ --> Narrow-band mode
// TODO Manage the other modes
_speexModePtr = &speex_nb_mode;
+ // _speexModePtr = &speex_wb_mode;
// Init the decoder struct
speex_bits_init(&_speex_dec_bits);
@@ -59,6 +63,10 @@ class Speex : public AudioCodec{
speex_bits_init(&_speex_enc_bits);
_speex_enc_state = speex_encoder_init(_speexModePtr);
+ speex_encoder_ctl(_speex_enc_state,SPEEX_SET_SAMPLING_RATE,&_clockRate);
+
+ speex_decoder_ctl(_speex_dec_state, SPEEX_GET_FRAME_SIZE, &_speex_frame_size);
+
#ifdef HAVE_SPEEXDSP_LIB
int enable = 1;
@@ -81,7 +89,7 @@ class Speex : public AudioCodec{
speex_preprocess_ctl(_preprocess_state, SPEEX_PREPROCESS_SET_VAD, &enable);
speex_preprocess_ctl(_preprocess_state, SPEEX_PREPROCESS_SET_AGC, &enable);
#endif
-
+
}
~Speex()
@@ -102,7 +110,8 @@ class Speex : public AudioCodec{
}
virtual int codecDecode (short *dst, unsigned char *src, unsigned int size)
- {
+ {
+
int ratio = 320 / _speex_frame_size;
speex_bits_read_from(&_speex_dec_bits, (char*)src, size);
speex_decode_int(_speex_dec_state, &_speex_dec_bits, dst);
@@ -115,12 +124,12 @@ class Speex : public AudioCodec{
speex_bits_reset(&_speex_enc_bits);
#ifdef HAVE_SPEEXDSP_LIB
- speex_encoder_ctl(_speex_enc_state,SPEEX_SET_SAMPLING_RATE,&_clockRate);
+
speex_preprocess_run(_preprocess_state, src);
#endif
speex_encode_int(_speex_enc_state, src, &_speex_enc_bits);
- int nbBytes = speex_bits_write(&_speex_enc_bits, (char*)dst, size);
+ int nbBytes = speex_bits_write(&_speex_enc_bits, (char*)dst, size);
return nbBytes;
}
diff --git a/sflphone-common/src/audio/codecs/speexcodec_wb.cpp b/sflphone-common/src/audio/codecs/speexcodec_wb.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..81d27bbcb0eebee7d7a75687bf82c0a8e410b9b6
--- /dev/null
+++ b/sflphone-common/src/audio/codecs/speexcodec_wb.cpp
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2007-2009 Savoir-Faire Linux inc.
+ * Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
+ * Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "audiocodec.h"
+#include <cstdio>
+#include <speex/speex.h>
+#include <speex/speex_preprocess.h>
+
+class Speex : public AudioCodec{
+ public:
+ Speex(int payload=0)
+ : AudioCodec(payload, "speex"),
+ _speexModePtr(NULL),
+ _speex_dec_bits(),
+ _speex_enc_bits(),
+ _speex_dec_state(),
+ _speex_enc_state(),
+ _speex_frame_size(),
+ _preprocess_state()
+ {
+ _clockRate = 16000;
+ _frameSize = 320; // 20 ms at 16 kHz
+ _channel = 1;
+ _bitrate = 0;
+ _bandwidth = 0;
+ initSpeex();
+ }
+
+ Speex( const Speex& );
+ Speex& operator=(const Speex&);
+
+ void initSpeex() {
+
+ int _samplingRate = 16000;
+
+ // 8000 HZ --> Narrow-band mode
+ // TODO Manage the other modes
+ _speexModePtr = &speex_wb_mode;
+ // _speexModePtr = &speex_wb_mode;
+
+ // Init the decoder struct
+ speex_bits_init(&_speex_dec_bits);
+ _speex_dec_state = speex_decoder_init(_speexModePtr);
+
+ // Init the encoder struct
+ speex_bits_init(&_speex_enc_bits);
+ _speex_enc_state = speex_encoder_init(_speexModePtr);
+
+ speex_encoder_ctl(_speex_enc_state,SPEEX_SET_SAMPLING_RATE,&_clockRate);
+
+ speex_decoder_ctl(_speex_dec_state, SPEEX_GET_FRAME_SIZE, &_speex_frame_size);
+
+#ifdef HAVE_SPEEXDSP_LIB
+
+ int enable = 1;
+ int quality = 10;
+ int complex = 10;
+ int attenuation = -10;
+
+ speex_encoder_ctl(_speex_enc_state, SPEEX_SET_VAD, &enable);
+ speex_encoder_ctl(_speex_enc_state, SPEEX_SET_DTX, &enable);
+ speex_encoder_ctl(_speex_enc_state, SPEEX_SET_VBR_QUALITY, &quality);
+ speex_encoder_ctl(_speex_enc_state, SPEEX_SET_COMPLEXITY, &complex);
+
+ // Init the decoder struct
+ speex_decoder_ctl(_speex_dec_state, SPEEX_GET_FRAME_SIZE, &_speex_frame_size);
+
+ // Init the preprocess struct
+ _preprocess_state = speex_preprocess_state_init(_speex_frame_size,_clockRate);
+ speex_preprocess_ctl(_preprocess_state, SPEEX_PREPROCESS_SET_DENOISE, &enable);
+ speex_preprocess_ctl(_preprocess_state, SPEEX_PREPROCESS_SET_NOISE_SUPPRESS, &attenuation);
+ speex_preprocess_ctl(_preprocess_state, SPEEX_PREPROCESS_SET_VAD, &enable);
+ speex_preprocess_ctl(_preprocess_state, SPEEX_PREPROCESS_SET_AGC, &enable);
+#endif
+
+ }
+
+ ~Speex()
+ {
+ terminateSpeex();
+ }
+
+ void terminateSpeex() {
+ // Destroy the decoder struct
+ speex_bits_destroy(&_speex_dec_bits);
+ speex_decoder_destroy(_speex_dec_state);
+ _speex_dec_state = 0;
+
+ // Destroy the encoder struct
+ speex_bits_destroy(&_speex_enc_bits);
+ speex_encoder_destroy(_speex_enc_state);
+ _speex_enc_state = 0;
+ }
+
+ virtual int codecDecode (short *dst, unsigned char *src, unsigned int size)
+ {
+
+ int ratio = 320 / _speex_frame_size;
+ speex_bits_read_from(&_speex_dec_bits, (char*)src, size);
+ speex_decode_int(_speex_dec_state, &_speex_dec_bits, dst);
+
+ return 2 * _speex_frame_size * ratio;
+ }
+
+ virtual int codecEncode (unsigned char *dst, short *src, unsigned int size)
+ {
+ speex_bits_reset(&_speex_enc_bits);
+
+#ifdef HAVE_SPEEXDSP_LIB
+
+ speex_preprocess_run(_preprocess_state, src);
+#endif
+
+ speex_encode_int(_speex_enc_state, src, &_speex_enc_bits);
+ int nbBytes = speex_bits_write(&_speex_enc_bits, (char*)dst, size);
+ printf("Codec::codecEncode() nbBytes: %i \n",nbBytes);
+ return nbBytes;
+ }
+
+ private:
+ const SpeexMode* _speexModePtr;
+ SpeexBits _speex_dec_bits;
+ SpeexBits _speex_enc_bits;
+ void *_speex_dec_state;
+ void *_speex_enc_state;
+ int _speex_frame_size;
+ SpeexPreprocessState *_preprocess_state;
+};
+
+// the class factories
+extern "C" AudioCodec* create() {
+ return new Speex(111);
+}
+
+extern "C" void destroy(AudioCodec* a) {
+ delete a;
+}
+
diff --git a/sflphone-common/src/audio/codecs/ulaw.cpp b/sflphone-common/src/audio/codecs/ulaw.cpp
index 6d44bff13c0ff27272a39d45e0c913fdb985619a..a7be89936a14281abd8a06fa95e0997c7844ee22 100644
--- a/sflphone-common/src/audio/codecs/ulaw.cpp
+++ b/sflphone-common/src/audio/codecs/ulaw.cpp
@@ -30,6 +30,7 @@ public:
: AudioCodec(payload, "PCMU")
{
_clockRate = 8000;
+ _frameSize = 160; // 20 ms at 8kHz
_channel = 1;
_bitrate = 64;
_bandwidth = 80;
diff --git a/src/audio/codecs/celtcodec.cpp b/src/audio/codecs/celtcodec.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..3dc61c7c2b9a09b4b70302da013d269c3d773501
--- /dev/null
+++ b/src/audio/codecs/celtcodec.cpp
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2007-2009 Savoir-Faire Linux inc.
+ * Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
+ * Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "audiocodec.h"
+#include <cstdio>
+#include <celt/celt.h>
+
+
+class Celt : public AudioCodec{
+ public:
+ Celt(int payload=0)
+ : AudioCodec(payload, "celt"),
+ _celt_frame_size(128)
+ {
+ _clockRate = 44100;
+ _channel = 1;
+ _bitrate = 0;
+ _bandwidth = 0;
+ initCelt();
+ }
+
+ Celt( const Celt& );
+ Celt& operator=(const Celt&);
+
+ void initCelt() {
+ printf("init celt");
+
+ mode = celt_mode_create(_clockRate, _channel, _celt_frame_size, NULL);
+ // celt_mode_info(mode, CELT_GET_LOOKAHEAD, &skip);
+
+ if (mode == NULL)
+ {
+ printf("failed to create a mode\n");
+ }
+
+ // bytes_per_packet = 1024;
+ // if (bytes_per_packet < 0 || bytes_per_packet > MAX_PACKET)
+ // {
+ // printf ("bytes per packet must be between 0 and %d\n");
+ // }
+
+ // celt_mode_info(mode, CELT_GET_FRAME_SIZE, &frame_size);
+ // celt_mode_info(mode, CELT_GET_NB_CHANNELS, &_channel);
+
+ enc = celt_encoder_create(mode);
+ dec = celt_decoder_create(mode);
+
+ }
+
+ ~Celt()
+ {
+ terminateCelt();
+ }
+
+ void terminateCelt() {
+
+ celt_encoder_destroy(enc);
+ celt_decoder_destroy(dec);
+ }
+
+ virtual int codecDecode (short *dst, unsigned char *src, unsigned int size)
+ {
+ int len = 0;
+ len = celt_decode(dec, src, size, (celt_int16_t*)dst);
+ return len;
+ }
+
+ virtual int codecEncode (unsigned char *dst, short *src, unsigned int size)
+ {
+ int len = 0;
+ len = celt_encode(enc, (celt_int16_t *)src, NULL, dst, size);
+ return len;
+ }
+
+ private:
+
+ CELTMode *mode;
+
+ CELTEncoder *enc;
+ CELTDecoder *dec;
+
+ celt_int32_t _celt_frame_size;
+ celt_int32_t skip;
+
+};
+
+// the class factories
+extern "C" AudioCodec* create() {
+ return new Celt(115);
+}
+
+extern "C" void destroy(AudioCodec* a) {
+ delete a;
+}
+
diff --git a/src/audio/codecs/speexcodec_nb.cpp b/src/audio/codecs/speexcodec_nb.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..72b3c36d0dadff319f236358b05be1e389f49ca4
--- /dev/null
+++ b/src/audio/codecs/speexcodec_nb.cpp
@@ -0,0 +1,154 @@
+/*
+ * Copyright (C) 2007-2009 Savoir-Faire Linux inc.
+ * Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
+ * Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "audiocodec.h"
+#include <cstdio>
+#include <speex/speex.h>
+#include <speex/speex_preprocess.h>
+
+class Speex : public AudioCodec{
+ public:
+ Speex(int payload=0)
+ : AudioCodec(payload, "speex"),
+ _speexModePtr(NULL),
+ _speex_dec_bits(),
+ _speex_enc_bits(),
+ _speex_dec_state(),
+ _speex_enc_state(),
+ _speex_frame_size(),
+ _preprocess_state()
+ {
+ _clockRate = 8000;
+ _channel = 1;
+ _bitrate = 0;
+ _bandwidth = 0;
+ initSpeex();
+ }
+
+ Speex( const Speex& );
+ Speex& operator=(const Speex&);
+
+ void initSpeex() {
+
+ int _samplingRate = 8000;
+
+ // 8000 HZ --> Narrow-band mode
+ // TODO Manage the other modes
+ _speexModePtr = &speex_nb_mode;
+ // _speexModePtr = &speex_wb_mode;
+
+ // Init the decoder struct
+ speex_bits_init(&_speex_dec_bits);
+ _speex_dec_state = speex_decoder_init(_speexModePtr);
+
+ // Init the encoder struct
+ speex_bits_init(&_speex_enc_bits);
+ _speex_enc_state = speex_encoder_init(_speexModePtr);
+
+ speex_encoder_ctl(_speex_enc_state,SPEEX_SET_SAMPLING_RATE,&_clockRate);
+
+ speex_decoder_ctl(_speex_dec_state, SPEEX_GET_FRAME_SIZE, &_speex_frame_size);
+
+#ifdef HAVE_SPEEXDSP_LIB
+
+ int enable = 1;
+ int quality = 10;
+ int complex = 10;
+ int attenuation = -10;
+
+ speex_encoder_ctl(_speex_enc_state, SPEEX_SET_VAD, &enable);
+ speex_encoder_ctl(_speex_enc_state, SPEEX_SET_DTX, &enable);
+ speex_encoder_ctl(_speex_enc_state, SPEEX_SET_VBR_QUALITY, &quality);
+ speex_encoder_ctl(_speex_enc_state, SPEEX_SET_COMPLEXITY, &complex);
+
+ // Init the decoder struct
+ speex_decoder_ctl(_speex_dec_state, SPEEX_GET_FRAME_SIZE, &_speex_frame_size);
+
+ // Init the preprocess struct
+ _preprocess_state = speex_preprocess_state_init(_speex_frame_size,_clockRate);
+ speex_preprocess_ctl(_preprocess_state, SPEEX_PREPROCESS_SET_DENOISE, &enable);
+ speex_preprocess_ctl(_preprocess_state, SPEEX_PREPROCESS_SET_NOISE_SUPPRESS, &attenuation);
+ speex_preprocess_ctl(_preprocess_state, SPEEX_PREPROCESS_SET_VAD, &enable);
+ speex_preprocess_ctl(_preprocess_state, SPEEX_PREPROCESS_SET_AGC, &enable);
+#endif
+
+ }
+
+ ~Speex()
+ {
+ terminateSpeex();
+ }
+
+ void terminateSpeex() {
+ // Destroy the decoder struct
+ speex_bits_destroy(&_speex_dec_bits);
+ speex_decoder_destroy(_speex_dec_state);
+ _speex_dec_state = 0;
+
+ // Destroy the encoder struct
+ speex_bits_destroy(&_speex_enc_bits);
+ speex_encoder_destroy(_speex_enc_state);
+ _speex_enc_state = 0;
+ }
+
+ virtual int codecDecode (short *dst, unsigned char *src, unsigned int size)
+ {
+
+ int ratio = 320 / _speex_frame_size;
+ speex_bits_read_from(&_speex_dec_bits, (char*)src, size);
+ speex_decode_int(_speex_dec_state, &_speex_dec_bits, dst);
+
+ return _speex_frame_size * ratio;
+ }
+
+ virtual int codecEncode (unsigned char *dst, short *src, unsigned int size)
+ {
+ speex_bits_reset(&_speex_enc_bits);
+
+#ifdef HAVE_SPEEXDSP_LIB
+
+ speex_preprocess_run(_preprocess_state, src);
+#endif
+
+ speex_encode_int(_speex_enc_state, src, &_speex_enc_bits);
+ int nbBytes = speex_bits_write(&_speex_enc_bits, (char*)dst, size);
+ printf("Codec::codecEncode() nbBytes: %i \n",nbBytes);
+ return nbBytes;
+ }
+
+ private:
+ const SpeexMode* _speexModePtr;
+ SpeexBits _speex_dec_bits;
+ SpeexBits _speex_enc_bits;
+ void *_speex_dec_state;
+ void *_speex_enc_state;
+ int _speex_frame_size;
+ SpeexPreprocessState *_preprocess_state;
+};
+
+// the class factories
+extern "C" AudioCodec* create() {
+ return new Speex(110);
+}
+
+extern "C" void destroy(AudioCodec* a) {
+ delete a;
+}
+
diff --git a/src/audio/codecs/speexcodec_wb.cpp b/src/audio/codecs/speexcodec_wb.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e86b3d724ef7b21040f7da61af96461fbd899685
--- /dev/null
+++ b/src/audio/codecs/speexcodec_wb.cpp
@@ -0,0 +1,154 @@
+/*
+ * Copyright (C) 2007-2009 Savoir-Faire Linux inc.
+ * Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
+ * Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "audiocodec.h"
+#include <cstdio>
+#include <speex/speex.h>
+#include <speex/speex_preprocess.h>
+
+class Speex : public AudioCodec{
+ public:
+ Speex(int payload=0)
+ : AudioCodec(payload, "speex"),
+ _speexModePtr(NULL),
+ _speex_dec_bits(),
+ _speex_enc_bits(),
+ _speex_dec_state(),
+ _speex_enc_state(),
+ _speex_frame_size(),
+ _preprocess_state()
+ {
+ _clockRate = 16000;
+ _channel = 1;
+ _bitrate = 0;
+ _bandwidth = 0;
+ initSpeex();
+ }
+
+ Speex( const Speex& );
+ Speex& operator=(const Speex&);
+
+ void initSpeex() {
+
+ int _samplingRate = 16000;
+
+ // 8000 HZ --> Narrow-band mode
+ // TODO Manage the other modes
+ _speexModePtr = &speex_wb_mode;
+ // _speexModePtr = &speex_wb_mode;
+
+ // Init the decoder struct
+ speex_bits_init(&_speex_dec_bits);
+ _speex_dec_state = speex_decoder_init(_speexModePtr);
+
+ // Init the encoder struct
+ speex_bits_init(&_speex_enc_bits);
+ _speex_enc_state = speex_encoder_init(_speexModePtr);
+
+ speex_encoder_ctl(_speex_enc_state,SPEEX_SET_SAMPLING_RATE,&_clockRate);
+
+ speex_decoder_ctl(_speex_dec_state, SPEEX_GET_FRAME_SIZE, &_speex_frame_size);
+
+#ifdef HAVE_SPEEXDSP_LIB
+
+ int enable = 1;
+ int quality = 10;
+ int complex = 10;
+ int attenuation = -10;
+
+ speex_encoder_ctl(_speex_enc_state, SPEEX_SET_VAD, &enable);
+ speex_encoder_ctl(_speex_enc_state, SPEEX_SET_DTX, &enable);
+ speex_encoder_ctl(_speex_enc_state, SPEEX_SET_VBR_QUALITY, &quality);
+ speex_encoder_ctl(_speex_enc_state, SPEEX_SET_COMPLEXITY, &complex);
+
+ // Init the decoder struct
+ speex_decoder_ctl(_speex_dec_state, SPEEX_GET_FRAME_SIZE, &_speex_frame_size);
+
+ // Init the preprocess struct
+ _preprocess_state = speex_preprocess_state_init(_speex_frame_size,_clockRate);
+ speex_preprocess_ctl(_preprocess_state, SPEEX_PREPROCESS_SET_DENOISE, &enable);
+ speex_preprocess_ctl(_preprocess_state, SPEEX_PREPROCESS_SET_NOISE_SUPPRESS, &attenuation);
+ speex_preprocess_ctl(_preprocess_state, SPEEX_PREPROCESS_SET_VAD, &enable);
+ speex_preprocess_ctl(_preprocess_state, SPEEX_PREPROCESS_SET_AGC, &enable);
+#endif
+
+ }
+
+ ~Speex()
+ {
+ terminateSpeex();
+ }
+
+ void terminateSpeex() {
+ // Destroy the decoder struct
+ speex_bits_destroy(&_speex_dec_bits);
+ speex_decoder_destroy(_speex_dec_state);
+ _speex_dec_state = 0;
+
+ // Destroy the encoder struct
+ speex_bits_destroy(&_speex_enc_bits);
+ speex_encoder_destroy(_speex_enc_state);
+ _speex_enc_state = 0;
+ }
+
+ virtual int codecDecode (short *dst, unsigned char *src, unsigned int size)
+ {
+
+ int ratio = 320 / _speex_frame_size;
+ speex_bits_read_from(&_speex_dec_bits, (char*)src, size);
+ speex_decode_int(_speex_dec_state, &_speex_dec_bits, dst);
+
+ return 2 * _speex_frame_size * ratio;
+ }
+
+ virtual int codecEncode (unsigned char *dst, short *src, unsigned int size)
+ {
+ speex_bits_reset(&_speex_enc_bits);
+
+#ifdef HAVE_SPEEXDSP_LIB
+
+ speex_preprocess_run(_preprocess_state, src);
+#endif
+
+ speex_encode_int(_speex_enc_state, src, &_speex_enc_bits);
+ int nbBytes = speex_bits_write(&_speex_enc_bits, (char*)dst, size);
+ printf("Codec::codecEncode() nbBytes: %i \n",nbBytes);
+ return nbBytes;
+ }
+
+ private:
+ const SpeexMode* _speexModePtr;
+ SpeexBits _speex_dec_bits;
+ SpeexBits _speex_enc_bits;
+ void *_speex_dec_state;
+ void *_speex_enc_state;
+ int _speex_frame_size;
+ SpeexPreprocessState *_preprocess_state;
+};
+
+// the class factories
+extern "C" AudioCodec* create() {
+ return new Speex(111);
+}
+
+extern "C" void destroy(AudioCodec* a) {
+ delete a;
+}
+
diff --git a/src/audio/codecs/vorbiscodec.cpp b/src/audio/codecs/vorbiscodec.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..2395fa2d200bd958c6997a7db60f05741be336bd
--- /dev/null
+++ b/src/audio/codecs/vorbiscodec.cpp
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2007-2009 Savoir-Faire Linux inc.
+ * Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
+ * Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "audiocodec.h"
+#include <cstdio>
+#include <math.h>
+#include <vorbis/vorbis.h>
+#include <vorbis/codec.h>
+#include <vorbis/vorbisenc.h>
+
+class Vorbis : public AudioCodec{
+ public:
+ Vorbis(int payload=0)
+ : AudioCodec(payload, "vorbis"),
+ _ogg_stream_state(),
+ _ogg_packet(),
+ _vorbis_info(),
+ _vorbis_comment(),
+ _vorbis_dsp_state(),
+ _vorbis_block()
+ {
+ _clockRate = 8000;
+ _channel = 1;
+ _bitrate = 0;
+ _bandwidth = 0;
+ initVorbis();
+ }
+
+ Vorbis( const Vorbis& );
+ Vorbis& operator=(const Vorbis&);
+
+ void initVorbis() {
+
+ // init the encoder
+ vorbis_info_init(&_vorbis_info);
+ vorbis_encode_init_vbr(&_vorbis_info,0.5);
+
+ vorbis_comment_init(&_vorbis_comment);
+
+ vorbis_analysis_init(&_vorbis_dsp_state, &_vorbis_info);
+
+ // random number for ogg serial number
+ srand(time(NULL));
+
+ }
+
+ ~Vorbis()
+ {
+ terminateVorbis();
+ }
+
+ void terminateVorbis() {
+
+ vorbis_block_clear(&_vorbis_block);
+ vorbis_dsp_clear(&_vorbis_dsp_state);
+ vorbis_comment_clear(&_vorbis_comment);
+ vorbis_info_clear(&_vorbis_info);
+ }
+
+ virtual int codecDecode (short *dst, unsigned char *src, unsigned int size)
+ {
+
+
+ return 1;
+ }
+
+ virtual int codecEncode (unsigned char *dst, short *src, unsigned int size)
+ {
+
+ return 1;
+ }
+
+ private:
+
+ // ogg-vorbis specific variables
+ ogg_sync_state oy;
+
+ ogg_stream_state _ogg_stream_state;
+
+ ogg_packet _ogg_packet;
+
+ vorbis_info _vorbis_info;
+
+ vorbis_comment _vorbis_comment;
+
+ vorbis_dsp_state _vorbis_dsp_state;
+
+ vorbis_block _vorbis_block;
+
+
+};
+
+// the class factories
+extern "C" AudioCodec* create() {
+ return new Vorbis(117);
+}
+
+extern "C" void destroy(AudioCodec* a) {
+ delete a;
+}
+