r22822 - in /desktop/unstable/gnome-user-share/debian: changelog patches/02_bluetooth_optional.patch patches/90_relibtoolize.patch
dktrkranz at users.alioth.debian.org
dktrkranz at users.alioth.debian.org
Sun Jan 17 23:35:41 UTC 2010
Author: dktrkranz
Date: Sun Jan 17 23:35:40 2010
New Revision: 22822
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22822
Log:
* debian/patches/02_bluetooth_optional.patch:
- Re-add HAVE_BLUETOOTH macro, erroneously removed (Closes: #563614).
* debian/patches/90_relibtoolize.patch:
- Regenerate to pick the above change.
Modified:
desktop/unstable/gnome-user-share/debian/changelog
desktop/unstable/gnome-user-share/debian/patches/02_bluetooth_optional.patch
desktop/unstable/gnome-user-share/debian/patches/90_relibtoolize.patch
Modified: desktop/unstable/gnome-user-share/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-user-share/debian/changelog?rev=22822&op=diff
==============================================================================
--- desktop/unstable/gnome-user-share/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-user-share/debian/changelog [utf-8] Sun Jan 17 23:35:40 2010
@@ -1,3 +1,12 @@
+gnome-user-share (2.28.2-4) unstable; urgency=low
+
+ * debian/patches/02_bluetooth_optional.patch:
+ - Re-add HAVE_BLUETOOTH macro, erroneously removed (Closes: #563614).
+ * debian/patches/90_relibtoolize.patch:
+ - Regenerate to pick the above change.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Mon, 18 Jan 2010 00:33:29 +0100
+
gnome-user-share (2.28.2-3) unstable; urgency=low
* debian/control.in:
Modified: desktop/unstable/gnome-user-share/debian/patches/02_bluetooth_optional.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-user-share/debian/patches/02_bluetooth_optional.patch?rev=22822&op=diff
==============================================================================
--- desktop/unstable/gnome-user-share/debian/patches/02_bluetooth_optional.patch [utf-8] (original)
+++ desktop/unstable/gnome-user-share/debian/patches/02_bluetooth_optional.patch [utf-8] Sun Jan 17 23:35:40 2010
@@ -1,8 +1,8 @@
Index: gnome-user-share-2.28.2/configure.in
===================================================================
---- gnome-user-share-2.28.2.orig/configure.in 2009-12-11 13:06:12.000000000 +0000
-+++ gnome-user-share-2.28.2/configure.in 2009-12-22 21:02:11.000000000 +0000
-@@ -56,7 +56,7 @@
+--- gnome-user-share-2.28.1.orig/configure.in 2009-11-14 12:13:07.854729773 +0100
++++ gnome-user-share-2.28.2/configure.in 2009-11-14 12:39:34.070725737 +0100
+@@ -56,10 +56,21 @@ if $have_dbus_1_1 ; then
AC_DEFINE(HAVE_DBUS_1_1, 1, [Set to true if we have D-BUS 1.1])
fi
@@ -11,10 +11,24 @@
AC_SUBST(USER_SHARE_CFLAGS)
AC_SUBST(USER_SHARE_LIBS)
++PKG_CHECK_MODULES(BLUETOOTH, gnome-bluetooth-1.0 >= 2.27.7.2,
++ have_bluetooth=true, have_bluetooth=false)
++AC_SUBST(BLUETOOTH_CFLAGS)
++AC_SUBST(BLUETOOTH_LIBS)
++if $have_bluetooth; then
++ AC_DEFINE(HAVE_BLUETOOTH, 1, [Set to true if gnome-bluetooth support is available])
++else
++ AC_MSG_WARN([Bluetooth support is disabled.])
++fi
++AM_CONDITIONAL(USE_BLUETOOTH, [test "$have_bluetooth" = "true"])
++
+ PKG_CHECK_MODULES(USER_SHARE_CONFIG, glib-2.0 >= 2.15.2 gtk+-2.0 >= 2.12.0 gconf-2.0 unique-1.0)
+ AC_SUBST(USER_SHARE_CONFIG_CFLAGS)
+ AC_SUBST(USER_SHARE_CONFIG_LIBS)
Index: gnome-user-share-2.28.2/data/file-share-properties.ui
===================================================================
---- gnome-user-share-2.28.2.orig/data/file-share-properties.ui 2009-06-29 09:41:06.000000000 +0000
-+++ gnome-user-share-2.28.2/data/file-share-properties.ui 2009-12-22 21:01:49.000000000 +0000
+--- gnome-user-share-2.28.1.orig/data/file-share-properties.ui 2009-11-14 13:00:50.210239213 +0100
++++ gnome-user-share-2.28.2/data/file-share-properties.ui 2009-11-14 13:05:19.554734880 +0100
@@ -19,7 +19,7 @@
<property name="border_width">5</property>
<property name="spacing">18</property>
@@ -48,9 +62,9 @@
<object class="GtkLabel" id="label8">
Index: gnome-user-share-2.28.2/src/Makefile.am
===================================================================
---- gnome-user-share-2.28.2.orig/src/Makefile.am 2009-12-11 13:05:50.000000000 +0000
-+++ gnome-user-share-2.28.2/src/Makefile.am 2009-12-22 21:01:49.000000000 +0000
-@@ -27,6 +27,7 @@
+--- gnome-user-share-2.28.1.orig/src/Makefile.am 2009-11-14 12:30:35.090220661 +0100
++++ gnome-user-share-2.28.2/src/Makefile.am 2009-11-14 12:38:26.518727652 +0100
+@@ -27,6 +27,7 @@ INCLUDES= \
-I$(top_srcdir) \
-I$(top_builddir) \
$(USER_SHARE_CFLAGS) \
@@ -58,7 +72,7 @@
$(USER_SHARE_CONFIG_CFLAGS) \
$(X_CFLAGS)
-@@ -37,10 +38,6 @@
+@@ -37,10 +38,6 @@ gnome_user_share_SOURCES = \
user_share-private.c \
http.c \
http.h \
@@ -69,7 +83,7 @@
$(MARSHALFILES)
gnome_user_share_LDADD = \
-@@ -48,6 +45,15 @@
+@@ -48,6 +45,15 @@ gnome_user_share_LDADD = \
$(SELINUX_LIBS) \
$(X_LIBS) $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS)
@@ -87,9 +101,9 @@
user_share-private.h \
Index: gnome-user-share-2.28.2/src/file-share-properties.c
===================================================================
---- gnome-user-share-2.28.2.orig/src/file-share-properties.c 2009-12-11 13:05:50.000000000 +0000
-+++ gnome-user-share-2.28.2/src/file-share-properties.c 2009-12-22 21:01:49.000000000 +0000
-@@ -86,26 +86,39 @@
+--- gnome-user-share-2.28.1.orig/src/file-share-properties.c 2009-11-14 13:06:00.178228925 +0100
++++ gnome-user-share-2.28.2/src/file-share-properties.c 2009-11-14 13:18:52.310730263 +0100
+@@ -86,26 +86,39 @@ static void
update_ui (void)
{
GConfClient *client;
@@ -130,7 +144,7 @@
bluetooth_enabled = gconf_client_get_bool (client,
FILE_SHARING_BLUETOOTH_ENABLED,
NULL);
-@@ -122,23 +135,24 @@
+@@ -122,23 +135,24 @@ update_ui (void)
FILE_SHARING_BLUETOOTH_OBEXPUSH_NOTIFY,
NULL);
@@ -159,7 +173,7 @@
/* Network */
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), enabled);
-@@ -148,7 +162,9 @@
+@@ -148,7 +162,9 @@ update_ui (void)
gtk_combo_box_set_active (GTK_COMBO_BOX (password_combo),
password_setting);
@@ -169,7 +183,7 @@
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (bluetooth_check), bluetooth_enabled);
gtk_widget_set_sensitive (allow_write_bluetooth_check, bluetooth_enabled);
gtk_widget_set_sensitive (require_pairing_check, bluetooth_enabled);
-@@ -159,6 +175,7 @@
+@@ -159,6 +175,7 @@ update_ui (void)
require_pairing_enabled);
/* Bluetooth ObexPush */
@@ -177,7 +191,7 @@
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (enable_obexpush_check), bluetooth_obexpush_enabled);
gtk_widget_set_sensitive (accept_obexpush_combo, bluetooth_obexpush_enabled);
gtk_widget_set_sensitive (notify_received_obexpush_check, bluetooth_obexpush_enabled);
-@@ -168,6 +185,7 @@
+@@ -168,6 +185,7 @@ update_ui (void)
gtk_combo_box_set_active (GTK_COMBO_BOX (accept_obexpush_combo),
accept_setting);
@@ -185,7 +199,7 @@
g_object_unref (client);
}
-@@ -190,6 +208,7 @@
+@@ -190,6 +208,7 @@ password_required_changed (GConfClient*
update_ui ();
}
@@ -193,7 +207,7 @@
static void
file_sharing_bluetooth_enabled_changed (GConfClient* client,
guint cnxn_id,
-@@ -243,6 +262,7 @@
+@@ -243,6 +262,7 @@ file_sharing_bluetooth_obexpush_notify_c
{
update_ui ();
}
@@ -201,7 +215,7 @@
static void
password_combo_changed (GtkComboBox *combo_box)
-@@ -283,6 +303,7 @@
+@@ -283,6 +303,7 @@ launch_share (void)
}
}
@@ -209,7 +223,7 @@
static void
enable_bluetooth_check_toggled (GtkWidget *check)
{
-@@ -303,6 +324,7 @@
+@@ -303,6 +324,7 @@ enable_bluetooth_check_toggled (GtkWidge
if (enabled != FALSE)
launch_share ();
}
@@ -217,7 +231,7 @@
static void
enable_check_toggled (GtkWidget *check)
-@@ -333,6 +355,7 @@
+@@ -333,6 +355,7 @@ password_entry_changed (GtkEditable *edi
flush_password ();
}
@@ -225,7 +239,7 @@
static void
bluetooth_allow_write_check_toggled (GtkWidget *check)
{
-@@ -424,6 +447,7 @@
+@@ -424,6 +447,7 @@ notify_received_obexpush_check_toggled (
g_object_unref (client);
}
@@ -233,7 +247,7 @@
static GtkWidget *
error_dialog (const char *title,
-@@ -490,12 +514,14 @@
+@@ -490,12 +514,14 @@ main (int argc, char *argv[])
GtkWidget *check;
GtkWidget *password_combo;
GtkWidget *password_entry;
@@ -248,7 +262,7 @@
GtkWidget *window;
GtkListStore *store;
GtkCellRenderer *cell;
-@@ -544,12 +570,14 @@
+@@ -544,12 +570,14 @@ main (int argc, char *argv[])
check = GTK_WIDGET (gtk_builder_get_object (builder, "enable_check"));
password_combo = GTK_WIDGET (gtk_builder_get_object (builder, "password_combo"));
password_entry = GTK_WIDGET (gtk_builder_get_object (builder, "password_entry"));
@@ -263,7 +277,7 @@
store = gtk_list_store_new (1, G_TYPE_STRING);
gtk_combo_box_set_model (GTK_COMBO_BOX (password_combo),
-@@ -579,6 +607,7 @@
+@@ -579,6 +607,7 @@ main (int argc, char *argv[])
g_signal_connect (password_entry,
"changed", G_CALLBACK (password_entry_changed), NULL);
@@ -271,7 +285,7 @@
/* Accept files combo */
store = gtk_list_store_new (1, G_TYPE_STRING);
gtk_combo_box_set_model (GTK_COMBO_BOX (accept_obexpush_combo),
-@@ -606,6 +635,7 @@
+@@ -606,6 +635,7 @@ main (int argc, char *argv[])
_("Ask"), -1);
#endif
g_object_unref (store);
@@ -279,7 +293,7 @@
update_ui ();
-@@ -613,6 +643,7 @@
+@@ -613,6 +643,7 @@ main (int argc, char *argv[])
"toggled", G_CALLBACK (enable_check_toggled), NULL);
g_signal_connect (password_combo,
"changed", G_CALLBACK (password_combo_changed), NULL);
@@ -287,7 +301,7 @@
g_signal_connect (bluetooth_check,
"toggled", G_CALLBACK (enable_bluetooth_check_toggled), NULL);
g_signal_connect (bluetooth_allow_write_check,
-@@ -625,6 +656,7 @@
+@@ -625,6 +656,7 @@ main (int argc, char *argv[])
"changed", G_CALLBACK (accept_obexpush_combo_changed), NULL);
g_signal_connect (notify_received_obexpush_check,
"toggled", G_CALLBACK (notify_received_obexpush_check_toggled), NULL);
@@ -295,7 +309,7 @@
g_signal_connect (GTK_WIDGET (gtk_builder_get_object (builder, "close_button")),
"clicked", G_CALLBACK (gtk_main_quit), NULL);
-@@ -644,6 +676,7 @@
+@@ -644,6 +676,7 @@ main (int argc, char *argv[])
NULL,
NULL,
NULL);
@@ -303,7 +317,7 @@
gconf_client_notify_add (client,
FILE_SHARING_BLUETOOTH_ENABLED,
file_sharing_bluetooth_enabled_changed,
-@@ -680,6 +713,7 @@
+@@ -680,6 +713,7 @@ main (int argc, char *argv[])
NULL,
NULL,
NULL);
@@ -313,8 +327,8 @@
Index: gnome-user-share-2.28.2/src/user_share.c
===================================================================
---- gnome-user-share-2.28.2.orig/src/user_share.c 2009-12-11 13:05:50.000000000 +0000
-+++ gnome-user-share-2.28.2/src/user_share.c 2009-12-22 21:01:49.000000000 +0000
+--- gnome-user-share-2.28.1.orig/src/user_share.c 2009-11-14 12:42:17.862732907 +0100
++++ gnome-user-share-2.28.2/src/user_share.c 2009-11-14 12:58:24.930723029 +0100
@@ -26,17 +26,21 @@
#include <gdk/gdkx.h>
#include <gtk/gtk.h>
@@ -356,7 +370,7 @@
static gboolean has_console = TRUE;
static BluetoothClient *client = NULL;
-@@ -261,6 +267,7 @@
+@@ -261,6 +267,7 @@ bluez_init (void)
g_signal_connect (G_OBJECT (client), "notify::default-adapter-powered",
G_CALLBACK (default_adapter_changed), NULL);
}
@@ -364,7 +378,7 @@
char *
lookup_public_dir (void)
-@@ -331,9 +338,13 @@
+@@ -331,9 +338,13 @@ disabled_timeout_callback (gpointer user
GConfClient* client = (GConfClient *) user_data;
http_down ();
@@ -378,7 +392,7 @@
return FALSE;
}
-@@ -364,6 +375,7 @@
+@@ -364,6 +375,7 @@ file_sharing_enabled_changed (GConfClien
}
}
@@ -386,7 +400,7 @@
static void
file_sharing_bluetooth_allow_write_changed (GConfClient* client,
guint cnxn_id,
-@@ -448,13 +460,16 @@
+@@ -448,13 +460,16 @@ file_sharing_bluetooth_obexpush_notify_c
{
obexpush_set_notify (gconf_client_get_bool (client, FILE_SHARING_BLUETOOTH_OBEXPUSH_NOTIFY, NULL));
}
@@ -403,7 +417,7 @@
_exit (2);
}
-@@ -462,7 +477,9 @@
+@@ -462,7 +477,9 @@ static int
x_io_error_handler (Display *xdisplay)
{
http_down ();
@@ -413,7 +427,7 @@
_exit (2);
}
-@@ -519,20 +536,27 @@
+@@ -519,20 +536,27 @@ main (int argc, char **argv)
migrate_old_configuration ();
client = gconf_client_get_default ();
@@ -441,7 +455,7 @@
gconf_client_add_dir (client,
FILE_SHARING_DIR,
-@@ -551,6 +575,7 @@
+@@ -551,6 +575,7 @@ main (int argc, char **argv)
NULL,
NULL,
NULL);
@@ -449,7 +463,7 @@
gconf_client_notify_add (client,
FILE_SHARING_BLUETOOTH_ENABLED,
file_sharing_bluetooth_enabled_changed,
-@@ -587,18 +612,23 @@
+@@ -587,18 +612,23 @@ main (int argc, char **argv)
NULL,
NULL,
NULL);
Modified: desktop/unstable/gnome-user-share/debian/patches/90_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-user-share/debian/patches/90_relibtoolize.patch?rev=22822&op=diff
==============================================================================
--- desktop/unstable/gnome-user-share/debian/patches/90_relibtoolize.patch [utf-8] (original)
+++ desktop/unstable/gnome-user-share/debian/patches/90_relibtoolize.patch [utf-8] Sun Jan 17 23:35:40 2010
@@ -1,14 +1,28 @@
-libtoolize --force --copy
-aclocal
-automake -acf -Wno-portability
-autoheader
-autoconf
-rm -rf config.h.in~ autom4te.cache/
-
+Index: gnome-user-share-2.28.2/Makefile.in
+===================================================================
+--- gnome-user-share-2.28.2.orig/Makefile.in 2010-01-17 23:19:19.000000000 +0000
++++ gnome-user-share-2.28.2/Makefile.in 2010-01-17 23:19:10.000000000 +0000
+@@ -117,6 +117,8 @@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
++BLUETOOTH_CFLAGS = @BLUETOOTH_CFLAGS@
++BLUETOOTH_LIBS = @BLUETOOTH_LIBS@
+ CATALOGS = @CATALOGS@
+ CATOBJEXT = @CATOBJEXT@
+ CC = @CC@
+@@ -187,6 +189,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
Index: gnome-user-share-2.28.2/aclocal.m4
===================================================================
---- gnome-user-share-2.28.2.orig/aclocal.m4 2009-12-22 23:03:49.000000000 +0000
-+++ gnome-user-share-2.28.2/aclocal.m4 2009-12-22 23:03:10.000000000 +0000
+--- gnome-user-share-2.28.2.orig/aclocal.m4 2010-01-17 23:19:19.000000000 +0000
++++ gnome-user-share-2.28.2/aclocal.m4 2010-01-17 23:19:04.000000000 +0000
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -215,8 +229,8 @@
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
Index: gnome-user-share-2.28.2/config.guess
===================================================================
---- gnome-user-share-2.28.2.orig/config.guess 2009-12-22 23:03:49.000000000 +0000
-+++ gnome-user-share-2.28.2/config.guess 2009-12-22 23:03:15.000000000 +0000
+--- gnome-user-share-2.28.2.orig/config.guess 2010-01-17 23:19:19.000000000 +0000
++++ gnome-user-share-2.28.2/config.guess 2010-01-17 23:19:08.000000000 +0000
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
@@ -348,9 +362,19 @@
SM[BE]S:UNIX_SV:*:*)
Index: gnome-user-share-2.28.2/config.h.in
===================================================================
---- gnome-user-share-2.28.2.orig/config.h.in 2009-12-22 23:03:49.000000000 +0000
-+++ gnome-user-share-2.28.2/config.h.in 2009-12-22 23:03:24.000000000 +0000
-@@ -82,6 +82,9 @@
+--- gnome-user-share-2.28.2.orig/config.h.in 2010-01-17 23:19:19.000000000 +0000
++++ gnome-user-share-2.28.2/config.h.in 2010-01-17 23:19:11.000000000 +0000
+@@ -9,6 +9,9 @@
+ /* Define to 1 if you have the `bind_textdomain_codeset' function. */
+ #undef HAVE_BIND_TEXTDOMAIN_CODESET
+
++/* Set to true if gnome-bluetooth support is available */
++#undef HAVE_BLUETOOTH
++
+ /* Set to true if we have D-BUS 1.1 */
+ #undef HAVE_DBUS_1_1
+
+@@ -82,6 +85,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
@@ -362,8 +386,8 @@
Index: gnome-user-share-2.28.2/config.sub
===================================================================
---- gnome-user-share-2.28.2.orig/config.sub 2009-12-22 23:03:47.000000000 +0000
-+++ gnome-user-share-2.28.2/config.sub 2009-12-22 23:03:15.000000000 +0000
+--- gnome-user-share-2.28.2.orig/config.sub 2010-01-17 23:19:18.000000000 +0000
++++ gnome-user-share-2.28.2/config.sub 2010-01-17 23:19:08.000000000 +0000
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
@@ -418,8 +442,8 @@
-beos*)
Index: gnome-user-share-2.28.2/configure
===================================================================
---- gnome-user-share-2.28.2.orig/configure 2009-12-22 23:03:47.000000000 +0000
-+++ gnome-user-share-2.28.2/configure 2009-12-22 23:03:31.000000000 +0000
+--- gnome-user-share-2.28.2.orig/configure 2010-01-17 23:19:17.000000000 +0000
++++ gnome-user-share-2.28.2/configure 2010-01-17 23:19:13.000000000 +0000
@@ -1,18 +1,22 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -890,7 +914,7 @@
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
-+
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
@@ -966,7 +990,6 @@
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-
-(eval "as_func_return () {
- (exit \$1)
-}
@@ -982,6 +1005,10 @@
-as_func_ret_failure () {
- return 1
-}
+
+-exitcode=0
+-if as_func_success; then
+- :
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
@@ -994,16 +1021,20 @@
+ {
+ eval $1+=\$2
+ }'
-+else
+ else
+- exitcode=1
+- echo as_func_success failed.
+-fi
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
--exitcode=0
--if as_func_success; then
-- :
+-if as_func_failure; then
+- exitcode=1
+- echo as_func_failure succeeded.
+-fi
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
@@ -1014,23 +1045,16 @@
+ {
+ as_val=$(( $* ))
+ }'
- else
-- exitcode=1
-- echo as_func_success failed.
--fi
++else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
--if as_func_failure; then
-- exitcode=1
-- echo as_func_failure succeeded.
--fi
-
-if as_func_ret_success; then
- :
++
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
@@ -1233,7 +1257,18 @@
# Factoring default headers for most tests.
ac_includes_default="\
-@@ -959,6 +915,7 @@
+@@ -810,6 +766,10 @@
+ GLIB_GENMARSHAL
+ USER_SHARE_CONFIG_LIBS
+ USER_SHARE_CONFIG_CFLAGS
++USE_BLUETOOTH_FALSE
++USE_BLUETOOTH_TRUE
++BLUETOOTH_LIBS
++BLUETOOTH_CFLAGS
+ USER_SHARE_LIBS
+ USER_SHARE_CFLAGS
+ HTTPD
+@@ -959,6 +919,7 @@
program_transform_name
prefix
exec_prefix
@@ -1241,7 +1276,16 @@
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -1114,8 +1071,7 @@
+@@ -1004,6 +965,8 @@
+ XMKMF
+ USER_SHARE_CFLAGS
+ USER_SHARE_LIBS
++BLUETOOTH_CFLAGS
++BLUETOOTH_LIBS
+ USER_SHARE_CONFIG_CFLAGS
+ USER_SHARE_CONFIG_LIBS'
+
+@@ -1114,8 +1077,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -1251,7 +1295,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1141,8 +1097,7 @@
+@@ -1141,8 +1103,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -1261,7 +1305,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1346,8 +1301,7 @@
+@@ -1346,8 +1307,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -1271,7 +1315,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1363,8 +1317,7 @@
+@@ -1363,8 +1323,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -1281,7 +1325,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1394,17 +1347,17 @@
+@@ -1394,17 +1353,17 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -1305,7 +1349,7 @@
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1421,15 +1374,13 @@
+@@ -1421,15 +1380,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -1323,7 +1367,7 @@
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1452,8 +1403,7 @@
+@@ -1452,8 +1409,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -1333,7 +1377,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1483,11 +1433,9 @@
+@@ -1483,11 +1439,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -1347,7 +1391,7 @@
# Find the source files, if location was not specified.
-@@ -1526,13 +1474,11 @@
+@@ -1526,13 +1480,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -1363,7 +1407,7 @@
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1684,7 +1630,7 @@
+@@ -1684,7 +1636,7 @@
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
@@ -1372,7 +1416,18 @@
you have headers in a nonstandard directory <include dir>
PKG_CONFIG path to pkg-config utility
CPP C preprocessor
-@@ -1701,6 +1647,7 @@
+@@ -1693,6 +1645,10 @@
+ C compiler flags for USER_SHARE, overriding pkg-config
+ USER_SHARE_LIBS
+ linker flags for USER_SHARE, overriding pkg-config
++ BLUETOOTH_CFLAGS
++ C compiler flags for BLUETOOTH, overriding pkg-config
++ BLUETOOTH_LIBS
++ linker flags for BLUETOOTH, overriding pkg-config
+ USER_SHARE_CONFIG_CFLAGS
+ C compiler flags for USER_SHARE_CONFIG, overriding pkg-config
+ USER_SHARE_CONFIG_LIBS
+@@ -1701,6 +1657,7 @@
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -1380,21 +1435,32 @@
_ACEOF
ac_status=$?
fi
-@@ -1764,21 +1711,426 @@
- if $ac_init_version; then
- cat <<\_ACEOF
- gnome-user-share configure 2.28.2
+@@ -1760,25 +1717,430 @@
+ done
+ fi
+
+-test -n "$ac_init_help" && exit $ac_status
+-if $ac_init_version; then
+- cat <<\_ACEOF
+-gnome-user-share configure 2.28.2
-generated by GNU Autoconf 2.63
-+generated by GNU Autoconf 2.65
-
+-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+-This configure script is free software; the Free Software Foundation
+-gives unlimited permission to copy, distribute and modify it.
++test -n "$ac_init_help" && exit $ac_status
++if $ac_init_version; then
++ cat <<\_ACEOF
++gnome-user-share configure 2.28.2
++generated by GNU Autoconf 2.65
++
+Copyright (C) 2009 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
- exit
- fi
++This configure script is free software; the Free Software Foundation
++gives unlimited permission to copy, distribute and modify it.
++_ACEOF
++ exit
++fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
@@ -1756,7 +1822,8 @@
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <$2>
-+_ACEOF
+ _ACEOF
+- exit
+if ac_fn_c_try_cpp "$LINENO"; then :
+ ac_header_preproc=yes
+else
@@ -1793,7 +1860,7 @@
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=\$ac_header_compiler"
-+fi
+ fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
@@ -1811,7 +1878,7 @@
$ $0 $@
-@@ -1814,8 +2166,8 @@
+@@ -1814,8 +2176,8 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1822,7 +1889,7 @@
IFS=$as_save_IFS
} >&5
-@@ -1852,9 +2204,9 @@
+@@ -1852,9 +2214,9 @@
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -1834,7 +1901,7 @@
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
-@@ -1870,13 +2222,13 @@
+@@ -1870,13 +2232,13 @@
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -1851,7 +1918,7 @@
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
-@@ -1901,13 +2253,13 @@
+@@ -1901,13 +2263,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -1867,7 +1934,7 @@
esac ;;
esac
done
-@@ -1979,39 +2331,41 @@
+@@ -1979,39 +2341,41 @@
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -1914,7 +1981,7 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
-@@ -2029,8 +2383,8 @@
+@@ -2029,8 +2393,8 @@
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
@@ -1925,7 +1992,7 @@
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
-@@ -2038,10 +2392,10 @@
+@@ -2038,10 +2402,10 @@
done
if test -r "$cache_file"; then
@@ -1940,7 +2007,7 @@
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2049,7 +2403,7 @@
+@@ -2049,7 +2413,7 @@
esac
fi
else
@@ -1949,7 +2016,7 @@
$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
-@@ -2064,11 +2418,11 @@
+@@ -2064,11 +2428,11 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
@@ -1963,7 +2030,7 @@
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -2078,17 +2432,17 @@
+@@ -2078,17 +2442,17 @@
ac_old_val_w=`echo x $ac_old_val`
ac_new_val_w=`echo x $ac_new_val`
if test "$ac_old_val_w" != "$ac_new_val_w"; then
@@ -1985,7 +2052,7 @@
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -2100,43 +2454,20 @@
+@@ -2100,43 +2464,20 @@
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -2036,7 +2103,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -2150,24 +2481,16 @@
+@@ -2150,24 +2491,16 @@
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2069,7 +2136,7 @@
fi
# These three variables are undocumented and unsupported,
-@@ -2193,10 +2516,10 @@
+@@ -2193,10 +2526,10 @@
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
# Reject install programs that cannot install multiple files.
@@ -2082,7 +2149,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2204,11 +2527,11 @@
+@@ -2204,11 +2537,11 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2098,7 +2165,7 @@
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2245,7 +2568,7 @@
+@@ -2245,7 +2578,7 @@
;;
esac
@@ -2107,7 +2174,7 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -2261,7 +2584,7 @@
+@@ -2261,7 +2594,7 @@
INSTALL=$ac_install_sh
fi
fi
@@ -2116,7 +2183,7 @@
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2272,7 +2595,7 @@
+@@ -2272,7 +2605,7 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -2125,7 +2192,7 @@
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -2283,15 +2606,11 @@
+@@ -2283,15 +2616,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -2143,7 +2210,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2313,11 +2632,8 @@
+@@ -2313,11 +2642,8 @@
# 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".
@@ -2157,7 +2224,7 @@
fi
test "$2" = conftest.file
-@@ -2326,13 +2642,10 @@
+@@ -2326,13 +2652,10 @@
# Ok.
:
else
@@ -2174,7 +2241,7 @@
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2360,7 +2673,7 @@
+@@ -2360,7 +2683,7 @@
am_missing_run="$MISSING --run "
else
am_missing_run=
@@ -2183,7 +2250,7 @@
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-@@ -2381,9 +2694,9 @@
+@@ -2381,9 +2704,9 @@
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
@@ -2195,7 +2262,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -2394,24 +2707,24 @@
+@@ -2394,24 +2717,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2225,7 +2292,7 @@
$as_echo "no" >&6; }
fi
-@@ -2421,9 +2734,9 @@
+@@ -2421,9 +2744,9 @@
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
@@ -2237,7 +2304,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -2434,24 +2747,24 @@
+@@ -2434,24 +2757,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2267,7 +2334,7 @@
$as_echo "no" >&6; }
fi
-@@ -2460,7 +2773,7 @@
+@@ -2460,7 +2783,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2276,7 +2343,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2473,10 +2786,10 @@
+@@ -2473,10 +2796,10 @@
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
@@ -2289,7 +2356,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2484,7 +2797,7 @@
+@@ -2484,7 +2807,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2298,7 +2365,7 @@
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 #(
-@@ -2496,11 +2809,12 @@
+@@ -2496,11 +2819,12 @@
esac
done
done
@@ -2312,7 +2379,7 @@
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
-@@ -2508,11 +2822,10 @@
+@@ -2508,11 +2832,10 @@
# 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.
@@ -2325,7 +2392,7 @@
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
-@@ -2525,9 +2838,9 @@
+@@ -2525,9 +2848,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -2337,7 +2404,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2538,24 +2851,24 @@
+@@ -2538,24 +2861,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2367,7 +2434,7 @@
$as_echo "no" >&6; }
fi
-@@ -2563,11 +2876,11 @@
+@@ -2563,11 +2886,11 @@
test -n "$AWK" && break
done
@@ -2381,7 +2448,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2585,11 +2898,11 @@
+@@ -2585,11 +2908,11 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -2395,7 +2462,7 @@
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2609,9 +2922,7 @@
+@@ -2609,9 +2932,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
@@ -2406,7 +2473,7 @@
fi
fi
-@@ -2672,7 +2983,7 @@
+@@ -2672,7 +2993,7 @@
# Enable silent build when available (Automake 1.11)
# Check whether --enable-silent-rules was given.
@@ -2415,7 +2482,7 @@
enableval=$enable_silent_rules;
fi
-@@ -2684,7 +2995,7 @@
+@@ -2684,7 +3005,7 @@
AM_BACKSLASH='\'
@@ -2424,7 +2491,7 @@
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -2695,15 +3006,11 @@
+@@ -2695,15 +3016,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -2442,7 +2509,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2725,11 +3032,8 @@
+@@ -2725,11 +3042,8 @@
# 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".
@@ -2456,7 +2523,7 @@
fi
test "$2" = conftest.file
-@@ -2738,25 +3042,22 @@
+@@ -2738,25 +3052,22 @@
# Ok.
:
else
@@ -2488,7 +2555,7 @@
$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
-@@ -2771,16 +3072,16 @@
+@@ -2771,16 +3082,16 @@
@@ -2508,7 +2575,7 @@
$as_echo "$USE_NLS" >&6; }
-@@ -2796,7 +3097,7 @@
+@@ -2796,7 +3107,7 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -2517,7 +2584,7 @@
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-@@ -2824,12 +3125,12 @@
+@@ -2824,12 +3135,12 @@
fi
@@ -2532,7 +2599,7 @@
enableval=$enable_dependency_tracking;
fi
-@@ -2854,9 +3155,9 @@
+@@ -2854,9 +3165,9 @@
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
@@ -2544,7 +2611,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2867,24 +3168,24 @@
+@@ -2867,24 +3178,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2574,7 +2641,7 @@
$as_echo "no" >&6; }
fi
-@@ -2894,9 +3195,9 @@
+@@ -2894,9 +3205,9 @@
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
@@ -2586,7 +2653,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -2907,24 +3208,24 @@
+@@ -2907,24 +3218,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2616,7 +2683,7 @@
$as_echo "no" >&6; }
fi
-@@ -2933,7 +3234,7 @@
+@@ -2933,7 +3244,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2625,7 +2692,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2947,9 +3248,9 @@
+@@ -2947,9 +3258,9 @@
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
@@ -2637,7 +2704,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2960,24 +3261,24 @@
+@@ -2960,24 +3271,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2667,7 +2734,7 @@
$as_echo "no" >&6; }
fi
-@@ -2987,9 +3288,9 @@
+@@ -2987,9 +3298,9 @@
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
@@ -2679,7 +2746,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3001,18 +3302,18 @@
+@@ -3001,18 +3312,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2701,7 +2768,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -3031,10 +3332,10 @@
+@@ -3031,10 +3342,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -2714,7 +2781,7 @@
$as_echo "no" >&6; }
fi
-@@ -3046,9 +3347,9 @@
+@@ -3046,9 +3357,9 @@
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
@@ -2726,7 +2793,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3059,24 +3360,24 @@
+@@ -3059,24 +3370,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2756,7 +2823,7 @@
$as_echo "no" >&6; }
fi
-@@ -3090,9 +3391,9 @@
+@@ -3090,9 +3401,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -2768,7 +2835,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3103,24 +3404,24 @@
+@@ -3103,24 +3414,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2798,7 +2865,7 @@
$as_echo "no" >&6; }
fi
-@@ -3133,7 +3434,7 @@
+@@ -3133,7 +3444,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2807,7 +2874,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3144,57 +3445,37 @@
+@@ -3144,57 +3455,37 @@
fi
@@ -2885,7 +2952,7 @@
/* end confdefs.h. */
int
-@@ -3210,8 +3491,8 @@
+@@ -3210,8 +3501,8 @@
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
@@ -2896,7 +2963,7 @@
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
-@@ -3227,17 +3508,17 @@
+@@ -3227,17 +3518,17 @@
done
rm -f $ac_rmfiles
@@ -2919,7 +2986,7 @@
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
# in a Makefile. We should not override ac_cv_exeext if it was cached,
-@@ -3254,7 +3535,7 @@
+@@ -3254,7 +3545,7 @@
# certainly right.
break;;
*.* )
@@ -2928,7 +2995,7 @@
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -3273,84 +3554,42 @@
+@@ -3273,84 +3564,42 @@
else
ac_file=''
fi
@@ -3034,7 +3101,7 @@
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -3365,32 +3604,83 @@
+@@ -3365,32 +3614,83 @@
esac
done
else
@@ -3134,7 +3201,7 @@
/* end confdefs.h. */
int
-@@ -3402,17 +3692,17 @@
+@@ -3402,17 +3702,17 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -3157,7 +3224,7 @@
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
-@@ -3425,31 +3715,23 @@
+@@ -3425,31 +3725,23 @@
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -3196,7 +3263,7 @@
/* end confdefs.h. */
int
-@@ -3463,37 +3745,16 @@
+@@ -3463,37 +3755,16 @@
return 0;
}
_ACEOF
@@ -3237,7 +3304,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -3502,20 +3763,16 @@
+@@ -3502,20 +3773,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -3261,7 +3328,7 @@
/* end confdefs.h. */
int
-@@ -3526,35 +3783,11 @@
+@@ -3526,35 +3793,11 @@
return 0;
}
_ACEOF
@@ -3300,7 +3367,7 @@
/* end confdefs.h. */
int
-@@ -3565,36 +3798,12 @@
+@@ -3565,36 +3808,12 @@
return 0;
}
_ACEOF
@@ -3341,7 +3408,7 @@
/* end confdefs.h. */
int
-@@ -3605,42 +3814,17 @@
+@@ -3605,42 +3824,17 @@
return 0;
}
_ACEOF
@@ -3386,7 +3453,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -3657,18 +3841,14 @@
+@@ -3657,18 +3851,14 @@
CFLAGS=
fi
fi
@@ -3408,7 +3475,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -3725,32 +3905,9 @@
+@@ -3725,32 +3915,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -3442,7 +3509,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -3761,17 +3918,19 @@
+@@ -3761,17 +3928,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -3465,7 +3532,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -3781,9 +3940,9 @@
+@@ -3781,9 +3950,9 @@
depcc="$CC" am_compiler_list=
@@ -3477,7 +3544,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -3891,7 +4050,7 @@
+@@ -3891,7 +4060,7 @@
fi
fi
@@ -3486,7 +3553,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -3911,35 +4070,31 @@
+@@ -3911,35 +4080,31 @@
case "$am__api_version" in
1.01234)
@@ -3528,7 +3595,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_UPDATE in
-@@ -3952,14 +4107,14 @@
+@@ -3952,14 +4117,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3546,7 +3613,7 @@
IFS=$as_save_IFS
;;
-@@ -3967,19 +4122,19 @@
+@@ -3967,19 +4132,19 @@
fi
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
if test -n "$INTLTOOL_UPDATE"; then
@@ -3570,7 +3637,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_MERGE in
-@@ -3992,14 +4147,14 @@
+@@ -3992,14 +4157,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3588,7 +3655,7 @@
IFS=$as_save_IFS
;;
-@@ -4007,19 +4162,19 @@
+@@ -4007,19 +4172,19 @@
fi
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
if test -n "$INTLTOOL_MERGE"; then
@@ -3612,7 +3679,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_EXTRACT in
-@@ -4032,14 +4187,14 @@
+@@ -4032,14 +4197,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3630,7 +3697,7 @@
IFS=$as_save_IFS
;;
-@@ -4047,18 +4202,16 @@
+@@ -4047,18 +4212,16 @@
fi
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
if test -n "$INTLTOOL_EXTRACT"; then
@@ -3652,7 +3719,7 @@
fi
INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-@@ -4180,9 +4333,9 @@
+@@ -4180,9 +4343,9 @@
# Check the gettext tools to make sure they are GNU
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -3664,7 +3731,7 @@
$as_echo_n "(cached) " >&6
else
case $XGETTEXT in
-@@ -4195,14 +4348,14 @@
+@@ -4195,14 +4358,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3682,7 +3749,7 @@
IFS=$as_save_IFS
;;
-@@ -4210,19 +4363,19 @@
+@@ -4210,19 +4373,19 @@
fi
XGETTEXT=$ac_cv_path_XGETTEXT
if test -n "$XGETTEXT"; then
@@ -3706,7 +3773,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGMERGE in
-@@ -4235,14 +4388,14 @@
+@@ -4235,14 +4398,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3724,7 +3791,7 @@
IFS=$as_save_IFS
;;
-@@ -4250,19 +4403,19 @@
+@@ -4250,19 +4413,19 @@
fi
MSGMERGE=$ac_cv_path_MSGMERGE
if test -n "$MSGMERGE"; then
@@ -3748,7 +3815,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGFMT in
-@@ -4275,14 +4428,14 @@
+@@ -4275,14 +4438,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3766,7 +3833,7 @@
IFS=$as_save_IFS
;;
-@@ -4290,19 +4443,19 @@
+@@ -4290,19 +4453,19 @@
fi
MSGFMT=$ac_cv_path_MSGFMT
if test -n "$MSGFMT"; then
@@ -3790,7 +3857,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -4315,14 +4468,14 @@
+@@ -4315,14 +4478,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3808,7 +3875,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -4331,33 +4484,29 @@
+@@ -4331,33 +4494,29 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -3848,7 +3915,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_PERL in
-@@ -4370,14 +4519,14 @@
+@@ -4370,14 +4529,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3866,7 +3933,7 @@
IFS=$as_save_IFS
;;
-@@ -4385,41 +4534,35 @@
+@@ -4385,41 +4544,35 @@
fi
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
if test -n "$INTLTOOL_PERL"; then
@@ -3917,7 +3984,7 @@
fi
fi
-@@ -4429,11 +4572,7 @@
+@@ -4429,11 +4582,7 @@
# Set DATADIRNAME correctly if it is not set yet
# (copied from glib-gettext.m4)
if test -z "$DATADIRNAME"; then
@@ -3930,7 +3997,7 @@
/* end confdefs.h. */
int
-@@ -4445,150 +4584,41 @@
+@@ -4445,120 +4594,13 @@
return 0;
}
_ACEOF
@@ -3968,10 +4035,7 @@
-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
- $as_echo_n "(cached) " >&6
-+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
-+ DATADIRNAME=share
- else
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -3981,31 +4045,20 @@
-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
-+ DATADIRNAME=lib
-+fi
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char bind_textdomain_codeset (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+ ;;
-+ *)
-+ DATADIRNAME=lib
-+ ;;
-+ esac
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-
+-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
+-
-#undef bind_textdomain_codeset
-
+-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
@@ -4064,28 +4117,28 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
-- DATADIRNAME=share
--else
-- DATADIRNAME=lib
--fi
--
-- ;;
-- *)
-- DATADIRNAME=lib
-- ;;
-- esac
--fi
++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+ DATADIRNAME=share
+ else
+ DATADIRNAME=lib
+@@ -4570,10 +4612,8 @@
+ ;;
+ esac
+ fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
-
-
-
--
--
--
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ fi
+
+
+@@ -4581,14 +4621,14 @@
+
+
+
-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
$as_echo_n "checking whether ln -s works... " >&6; }
@@ -4100,7 +4153,7 @@
$as_echo "no, using $LN_S" >&6; }
fi
-@@ -4598,9 +4628,9 @@
+@@ -4598,9 +4638,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
@@ -4112,7 +4165,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -4613,14 +4643,14 @@
+@@ -4613,14 +4653,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4130,7 +4183,7 @@
IFS=$as_save_IFS
;;
-@@ -4628,10 +4658,10 @@
+@@ -4628,10 +4668,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -4143,7 +4196,7 @@
$as_echo "no" >&6; }
fi
-@@ -4641,9 +4671,9 @@
+@@ -4641,9 +4681,9 @@
ac_pt_PKG_CONFIG=$PKG_CONFIG
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -4155,7 +4208,7 @@
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -4656,14 +4686,14 @@
+@@ -4656,14 +4696,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4173,7 +4226,7 @@
IFS=$as_save_IFS
;;
-@@ -4671,10 +4701,10 @@
+@@ -4671,10 +4711,10 @@
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -4186,7 +4239,7 @@
$as_echo "no" >&6; }
fi
-@@ -4683,7 +4713,7 @@
+@@ -4683,7 +4723,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4195,7 +4248,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -4696,13 +4726,13 @@
+@@ -4696,13 +4736,13 @@
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -4212,7 +4265,7 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -4711,35 +4741,33 @@
+@@ -4711,35 +4751,33 @@
gdu_cv_version_required=0.3.2
@@ -4256,7 +4309,7 @@
withval=$with_help_dir;
else
with_help_dir='${datadir}/gnome/help'
-@@ -4750,7 +4778,7 @@
+@@ -4750,7 +4788,7 @@
# Check whether --with-omf-dir was given.
@@ -4265,7 +4318,7 @@
withval=$with_omf_dir;
else
with_omf_dir='${datadir}/omf'
-@@ -4761,7 +4789,7 @@
+@@ -4761,7 +4799,7 @@
# Check whether --with-help-formats was given.
@@ -4274,7 +4327,7 @@
withval=$with_help_formats;
else
with_help_formats=''
-@@ -4771,7 +4799,7 @@
+@@ -4771,7 +4809,7 @@
# Check whether --enable-scrollkeeper was given.
@@ -4283,7 +4336,7 @@
enableval=$enable_scrollkeeper;
else
enable_scrollkeeper=yes
-@@ -4800,16 +4828,12 @@
+@@ -4800,16 +4838,12 @@
@@ -4303,7 +4356,7 @@
/* end confdefs.h. */
int
-@@ -4869,55 +4893,28 @@
+@@ -4869,55 +4903,28 @@
return 0;
}
_ACEOF
@@ -4366,7 +4419,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -4942,54 +4939,27 @@
+@@ -4942,54 +4949,27 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -4429,7 +4482,7 @@
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
-@@ -5002,9 +4972,9 @@
+@@ -5002,9 +4982,9 @@
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
@@ -4441,7 +4494,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -5015,24 +4985,24 @@
+@@ -5015,24 +4995,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4471,7 +4524,7 @@
$as_echo "no" >&6; }
fi
-@@ -5042,9 +5012,9 @@
+@@ -5042,9 +5022,9 @@
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
@@ -4483,7 +4536,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -5055,24 +5025,24 @@
+@@ -5055,24 +5035,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4513,7 +4566,7 @@
$as_echo "no" >&6; }
fi
-@@ -5081,7 +5051,7 @@
+@@ -5081,7 +5061,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4522,7 +4575,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5095,9 +5065,9 @@
+@@ -5095,9 +5075,9 @@
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
@@ -4534,7 +4587,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -5108,24 +5078,24 @@
+@@ -5108,24 +5088,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4564,7 +4617,7 @@
$as_echo "no" >&6; }
fi
-@@ -5135,9 +5105,9 @@
+@@ -5135,9 +5115,9 @@
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
@@ -4576,7 +4629,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -5149,18 +5119,18 @@
+@@ -5149,18 +5129,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4598,7 +4651,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -5179,10 +5149,10 @@
+@@ -5179,10 +5159,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -4611,7 +4664,7 @@
$as_echo "no" >&6; }
fi
-@@ -5194,9 +5164,9 @@
+@@ -5194,9 +5174,9 @@
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
@@ -4623,7 +4676,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -5207,24 +5177,24 @@
+@@ -5207,24 +5187,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4653,7 +4706,7 @@
$as_echo "no" >&6; }
fi
-@@ -5238,9 +5208,9 @@
+@@ -5238,9 +5218,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -4665,7 +4718,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -5251,24 +5221,24 @@
+@@ -5251,24 +5231,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4695,7 +4748,7 @@
$as_echo "no" >&6; }
fi
-@@ -5281,7 +5251,7 @@
+@@ -5281,7 +5261,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4704,7 +4757,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5292,62 +5262,42 @@
+@@ -5292,62 +5272,42 @@
fi
@@ -4789,7 +4842,7 @@
/* end confdefs.h. */
int
-@@ -5361,37 +5311,16 @@
+@@ -5361,37 +5321,16 @@
return 0;
}
_ACEOF
@@ -4830,7 +4883,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -5400,20 +5329,16 @@
+@@ -5400,20 +5339,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -4854,7 +4907,7 @@
/* end confdefs.h. */
int
-@@ -5424,35 +5349,11 @@
+@@ -5424,35 +5359,11 @@
return 0;
}
_ACEOF
@@ -4893,7 +4946,7 @@
/* end confdefs.h. */
int
-@@ -5463,36 +5364,12 @@
+@@ -5463,36 +5374,12 @@
return 0;
}
_ACEOF
@@ -4934,7 +4987,7 @@
/* end confdefs.h. */
int
-@@ -5503,42 +5380,17 @@
+@@ -5503,42 +5390,17 @@
return 0;
}
_ACEOF
@@ -4979,7 +5032,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -5555,18 +5407,14 @@
+@@ -5555,18 +5417,14 @@
CFLAGS=
fi
fi
@@ -5001,10 +5054,15 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -5623,32 +5471,9 @@
- -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
- do
- CC="$ac_save_CC $ac_arg"
+@@ -5618,37 +5476,14 @@
+ ;
+ return 0;
+ }
+-_ACEOF
+-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+- -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+-do
+- CC="$ac_save_CC $ac_arg"
- rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -5023,6 +5081,11 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
++_ACEOF
++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
++ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
++do
++ CC="$ac_save_CC $ac_arg"
+ if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_prog_cc_c89=$ac_arg
-else
@@ -5035,7 +5098,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -5659,17 +5484,19 @@
+@@ -5659,17 +5494,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -5058,7 +5121,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -5679,9 +5506,9 @@
+@@ -5679,9 +5516,9 @@
depcc="$CC" am_compiler_list=
@@ -5070,7 +5133,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -5789,7 +5616,7 @@
+@@ -5789,7 +5626,7 @@
fi
fi
@@ -5079,7 +5142,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -5809,14 +5636,14 @@
+@@ -5809,14 +5646,14 @@
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
@@ -5096,7 +5159,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -5831,11 +5658,7 @@
+@@ -5831,11 +5668,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -5109,7 +5172,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -5844,78 +5667,34 @@
+@@ -5844,78 +5677,34 @@
#endif
Syntax error
_ACEOF
@@ -5193,7 +5256,7 @@
break
fi
-@@ -5927,7 +5706,7 @@
+@@ -5927,7 +5716,7 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -5202,7 +5265,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -5938,11 +5717,7 @@
+@@ -5938,11 +5727,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -5215,7 +5278,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -5951,87 +5726,40 @@
+@@ -5951,87 +5736,40 @@
#endif
Syntax error
_ACEOF
@@ -5312,7 +5375,7 @@
fi
ac_ext=c
-@@ -6040,115 +5768,23 @@
+@@ -6040,115 +5778,23 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -5406,9 +5469,9 @@
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
+-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
--
+
-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
$as_echo_n "checking whether ln -s works... " >&6; }
@@ -5433,7 +5496,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -6166,17 +5802,17 @@
+@@ -6166,17 +5812,17 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -5454,7 +5517,7 @@
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -6208,7 +5844,7 @@
+@@ -6208,7 +5854,7 @@
case `pwd` in
*\ * | *\ *)
@@ -5463,7 +5526,7 @@
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
esac
-@@ -6233,35 +5869,27 @@
+@@ -6233,35 +5879,27 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -5506,7 +5569,7 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -6277,28 +5905,24 @@
+@@ -6277,28 +5915,24 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -5540,7 +5603,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -6314,9 +5938,9 @@
+@@ -6314,9 +5948,9 @@
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
@@ -5552,7 +5615,7 @@
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -6324,7 +5948,7 @@
+@@ -6324,7 +5958,7 @@
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -5561,7 +5624,7 @@
if test -z "$SED"; then
ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
-@@ -6333,7 +5957,7 @@
+@@ -6333,7 +5967,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5570,7 +5633,7 @@
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
-@@ -6353,7 +5977,7 @@
+@@ -6353,7 +5987,7 @@
$as_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
@@ -5579,7 +5642,7 @@
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"
-@@ -6368,19 +5992,17 @@
+@@ -6368,19 +6002,17 @@
$ac_path_SED_found && break 3
done
done
@@ -5602,7 +5665,7 @@
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -6398,9 +6020,9 @@
+@@ -6398,9 +6030,9 @@
@@ -5614,7 +5677,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -6411,7 +6033,7 @@
+@@ -6411,7 +6043,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5623,7 +5686,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-@@ -6431,7 +6053,7 @@
+@@ -6431,7 +6063,7 @@
$as_echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -5632,7 +5695,7 @@
if test $ac_count -gt ${ac_path_GREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_GREP="$ac_path_GREP"
-@@ -6446,26 +6068,24 @@
+@@ -6446,26 +6078,24 @@
$ac_path_GREP_found && break 3
done
done
@@ -5664,7 +5727,7 @@
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -6479,7 +6099,7 @@
+@@ -6479,7 +6109,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5673,7 +5736,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-@@ -6499,7 +6119,7 @@
+@@ -6499,7 +6129,7 @@
$as_echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -5682,7 +5745,7 @@
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_EGREP="$ac_path_EGREP"
-@@ -6514,12 +6134,10 @@
+@@ -6514,12 +6144,10 @@
$ac_path_EGREP_found && break 3
done
done
@@ -5697,7 +5760,7 @@
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -6527,14 +6145,14 @@
+@@ -6527,14 +6155,14 @@
fi
fi
@@ -5715,7 +5778,7 @@
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -6548,7 +6166,7 @@
+@@ -6548,7 +6176,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5724,7 +5787,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-@@ -6568,7 +6186,7 @@
+@@ -6568,7 +6196,7 @@
$as_echo 'FGREP' >> "conftest.nl"
"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -5733,7 +5796,7 @@
if test $ac_count -gt ${ac_path_FGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_FGREP="$ac_path_FGREP"
-@@ -6583,12 +6201,10 @@
+@@ -6583,12 +6211,10 @@
$ac_path_FGREP_found && break 3
done
done
@@ -5748,7 +5811,7 @@
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -6596,7 +6212,7 @@
+@@ -6596,7 +6222,7 @@
fi
fi
@@ -5757,7 +5820,7 @@
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
-@@ -6622,7 +6238,7 @@
+@@ -6622,7 +6248,7 @@
# Check whether --with-gnu-ld was given.
@@ -5766,7 +5829,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -6631,7 +6247,7 @@
+@@ -6631,7 +6257,7 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -5775,7 +5838,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -6661,13 +6277,13 @@
+@@ -6661,13 +6287,13 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -5792,7 +5855,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -6698,18 +6314,16 @@
+@@ -6698,18 +6324,16 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -5816,7 +5879,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -6722,7 +6336,7 @@
+@@ -6722,7 +6346,7 @@
;;
esac
fi
@@ -5825,7 +5888,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -6734,9 +6348,9 @@
+@@ -6734,9 +6358,9 @@
@@ -5837,7 +5900,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -6783,7 +6397,7 @@
+@@ -6783,7 +6407,7 @@
: ${lt_cv_path_NM=no}
fi
fi
@@ -5846,7 +5909,7 @@
$as_echo "$lt_cv_path_NM" >&6; }
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
-@@ -6794,9 +6408,9 @@
+@@ -6794,9 +6418,9 @@
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
@@ -5858,7 +5921,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -6807,24 +6421,24 @@
+@@ -6807,24 +6431,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5888,7 +5951,7 @@
$as_echo "no" >&6; }
fi
-@@ -6838,9 +6452,9 @@
+@@ -6838,9 +6462,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -5900,7 +5963,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -6851,24 +6465,24 @@
+@@ -6851,24 +6475,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5930,7 +5993,7 @@
$as_echo "no" >&6; }
fi
-@@ -6881,7 +6495,7 @@
+@@ -6881,7 +6505,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5939,7 +6002,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6901,33 +6515,33 @@
+@@ -6901,33 +6525,33 @@
@@ -5953,15 +6016,15 @@
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:6911: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:6525: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:6535: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:6914: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:6528: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:6538: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:6917: output\"" >&5)
-+ (eval echo "\"\$as_me:6531: output\"" >&5)
++ (eval echo "\"\$as_me:6541: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -5981,7 +6044,7 @@
$as_echo_n "(cached) " >&6
else
i=0
-@@ -7045,10 +6659,10 @@
+@@ -7045,10 +6669,10 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -5994,7 +6057,7 @@
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -7062,7 +6676,7 @@
+@@ -7062,7 +6686,7 @@
: ${MV="mv -f"}
: ${RM="rm -f"}
@@ -6003,7 +6066,7 @@
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
-@@ -7072,17 +6686,17 @@
+@@ -7072,17 +6696,17 @@
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -6024,7 +6087,7 @@
$as_echo "$lt_shell_append" >&6; }
-@@ -7117,14 +6731,14 @@
+@@ -7117,14 +6741,14 @@
@@ -6042,7 +6105,7 @@
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
-@@ -7153,9 +6767,9 @@
+@@ -7153,9 +6777,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -6054,7 +6117,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -7166,24 +6780,24 @@
+@@ -7166,24 +6790,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6084,7 +6147,7 @@
$as_echo "no" >&6; }
fi
-@@ -7193,9 +6807,9 @@
+@@ -7193,9 +6817,9 @@
ac_ct_OBJDUMP=$OBJDUMP
# Extract the first word of "objdump", so it can be a program name with args.
set dummy objdump; ac_word=$2
@@ -6096,7 +6159,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -7206,24 +6820,24 @@
+@@ -7206,24 +6830,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6126,7 +6189,7 @@
$as_echo "no" >&6; }
fi
-@@ -7232,7 +6846,7 @@
+@@ -7232,7 +6856,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6135,7 +6198,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7252,9 +6866,9 @@
+@@ -7252,9 +6876,9 @@
@@ -6147,7 +6210,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -7369,11 +6983,11 @@
+@@ -7369,11 +6993,11 @@
;;
# This must be Linux ELF.
@@ -6161,7 +6224,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -7448,7 +7062,7 @@
+@@ -7448,7 +7072,7 @@
esac
fi
@@ -6170,7 +6233,7 @@
$as_echo "$lt_cv_deplibs_check_method" >&6; }
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
-@@ -7468,9 +7082,9 @@
+@@ -7468,9 +7092,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -6182,7 +6245,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
-@@ -7481,24 +7095,24 @@
+@@ -7481,24 +7105,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6212,7 +6275,7 @@
$as_echo "no" >&6; }
fi
-@@ -7508,9 +7122,9 @@
+@@ -7508,9 +7132,9 @@
ac_ct_AR=$AR
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
@@ -6224,7 +6287,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
-@@ -7521,24 +7135,24 @@
+@@ -7521,24 +7145,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6254,7 +6317,7 @@
$as_echo "no" >&6; }
fi
-@@ -7547,7 +7161,7 @@
+@@ -7547,7 +7171,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6263,7 +6326,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7573,9 +7187,9 @@
+@@ -7573,9 +7197,9 @@
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
@@ -6275,7 +6338,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -7586,24 +7200,24 @@
+@@ -7586,24 +7210,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6305,7 +6368,7 @@
$as_echo "no" >&6; }
fi
-@@ -7613,9 +7227,9 @@
+@@ -7613,9 +7237,9 @@
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
@@ -6317,7 +6380,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -7626,24 +7240,24 @@
+@@ -7626,24 +7250,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6347,7 +6410,7 @@
$as_echo "no" >&6; }
fi
-@@ -7652,7 +7266,7 @@
+@@ -7652,7 +7276,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6356,7 +6419,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7672,9 +7286,9 @@
+@@ -7672,9 +7296,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -6368,7 +6431,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -7685,24 +7299,24 @@
+@@ -7685,24 +7309,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6398,7 +6461,7 @@
$as_echo "no" >&6; }
fi
-@@ -7712,9 +7326,9 @@
+@@ -7712,9 +7336,9 @@
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
@@ -6410,7 +6473,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -7725,24 +7339,24 @@
+@@ -7725,24 +7349,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6440,7 +6503,7 @@
$as_echo "no" >&6; }
fi
-@@ -7751,7 +7365,7 @@
+@@ -7751,7 +7375,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6449,7 +6512,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7829,9 +7443,9 @@
+@@ -7829,9 +7453,9 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -6461,7 +6524,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -7947,18 +7561,18 @@
+@@ -7947,18 +7571,18 @@
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
@@ -6486,7 +6549,7 @@
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -8011,11 +7625,11 @@
+@@ -8011,11 +7635,11 @@
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -6501,7 +6564,7 @@
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
-@@ -8049,10 +7663,10 @@
+@@ -8049,10 +7673,10 @@
lt_cv_sys_global_symbol_to_cdecl=
fi
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -6514,7 +6577,7 @@
$as_echo "ok" >&6; }
fi
-@@ -8078,7 +7692,7 @@
+@@ -8078,7 +7702,7 @@
# Check whether --enable-libtool-lock was given.
@@ -6523,7 +6586,7 @@
enableval=$enable_libtool_lock;
fi
-@@ -8090,11 +7704,11 @@
+@@ -8090,11 +7714,11 @@
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -6538,13 +6601,13 @@
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
-@@ -8108,12 +7722,12 @@
+@@ -8108,12 +7732,12 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 8111 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ echo '#line 7725 "configure"' > conftest.$ac_ext
++ echo '#line 7735 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -6555,7 +6618,7 @@
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
-@@ -8147,11 +7761,11 @@
+@@ -8147,11 +7771,11 @@
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -6570,7 +6633,7 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
-@@ -8200,9 +7814,9 @@
+@@ -8200,9 +7824,9 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -6582,7 +6645,7 @@
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -8211,11 +7825,7 @@
+@@ -8211,11 +7835,7 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -6595,7 +6658,7 @@
/* end confdefs.h. */
int
-@@ -8226,38 +7836,13 @@
+@@ -8226,38 +7846,13 @@
return 0;
}
_ACEOF
@@ -6638,7 +6701,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -8265,7 +7850,7 @@
+@@ -8265,7 +7860,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -6647,7 +6710,7 @@
$as_echo "$lt_cv_cc_needs_belf" >&6; }
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-@@ -8275,11 +7860,11 @@
+@@ -8275,11 +7870,11 @@
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -6662,7 +6725,7 @@
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
-@@ -8305,9 +7890,9 @@
+@@ -8305,9 +7900,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
@@ -6674,7 +6737,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -8318,24 +7903,24 @@
+@@ -8318,24 +7913,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6704,7 +6767,7 @@
$as_echo "no" >&6; }
fi
-@@ -8345,9 +7930,9 @@
+@@ -8345,9 +7940,9 @@
ac_ct_DSYMUTIL=$DSYMUTIL
# Extract the first word of "dsymutil", so it can be a program name with args.
set dummy dsymutil; ac_word=$2
@@ -6716,7 +6779,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -8358,24 +7943,24 @@
+@@ -8358,24 +7953,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6746,7 +6809,7 @@
$as_echo "no" >&6; }
fi
-@@ -8384,7 +7969,7 @@
+@@ -8384,7 +7979,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6755,7 +6818,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8397,9 +7982,9 @@
+@@ -8397,9 +7992,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
@@ -6767,7 +6830,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -8410,24 +7995,24 @@
+@@ -8410,24 +8005,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6797,7 +6860,7 @@
$as_echo "no" >&6; }
fi
-@@ -8437,9 +8022,9 @@
+@@ -8437,9 +8032,9 @@
ac_ct_NMEDIT=$NMEDIT
# Extract the first word of "nmedit", so it can be a program name with args.
set dummy nmedit; ac_word=$2
@@ -6809,7 +6872,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -8450,24 +8035,24 @@
+@@ -8450,24 +8045,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6839,7 +6902,7 @@
$as_echo "no" >&6; }
fi
-@@ -8476,7 +8061,7 @@
+@@ -8476,7 +8071,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6848,7 +6911,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8489,9 +8074,9 @@
+@@ -8489,9 +8084,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
set dummy ${ac_tool_prefix}lipo; ac_word=$2
@@ -6860,7 +6923,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -8502,24 +8087,24 @@
+@@ -8502,24 +8097,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6890,7 +6953,7 @@
$as_echo "no" >&6; }
fi
-@@ -8529,9 +8114,9 @@
+@@ -8529,9 +8124,9 @@
ac_ct_LIPO=$LIPO
# Extract the first word of "lipo", so it can be a program name with args.
set dummy lipo; ac_word=$2
@@ -6902,7 +6965,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -8542,24 +8127,24 @@
+@@ -8542,24 +8137,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6932,7 +6995,7 @@
$as_echo "no" >&6; }
fi
-@@ -8568,7 +8153,7 @@
+@@ -8568,7 +8163,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6941,7 +7004,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8581,9 +8166,9 @@
+@@ -8581,9 +8176,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool; ac_word=$2
@@ -6953,7 +7016,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -8594,24 +8179,24 @@
+@@ -8594,24 +8189,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6983,7 +7046,7 @@
$as_echo "no" >&6; }
fi
-@@ -8621,9 +8206,9 @@
+@@ -8621,9 +8216,9 @@
ac_ct_OTOOL=$OTOOL
# Extract the first word of "otool", so it can be a program name with args.
set dummy otool; ac_word=$2
@@ -6995,7 +7058,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -8634,24 +8219,24 @@
+@@ -8634,24 +8229,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7025,7 +7088,7 @@
$as_echo "no" >&6; }
fi
-@@ -8660,7 +8245,7 @@
+@@ -8660,7 +8255,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7034,7 +7097,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8673,9 +8258,9 @@
+@@ -8673,9 +8268,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool64; ac_word=$2
@@ -7046,7 +7109,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -8686,24 +8271,24 @@
+@@ -8686,24 +8281,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7076,7 +7139,7 @@
$as_echo "no" >&6; }
fi
-@@ -8713,9 +8298,9 @@
+@@ -8713,9 +8308,9 @@
ac_ct_OTOOL64=$OTOOL64
# Extract the first word of "otool64", so it can be a program name with args.
set dummy otool64; ac_word=$2
@@ -7088,7 +7151,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -8726,24 +8311,24 @@
+@@ -8726,24 +8321,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7118,7 +7181,7 @@
$as_echo "no" >&6; }
fi
-@@ -8752,7 +8337,7 @@
+@@ -8752,7 +8347,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7127,7 +7190,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8788,9 +8373,9 @@
+@@ -8788,9 +8383,9 @@
@@ -7139,7 +7202,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -8815,22 +8400,18 @@
+@@ -8815,22 +8410,18 @@
rm -f conftest.*
fi
fi
@@ -7166,7 +7229,7 @@
/* end confdefs.h. */
int
-@@ -8841,42 +8422,17 @@
+@@ -8841,42 +8432,17 @@
return 0;
}
_ACEOF
@@ -7193,11 +7256,12 @@
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
lt_cv_ld_exported_symbols_list=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- lt_cv_ld_exported_symbols_list=no
++else
+ lt_cv_ld_exported_symbols_list=no
fi
-
@@ -7214,7 +7278,7 @@
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
-@@ -8914,16 +8470,12 @@
+@@ -8914,16 +8480,12 @@
esac
@@ -7234,7 +7298,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -8938,48 +8490,23 @@
+@@ -8938,48 +8500,23 @@
return 0;
}
_ACEOF
@@ -7288,7 +7352,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -8989,18 +8516,14 @@
+@@ -8989,18 +8526,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -7310,7 +7374,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -9010,14 +8533,10 @@
+@@ -9010,14 +8543,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -7327,7 +7391,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -9044,192 +8563,59 @@
+@@ -9044,118 +8573,34 @@
return 0;
}
_ACEOF
@@ -7387,40 +7451,17 @@
fi
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-+ inttypes.h stdint.h unistd.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-+"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-
-+fi
-
-+done
-
-
-+for ac_header in dlfcn.h
-+do :
-+ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-+"
-+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_DLFCN_H 1
-+_ACEOF
-
-+fi
-
-+done
-
-
-
--for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-- inttypes.h stdint.h unistd.h
+-
+-
+-
+-
+-
+-
+-
+-
+-
+ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+ inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -7473,17 +7514,21 @@
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--
--done
--
--
--
--for ac_header in dlfcn.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
++"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -9165,62 +8610,13 @@
+ done
+
+
+-
+ for ac_header in dlfcn.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -7536,22 +7581,17 @@
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
++do :
++ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
++"
++if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--
--done
--
--
--
--# Set options
-+# Set options
-
-
-
-@@ -9240,7 +8626,7 @@
++#define HAVE_DLFCN_H 1
+ _ACEOF
+
+ fi
+@@ -9240,7 +8636,7 @@
# Check whether --enable-shared was given.
@@ -7560,7 +7600,7 @@
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -9273,7 +8659,7 @@
+@@ -9273,7 +8669,7 @@
# Check whether --with-pic was given.
@@ -7569,7 +7609,7 @@
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
-@@ -9289,7 +8675,7 @@
+@@ -9289,7 +8685,7 @@
# Check whether --enable-fast-install was given.
@@ -7578,7 +7618,7 @@
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
-@@ -9370,9 +8756,9 @@
+@@ -9370,9 +8766,9 @@
setopt NO_GLOB_SUBST
fi
@@ -7590,7 +7630,7 @@
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -9385,7 +8771,7 @@
+@@ -9385,7 +8781,7 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -7599,7 +7639,7 @@
$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
-@@ -9478,9 +8864,9 @@
+@@ -9478,9 +8874,9 @@
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -7611,7 +7651,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -9531,10 +8917,10 @@
+@@ -9531,10 +8927,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -7624,7 +7664,7 @@
$as_echo "no" >&6; }
fi
-@@ -9544,9 +8930,9 @@
+@@ -9544,9 +8940,9 @@
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
@@ -7636,7 +7676,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -9597,10 +8983,10 @@
+@@ -9597,10 +8993,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -7649,7 +7689,7 @@
$as_echo "no" >&6; }
fi
-@@ -9677,9 +9063,9 @@
+@@ -9677,9 +9073,9 @@
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -7661,21 +7701,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -9695,11 +9081,11 @@
+@@ -9695,11 +9091,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9698: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9084: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9094: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9702: \$? = $ac_status" >&5
-+ echo "$as_me:9088: \$? = $ac_status" >&5
++ echo "$as_me:9098: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -9712,7 +9098,7 @@
+@@ -9712,7 +9108,7 @@
$RM conftest*
fi
@@ -7684,7 +7724,7 @@
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -9732,7 +9118,7 @@
+@@ -9732,7 +9128,7 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -7693,7 +7733,7 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
-@@ -9864,7 +9250,7 @@
+@@ -9864,7 +9260,7 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -7702,7 +7742,7 @@
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
-@@ -10004,7 +9390,7 @@
+@@ -10004,7 +9400,7 @@
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -7711,7 +7751,7 @@
$as_echo "$lt_prog_compiler_pic" >&6; }
-@@ -10016,9 +9402,9 @@
+@@ -10016,9 +9412,9 @@
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
@@ -7723,21 +7763,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -10034,11 +9420,11 @@
+@@ -10034,11 +9430,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10037: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9423: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9433: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10041: \$? = $ac_status" >&5
-+ echo "$as_me:9427: \$? = $ac_status" >&5
++ echo "$as_me:9437: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -10051,7 +9437,7 @@
+@@ -10051,7 +9447,7 @@
$RM conftest*
fi
@@ -7746,7 +7786,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -10075,9 +9461,9 @@
+@@ -10075,9 +9471,9 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -7758,7 +7798,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -10103,7 +9489,7 @@
+@@ -10103,7 +9499,7 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -7767,7 +7807,7 @@
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -10118,9 +9504,9 @@
+@@ -10118,9 +9514,9 @@
@@ -7779,21 +7819,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -10139,11 +9525,11 @@
+@@ -10139,11 +9535,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10142: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9528: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9538: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10146: \$? = $ac_status" >&5
-+ echo "$as_me:9532: \$? = $ac_status" >&5
++ echo "$as_me:9542: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -10165,7 +9551,7 @@
+@@ -10165,7 +9561,7 @@
$RM conftest*
fi
@@ -7802,7 +7842,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -10173,9 +9559,9 @@
+@@ -10173,9 +9569,9 @@
@@ -7814,21 +7854,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -10194,11 +9580,11 @@
+@@ -10194,11 +9590,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10197: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9583: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9593: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10201: \$? = $ac_status" >&5
-+ echo "$as_me:9587: \$? = $ac_status" >&5
++ echo "$as_me:9597: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -10220,7 +9606,7 @@
+@@ -10220,7 +9616,7 @@
$RM conftest*
fi
@@ -7837,7 +7877,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -10229,7 +9615,7 @@
+@@ -10229,7 +9625,7 @@
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
@@ -7846,7 +7886,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -10237,10 +9623,10 @@
+@@ -10237,10 +9633,10 @@
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -7859,7 +7899,7 @@
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -10253,7 +9639,7 @@
+@@ -10253,7 +9649,7 @@
@@ -7868,7 +7908,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
-@@ -10313,6 +9699,9 @@
+@@ -10313,6 +9709,9 @@
openbsd*)
with_gnu_ld=no
;;
@@ -7878,7 +7918,7 @@
esac
ld_shlibs=yes
-@@ -10334,6 +9723,7 @@
+@@ -10334,6 +9733,7 @@
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
@@ -7886,7 +7926,7 @@
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -10425,7 +9815,7 @@
+@@ -10425,7 +9825,7 @@
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -7895,7 +7935,7 @@
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
-@@ -10495,7 +9885,7 @@
+@@ -10495,7 +9895,7 @@
fi
;;
@@ -7904,7 +7944,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -10670,6 +10060,7 @@
+@@ -10670,6 +10070,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -7912,7 +7952,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -10695,11 +10086,7 @@
+@@ -10695,11 +10096,7 @@
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -7925,7 +7965,7 @@
/* end confdefs.h. */
int
-@@ -10710,27 +10097,7 @@
+@@ -10710,27 +10107,7 @@
return 0;
}
_ACEOF
@@ -7954,7 +7994,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10744,16 +10111,9 @@
+@@ -10744,16 +10121,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -7973,7 +8013,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -10766,11 +10126,7 @@
+@@ -10766,11 +10136,7 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -7986,7 +8026,7 @@
/* end confdefs.h. */
int
-@@ -10781,27 +10137,7 @@
+@@ -10781,27 +10147,7 @@
return 0;
}
_ACEOF
@@ -8015,7 +8055,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10815,16 +10151,9 @@
+@@ -10815,16 +10161,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -8034,7 +8074,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -11036,42 +10365,16 @@
+@@ -11036,42 +10375,16 @@
# implicitly export all symbols.
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
@@ -8082,7 +8122,7 @@
LDFLAGS="$save_LDFLAGS"
else
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -11084,7 +10387,7 @@
+@@ -11084,7 +10397,7 @@
link_all_deplibs=yes
;;
@@ -8091,7 +8131,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -11327,7 +10630,7 @@
+@@ -11327,7 +10640,7 @@
fi
fi
@@ -8100,7 +8140,7 @@
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-@@ -11364,16 +10667,16 @@
+@@ -11364,16 +10677,16 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -8121,7 +8161,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -11387,11 +10690,11 @@
+@@ -11387,11 +10700,11 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
@@ -8136,7 +8176,7 @@
then
archive_cmds_need_lc=no
else
-@@ -11402,7 +10705,7 @@
+@@ -11402,7 +10715,7 @@
cat conftest.err 1>&5
fi
$RM conftest*
@@ -8145,7 +8185,7 @@
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
-@@ -11566,7 +10869,7 @@
+@@ -11566,7 +10879,7 @@
@@ -8154,7 +8194,7 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
-@@ -11974,7 +11277,7 @@
+@@ -11974,7 +11287,7 @@
;;
# This must be Linux ELF.
@@ -8163,7 +8203,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -11988,11 +11291,7 @@
+@@ -11988,11 +11301,7 @@
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -8176,7 +8216,7 @@
/* end confdefs.h. */
int
-@@ -12003,41 +11302,13 @@
+@@ -12003,41 +11312,13 @@
return 0;
}
_ACEOF
@@ -8222,7 +8262,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -12046,13 +11317,10 @@
+@@ -12046,13 +11327,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -8237,7 +8277,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -12064,6 +11332,18 @@
+@@ -12064,6 +11342,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -8256,7 +8296,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -12252,7 +11532,7 @@
+@@ -12252,7 +11542,7 @@
dynamic_linker=no
;;
esac
@@ -8265,7 +8305,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -12354,7 +11634,7 @@
+@@ -12354,7 +11644,7 @@
@@ -8274,7 +8314,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
-@@ -12379,7 +11659,7 @@
+@@ -12379,7 +11669,7 @@
# directories.
hardcode_action=unsupported
fi
@@ -8283,368 +8323,30 @@
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
-@@ -12424,18 +11704,14 @@
-
- darwin*)
- # if libdl is installed we need to link against it
+@@ -12405,130 +11695,34 @@
+ lt_cv_dlopen=no
+ lt_cv_dlopen_libs=
+
+- case $host_os in
+- beos*)
+- lt_cv_dlopen="load_add_on"
+- lt_cv_dlopen_libs=
+- lt_cv_dlopen_self=yes
+- ;;
+-
+- mingw* | pw32* | cegcc*)
+- lt_cv_dlopen="LoadLibrary"
+- lt_cv_dlopen_libs=
+- ;;
+-
+- cygwin*)
+- lt_cv_dlopen="dlopen"
+- lt_cv_dlopen_libs=
+- ;;
+-
+- darwin*)
+- # if libdl is installed we need to link against it
- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
- $as_echo_n "checking for dlopen in -ldl... " >&6; }
--if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -12453,43 +11729,18 @@
- 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_dl_dlopen=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_dl_dlopen=no
-+ ac_cv_lib_dl_dlopen=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
- $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
--if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
-+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
- else
-
-@@ -12502,33 +11753,19 @@
- ;;
-
- *)
-- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
--$as_echo_n "checking for shl_load... " >&6; }
--if test "${ac_cv_func_shl_load+set}" = set; then
-+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-+if test "x$ac_cv_func_shl_load" = x""yes; then :
-+ lt_cv_dlopen="shl_load"
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-+$as_echo_n "checking for shl_load in -ldld... " >&6; }
-+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldld $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define shl_load innocuous_shl_load
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char shl_load (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef shl_load
-
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -12537,13 +11774,6 @@
- extern "C"
- #endif
- char shl_load ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_shl_load || defined __stub___shl_load
--choke me
--#endif
--
- int
- main ()
- {
-@@ -12552,56 +11782,32 @@
- 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_func_shl_load=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_dld_shl_load=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_func_shl_load=no
-+ ac_cv_lib_dld_shl_load=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
--$as_echo "$ac_cv_func_shl_load" >&6; }
--if test "x$ac_cv_func_shl_load" = x""yes; then
-- lt_cv_dlopen="shl_load"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
-+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
- else
-- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
--$as_echo_n "checking for shl_load in -ldld... " >&6; }
--if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-+if test "x$ac_cv_func_dlopen" = x""yes; then :
-+ lt_cv_dlopen="dlopen"
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-+$as_echo_n "checking for dlopen in -ldl... " >&6; }
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldld $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+LIBS="-ldl $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -12610,81 +11816,38 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char shl_load ();
-+char dlopen ();
- int
- main ()
- {
--return shl_load ();
-+return dlopen ();
- ;
- 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_lib_dld_shl_load=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_dl_dlopen=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_dld_shl_load=no
-+ ac_cv_lib_dl_dlopen=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
--$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
--if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
-- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
- else
-- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
--$as_echo_n "checking for dlopen... " >&6; }
--if test "${ac_cv_func_dlopen+set}" = set; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
-+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-+if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsvld $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define dlopen innocuous_dlopen
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char dlopen (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef dlopen
-
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -12693,13 +11856,6 @@
- extern "C"
- #endif
- char dlopen ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_dlopen || defined __stub___dlopen
--choke me
--#endif
--
- int
- main ()
- {
-@@ -12708,192 +11864,28 @@
- 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_func_dlopen=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_func_dlopen=no
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
--$as_echo "$ac_cv_func_dlopen" >&6; }
--if test "x$ac_cv_func_dlopen" = x""yes; then
-- lt_cv_dlopen="dlopen"
--else
-- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
- $as_echo_n "(cached) " >&6
@@ -8712,19 +8414,241 @@
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-- { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
--$as_echo_n "checking for dlopen in -lsvld... " >&6; }
--if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsvld $LIBS"
+-
+- lt_cv_dlopen="dyld"
++ case $host_os in
++ beos*)
++ lt_cv_dlopen="load_add_on"
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=yes
++ ;;
+
+-fi
++ mingw* | pw32* | cegcc*)
++ lt_cv_dlopen="LoadLibrary"
++ lt_cv_dlopen_libs=
++ ;;
+
++ cygwin*)
++ lt_cv_dlopen="dlopen"
++ lt_cv_dlopen_libs=
+ ;;
+
+- *)
+- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
+-$as_echo_n "checking for shl_load... " >&6; }
+-if test "${ac_cv_func_shl_load+set}" = set; then
++ darwin*)
++ # if libdl is installed we need to link against it
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
++$as_echo_n "checking for dlopen in -ldl... " >&6; }
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define shl_load innocuous_shl_load
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char shl_load (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef shl_load
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+@@ -12536,72 +11730,51 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char shl_load ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_shl_load || defined __stub___shl_load
+-choke me
+-#endif
+-
++char dlopen ();
+ int
+ main ()
+ {
+-return shl_load ();
++return dlopen ();
+ ;
+ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$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
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- ac_cv_func_shl_load=yes
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_dl_dlopen=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_func_shl_load=no
++ ac_cv_lib_dl_dlopen=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
++$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
++ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
++
++ lt_cv_dlopen="dyld"
++ lt_cv_dlopen_libs=
++ lt_cv_dlopen_self=yes
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+-$as_echo "$ac_cv_func_shl_load" >&6; }
+-if test "x$ac_cv_func_shl_load" = x""yes; then
++
++ ;;
++
++ *)
++ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
++if test "x$ac_cv_func_shl_load" = x""yes; then :
+ lt_cv_dlopen="shl_load"
+ else
+- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+ $as_echo_n "checking for shl_load in -ldld... " >&6; }
+-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
++if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -12619,145 +11792,32 @@
+ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$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
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dld_shl_load=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_dld_shl_load=no
++ ac_cv_lib_dld_shl_load=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+ $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
++if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+ else
+- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
+-$as_echo_n "checking for dlopen... " >&6; }
+-if test "${ac_cv_func_dlopen+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define dlopen innocuous_dlopen
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char dlopen (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef dlopen
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -8733,6 +8657,13 @@
-extern "C"
-#endif
-char dlopen ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_dlopen || defined __stub___dlopen
+-choke me
+-#endif
+-
-int
-main ()
-{
@@ -8762,6 +8693,135 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+- ac_cv_func_dlopen=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_func_dlopen=no
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+-$as_echo "$ac_cv_func_dlopen" >&6; }
+-if test "x$ac_cv_func_dlopen" = x""yes; then
++ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
++if test "x$ac_cv_func_dlopen" = x""yes; then :
+ lt_cv_dlopen="dlopen"
+ else
+- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -12775,57 +11835,28 @@
+ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$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
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dl_dlopen=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_dl_dlopen=no
++ ac_cv_lib_dl_dlopen=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+- { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+ $as_echo_n "checking for dlopen in -lsvld... " >&6; }
+-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
++if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsvld $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -12843,57 +11874,28 @@
+ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$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
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_svld_dlopen=yes
else
@@ -8804,7 +8864,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12911,43 +11903,18 @@
+@@ -12911,43 +11913,18 @@
return 0;
}
_ACEOF
@@ -8854,7 +8914,7 @@
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -12986,9 +11953,9 @@
+@@ -12986,9 +11963,9 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -8866,16 +8926,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -12997,7 +11964,7 @@
+@@ -12997,7 +11974,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 13000 "configure"
-+#line 11967 "configure"
++#line 11977 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -13056,11 +12023,11 @@
+@@ -13056,11 +12033,11 @@
return status;
}
_LT_EOF
@@ -8890,7 +8950,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -13077,14 +12044,14 @@
+@@ -13077,14 +12054,14 @@
fi
@@ -8908,16 +8968,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -13093,7 +12060,7 @@
+@@ -13093,7 +12070,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 13096 "configure"
-+#line 12063 "configure"
++#line 12073 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -13152,11 +12119,11 @@
+@@ -13152,11 +12129,11 @@
return status;
}
_LT_EOF
@@ -8932,7 +8992,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -13173,7 +12140,7 @@
+@@ -13173,7 +12150,7 @@
fi
@@ -8941,7 +9001,7 @@
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
-@@ -13212,12 +12179,12 @@
+@@ -13212,12 +12189,12 @@
striplib=
old_striplib=
@@ -8956,7 +9016,7 @@
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
-@@ -13226,15 +12193,15 @@
+@@ -13226,15 +12203,15 @@
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -8975,7 +9035,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -13252,12 +12219,12 @@
+@@ -13252,12 +12229,12 @@
# Report which library types will actually be built
@@ -8991,7 +9051,7 @@
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
-@@ -13278,14 +12245,14 @@
+@@ -13278,14 +12255,14 @@
fi
;;
esac
@@ -9009,7 +9069,7 @@
$as_echo "$enable_static" >&6; }
-@@ -13320,12 +12287,12 @@
+@@ -13320,12 +12297,12 @@
# Only expand once:
@@ -9024,7 +9084,7 @@
withval=$with_x;
fi
-@@ -13335,10 +12302,8 @@
+@@ -13335,10 +12312,8 @@
have_x=disabled
else
case $x_includes,$x_libraries in #(
@@ -9037,7 +9097,7 @@
$as_echo_n "(cached) " >&6
else
# One or both of the vars are not set, and there is no cached value.
-@@ -13386,21 +12351,25 @@
+@@ -13386,21 +12361,25 @@
# Check X11 before X11Rn because it is often a symlink to the current release.
ac_x_header_dirs='
/usr/X11/include
@@ -9063,7 +9123,7 @@
/usr/local/include/X11R6
/usr/local/include/X11R5
/usr/local/include/X11R4
-@@ -13422,37 +12391,14 @@
+@@ -13422,37 +12401,14 @@
if test "$ac_x_includes" = no; then
# Guess where to find include files, by looking for Xlib.h.
# First, try using that file with no special directory specified.
@@ -9103,7 +9163,7 @@
for ac_dir in $ac_x_header_dirs; do
if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir
-@@ -13460,7 +12406,6 @@
+@@ -13460,7 +12416,6 @@
fi
done
fi
@@ -9111,7 +9171,7 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = no
-@@ -13470,11 +12415,7 @@
+@@ -13470,11 +12425,7 @@
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
LIBS="-lX11 $LIBS"
@@ -9124,7 +9184,7 @@
/* end confdefs.h. */
#include <X11/Xlib.h>
int
-@@ -13485,35 +12426,12 @@
+@@ -13485,35 +12436,12 @@
return 0;
}
_ACEOF
@@ -9162,7 +9222,7 @@
for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
do
# Don't even attempt the hair of trying to link an X program!
-@@ -13525,10 +12443,8 @@
+@@ -13525,10 +12453,8 @@
done
done
fi
@@ -9175,7 +9235,7 @@
fi # $ac_x_libraries = no
case $ac_x_includes,$ac_x_libraries in #(
-@@ -13549,7 +12465,7 @@
+@@ -13549,7 +12475,7 @@
fi # $with_x != no
if test "$have_x" != yes; then
@@ -9184,7 +9244,7 @@
$as_echo "$have_x" >&6; }
no_x=yes
else
-@@ -13560,16 +12476,14 @@
+@@ -13560,16 +12486,14 @@
ac_cv_have_x="have_x=yes\
ac_x_includes='$x_includes'\
ac_x_libraries='$x_libraries'"
@@ -9203,7 +9263,7 @@
X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
else
-@@ -13582,16 +12496,12 @@
+@@ -13582,16 +12506,12 @@
X_LIBS="$X_LIBS -L$x_libraries"
# For Solaris; some versions of Sun CC require a space after -R and
# others require no space. Words are not sufficient . . . .
@@ -9222,7 +9282,7 @@
/* end confdefs.h. */
int
-@@ -13602,40 +12512,13 @@
+@@ -13602,90 +12522,36 @@
return 0;
}
_ACEOF
@@ -9266,11 +9326,14 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- int
-@@ -13646,46 +12529,19 @@
- return 0;
- }
- _ACEOF
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -9293,6 +9356,14 @@
- $as_test_x conftest$ac_exeext
- }; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -9321,7 +9392,7 @@
ac_c_werror_flag=$ac_xsave_c_werror_flag
LIBS=$ac_xsave_LIBS
fi
-@@ -13701,11 +12557,7 @@
+@@ -13701,11 +12567,7 @@
# libraries were built with DECnet support. And Karl Berry says
# the Alpha needs dnet_stub (dnet does not exist).
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
@@ -9334,7 +9405,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -13723,44 +12575,17 @@
+@@ -13723,44 +12585,17 @@
return 0;
}
_ACEOF
@@ -9384,7 +9455,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -13778,59 +12603,30 @@
+@@ -13778,59 +12613,30 @@
return 0;
}
_ACEOF
@@ -9453,7 +9524,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -13848,52 +12644,25 @@
+@@ -13848,52 +12654,25 @@
return 0;
}
_ACEOF
@@ -9514,7 +9585,7 @@
LIBS="$ac_xsave_LIBS"
# msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-@@ -13904,105 +12673,20 @@
+@@ -13904,105 +12683,20 @@
# on Irix 5.2, according to T.E. Dickey.
# The functions gethostbyname, getservbyname, and inet_addr are
# in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
@@ -9532,9 +9603,7 @@
-/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define gethostbyname innocuous_gethostbyname
-+ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char gethostbyname (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
@@ -9597,15 +9666,17 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_gethostbyname=no
- fi
+-fi
++ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
++if test "x$ac_cv_func_gethostbyname" = x""yes; then :
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-$as_echo "$ac_cv_func_gethostbyname" >&6; }
--
+
if test $ac_cv_func_gethostbyname = no; then
- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
@@ -9625,7 +9696,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14020,225 +12704,30 @@
+@@ -14020,59 +12714,30 @@
return 0;
}
_ACEOF
@@ -9652,54 +9723,52 @@
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_nsl_gethostbyname=yes
--else
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_nsl_gethostbyname=no
--fi
++ ac_cv_lib_nsl_gethostbyname=no
+ fi
-
-rm -rf conftest.dSYM
-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
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
--$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
-- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
--fi
--
-- if test $ac_cv_lib_nsl_gethostbyname = no; then
++if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+
+ if test $ac_cv_lib_nsl_gethostbyname = no; then
- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
--$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
+ $as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lbsd $LIBS"
++if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char gethostbyname ();
--int
--main ()
--{
--return gethostbyname ();
-- ;
-- return 0;
--}
--_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -14090,43 +12755,18 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -9721,32 +9790,35 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_bsd_gethostbyname=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_bsd_gethostbyname=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_bsd_gethostbyname=no
--fi
++ ac_cv_lib_bsd_gethostbyname=no
+ fi
-
-rm -rf conftest.dSYM
-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
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
--$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
-if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then
-- X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
--fi
--
-- fi
-- fi
--
-- # lieder at skyler.mavd.honeywell.com says without -lsocket,
-- # socket/setsockopt and other routines are undefined under SCO ODT
-- # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary
-- # on later versions), says Simon Leinen: it contains gethostby*
++if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+ fi
+
+@@ -14137,195 +12777,24 @@
+ # socket/setsockopt and other routines are undefined under SCO ODT
+ # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary
+ # on later versions), says Simon Leinen: it contains gethostby*
- # variants that don't use the name server (or something). -lsocket
- # must be given before -lnsl if both are needed. We assume that
- # if connect needs -lnsl, so does gethostbyname.
@@ -9827,62 +9899,45 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_connect=no
-+else
-+ ac_cv_lib_nsl_gethostbyname=no
- fi
+-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
-+$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
-+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
-+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-$as_echo "$ac_cv_func_connect" >&6; }
-
+-
- if test $ac_cv_func_connect = no; then
- { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-$as_echo_n "checking for connect in -lsocket... " >&6; }
-if test "${ac_cv_lib_socket_connect+set}" = set; then
-+ if test $ac_cv_lib_nsl_gethostbyname = no; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
-+$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
-+if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+LIBS="-lbsd $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -14247,85 +12736,55 @@
- #ifdef __cplusplus
- extern "C"
- #endif
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
-char connect ();
-+char gethostbyname ();
- int
- main ()
- {
+-int
+-main ()
+-{
-return connect ();
-+return gethostbyname ();
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -9905,52 +9960,36 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_socket_connect=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_bsd_gethostbyname=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_socket_connect=no
-+ ac_cv_lib_bsd_gethostbyname=no
- fi
+-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
+-LIBS=$ac_check_lib_save_LIBS
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-$as_echo "$ac_cv_lib_socket_connect" >&6; }
-if test "x$ac_cv_lib_socket_connect" = x""yes; then
- X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
-+$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
-+if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
-+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
- fi
-
-+ fi
- fi
-
-- # Guillermo Gomez says -lposix is necessary on A/UX.
-- { $as_echo "$as_me:$LINENO: checking for remove" >&5
--$as_echo_n "checking for remove... " >&6; }
--if test "${ac_cv_func_remove+set}" = set; then
-+ # lieder at skyler.mavd.honeywell.com says without -lsocket,
-+ # socket/setsockopt and other routines are undefined under SCO ODT
-+ # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary
-+ # on later versions), says Simon Leinen: it contains gethostby*
+-fi
+ # variants that don't use the name server (or something). -lsocket
+ # must be given before -lnsl if both are needed. We assume that
+ # if connect needs -lnsl, so does gethostbyname.
+ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
+if test "x$ac_cv_func_connect" = x""yes; then :
-+
+
+- fi
+fi
-+
+
+- # Guillermo Gomez says -lposix is necessary on A/UX.
+- { $as_echo "$as_me:$LINENO: checking for remove" >&5
+-$as_echo_n "checking for remove... " >&6; }
+-if test "${ac_cv_func_remove+set}" = set; then
+ if test $ac_cv_func_connect = no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
+$as_echo_n "checking for connect in -lsocket... " >&6; }
@@ -9985,7 +10024,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -14333,71 +12792,47 @@
+@@ -14333,71 +12802,47 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -10037,7 +10076,7 @@
-
- ac_cv_func_remove=no
+ ac_cv_lib_socket_connect=no
-+fi
+ fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
@@ -10046,17 +10085,17 @@
+$as_echo "$ac_cv_lib_socket_connect" >&6; }
+if test "x$ac_cv_lib_socket_connect" = x""yes; then :
+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
- fi
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
++fi
++
+ fi
+
+ # Guillermo Gomez says -lposix is necessary on A/UX.
+ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
+if test "x$ac_cv_func_remove" = x""yes; then :
-+
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-$as_echo "$ac_cv_func_remove" >&6; }
@@ -10080,7 +10119,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14415,148 +12850,38 @@
+@@ -14415,148 +12860,38 @@
return 0;
}
_ACEOF
@@ -10240,7 +10279,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14574,43 +12899,18 @@
+@@ -14574,43 +12909,18 @@
return 0;
}
_ACEOF
@@ -10290,7 +10329,7 @@
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -14626,18 +12926,14 @@
+@@ -14626,18 +12936,14 @@
# These have to be linked with before -lX11, unlike the other
# libraries we check for below, so use a different variable.
# John Interrante, Karl Berry
@@ -10312,7 +10351,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14655,43 +12951,18 @@
+@@ -14655,43 +12961,18 @@
return 0;
}
_ACEOF
@@ -10362,7 +10401,7 @@
X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
fi
-@@ -14701,9 +12972,9 @@
+@@ -14701,9 +12982,9 @@
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -10374,36 +10413,39 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -14715,128 +12986,35 @@
- for as_dir in $PATH
+@@ -14716,14 +12997,14 @@
do
IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
+ 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
-done
--done
--IFS=$as_save_IFS
--
-- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-- ;;
--esac
--fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
++ done
+ IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+@@ -14732,273 +13013,62 @@
+ fi
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ if test -n "$PKG_CONFIG"; then
- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
--else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+ $as_echo "$PKG_CONFIG" >&6; }
+ else
- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+
-{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5
-$as_echo_n "checking for pid_t... " >&6; }
-if test "${ac_cv_type_pid_t+set}" = set; then
@@ -10465,20 +10507,7 @@
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-+ 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
-+
-+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-+ ;;
- esac
+-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
@@ -10492,26 +10521,19 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-+fi
-+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-+if test -n "$PKG_CONFIG"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-+$as_echo "$PKG_CONFIG" >&6; }
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_pid_t=yes
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+-
+-
-fi
+ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
+if test "x$ac_cv_type_pid_t" = x""yes; then :
@@ -10525,30 +10547,33 @@
else
cat >>confdefs.h <<_ACEOF
-@@ -14845,16 +13023,12 @@
-
- fi
-
+ #define pid_t int
+ _ACEOF
+
+-fi
+-
-{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
- $as_echo_n "checking return type of signal handlers... " >&6; }
+-$as_echo_n "checking return type of signal handlers... " >&6; }
-if test "${ac_cv_type_signal+set}" = set; then
-+if test "${ac_cv_type_signal+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- #include <sys/types.h>
- #include <signal.h>
-@@ -14867,35 +13041,14 @@
- return 0;
- }
- _ACEOF
+-/* end confdefs.h. */
+-#include <sys/types.h>
+-#include <signal.h>
+-
+-int
+-main ()
+-{
+-return *(signal (0, 0)) (0) == 1;
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -10567,32 +10592,33 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_type_signal=int
- else
+- ac_cv_type_signal=int
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_signal=void
-+ ac_cv_type_signal=void
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
- $as_echo "$ac_cv_type_signal" >&6; }
-
- cat >>confdefs.h <<_ACEOF
-@@ -14903,102 +13056,9 @@
- _ACEOF
-
+-$as_echo "$ac_cv_type_signal" >&6; }
+-
+-cat >>confdefs.h <<_ACEOF
+-#define RETSIGTYPE $ac_cv_type_signal
+-_ACEOF
+-
++fi
-{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
-$as_echo_n "checking for size_t... " >&6; }
-if test "${ac_cv_type_size_t+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
++$as_echo_n "checking return type of signal handlers... " >&6; }
++if test "${ac_cv_type_signal+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- ac_cv_type_size_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -10633,17 +10659,22 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-$ac_includes_default
--int
--main ()
--{
++#include <sys/types.h>
++#include <signal.h>
++
+ int
+ main ()
+ {
-if (sizeof ((size_t)))
- return 0;
-- ;
-- return 0;
--}
--_ACEOF
++return *(signal (0, 0)) (0) == 1;
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -10663,22 +10694,29 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_type_signal=int
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_type_size_t=yes
++ ac_cv_type_signal=void
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_type_size_t=yes
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
++$as_echo "$ac_cv_type_signal" >&6; }
+
++cat >>confdefs.h <<_ACEOF
++#define RETSIGTYPE $ac_cv_type_signal
++_ACEOF
+
-fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
--fi
-+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-+if test "x$ac_cv_type_size_t" = x""yes; then :
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
@@ -10686,10 +10724,13 @@
-$as_echo "$ac_cv_type_size_t" >&6; }
-if test "x$ac_cv_type_size_t" = x""yes; then
- :
++ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
++if test "x$ac_cv_type_size_t" = x""yes; then :
++
else
cat >>confdefs.h <<_ACEOF
-@@ -15007,22 +13067,18 @@
+@@ -15007,22 +13077,18 @@
fi
@@ -10716,7 +10757,7 @@
ac_cv_type_uid_t=yes
else
ac_cv_type_uid_t=no
-@@ -15030,34 +13086,30 @@
+@@ -15030,34 +13096,30 @@
rm -f conftest*
fi
@@ -10757,7 +10798,7 @@
$as_echo_n "(cached) " >&6
else
case $HTTPD in
-@@ -15071,14 +13123,14 @@
+@@ -15071,14 +13133,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10775,7 +10816,7 @@
IFS=$as_save_IFS
;;
-@@ -15086,10 +13138,10 @@
+@@ -15086,10 +13148,10 @@
fi
HTTPD=$ac_cv_path_HTTPD
if test -n "$HTTPD"; then
@@ -10788,7 +10829,7 @@
$as_echo "no" >&6; }
fi
-@@ -15098,9 +13150,9 @@
+@@ -15098,9 +13160,9 @@
# As used in SUSE
# Extract the first word of "apache2", so it can be a program name with args.
set dummy apache2; ac_word=$2
@@ -10800,7 +10841,7 @@
$as_echo_n "(cached) " >&6
else
case $HTTPD in
-@@ -15114,14 +13166,14 @@
+@@ -15114,14 +13176,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10818,7 +10859,7 @@
IFS=$as_save_IFS
;;
-@@ -15129,10 +13181,10 @@
+@@ -15129,10 +13191,10 @@
fi
HTTPD=$ac_cv_path_HTTPD
if test -n "$HTTPD"; then
@@ -10831,7 +10872,7 @@
$as_echo "no" >&6; }
fi
-@@ -15142,9 +13194,9 @@
+@@ -15142,9 +13204,9 @@
# As used in Ubuntu
# Extract the first word of "httpd2", so it can be a program name with args.
set dummy httpd2; ac_word=$2
@@ -10843,7 +10884,7 @@
$as_echo_n "(cached) " >&6
else
case $HTTPD in
-@@ -15158,14 +13210,14 @@
+@@ -15158,14 +13220,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10861,7 +10902,7 @@
IFS=$as_save_IFS
;;
-@@ -15173,10 +13225,10 @@
+@@ -15173,10 +13235,10 @@
fi
HTTPD=$ac_cv_path_HTTPD
if test -n "$HTTPD"; then
@@ -10874,7 +10915,7 @@
$as_echo "no" >&6; }
fi
-@@ -15187,11 +13239,11 @@
+@@ -15187,11 +13249,11 @@
if test -n "$PKG_CONFIG" && \
@@ -10889,7 +10930,7 @@
have_dbus_1_1=true
else
have_dbus_1_1=false
-@@ -15199,48 +13251,50 @@
+@@ -15199,48 +13261,50 @@
if $have_dbus_1_1 ; then
DBUS_MODULES=dbus-1
@@ -10968,7 +11009,7 @@
fi
-@@ -15253,25 +13307,14 @@
+@@ -15253,25 +13317,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -10997,7 +11038,7 @@
$USER_SHARE_PKG_ERRORS
-@@ -15281,22 +13324,11 @@
+@@ -15281,22 +13334,11 @@
Alternatively, you may set the environment variables USER_SHARE_CFLAGS
and USER_SHARE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -11023,7 +11064,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -15305,12 +13337,11 @@
+@@ -15305,12 +13347,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -11038,11 +11079,101 @@
$as_echo "yes" >&6; }
:
fi
-@@ -15319,40 +13350,44 @@
+@@ -15319,40 +13360,134 @@
pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for USER_SHARE_CONFIG" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BLUETOOTH" >&5
++$as_echo_n "checking for BLUETOOTH... " >&6; }
++
++if test -n "$PKG_CONFIG"; then
++ if test -n "$BLUETOOTH_CFLAGS"; then
++ pkg_cv_BLUETOOTH_CFLAGS="$BLUETOOTH_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-bluetooth-1.0 >= 2.27.7.2\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "gnome-bluetooth-1.0 >= 2.27.7.2") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_BLUETOOTH_CFLAGS=`$PKG_CONFIG --cflags "gnome-bluetooth-1.0 >= 2.27.7.2" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++if test -n "$PKG_CONFIG"; then
++ if test -n "$BLUETOOTH_LIBS"; then
++ pkg_cv_BLUETOOTH_LIBS="$BLUETOOTH_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-bluetooth-1.0 >= 2.27.7.2\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "gnome-bluetooth-1.0 >= 2.27.7.2") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_BLUETOOTH_LIBS=`$PKG_CONFIG --libs "gnome-bluetooth-1.0 >= 2.27.7.2" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ BLUETOOTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-bluetooth-1.0 >= 2.27.7.2"`
++ else
++ BLUETOOTH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-bluetooth-1.0 >= 2.27.7.2"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$BLUETOOTH_PKG_ERRORS" >&5
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ have_bluetooth=false
++elif test $pkg_failed = untried; then
++ have_bluetooth=false
++else
++ BLUETOOTH_CFLAGS=$pkg_cv_BLUETOOTH_CFLAGS
++ BLUETOOTH_LIBS=$pkg_cv_BLUETOOTH_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ have_bluetooth=true
++fi
++
++
++if $have_bluetooth; then
++
++$as_echo "#define HAVE_BLUETOOTH 1" >>confdefs.h
++
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Bluetooth support is disabled." >&5
++$as_echo "$as_me: WARNING: Bluetooth support is disabled." >&2;}
++fi
++ if test "$have_bluetooth" = "true"; then
++ USE_BLUETOOTH_TRUE=
++ USE_BLUETOOTH_FALSE='#'
++else
++ USE_BLUETOOTH_TRUE='#'
++ USE_BLUETOOTH_FALSE=
++fi
++
++
++
++pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for USER_SHARE_CONFIG" >&5
$as_echo_n "checking for USER_SHARE_CONFIG... " >&6; }
@@ -11102,7 +11233,7 @@
fi
-@@ -15365,25 +13400,14 @@
+@@ -15365,25 +13500,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -11131,7 +11262,7 @@
$USER_SHARE_CONFIG_PKG_ERRORS
-@@ -15393,22 +13417,11 @@
+@@ -15393,22 +13517,11 @@
Alternatively, you may set the environment variables USER_SHARE_CONFIG_CFLAGS
and USER_SHARE_CONFIG_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -11157,7 +11288,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -15417,31 +13430,25 @@
+@@ -15417,31 +13530,25 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -11194,7 +11325,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15459,43 +13466,18 @@
+@@ -15459,43 +13566,18 @@
return 0;
}
_ACEOF
@@ -11244,7 +11375,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSOCKET 1
_ACEOF
-@@ -15506,102 +13488,12 @@
+@@ -15506,102 +13588,12 @@
have_socket=no
@@ -11351,7 +11482,7 @@
_ACEOF
have_socket=yes
fi
-@@ -15611,18 +13503,14 @@
+@@ -15611,18 +13603,14 @@
# socket is not in the default libraries. See if it's in some other.
for lib in bsd socket inet; do
as_ac_Lib=`$as_echo "ac_cv_lib_$lib''_socket" | $as_tr_sh`
@@ -11373,7 +11504,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15640,53 +13528,24 @@
+@@ -15640,53 +13628,24 @@
return 0;
}
_ACEOF
@@ -11398,14 +11529,13 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- eval "$as_ac_Lib=yes"
++if ac_fn_c_try_link "$LINENO"; then :
+ eval "$as_ac_Lib=yes"
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_Lib=no"
-+if ac_fn_c_try_link "$LINENO"; then :
-+ eval "$as_ac_Lib=yes"
+else
+ eval "$as_ac_Lib=no"
fi
@@ -11438,7 +11568,7 @@
break
fi
-@@ -15696,9 +13555,9 @@
+@@ -15696,9 +13655,9 @@
# Extract the first word of "glib-genmarshal", so it can be a program name with args.
set dummy glib-genmarshal; ac_word=$2
@@ -11450,7 +11580,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_GENMARSHAL in
-@@ -15711,14 +13570,14 @@
+@@ -15711,14 +13670,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11468,7 +11598,7 @@
IFS=$as_save_IFS
;;
-@@ -15726,10 +13585,10 @@
+@@ -15726,10 +13685,10 @@
fi
GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
if test -n "$GLIB_GENMARSHAL"; then
@@ -11481,7 +11611,7 @@
$as_echo "no" >&6; }
fi
-@@ -15737,9 +13596,9 @@
+@@ -15737,9 +13696,9 @@
# Extract the first word of "gconftool-2", so it can be a program name with args.
set dummy gconftool-2; ac_word=$2
@@ -11493,7 +11623,7 @@
$as_echo_n "(cached) " >&6
else
case $GCONFTOOL in
-@@ -15752,14 +13611,14 @@
+@@ -15752,14 +13711,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11511,7 +11641,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
-@@ -15768,19 +13627,17 @@
+@@ -15768,19 +13727,17 @@
fi
GCONFTOOL=$ac_cv_path_GCONFTOOL
if test -n "$GCONFTOOL"; then
@@ -11534,7 +11664,7 @@
fi
-@@ -15792,13 +13649,13 @@
+@@ -15792,13 +13749,13 @@
# Check whether --with-gconf-source was given.
@@ -11550,7 +11680,7 @@
$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-@@ -15807,22 +13664,20 @@
+@@ -15807,22 +13764,20 @@
# Check whether --with-gconf-schema-file-dir was given.
@@ -11577,7 +11707,7 @@
esac
fi
-@@ -15856,146 +13711,12 @@
+@@ -15856,146 +13811,12 @@
@@ -11729,7 +11859,7 @@
_ACEOF
fi
-@@ -16003,16 +13724,12 @@
+@@ -16003,16 +13824,12 @@
done
if test $ac_cv_header_locale_h = yes; then
@@ -11749,7 +11879,7 @@
/* end confdefs.h. */
#include <locale.h>
int
-@@ -16023,46 +13740,19 @@
+@@ -16023,46 +13840,19 @@
return 0;
}
_ACEOF
@@ -11802,7 +11932,7 @@
fi
fi
-@@ -16075,150 +13765,20 @@
+@@ -16075,150 +13865,20 @@
XGETTEXT=:
INTLLIBS=
@@ -11958,7 +12088,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -16231,54 +13791,25 @@
+@@ -16231,54 +13891,25 @@
return 0;
}
_ACEOF
@@ -12021,7 +12151,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -16291,141 +13822,26 @@
+@@ -16291,141 +13922,26 @@
return 0;
}
_ACEOF
@@ -12173,7 +12303,7 @@
_ACEOF
fi
-@@ -16440,18 +13856,14 @@
+@@ -16440,18 +13956,14 @@
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
@@ -12195,10 +12325,11 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16469,55 +13881,26 @@
+@@ -16468,56 +13980,27 @@
+ ;
return 0;
}
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -12220,6 +12351,7 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
++_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_intl_bindtextdomain=yes
else
@@ -12260,7 +12392,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16535,55 +13918,26 @@
+@@ -16535,55 +14018,26 @@
return 0;
}
_ACEOF
@@ -12325,7 +12457,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16601,43 +13955,18 @@
+@@ -16601,43 +14055,18 @@
return 0;
}
_ACEOF
@@ -12375,7 +12507,7 @@
gt_cv_func_dgettext_libintl=yes
fi
-@@ -16647,22 +13976,18 @@
+@@ -16647,22 +14076,18 @@
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -12403,7 +12535,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16680,55 +14005,26 @@
+@@ -16680,55 +14105,26 @@
return 0;
}
_ACEOF
@@ -12468,7 +12600,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16746,43 +14042,18 @@
+@@ -16746,43 +14142,18 @@
return 0;
}
_ACEOF
@@ -12518,7 +12650,7 @@
gt_cv_func_dgettext_libintl=yes
libintl_extra_libs=-liconv
else
-@@ -16804,102 +14075,12 @@
+@@ -16804,102 +14175,12 @@
glib_save_LIBS="$LIBS"
LIBS="$LIBS -lintl $libintl_extra_libs"
unset ac_cv_func_bind_textdomain_codeset
@@ -12626,7 +12758,7 @@
_ACEOF
fi
-@@ -16929,15 +14110,13 @@
+@@ -16929,15 +14210,13 @@
if test "$gt_cv_have_gettext" = "yes"; then
@@ -12645,7 +12777,7 @@
$as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
-@@ -16962,118 +14141,28 @@
+@@ -16962,118 +14241,28 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
@@ -12772,7 +12904,7 @@
$as_echo_n "checking if msgfmt accepts -c... " >&6; }
cat >conftest.foo <<_ACEOF
-@@ -17088,14 +14177,14 @@
+@@ -17088,14 +14277,14 @@
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -12792,7 +12924,7 @@
$as_echo "no" >&6; }
echo "$as_me: failed input was:" >&5
sed 's/^/| /' conftest.foo >&5
-@@ -17103,9 +14192,9 @@
+@@ -17103,9 +14292,9 @@
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
@@ -12804,7 +12936,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -17118,14 +14207,14 @@
+@@ -17118,14 +14307,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12822,7 +12954,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -17134,19 +14223,19 @@
+@@ -17134,19 +14323,19 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -12846,7 +12978,7 @@
$as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
-@@ -17171,18 +14260,14 @@
+@@ -17171,18 +14360,14 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
@@ -12868,11 +13000,10 @@
/* end confdefs.h. */
int
-@@ -17191,124 +14276,17 @@
- extern int _nl_msg_cat_cntr;
+@@ -17192,123 +14377,16 @@
return _nl_msg_cat_cntr
;
-- return 0;
+ return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12976,7 +13107,6 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_bind_textdomain_codeset=yes
-+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
@@ -13003,7 +13133,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -17323,10 +14301,8 @@
+@@ -17323,10 +14401,8 @@
;;
esac
fi
@@ -13016,7 +13146,7 @@
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
else
-@@ -17340,9 +14316,7 @@
+@@ -17340,9 +14416,7 @@
if test "$gt_cv_have_gettext" = "yes" ; then
@@ -13027,7 +13157,7 @@
fi
-@@ -17350,7 +14324,7 @@
+@@ -17350,7 +14424,7 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -13036,7 +13166,7 @@
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
-@@ -17383,7 +14357,7 @@
+@@ -17383,7 +14457,7 @@
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -13045,7 +13175,7 @@
$as_echo_n "checking for catalogs to be installed... " >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
-@@ -17408,7 +14382,7 @@
+@@ -17408,7 +14482,7 @@
fi
done
LINGUAS=$NEW_LINGUAS
@@ -13054,7 +13184,7 @@
$as_echo "$LINGUAS" >&6; }
fi
-@@ -17443,18 +14417,14 @@
+@@ -17443,18 +14517,14 @@
@@ -13076,7 +13206,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17472,48 +14442,21 @@
+@@ -17472,48 +14542,21 @@
return 0;
}
_ACEOF
@@ -13132,7 +13262,7 @@
fi
-@@ -17524,7 +14467,7 @@
+@@ -17524,7 +14567,7 @@
# Check whether --with-modules-path was given.
@@ -13141,7 +13271,7 @@
withval=$with_modules_path; with_modules_path=$withval
fi
-@@ -17535,7 +14478,7 @@
+@@ -17535,7 +14578,7 @@
# Check whether --enable-more-warnings was given.
@@ -13150,7 +13280,7 @@
enableval=$enable_more_warnings; set_more_warnings="$enableval"
else
-@@ -17548,10 +14491,10 @@
+@@ -17548,10 +14591,10 @@
fi
@@ -13163,7 +13293,7 @@
$as_echo "yes" >&6; }
CFLAGS="\
-Wall \
-@@ -17564,13 +14507,9 @@
+@@ -17564,13 +14607,9 @@
for option in -Wno-strict-aliasing -Wno-sign-compare; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
@@ -13179,7 +13309,7 @@
/* end confdefs.h. */
int
-@@ -17581,44 +14520,23 @@
+@@ -17581,44 +14620,23 @@
return 0;
}
_ACEOF
@@ -13228,7 +13358,7 @@
$as_echo "no" >&6; }
fi
-@@ -17651,13 +14569,13 @@
+@@ -17651,13 +14669,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -13244,7 +13374,7 @@
esac ;;
esac
done
-@@ -17665,8 +14583,8 @@
+@@ -17665,8 +14683,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -13255,7 +13385,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -17689,11 +14607,11 @@
+@@ -17689,11 +14707,11 @@
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
@@ -13269,7 +13399,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -17713,8 +14631,8 @@
+@@ -17713,8 +14731,8 @@
ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
@@ -13280,7 +13410,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -17730,66 +14648,46 @@
+@@ -17730,66 +14748,50 @@
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -13339,6 +13469,10 @@
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
++if test -z "${USE_BLUETOOTH_TRUE}" && test -z "${USE_BLUETOOTH_FALSE}"; then
++ as_fn_error "conditional \"USE_BLUETOOTH\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
@@ -13364,7 +13498,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -17799,17 +14697,18 @@
+@@ -17799,17 +14801,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -13390,7 +13524,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -17817,23 +14716,15 @@
+@@ -17817,23 +14820,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -13419,7 +13553,7 @@
as_nl='
'
export as_nl
-@@ -17841,7 +14732,13 @@
+@@ -17841,7 +14836,13 @@
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -13434,7 +13568,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -17852,7 +14749,7 @@
+@@ -17852,7 +14853,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -13443,7 +13577,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -17875,13 +14772,6 @@
+@@ -17875,13 +14876,6 @@
}
fi
@@ -13457,7 +13591,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -17891,15 +14781,15 @@
+@@ -17891,15 +14885,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -13476,7 +13610,7 @@
IFS=$as_save_IFS
;;
-@@ -17911,12 +14801,16 @@
+@@ -17911,12 +14905,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -13497,7 +13631,7 @@
done
PS1='$ '
PS2='> '
-@@ -17928,7 +14822,89 @@
+@@ -17928,7 +14926,89 @@
LANGUAGE=C
export LANGUAGE
@@ -13588,7 +13722,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -17942,8 +14918,12 @@
+@@ -17942,8 +15022,12 @@
as_basename=false
fi
@@ -13602,7 +13736,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -17963,76 +14943,25 @@
+@@ -17963,76 +15047,25 @@
}
s/.*/./; q'`
@@ -13690,7 +13824,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -18061,8 +14990,56 @@
+@@ -18061,8 +15094,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -13748,7 +13882,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -18081,10 +15058,10 @@
+@@ -18081,10 +15162,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -13761,7 +13895,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -18099,13 +15076,19 @@
+@@ -18099,13 +15180,19 @@
exec 6>&1
@@ -13783,7 +13917,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -18137,13 +15120,15 @@
+@@ -18137,13 +15224,15 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -13802,7 +13936,7 @@
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
-@@ -18162,16 +15147,17 @@
+@@ -18162,16 +15251,17 @@
Configuration commands:
$config_commands
@@ -13824,7 +13958,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -18207,6 +15193,8 @@
+@@ -18207,6 +15297,8 @@
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
@@ -13833,7 +13967,7 @@
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
-@@ -18214,20 +15202,19 @@
+@@ -18214,20 +15306,19 @@
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -13858,7 +13992,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -18235,11 +15222,10 @@
+@@ -18235,11 +15326,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -13873,7 +14007,7 @@
ac_need_defaults=false ;;
esac
-@@ -18563,9 +15549,7 @@
+@@ -18563,9 +15653,7 @@
"help/Makefile") CONFIG_FILES="$CONFIG_FILES help/Makefile" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -13884,7 +14018,7 @@
esac
done
-@@ -18592,7 +15576,7 @@
+@@ -18592,7 +15680,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -13893,7 +14027,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -18603,11 +15587,7 @@
+@@ -18603,11 +15691,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -13906,7 +14040,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -18615,10 +15595,16 @@
+@@ -18615,10 +15699,16 @@
if test -n "$CONFIG_FILES"; then
@@ -13925,7 +14059,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -18632,24 +15618,18 @@
+@@ -18632,24 +15722,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -13953,7 +14087,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -18671,7 +15651,7 @@
+@@ -18671,7 +15755,7 @@
t delim
:nl
h
@@ -13962,7 +14096,7 @@
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
-@@ -18685,7 +15665,7 @@
+@@ -18685,7 +15769,7 @@
t nl
:delim
h
@@ -13971,7 +14105,7 @@
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
-@@ -18738,9 +15718,7 @@
+@@ -18738,9 +15822,7 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -13982,7 +14116,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -18781,9 +15759,7 @@
+@@ -18781,9 +15863,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -13993,7 +14127,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -18868,9 +15844,7 @@
+@@ -18868,9 +15948,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -14004,7 +14138,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -18883,9 +15857,7 @@
+@@ -18883,9 +15961,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -14015,7 +14149,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -18913,12 +15885,10 @@
+@@ -18913,12 +15989,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -14030,7 +14164,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -18929,7 +15899,7 @@
+@@ -18929,7 +16003,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -14039,7 +14173,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -18942,9 +15912,7 @@
+@@ -18942,9 +16016,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -14050,7 +14184,7 @@
esac
;;
esac
-@@ -18972,47 +15940,7 @@
+@@ -18972,47 +16044,7 @@
q
}
s/.*/./; q'`
@@ -14099,7 +14233,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -19069,7 +15997,6 @@
+@@ -19069,7 +16101,6 @@
# 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=
@@ -14107,7 +14241,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -19079,12 +16006,11 @@
+@@ -19079,12 +16110,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -14122,7 +14256,7 @@
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -19094,7 +16020,7 @@
+@@ -19094,7 +16124,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -14131,7 +14265,7 @@
esac
_ACEOF
-@@ -19123,14 +16049,12 @@
+@@ -19123,14 +16153,12 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -14148,7 +14282,7 @@
which seems to be undefined. Please make sure it is defined." >&5
$as_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;}
-@@ -19140,9 +16064,7 @@
+@@ -19140,9 +16168,7 @@
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -14159,7 +14293,7 @@
;;
:H)
#
-@@ -19153,25 +16075,19 @@
+@@ -19153,25 +16179,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -14189,7 +14323,7 @@
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -19209,7 +16125,7 @@
+@@ -19209,7 +16229,7 @@
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -14198,7 +14332,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -19304,47 +16220,7 @@
+@@ -19304,47 +16324,7 @@
q
}
s/.*/./; q'`
@@ -14247,7 +14381,7 @@
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
-@@ -19991,9 +16867,7 @@
+@@ -19991,9 +16971,7 @@
esac ;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
@@ -14258,7 +14392,7 @@
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
-@@ -20016,15 +16890,12 @@
+@@ -20016,15 +16994,12 @@
done # for ac_tag
@@ -14276,7 +14410,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -20045,10 +16916,10 @@
+@@ -20045,10 +17020,10 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
@@ -14291,9 +14425,18 @@
Index: gnome-user-share-2.28.2/data/Makefile.in
===================================================================
---- gnome-user-share-2.28.2.orig/data/Makefile.in 2009-12-22 23:03:48.000000000 +0000
-+++ gnome-user-share-2.28.2/data/Makefile.in 2009-12-22 23:03:16.000000000 +0000
-@@ -197,6 +197,7 @@
+--- gnome-user-share-2.28.2.orig/data/Makefile.in 2010-01-17 23:19:18.000000000 +0000
++++ gnome-user-share-2.28.2/data/Makefile.in 2010-01-17 23:19:08.000000000 +0000
+@@ -127,6 +127,8 @@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
++BLUETOOTH_CFLAGS = @BLUETOOTH_CFLAGS@
++BLUETOOTH_LIBS = @BLUETOOTH_LIBS@
+ CATALOGS = @CATALOGS@
+ CATOBJEXT = @CATOBJEXT@
+ CC = @CC@
+@@ -197,6 +199,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -14303,9 +14446,18 @@
PKG_CONFIG = @PKG_CONFIG@
Index: gnome-user-share-2.28.2/data/icons/16x16/Makefile.in
===================================================================
---- gnome-user-share-2.28.2.orig/data/icons/16x16/Makefile.in 2009-12-22 23:03:48.000000000 +0000
-+++ gnome-user-share-2.28.2/data/icons/16x16/Makefile.in 2009-12-22 23:03:16.000000000 +0000
-@@ -155,6 +155,7 @@
+--- gnome-user-share-2.28.2.orig/data/icons/16x16/Makefile.in 2010-01-17 23:19:18.000000000 +0000
++++ gnome-user-share-2.28.2/data/icons/16x16/Makefile.in 2010-01-17 23:19:08.000000000 +0000
+@@ -85,6 +85,8 @@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
++BLUETOOTH_CFLAGS = @BLUETOOTH_CFLAGS@
++BLUETOOTH_LIBS = @BLUETOOTH_LIBS@
+ CATALOGS = @CATALOGS@
+ CATOBJEXT = @CATOBJEXT@
+ CC = @CC@
+@@ -155,6 +157,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -14315,9 +14467,18 @@
PKG_CONFIG = @PKG_CONFIG@
Index: gnome-user-share-2.28.2/data/icons/22x22/Makefile.in
===================================================================
---- gnome-user-share-2.28.2.orig/data/icons/22x22/Makefile.in 2009-12-22 23:03:48.000000000 +0000
-+++ gnome-user-share-2.28.2/data/icons/22x22/Makefile.in 2009-12-22 23:03:16.000000000 +0000
-@@ -155,6 +155,7 @@
+--- gnome-user-share-2.28.2.orig/data/icons/22x22/Makefile.in 2010-01-17 23:19:18.000000000 +0000
++++ gnome-user-share-2.28.2/data/icons/22x22/Makefile.in 2010-01-17 23:19:09.000000000 +0000
+@@ -85,6 +85,8 @@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
++BLUETOOTH_CFLAGS = @BLUETOOTH_CFLAGS@
++BLUETOOTH_LIBS = @BLUETOOTH_LIBS@
+ CATALOGS = @CATALOGS@
+ CATOBJEXT = @CATOBJEXT@
+ CC = @CC@
+@@ -155,6 +157,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -14327,9 +14488,18 @@
PKG_CONFIG = @PKG_CONFIG@
Index: gnome-user-share-2.28.2/data/icons/32x32/Makefile.in
===================================================================
---- gnome-user-share-2.28.2.orig/data/icons/32x32/Makefile.in 2009-12-22 23:03:48.000000000 +0000
-+++ gnome-user-share-2.28.2/data/icons/32x32/Makefile.in 2009-12-22 23:03:16.000000000 +0000
-@@ -155,6 +155,7 @@
+--- gnome-user-share-2.28.2.orig/data/icons/32x32/Makefile.in 2010-01-17 23:19:18.000000000 +0000
++++ gnome-user-share-2.28.2/data/icons/32x32/Makefile.in 2010-01-17 23:19:09.000000000 +0000
+@@ -85,6 +85,8 @@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
++BLUETOOTH_CFLAGS = @BLUETOOTH_CFLAGS@
++BLUETOOTH_LIBS = @BLUETOOTH_LIBS@
+ CATALOGS = @CATALOGS@
+ CATOBJEXT = @CATOBJEXT@
+ CC = @CC@
+@@ -155,6 +157,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -14339,9 +14509,18 @@
PKG_CONFIG = @PKG_CONFIG@
Index: gnome-user-share-2.28.2/data/icons/48x48/Makefile.in
===================================================================
---- gnome-user-share-2.28.2.orig/data/icons/48x48/Makefile.in 2009-12-22 23:03:48.000000000 +0000
-+++ gnome-user-share-2.28.2/data/icons/48x48/Makefile.in 2009-12-22 23:03:17.000000000 +0000
-@@ -155,6 +155,7 @@
+--- gnome-user-share-2.28.2.orig/data/icons/48x48/Makefile.in 2010-01-17 23:19:18.000000000 +0000
++++ gnome-user-share-2.28.2/data/icons/48x48/Makefile.in 2010-01-17 23:19:09.000000000 +0000
+@@ -85,6 +85,8 @@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
++BLUETOOTH_CFLAGS = @BLUETOOTH_CFLAGS@
++BLUETOOTH_LIBS = @BLUETOOTH_LIBS@
+ CATALOGS = @CATALOGS@
+ CATOBJEXT = @CATOBJEXT@
+ CC = @CC@
+@@ -155,6 +157,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -14351,9 +14530,18 @@
PKG_CONFIG = @PKG_CONFIG@
Index: gnome-user-share-2.28.2/data/icons/Makefile.in
===================================================================
---- gnome-user-share-2.28.2.orig/data/icons/Makefile.in 2009-12-22 23:03:48.000000000 +0000
-+++ gnome-user-share-2.28.2/data/icons/Makefile.in 2009-12-22 23:03:17.000000000 +0000
-@@ -171,6 +171,7 @@
+--- gnome-user-share-2.28.2.orig/data/icons/Makefile.in 2010-01-17 23:19:18.000000000 +0000
++++ gnome-user-share-2.28.2/data/icons/Makefile.in 2010-01-17 23:19:09.000000000 +0000
+@@ -101,6 +101,8 @@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
++BLUETOOTH_CFLAGS = @BLUETOOTH_CFLAGS@
++BLUETOOTH_LIBS = @BLUETOOTH_LIBS@
+ CATALOGS = @CATALOGS@
+ CATOBJEXT = @CATOBJEXT@
+ CC = @CC@
+@@ -171,6 +173,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -14363,9 +14551,18 @@
PKG_CONFIG = @PKG_CONFIG@
Index: gnome-user-share-2.28.2/help/Makefile.in
===================================================================
---- gnome-user-share-2.28.2.orig/help/Makefile.in 2009-12-22 23:03:48.000000000 +0000
-+++ gnome-user-share-2.28.2/help/Makefile.in 2009-12-22 23:03:17.000000000 +0000
-@@ -156,6 +156,7 @@
+--- gnome-user-share-2.28.2.orig/help/Makefile.in 2010-01-17 23:19:18.000000000 +0000
++++ gnome-user-share-2.28.2/help/Makefile.in 2010-01-17 23:19:10.000000000 +0000
+@@ -86,6 +86,8 @@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
++BLUETOOTH_CFLAGS = @BLUETOOTH_CFLAGS@
++BLUETOOTH_LIBS = @BLUETOOTH_LIBS@
+ CATALOGS = @CATALOGS@
+ CATOBJEXT = @CATOBJEXT@
+ CC = @CC@
+@@ -156,6 +158,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -14375,8 +14572,8 @@
PKG_CONFIG = @PKG_CONFIG@
Index: gnome-user-share-2.28.2/ltmain.sh
===================================================================
---- gnome-user-share-2.28.2.orig/ltmain.sh 2009-12-22 23:03:48.000000000 +0000
-+++ gnome-user-share-2.28.2/ltmain.sh 2009-12-22 23:02:48.000000000 +0000
+--- gnome-user-share-2.28.2.orig/ltmain.sh 2010-01-17 23:19:19.000000000 +0000
++++ gnome-user-share-2.28.2/ltmain.sh 2010-01-17 23:18:55.000000000 +0000
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
@@ -14455,3 +14652,106 @@
esac
;;
no)
+Index: gnome-user-share-2.28.2/src/Makefile.in
+===================================================================
+--- gnome-user-share-2.28.2.orig/src/Makefile.in 2010-01-17 23:19:19.000000000 +0000
++++ gnome-user-share-2.28.2/src/Makefile.in 2010-01-17 23:19:10.000000000 +0000
+@@ -36,6 +36,13 @@
+ host_triplet = @host@
+ bin_PROGRAMS = gnome-file-share-properties$(EXEEXT)
+ libexec_PROGRAMS = gnome-user-share$(EXEEXT)
++ at USE_BLUETOOTH_TRUE@am__append_1 = \
++ at USE_BLUETOOTH_TRUE@ obexftp.c \
++ at USE_BLUETOOTH_TRUE@ obexftp.h \
++ at USE_BLUETOOTH_TRUE@ obexpush.c \
++ at USE_BLUETOOTH_TRUE@ obexpush.h
++
++ at USE_BLUETOOTH_TRUE@am__append_2 = $(BLUETOOTH_LIBS)
+ subdir = src
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -57,14 +64,21 @@
+ AM_V_lt = $(am__v_lt_$(V))
+ am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+ am__v_lt_0 = --silent
++am__gnome_user_share_SOURCES_DIST = user_share.c user_share.h \
++ user_share-private.h user_share-private.c http.c http.h \
++ marshal.c marshal.h obexftp.c obexftp.h obexpush.c obexpush.h
+ am__objects_1 = marshal.$(OBJEXT)
++ at USE_BLUETOOTH_TRUE@am__objects_2 = obexftp.$(OBJEXT) \
++ at USE_BLUETOOTH_TRUE@ obexpush.$(OBJEXT)
+ am_gnome_user_share_OBJECTS = user_share.$(OBJEXT) \
+- user_share-private.$(OBJEXT) http.$(OBJEXT) obexftp.$(OBJEXT) \
+- obexpush.$(OBJEXT) $(am__objects_1)
++ user_share-private.$(OBJEXT) http.$(OBJEXT) $(am__objects_1) \
++ $(am__objects_2)
+ gnome_user_share_OBJECTS = $(am_gnome_user_share_OBJECTS)
++ at USE_BLUETOOTH_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
+ gnome_user_share_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_2)
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -94,7 +108,7 @@
+ SOURCES = $(gnome_file_share_properties_SOURCES) \
+ $(gnome_user_share_SOURCES)
+ DIST_SOURCES = $(gnome_file_share_properties_SOURCES) \
+- $(gnome_user_share_SOURCES)
++ $(am__gnome_user_share_SOURCES_DIST)
+ ETAGS = etags
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -107,6 +121,8 @@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
++BLUETOOTH_CFLAGS = @BLUETOOTH_CFLAGS@
++BLUETOOTH_LIBS = @BLUETOOTH_LIBS@
+ CATALOGS = @CATALOGS@
+ CATOBJEXT = @CATOBJEXT@
+ CC = @CC@
+@@ -177,6 +193,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+@@ -270,27 +287,15 @@
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ $(USER_SHARE_CFLAGS) \
++ $(BLUETOOTH_CFLAGS) \
+ $(USER_SHARE_CONFIG_CFLAGS) \
+ $(X_CFLAGS)
+
+-gnome_user_share_SOURCES = \
+- user_share.c \
+- user_share.h \
+- user_share-private.h \
+- user_share-private.c \
+- http.c \
+- http.h \
+- obexftp.c \
+- obexftp.h \
+- obexpush.c \
+- obexpush.h \
+- $(MARSHALFILES)
+-
+-gnome_user_share_LDADD = \
+- $(USER_SHARE_LIBS) \
+- $(SELINUX_LIBS) \
+- $(X_LIBS) $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS)
+-
++gnome_user_share_SOURCES = user_share.c user_share.h \
++ user_share-private.h user_share-private.c http.c http.h \
++ $(MARSHALFILES) $(am__append_1)
++gnome_user_share_LDADD = $(USER_SHARE_LIBS) $(SELINUX_LIBS) $(X_LIBS) \
++ $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS) $(am__append_2)
+ gnome_file_share_properties_SOURCES = \
+ file-share-properties.c \
+ user_share-private.h \
More information about the pkg-gnome-commits
mailing list