~ubuntu-branches/ubuntu/oneiric/gnome-panel/oneiric
» Revision
182
: debian/patches/70_relibtoolize.patch
« back to all changes in this revision
Viewing changes to debian/patches/70_relibtoolize.patch
- browse files at revision 182
- compare with another revision
- download diff
- download tarball
- view history from revision 182
- Committer: Bazaar Package Importer
- Author(s): Sebastien Bacher
- Date: 2010-03-30 11:59:32 UTC
- mfrom: (1.13.6 upstream)
- Revision ID: james.westby@ubuntu.com-20100330115932-j94o334zoki5sbkb
Tags: 1:2.30.0-0ubuntu1
* New upstream version
* debian/patches/25_dynamic_fusa_detection.patch:
- update by Cody Russell to try to fix a crasher in the change
(lp: #448084)
* debian/patches/70_relibtoolize.patch:
- new version update
* debian/patches/25_dynamic_fusa_detection.patch:
- update by Cody Russell to try to fix a crasher in the change
(lp: #448084)
* debian/patches/70_relibtoolize.patch:
- new version update
- files added:
- help/clock/zh_HK
- files modified:
- ChangeLog
added
removed
debian/patches/70_relibtoolize.patch
1
diff -Nur gnome-panel-2.29.92.1/aclocal.m4 gnome-panel-2.29.92.1.ubuntu/aclocal.m4
2
--- gnome-panel-2.29.92.1/aclocal.m4 2010-03-09 23:56:15.000000000 +0100
3
+++ gnome-panel-2.29.92.1.ubuntu/aclocal.m4 2010-03-10 01:11:36.000000000 +0100
1
diff -Nur gnome-panel-2.30.0/aclocal.m4 gnome-panel-2.30.0.ubuntu/aclocal.m4
2
--- gnome-panel-2.30.0/aclocal.m4 2010-03-30 02:52:39.000000000 +0200
3
+++ gnome-panel-2.30.0.ubuntu/aclocal.m4 2010-03-30 12:08:07.000000000 +0200
4
4
@@ -1,4 +1,4 @@
5
5
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
6
6
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
3993
3993
3994
3994
m4_include([m4/d-type.m4])
3995
3995
m4_include([m4/gnome-doc-utils.m4])
3996
diff -Nur gnome-panel-2.29.92.1/applets/clock/Makefile.in gnome-panel-2.29.92.1.ubuntu/applets/clock/Makefile.in
3997
--- gnome-panel-2.29.92.1/applets/clock/Makefile.in 2010-03-09 23:56:21.000000000 +0100
3998
+++ gnome-panel-2.29.92.1.ubuntu/applets/clock/Makefile.in 2010-03-10 01:11:38.000000000 +0100
3996
diff -Nur gnome-panel-2.30.0/applets/clock/Makefile.in gnome-panel-2.30.0.ubuntu/applets/clock/Makefile.in
3997
--- gnome-panel-2.30.0/applets/clock/Makefile.in 2010-03-30 02:52:45.000000000 +0200
3998
+++ gnome-panel-2.30.0.ubuntu/applets/clock/Makefile.in 2010-03-30 12:08:09.000000000 +0200
3999
3999
@@ -1,4 +1,4 @@
4000
4000
-# Makefile.in generated by automake 1.11 from Makefile.am.
4001
4001
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
4028
4028
for f in x $$MAKEFLAGS; do \
4029
4029
case $$f in \
4030
4030
*=* | --[!k]*);; \
4031
diff -Nur gnome-panel-2.29.92.1/applets/clock/pixmaps/Makefile.in gnome-panel-2.29.92.1.ubuntu/applets/clock/pixmaps/Makefile.in
4032
--- gnome-panel-2.29.92.1/applets/clock/pixmaps/Makefile.in 2010-03-09 23:56:21.000000000 +0100
4033
+++ gnome-panel-2.29.92.1.ubuntu/applets/clock/pixmaps/Makefile.in 2010-03-10 01:11:38.000000000 +0100
4031
diff -Nur gnome-panel-2.30.0/applets/clock/pixmaps/Makefile.in gnome-panel-2.30.0.ubuntu/applets/clock/pixmaps/Makefile.in
4032
--- gnome-panel-2.30.0/applets/clock/pixmaps/Makefile.in 2010-03-30 02:52:45.000000000 +0200
4033
+++ gnome-panel-2.30.0.ubuntu/applets/clock/pixmaps/Makefile.in 2010-03-30 12:08:09.000000000 +0200
4034
4034
@@ -1,4 +1,4 @@
4035
4035
-# Makefile.in generated by automake 1.11 from Makefile.am.
4036
4036
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
4045
4045
PACKAGE_VERSION = @PACKAGE_VERSION@
4046
4046
PANEL_CFLAGS = @PANEL_CFLAGS@
4047
4047
PANEL_LIBS = @PANEL_LIBS@
4048
diff -Nur gnome-panel-2.29.92.1/applets/fish/Makefile.in gnome-panel-2.29.92.1.ubuntu/applets/fish/Makefile.in
4049
--- gnome-panel-2.29.92.1/applets/fish/Makefile.in 2010-03-09 23:56:21.000000000 +0100
4050
+++ gnome-panel-2.29.92.1.ubuntu/applets/fish/Makefile.in 2010-03-10 01:11:38.000000000 +0100
4048
diff -Nur gnome-panel-2.30.0/applets/fish/Makefile.in gnome-panel-2.30.0.ubuntu/applets/fish/Makefile.in
4049
--- gnome-panel-2.30.0/applets/fish/Makefile.in 2010-03-30 02:52:45.000000000 +0200
4050
+++ gnome-panel-2.30.0.ubuntu/applets/fish/Makefile.in 2010-03-30 12:08:09.000000000 +0200
4051
4051
@@ -1,4 +1,4 @@
4052
4052
-# Makefile.in generated by automake 1.11 from Makefile.am.
4053
4053
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
4062
4062
PACKAGE_VERSION = @PACKAGE_VERSION@
4063
4063
PANEL_CFLAGS = @PANEL_CFLAGS@
4064
4064
PANEL_LIBS = @PANEL_LIBS@
4065
diff -Nur gnome-panel-2.29.92.1/applets/Makefile.in gnome-panel-2.29.92.1.ubuntu/applets/Makefile.in
4066
--- gnome-panel-2.29.92.1/applets/Makefile.in 2010-03-09 23:56:21.000000000 +0100
4067
+++ gnome-panel-2.29.92.1.ubuntu/applets/Makefile.in 2010-03-10 01:11:37.000000000 +0100
4065
diff -Nur gnome-panel-2.30.0/applets/Makefile.in gnome-panel-2.30.0.ubuntu/applets/Makefile.in
4066
--- gnome-panel-2.30.0/applets/Makefile.in 2010-03-30 02:52:44.000000000 +0200
4067
+++ gnome-panel-2.30.0.ubuntu/applets/Makefile.in 2010-03-30 12:08:09.000000000 +0200
4068
4068
@@ -1,4 +1,4 @@
4069
4069
-# Makefile.in generated by automake 1.11 from Makefile.am.
4070
4070
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
4097
4097
for f in x $$MAKEFLAGS; do \
4098
4098
case $$f in \
4099
4099
*=* | --[!k]*);; \
4100
diff -Nur gnome-panel-2.29.92.1/applets/notification_area/Makefile.in gnome-panel-2.29.92.1.ubuntu/applets/notification_area/Makefile.in
4101
--- gnome-panel-2.29.92.1/applets/notification_area/Makefile.in 2010-03-09 23:56:22.000000000 +0100
4102
+++ gnome-panel-2.29.92.1.ubuntu/applets/notification_area/Makefile.in 2010-03-10 01:11:38.000000000 +0100
4100
diff -Nur gnome-panel-2.30.0/applets/notification_area/Makefile.in gnome-panel-2.30.0.ubuntu/applets/notification_area/Makefile.in
4101
--- gnome-panel-2.30.0/applets/notification_area/Makefile.in 2010-03-30 02:52:45.000000000 +0200
4102
+++ gnome-panel-2.30.0.ubuntu/applets/notification_area/Makefile.in 2010-03-30 12:08:09.000000000 +0200
4103
4103
@@ -1,4 +1,4 @@
4104
4104
-# Makefile.in generated by automake 1.11 from Makefile.am.
4105
4105
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
4114
4114
PACKAGE_VERSION = @PACKAGE_VERSION@
4115
4115
PANEL_CFLAGS = @PANEL_CFLAGS@
4116
4116
PANEL_LIBS = @PANEL_LIBS@
4117
diff -Nur gnome-panel-2.29.92.1/applets/wncklet/Makefile.in gnome-panel-2.29.92.1.ubuntu/applets/wncklet/Makefile.in
4118
--- gnome-panel-2.29.92.1/applets/wncklet/Makefile.in 2010-03-09 23:56:22.000000000 +0100
4119
+++ gnome-panel-2.29.92.1.ubuntu/applets/wncklet/Makefile.in 2010-03-10 01:11:38.000000000 +0100
4117
diff -Nur gnome-panel-2.30.0/applets/wncklet/Makefile.in gnome-panel-2.30.0.ubuntu/applets/wncklet/Makefile.in
4118
--- gnome-panel-2.30.0/applets/wncklet/Makefile.in 2010-03-30 02:52:45.000000000 +0200
4119
+++ gnome-panel-2.30.0.ubuntu/applets/wncklet/Makefile.in 2010-03-30 12:08:09.000000000 +0200
4120
4120
@@ -1,4 +1,4 @@
4121
4121
-# Makefile.in generated by automake 1.11 from Makefile.am.
4122
4122
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
4131
4131
PACKAGE_VERSION = @PACKAGE_VERSION@
4132
4132
PANEL_CFLAGS = @PANEL_CFLAGS@
4133
4133
PANEL_LIBS = @PANEL_LIBS@
4134
diff -Nur gnome-panel-2.29.92.1/config.h.in gnome-panel-2.29.92.1.ubuntu/config.h.in
4135
--- gnome-panel-2.29.92.1/config.h.in 2010-03-10 01:11:20.000000000 +0100
4136
+++ gnome-panel-2.29.92.1.ubuntu/config.h.in 2010-03-10 01:11:37.000000000 +0100
4137
@@ -138,6 +138,9 @@
4134
diff -Nur gnome-panel-2.30.0/config.h.in gnome-panel-2.30.0.ubuntu/config.h.in
4135
--- gnome-panel-2.30.0/config.h.in 2010-03-30 02:52:43.000000000 +0200
4136
+++ gnome-panel-2.30.0.ubuntu/config.h.in 2010-03-30 12:08:08.000000000 +0200
4137
@@ -135,6 +135,9 @@
4138
4138
/* Define to the one symbol short name of this package. */
4139
4139
#undef PACKAGE_TARNAME
4140
4140
4144
4144
/* Define to the version of this package. */
4145
4145
#undef PACKAGE_VERSION
4146
4146
4147
diff -Nur gnome-panel-2.29.92.1/configure gnome-panel-2.29.92.1.ubuntu/configure
4148
--- gnome-panel-2.29.92.1/configure 2010-03-09 23:56:19.000000000 +0100
4149
+++ gnome-panel-2.29.92.1.ubuntu/configure 2010-03-10 01:12:06.000000000 +0100
4147
diff -Nur gnome-panel-2.30.0/configure gnome-panel-2.30.0.ubuntu/configure
4148
--- gnome-panel-2.30.0/configure 2010-03-30 02:52:43.000000000 +0200
4149
+++ gnome-panel-2.30.0.ubuntu/configure 2010-03-30 12:08:08.000000000 +0200
4150
4150
@@ -1,20 +1,24 @@
4151
4151
#! /bin/sh
4152
4152
# Guess values for system-dependent variables and create Makefiles.
4153
-# Generated by GNU Autoconf 2.63 for gnome-panel 2.29.92.1.
4154
+# Generated by GNU Autoconf 2.65 for gnome-panel 2.29.92.1.
4153
-# Generated by GNU Autoconf 2.63 for gnome-panel 2.30.0.
4154
+# Generated by GNU Autoconf 2.65 for gnome-panel 2.30.0.
4155
4155
#
4156
4156
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel>.
4157
4157
#
4957
4957
# Identity of this package.
4958
4958
PACKAGE_NAME='gnome-panel'
4959
4959
@@ -748,6 +705,7 @@
4960
PACKAGE_VERSION='2.29.92.1'
4961
PACKAGE_STRING='gnome-panel 2.29.92.1'
4960
PACKAGE_VERSION='2.30.0'
4961
PACKAGE_STRING='gnome-panel 2.30.0'
4962
4962
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel'
4963
4963
+PACKAGE_URL=''
4964
4964
4972
4972
PACKAGE_BUGREPORT
4973
4973
PACKAGE_STRING
4974
4974
PACKAGE_VERSION
4975
@@ -1048,6 +1007,7 @@
4976
enable_polkit
4977
enable_network_manager
4978
with_in_process_applets
4979
+enable_initial_animation
4980
with_x
4981
with_html_dir
4982
enable_gtk_doc
4983
@@ -1203,8 +1163,7 @@
4975
@@ -1203,8 +1162,7 @@
4984
4976
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
4985
4977
# Reject names that are not valid shell variable names.
4986
4978
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
4990
4982
ac_useropt_orig=$ac_useropt
4991
4983
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
4992
4984
case $ac_user_opts in
4993
@@ -1230,8 +1189,7 @@
4985
@@ -1230,8 +1188,7 @@
4994
4986
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
4995
4987
# Reject names that are not valid shell variable names.
4996
4988
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
5000
4992
ac_useropt_orig=$ac_useropt
5001
4993
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
5002
4994
case $ac_user_opts in
5003
@@ -1435,8 +1393,7 @@
4995
@@ -1435,8 +1392,7 @@
5004
4996
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
5005
4997
# Reject names that are not valid shell variable names.
5006
4998
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
5010
5002
ac_useropt_orig=$ac_useropt
5011
5003
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
5012
5004
case $ac_user_opts in
5013
@@ -1452,8 +1409,7 @@
5005
@@ -1452,8 +1408,7 @@
5014
5006
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
5015
5007
# Reject names that are not valid shell variable names.
5016
5008
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
5020
5012
ac_useropt_orig=$ac_useropt
5021
5013
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
5022
5014
case $ac_user_opts in
5023
@@ -1483,17 +1439,17 @@
5015
@@ -1483,17 +1438,17 @@
5024
5016
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
5025
5017
x_libraries=$ac_optarg ;;
5026
5018
5044
5036
eval $ac_envvar=\$ac_optarg
5045
5037
export $ac_envvar ;;
5046
5038
5047
@@ -1510,15 +1466,13 @@
5039
@@ -1510,15 +1465,13 @@
5048
5040
5049
5041
if test -n "$ac_prev"; then
5050
5042
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
5062
5054
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
5063
5055
esac
5064
5056
fi
5065
@@ -1541,8 +1495,7 @@
5057
@@ -1541,8 +1494,7 @@
5066
5058
[\\/$]* | ?:[\\/]* ) continue;;
5067
5059
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
5068
5060
esac
5072
5064
done
5073
5065
5074
5066
# There might be people who depend on the old broken behavior: `$host'
5075
@@ -1572,11 +1525,9 @@
5067
@@ -1572,11 +1524,9 @@
5076
5068
ac_pwd=`pwd` && test -n "$ac_pwd" &&
5077
5069
ac_ls_di=`ls -di .` &&
5078
5070
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
5086
5078
5087
5079
5088
5080
# Find the source files, if location was not specified.
5089
@@ -1615,13 +1566,11 @@
5081
@@ -1615,13 +1565,11 @@
5090
5082
fi
5091
5083
if test ! -r "$srcdir/$ac_unique_file"; then
5092
5084
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
5102
5094
pwd)`
5103
5095
# When building in place, set srcdir=.
5104
5096
if test "$ac_abs_confdir" = "$ac_pwd"; then
5105
@@ -1750,11 +1699,14 @@
5097
@@ -1750,11 +1698,12 @@
5106
5098
--enable-polkit Enable PolicyKit support (auto)
5107
5099
--enable-network-manager
5108
5100
Enable NetworkManager support (auto)
5109
5101
- --enable-gtk-doc use gtk-doc to build documentation [default=no]
5110
5102
- --enable-gtk-doc-html build documentation in html format [default=yes]
5111
5103
- --enable-gtk-doc-pdf build documentation in pdf format [default=no]
5112
+ --disable-initial-animation
5113
+ disable the initial slide-in animation of panels
5114
5104
+ --enable-gtk-doc use gtk-doc to build documentation [[default=no]]
5115
5105
+ --enable-gtk-doc-html build documentation in html format [[default=yes]]
5116
5106
+ --enable-gtk-doc-pdf build documentation in pdf format [[default=no]]
5121
5111
--disable-rebuilds disable all source autogeneration rules
5122
5112
5123
5113
Optional Packages:
5124
@@ -1784,7 +1736,7 @@
5114
@@ -1784,7 +1733,7 @@
5125
5115
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
5126
5116
nonstandard directory <lib dir>
5127
5117
LIBS libraries to pass to the linker, e.g. -l<library>
5130
5120
you have headers in a nonstandard directory <include dir>
5131
5121
CPP C preprocessor
5132
5122
PKG_CONFIG path to pkg-config utility
5133
@@ -1894,21 +1846,378 @@
5123
@@ -1894,21 +1843,378 @@
5134
5124
if $ac_init_version; then
5135
5125
cat <<\_ACEOF
5136
gnome-panel configure 2.29.92.1
5126
gnome-panel configure 2.30.0
5137
5127
-generated by GNU Autoconf 2.63
5138
5128
+generated by GNU Autoconf 2.65
5139
5129
5507
5497
This file contains any messages produced by compilers while
5508
5498
running configure, to aid debugging if configure makes a mistake.
5509
5499
5510
It was created by gnome-panel $as_me 2.29.92.1, which was
5500
It was created by gnome-panel $as_me 2.30.0, which was
5511
5501
-generated by GNU Autoconf 2.63. Invocation command line was
5512
5502
+generated by GNU Autoconf 2.65. Invocation command line was
5513
5503
5514
5504
$ $0 $@
5515
5505
5516
@@ -1944,8 +2253,8 @@
5506
@@ -1944,8 +2250,8 @@
5517
5507
do
5518
5508
IFS=$as_save_IFS
5519
5509
test -z "$as_dir" && as_dir=.
5524
5514
IFS=$as_save_IFS
5525
5515
5526
5516
} >&5
5527
@@ -1982,9 +2291,9 @@
5517
@@ -1982,9 +2288,9 @@
5528
5518
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
5529
5519
esac
5530
5520
case $ac_pass in
5536
5526
if test $ac_must_keep_next = true; then
5537
5527
ac_must_keep_next=false # Got value, back to normal.
5538
5528
else
5539
@@ -2000,13 +2309,13 @@
5529
@@ -2000,13 +2306,13 @@
5540
5530
-* ) ac_must_keep_next=true ;;
5541
5531
esac
5542
5532
fi
5553
5543
5554
5544
# When interrupted or exit'd, cleanup temporary files, and complete
5555
5545
# config.log. We remove comments because anyway the quotes in there
5556
@@ -2031,13 +2340,13 @@
5546
@@ -2031,13 +2337,13 @@
5557
5547
case $ac_val in #(
5558
5548
*${as_nl}*)
5559
5549
case $ac_var in #(
5569
5559
esac ;;
5570
5560
esac
5571
5561
done
5572
@@ -2109,39 +2418,41 @@
5562
@@ -2109,39 +2415,41 @@
5573
5563
exit $exit_status
5574
5564
' 0
5575
5565
for ac_signal in 1 2 13 15; do
5616
5606
5617
5607
# Let the site file select an alternate cache file if it wants to.
5618
5608
# Prefer an explicitly selected file to automatically selected ones.
5619
@@ -2159,8 +2470,8 @@
5609
@@ -2159,8 +2467,8 @@
5620
5610
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
5621
5611
do
5622
5612
test "x$ac_site_file" = xNONE && continue
5627
5617
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
5628
5618
sed 's/^/| /' "$ac_site_file" >&5
5629
5619
. "$ac_site_file"
5630
@@ -2168,10 +2479,10 @@
5620
@@ -2168,10 +2476,10 @@
5631
5621
done
5632
5622
5633
5623
if test -r "$cache_file"; then
5642
5632
$as_echo "$as_me: loading cache $cache_file" >&6;}
5643
5633
case $cache_file in
5644
5634
[\\/]* | ?:[\\/]* ) . "$cache_file";;
5645
@@ -2179,7 +2490,7 @@
5635
@@ -2179,7 +2487,7 @@
5646
5636
esac
5647
5637
fi
5648
5638
else
5651
5641
$as_echo "$as_me: creating cache $cache_file" >&6;}
5652
5642
>$cache_file
5653
5643
fi
5654
@@ -2194,11 +2505,11 @@
5644
@@ -2194,11 +2502,11 @@
5655
5645
eval ac_new_val=\$ac_env_${ac_var}_value
5656
5646
case $ac_old_set,$ac_new_set in
5657
5647
set,)
5665
5655
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
5666
5656
ac_cache_corrupted=: ;;
5667
5657
,);;
5668
@@ -2208,17 +2519,17 @@
5658
@@ -2208,17 +2516,17 @@
5669
5659
ac_old_val_w=`echo x $ac_old_val`
5670
5660
ac_new_val_w=`echo x $ac_new_val`
5671
5661
if test "$ac_old_val_w" != "$ac_new_val_w"; then
5687
5677
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
5688
5678
fi;;
5689
5679
esac
5690
@@ -2230,43 +2541,20 @@
5680
@@ -2230,43 +2538,20 @@
5691
5681
esac
5692
5682
case " $ac_configure_args " in
5693
5683
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
5738
5728
5739
5729
ac_ext=c
5740
5730
ac_cpp='$CPP $CPPFLAGS'
5741
@@ -2281,24 +2569,16 @@
5731
@@ -2281,24 +2566,16 @@
5742
5732
5743
5733
ac_aux_dir=
5744
5734
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
5771
5761
fi
5772
5762
5773
5763
# These three variables are undocumented and unsupported,
5774
@@ -2324,10 +2604,10 @@
5764
@@ -2324,10 +2601,10 @@
5775
5765
# OS/2's system install, which has a completely different semantic
5776
5766
# ./install, which can be erroneously created by make from ./install.sh.
5777
5767
# Reject install programs that cannot install multiple files.
5784
5774
$as_echo_n "(cached) " >&6
5785
5775
else
5786
5776
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5787
@@ -2335,11 +2615,11 @@
5777
@@ -2335,11 +2612,11 @@
5788
5778
do
5789
5779
IFS=$as_save_IFS
5790
5780
test -z "$as_dir" && as_dir=.
5800
5790
/usr/ucb/* ) ;;
5801
5791
*)
5802
5792
# OSF1 and SCO ODT 3.0 have their own names for install.
5803
@@ -2376,7 +2656,7 @@
5793
@@ -2376,7 +2653,7 @@
5804
5794
;;
5805
5795
esac
5806
5796
5809
5799
IFS=$as_save_IFS
5810
5800
5811
5801
rm -rf conftest.one conftest.two conftest.dir
5812
@@ -2392,7 +2672,7 @@
5802
@@ -2392,7 +2669,7 @@
5813
5803
INSTALL=$ac_install_sh
5814
5804
fi
5815
5805
fi
5818
5808
$as_echo "$INSTALL" >&6; }
5819
5809
5820
5810
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
5821
@@ -2403,7 +2683,7 @@
5811
@@ -2403,7 +2680,7 @@
5822
5812
5823
5813
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
5824
5814
5827
5817
$as_echo_n "checking whether build environment is sane... " >&6; }
5828
5818
# Just in case
5829
5819
sleep 1
5830
@@ -2414,15 +2694,11 @@
5820
@@ -2414,15 +2691,11 @@
5831
5821
'
5832
5822
case `pwd` in
5833
5823
*[\\\"\#\$\&\'\`$am_lf]*)
5845
5835
esac
5846
5836
5847
5837
# Do `set' in a subshell so we don't clobber the current shell's
5848
@@ -2444,11 +2720,8 @@
5838
@@ -2444,11 +2717,8 @@
5849
5839
# if, for instance, CONFIG_SHELL is bash and it inherits a
5850
5840
# broken ls alias from the environment. This has actually
5851
5841
# happened. Such a system could not be considered "sane".
5859
5849
fi
5860
5850
5861
5851
test "$2" = conftest.file
5862
@@ -2457,13 +2730,10 @@
5852
@@ -2457,13 +2727,10 @@
5863
5853
# Ok.
5864
5854
:
5865
5855
else
5876
5866
$as_echo "yes" >&6; }
5877
5867
test "$program_prefix" != NONE &&
5878
5868
program_transform_name="s&^&$program_prefix&;$program_transform_name"
5879
@@ -2491,7 +2761,7 @@
5869
@@ -2491,7 +2758,7 @@
5880
5870
am_missing_run="$MISSING --run "
5881
5871
else
5882
5872
am_missing_run=
5885
5875
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
5886
5876
fi
5887
5877
5888
@@ -2512,9 +2782,9 @@
5878
@@ -2512,9 +2779,9 @@
5889
5879
if test -n "$ac_tool_prefix"; then
5890
5880
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
5891
5881
set dummy ${ac_tool_prefix}strip; ac_word=$2
5897
5887
$as_echo_n "(cached) " >&6
5898
5888
else
5899
5889
if test -n "$STRIP"; then
5900
@@ -2525,24 +2795,24 @@
5890
@@ -2525,24 +2792,24 @@
5901
5891
do
5902
5892
IFS=$as_save_IFS
5903
5893
test -z "$as_dir" && as_dir=.
5927
5917
$as_echo "no" >&6; }
5928
5918
fi
5929
5919
5930
@@ -2552,9 +2822,9 @@
5920
@@ -2552,9 +2819,9 @@
5931
5921
ac_ct_STRIP=$STRIP
5932
5922
# Extract the first word of "strip", so it can be a program name with args.
5933
5923
set dummy strip; ac_word=$2
5939
5929
$as_echo_n "(cached) " >&6
5940
5930
else
5941
5931
if test -n "$ac_ct_STRIP"; then
5942
@@ -2565,24 +2835,24 @@
5932
@@ -2565,24 +2832,24 @@
5943
5933
do
5944
5934
IFS=$as_save_IFS
5945
5935
test -z "$as_dir" && as_dir=.
5969
5959
$as_echo "no" >&6; }
5970
5960
fi
5971
5961
5972
@@ -2591,7 +2861,7 @@
5962
@@ -2591,7 +2858,7 @@
5973
5963
else
5974
5964
case $cross_compiling:$ac_tool_warned in
5975
5965
yes:)
5978
5968
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
5979
5969
ac_tool_warned=yes ;;
5980
5970
esac
5981
@@ -2604,10 +2874,10 @@
5971
@@ -2604,10 +2871,10 @@
5982
5972
fi
5983
5973
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
5984
5974
5991
5981
$as_echo_n "(cached) " >&6
5992
5982
else
5993
5983
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5994
@@ -2615,7 +2885,7 @@
5984
@@ -2615,7 +2882,7 @@
5995
5985
do
5996
5986
IFS=$as_save_IFS
5997
5987
test -z "$as_dir" && as_dir=.
6000
5990
for ac_exec_ext in '' $ac_executable_extensions; do
6001
5991
{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
6002
5992
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
6003
@@ -2627,11 +2897,12 @@
5993
@@ -2627,11 +2894,12 @@
6004
5994
esac
6005
5995
done
6006
5996
done
6014
6004
if test "${ac_cv_path_mkdir+set}" = set; then
6015
6005
MKDIR_P="$ac_cv_path_mkdir -p"
6016
6006
else
6017
@@ -2639,11 +2910,10 @@
6007
@@ -2639,11 +2907,10 @@
6018
6008
# value for MKDIR_P within a source directory, because that will
6019
6009
# break other packages using the cache if that directory is
6020
6010
# removed, or if the value is a relative name.
6027
6017
$as_echo "$MKDIR_P" >&6; }
6028
6018
6029
6019
mkdir_p="$MKDIR_P"
6030
@@ -2656,9 +2926,9 @@
6020
@@ -2656,9 +2923,9 @@
6031
6021
do
6032
6022
# Extract the first word of "$ac_prog", so it can be a program name with args.
6033
6023
set dummy $ac_prog; ac_word=$2
6039
6029
$as_echo_n "(cached) " >&6
6040
6030
else
6041
6031
if test -n "$AWK"; then
6042
@@ -2669,24 +2939,24 @@
6032
@@ -2669,24 +2936,24 @@
6043
6033
do
6044
6034
IFS=$as_save_IFS
6045
6035
test -z "$as_dir" && as_dir=.
6069
6059
$as_echo "no" >&6; }
6070
6060
fi
6071
6061
6072
@@ -2694,11 +2964,11 @@
6062
@@ -2694,11 +2961,11 @@
6073
6063
test -n "$AWK" && break
6074
6064
done
6075
6065
6083
6073
$as_echo_n "(cached) " >&6
6084
6074
else
6085
6075
cat >conftest.make <<\_ACEOF
6086
@@ -2716,11 +2986,11 @@
6076
@@ -2716,11 +2983,11 @@
6087
6077
rm -f conftest.make
6088
6078
fi
6089
6079
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
6097
6087
$as_echo "no" >&6; }
6098
6088
SET_MAKE="MAKE=${MAKE-make}"
6099
6089
fi
6100
@@ -2740,9 +3010,7 @@
6090
@@ -2740,9 +3007,7 @@
6101
6091
am__isrc=' -I$(srcdir)'
6102
6092
# test to see if srcdir already configured
6103
6093
if test -f $srcdir/config.status; then
6108
6098
fi
6109
6099
fi
6110
6100
6111
@@ -2799,7 +3067,7 @@
6101
@@ -2799,7 +3064,7 @@
6112
6102
6113
6103
6114
6104
# Check whether --enable-silent-rules was given.
6117
6107
enableval=$enable_silent_rules;
6118
6108
fi
6119
6109
6120
@@ -2835,16 +3103,16 @@
6110
@@ -2835,16 +3100,16 @@
6121
6111
6122
6112
6123
6113
6137
6127
$as_echo "$USE_MAINTAINER_MODE" >&6; }
6138
6128
if test $USE_MAINTAINER_MODE = yes; then
6139
6129
MAINTAINER_MODE_TRUE=
6140
@@ -2872,16 +3140,16 @@
6130
@@ -2872,16 +3137,16 @@
6141
6131
6142
6132
6143
6133
6157
6147
$as_echo "$USE_NLS" >&6; }
6158
6148
6159
6149
6160
@@ -2897,7 +3165,7 @@
6150
@@ -2897,7 +3162,7 @@
6161
6151
.PHONY: am__doit
6162
6152
END
6163
6153
# If we don't find an include directive, just comment out the code.
6166
6156
$as_echo_n "checking for style of include used by $am_make... " >&6; }
6167
6157
am__include="#"
6168
6158
am__quote=
6169
@@ -2925,12 +3193,12 @@
6159
@@ -2925,12 +3190,12 @@
6170
6160
fi
6171
6161
6172
6162
6181
6171
enableval=$enable_dependency_tracking;
6182
6172
fi
6183
6173
6184
@@ -2955,9 +3223,9 @@
6174
@@ -2955,9 +3220,9 @@
6185
6175
if test -n "$ac_tool_prefix"; then
6186
6176
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
6187
6177
set dummy ${ac_tool_prefix}gcc; ac_word=$2
6193
6183
$as_echo_n "(cached) " >&6
6194
6184
else
6195
6185
if test -n "$CC"; then
6196
@@ -2968,24 +3236,24 @@
6186
@@ -2968,24 +3233,24 @@
6197
6187
do
6198
6188
IFS=$as_save_IFS
6199
6189
test -z "$as_dir" && as_dir=.
6223
6213
$as_echo "no" >&6; }
6224
6214
fi
6225
6215
6226
@@ -2995,9 +3263,9 @@
6216
@@ -2995,9 +3260,9 @@
6227
6217
ac_ct_CC=$CC
6228
6218
# Extract the first word of "gcc", so it can be a program name with args.
6229
6219
set dummy gcc; ac_word=$2
6235
6225
$as_echo_n "(cached) " >&6
6236
6226
else
6237
6227
if test -n "$ac_ct_CC"; then
6238
@@ -3008,24 +3276,24 @@
6228
@@ -3008,24 +3273,24 @@
6239
6229
do
6240
6230
IFS=$as_save_IFS
6241
6231
test -z "$as_dir" && as_dir=.
6265
6255
$as_echo "no" >&6; }
6266
6256
fi
6267
6257
6268
@@ -3034,7 +3302,7 @@
6258
@@ -3034,7 +3299,7 @@
6269
6259
else
6270
6260
case $cross_compiling:$ac_tool_warned in
6271
6261
yes:)
6274
6264
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6275
6265
ac_tool_warned=yes ;;
6276
6266
esac
6277
@@ -3048,9 +3316,9 @@
6267
@@ -3048,9 +3313,9 @@
6278
6268
if test -n "$ac_tool_prefix"; then
6279
6269
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
6280
6270
set dummy ${ac_tool_prefix}cc; ac_word=$2
6286
6276
$as_echo_n "(cached) " >&6
6287
6277
else
6288
6278
if test -n "$CC"; then
6289
@@ -3061,24 +3329,24 @@
6279
@@ -3061,24 +3326,24 @@
6290
6280
do
6291
6281
IFS=$as_save_IFS
6292
6282
test -z "$as_dir" && as_dir=.
6316
6306
$as_echo "no" >&6; }
6317
6307
fi
6318
6308
6319
@@ -3088,9 +3356,9 @@
6309
@@ -3088,9 +3353,9 @@
6320
6310
if test -z "$CC"; then
6321
6311
# Extract the first word of "cc", so it can be a program name with args.
6322
6312
set dummy cc; ac_word=$2
6328
6318
$as_echo_n "(cached) " >&6
6329
6319
else
6330
6320
if test -n "$CC"; then
6331
@@ -3102,18 +3370,18 @@
6321
@@ -3102,18 +3367,18 @@
6332
6322
do
6333
6323
IFS=$as_save_IFS
6334
6324
test -z "$as_dir" && as_dir=.
6350
6340
IFS=$as_save_IFS
6351
6341
6352
6342
if test $ac_prog_rejected = yes; then
6353
@@ -3132,10 +3400,10 @@
6343
@@ -3132,10 +3397,10 @@
6354
6344
fi
6355
6345
CC=$ac_cv_prog_CC
6356
6346
if test -n "$CC"; then
6363
6353
$as_echo "no" >&6; }
6364
6354
fi
6365
6355
6366
@@ -3147,9 +3415,9 @@
6356
@@ -3147,9 +3412,9 @@
6367
6357
do
6368
6358
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
6369
6359
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
6375
6365
$as_echo_n "(cached) " >&6
6376
6366
else
6377
6367
if test -n "$CC"; then
6378
@@ -3160,24 +3428,24 @@
6368
@@ -3160,24 +3425,24 @@
6379
6369
do
6380
6370
IFS=$as_save_IFS
6381
6371
test -z "$as_dir" && as_dir=.
6405
6395
$as_echo "no" >&6; }
6406
6396
fi
6407
6397
6408
@@ -3191,9 +3459,9 @@
6398
@@ -3191,9 +3456,9 @@
6409
6399
do
6410
6400
# Extract the first word of "$ac_prog", so it can be a program name with args.
6411
6401
set dummy $ac_prog; ac_word=$2
6417
6407
$as_echo_n "(cached) " >&6
6418
6408
else
6419
6409
if test -n "$ac_ct_CC"; then
6420
@@ -3204,24 +3472,24 @@
6410
@@ -3204,24 +3469,24 @@
6421
6411
do
6422
6412
IFS=$as_save_IFS
6423
6413
test -z "$as_dir" && as_dir=.
6447
6437
$as_echo "no" >&6; }
6448
6438
fi
6449
6439
6450
@@ -3234,7 +3502,7 @@
6440
@@ -3234,7 +3499,7 @@
6451
6441
else
6452
6442
case $cross_compiling:$ac_tool_warned in
6453
6443
yes:)
6456
6446
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6457
6447
ac_tool_warned=yes ;;
6458
6448
esac
6459
@@ -3245,57 +3513,37 @@
6449
@@ -3245,57 +3510,37 @@
6460
6450
fi
6461
6451
6462
6452
6534
6524
/* end confdefs.h. */
6535
6525
6536
6526
int
6537
@@ -3311,8 +3559,8 @@
6527
@@ -3311,8 +3556,8 @@
6538
6528
# Try to create an executable without -o first, disregard a.out.
6539
6529
# It will help us diagnose broken compilers, and finding out an intuition
6540
6530
# of exeext.
6545
6535
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
6546
6536
6547
6537
# The possible output files:
6548
@@ -3328,17 +3576,17 @@
6538
@@ -3328,17 +3573,17 @@
6549
6539
done
6550
6540
rm -f $ac_rmfiles
6551
6541
6568
6558
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
6569
6559
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
6570
6560
# in a Makefile. We should not override ac_cv_exeext if it was cached,
6571
@@ -3355,7 +3603,7 @@
6561
@@ -3355,7 +3600,7 @@
6572
6562
# certainly right.
6573
6563
break;;
6574
6564
*.* )
6577
6567
then :; else
6578
6568
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
6579
6569
fi
6580
@@ -3374,84 +3622,42 @@
6570
@@ -3374,84 +3619,42 @@
6581
6571
else
6582
6572
ac_file=''
6583
6573
fi
6683
6673
# If both `conftest.exe' and `conftest' are `present' (well, observable)
6684
6674
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
6685
6675
# work properly (i.e., refer to `conftest.exe'), while it won't with
6686
@@ -3466,32 +3672,83 @@
6676
@@ -3466,32 +3669,83 @@
6687
6677
esac
6688
6678
done
6689
6679
else
6783
6773
/* end confdefs.h. */
6784
6774
6785
6775
int
6786
@@ -3503,17 +3760,17 @@
6776
@@ -3503,17 +3757,17 @@
6787
6777
}
6788
6778
_ACEOF
6789
6779
rm -f conftest.o conftest.obj
6806
6796
for ac_file in conftest.o conftest.obj conftest.*; do
6807
6797
test -f "$ac_file" || continue;
6808
6798
case $ac_file in
6809
@@ -3526,31 +3783,23 @@
6799
@@ -3526,31 +3780,23 @@
6810
6800
$as_echo "$as_me: failed program was:" >&5
6811
6801
sed 's/^/| /' conftest.$ac_ext >&5
6812
6802
6845
6835
/* end confdefs.h. */
6846
6836
6847
6837
int
6848
@@ -3564,37 +3813,16 @@
6838
@@ -3564,37 +3810,16 @@
6849
6839
return 0;
6850
6840
}
6851
6841
_ACEOF
6886
6876
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
6887
6877
if test $ac_compiler_gnu = yes; then
6888
6878
GCC=yes
6889
@@ -3603,20 +3831,16 @@
6879
@@ -3603,20 +3828,16 @@
6890
6880
fi
6891
6881
ac_test_CFLAGS=${CFLAGS+set}
6892
6882
ac_save_CFLAGS=$CFLAGS
6910
6900
/* end confdefs.h. */
6911
6901
6912
6902
int
6913
@@ -3627,35 +3851,11 @@
6903
@@ -3627,35 +3848,11 @@
6914
6904
return 0;
6915
6905
}
6916
6906
_ACEOF
6949
6939
/* end confdefs.h. */
6950
6940
6951
6941
int
6952
@@ -3666,36 +3866,12 @@
6942
@@ -3666,36 +3863,12 @@
6953
6943
return 0;
6954
6944
}
6955
6945
_ACEOF
6990
6980
/* end confdefs.h. */
6991
6981
6992
6982
int
6993
@@ -3706,42 +3882,17 @@
6983
@@ -3706,42 +3879,17 @@
6994
6984
return 0;
6995
6985
}
6996
6986
_ACEOF
7035
7025
$as_echo "$ac_cv_prog_cc_g" >&6; }
7036
7026
if test "$ac_test_CFLAGS" = set; then
7037
7027
CFLAGS=$ac_save_CFLAGS
7038
@@ -3758,18 +3909,14 @@
7028
@@ -3758,18 +3906,14 @@
7039
7029
CFLAGS=
7040
7030
fi
7041
7031
fi
7057
7047
/* end confdefs.h. */
7058
7048
#include <stdarg.h>
7059
7049
#include <stdio.h>
7060
@@ -3826,32 +3973,9 @@
7050
@@ -3826,32 +3970,9 @@
7061
7051
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
7062
7052
do
7063
7053
CC="$ac_save_CC $ac_arg"
7091
7081
rm -f core conftest.err conftest.$ac_objext
7092
7082
test "x$ac_cv_prog_cc_c89" != "xno" && break
7093
7083
done
7094
@@ -3862,17 +3986,19 @@
7084
@@ -3862,17 +3983,19 @@
7095
7085
# AC_CACHE_VAL
7096
7086
case "x$ac_cv_prog_cc_c89" in
7097
7087
x)
7114
7104
7115
7105
ac_ext=c
7116
7106
ac_cpp='$CPP $CPPFLAGS'
7117
@@ -3882,9 +4008,9 @@
7107
@@ -3882,9 +4005,9 @@
7118
7108
7119
7109
depcc="$CC" am_compiler_list=
7120
7110
7126
7116
$as_echo_n "(cached) " >&6
7127
7117
else
7128
7118
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
7129
@@ -3992,7 +4118,7 @@
7119
@@ -3992,7 +4115,7 @@
7130
7120
fi
7131
7121
7132
7122
fi
7135
7125
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
7136
7126
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
7137
7127
7138
@@ -4012,35 +4138,31 @@
7128
@@ -4012,35 +4135,31 @@
7139
7129
7140
7130
case "$am__api_version" in
7141
7131
1.01234)
7177
7167
$as_echo_n "(cached) " >&6
7178
7168
else
7179
7169
case $INTLTOOL_UPDATE in
7180
@@ -4053,14 +4175,14 @@
7170
@@ -4053,14 +4172,14 @@
7181
7171
do
7182
7172
IFS=$as_save_IFS
7183
7173
test -z "$as_dir" && as_dir=.
7195
7185
IFS=$as_save_IFS
7196
7186
7197
7187
;;
7198
@@ -4068,19 +4190,19 @@
7188
@@ -4068,19 +4187,19 @@
7199
7189
fi
7200
7190
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
7201
7191
if test -n "$INTLTOOL_UPDATE"; then
7219
7209
$as_echo_n "(cached) " >&6
7220
7210
else
7221
7211
case $INTLTOOL_MERGE in
7222
@@ -4093,14 +4215,14 @@
7212
@@ -4093,14 +4212,14 @@
7223
7213
do
7224
7214
IFS=$as_save_IFS
7225
7215
test -z "$as_dir" && as_dir=.
7237
7227
IFS=$as_save_IFS
7238
7228
7239
7229
;;
7240
@@ -4108,19 +4230,19 @@
7230
@@ -4108,19 +4227,19 @@
7241
7231
fi
7242
7232
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
7243
7233
if test -n "$INTLTOOL_MERGE"; then
7261
7251
$as_echo_n "(cached) " >&6
7262
7252
else
7263
7253
case $INTLTOOL_EXTRACT in
7264
@@ -4133,14 +4255,14 @@
7254
@@ -4133,14 +4252,14 @@
7265
7255
do
7266
7256
IFS=$as_save_IFS
7267
7257
test -z "$as_dir" && as_dir=.
7279
7269
IFS=$as_save_IFS
7280
7270
7281
7271
;;
7282
@@ -4148,18 +4270,16 @@
7272
@@ -4148,18 +4267,16 @@
7283
7273
fi
7284
7274
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
7285
7275
if test -n "$INTLTOOL_EXTRACT"; then
7301
7291
fi
7302
7292
7303
7293
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 $< $@'
7304
@@ -4281,9 +4401,9 @@
7294
@@ -4281,9 +4398,9 @@
7305
7295
# Check the gettext tools to make sure they are GNU
7306
7296
# Extract the first word of "xgettext", so it can be a program name with args.
7307
7297
set dummy xgettext; ac_word=$2
7313
7303
$as_echo_n "(cached) " >&6
7314
7304
else
7315
7305
case $XGETTEXT in
7316
@@ -4296,14 +4416,14 @@
7306
@@ -4296,14 +4413,14 @@
7317
7307
do
7318
7308
IFS=$as_save_IFS
7319
7309
test -z "$as_dir" && as_dir=.
7331
7321
IFS=$as_save_IFS
7332
7322
7333
7323
;;
7334
@@ -4311,19 +4431,19 @@
7324
@@ -4311,19 +4428,19 @@
7335
7325
fi
7336
7326
XGETTEXT=$ac_cv_path_XGETTEXT
7337
7327
if test -n "$XGETTEXT"; then
7355
7345
$as_echo_n "(cached) " >&6
7356
7346
else
7357
7347
case $MSGMERGE in
7358
@@ -4336,14 +4456,14 @@
7348
@@ -4336,14 +4453,14 @@
7359
7349
do
7360
7350
IFS=$as_save_IFS
7361
7351
test -z "$as_dir" && as_dir=.
7373
7363
IFS=$as_save_IFS
7374
7364
7375
7365
;;
7376
@@ -4351,19 +4471,19 @@
7366
@@ -4351,19 +4468,19 @@
7377
7367
fi
7378
7368
MSGMERGE=$ac_cv_path_MSGMERGE
7379
7369
if test -n "$MSGMERGE"; then
7397
7387
$as_echo_n "(cached) " >&6
7398
7388
else
7399
7389
case $MSGFMT in
7400
@@ -4376,14 +4496,14 @@
7390
@@ -4376,14 +4493,14 @@
7401
7391
do
7402
7392
IFS=$as_save_IFS
7403
7393
test -z "$as_dir" && as_dir=.
7415
7405
IFS=$as_save_IFS
7416
7406
7417
7407
;;
7418
@@ -4391,19 +4511,19 @@
7408
@@ -4391,19 +4508,19 @@
7419
7409
fi
7420
7410
MSGFMT=$ac_cv_path_MSGFMT
7421
7411
if test -n "$MSGFMT"; then
7439
7429
$as_echo_n "(cached) " >&6
7440
7430
else
7441
7431
case $GMSGFMT in
7442
@@ -4416,14 +4536,14 @@
7432
@@ -4416,14 +4533,14 @@
7443
7433
do
7444
7434
IFS=$as_save_IFS
7445
7435
test -z "$as_dir" && as_dir=.
7457
7447
IFS=$as_save_IFS
7458
7448
7459
7449
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
7460
@@ -4432,33 +4552,29 @@
7450
@@ -4432,33 +4549,29 @@
7461
7451
fi
7462
7452
GMSGFMT=$ac_cv_path_GMSGFMT
7463
7453
if test -n "$GMSGFMT"; then
7497
7487
$as_echo_n "(cached) " >&6
7498
7488
else
7499
7489
case $INTLTOOL_PERL in
7500
@@ -4471,14 +4587,14 @@
7490
@@ -4471,14 +4584,14 @@
7501
7491
do
7502
7492
IFS=$as_save_IFS
7503
7493
test -z "$as_dir" && as_dir=.
7515
7505
IFS=$as_save_IFS
7516
7506
7517
7507
;;
7518
@@ -4486,41 +4602,35 @@
7508
@@ -4486,41 +4599,35 @@
7519
7509
fi
7520
7510
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
7521
7511
if test -n "$INTLTOOL_PERL"; then
7566
7556
fi
7567
7557
fi
7568
7558
7569
@@ -4530,11 +4640,7 @@
7559
@@ -4530,11 +4637,7 @@
7570
7560
# Set DATADIRNAME correctly if it is not set yet
7571
7561
# (copied from glib-gettext.m4)
7572
7562
if test -z "$DATADIRNAME"; then
7579
7569
/* end confdefs.h. */
7580
7570
7581
7571
int
7582
@@ -4546,61 +4652,41 @@
7572
@@ -4546,61 +4649,41 @@
7583
7573
return 0;
7584
7574
}
7585
7575
_ACEOF
7669
7659
7670
7660
/* Override any GCC internal prototype to avoid an error.
7671
7661
Use char because int might match the return type of a GCC
7672
@@ -4608,104 +4694,11 @@
7662
@@ -4608,104 +4691,11 @@
7673
7663
#ifdef __cplusplus
7674
7664
extern "C"
7675
7665
#endif
7776
7766
;
7777
7767
return 0;
7778
7768
}
7779
@@ -4717,54 +4710,27 @@
7769
@@ -4717,54 +4707,27 @@
7780
7770
ac_res=-l$ac_lib
7781
7771
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
7782
7772
fi
7839
7829
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
7840
7830
7841
7831
fi
7842
@@ -4777,9 +4743,9 @@
7832
@@ -4777,9 +4740,9 @@
7843
7833
if test -n "$ac_tool_prefix"; then
7844
7834
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
7845
7835
set dummy ${ac_tool_prefix}gcc; ac_word=$2
7851
7841
$as_echo_n "(cached) " >&6
7852
7842
else
7853
7843
if test -n "$CC"; then
7854
@@ -4790,24 +4756,24 @@
7844
@@ -4790,24 +4753,24 @@
7855
7845
do
7856
7846
IFS=$as_save_IFS
7857
7847
test -z "$as_dir" && as_dir=.
7881
7871
$as_echo "no" >&6; }
7882
7872
fi
7883
7873
7884
@@ -4817,9 +4783,9 @@
7874
@@ -4817,9 +4780,9 @@
7885
7875
ac_ct_CC=$CC
7886
7876
# Extract the first word of "gcc", so it can be a program name with args.
7887
7877
set dummy gcc; ac_word=$2
7893
7883
$as_echo_n "(cached) " >&6
7894
7884
else
7895
7885
if test -n "$ac_ct_CC"; then
7896
@@ -4830,24 +4796,24 @@
7886
@@ -4830,24 +4793,24 @@
7897
7887
do
7898
7888
IFS=$as_save_IFS
7899
7889
test -z "$as_dir" && as_dir=.
7923
7913
$as_echo "no" >&6; }
7924
7914
fi
7925
7915
7926
@@ -4856,7 +4822,7 @@
7916
@@ -4856,7 +4819,7 @@
7927
7917
else
7928
7918
case $cross_compiling:$ac_tool_warned in
7929
7919
yes:)
7932
7922
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7933
7923
ac_tool_warned=yes ;;
7934
7924
esac
7935
@@ -4870,9 +4836,9 @@
7925
@@ -4870,9 +4833,9 @@
7936
7926
if test -n "$ac_tool_prefix"; then
7937
7927
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
7938
7928
set dummy ${ac_tool_prefix}cc; ac_word=$2
7944
7934
$as_echo_n "(cached) " >&6
7945
7935
else
7946
7936
if test -n "$CC"; then
7947
@@ -4883,24 +4849,24 @@
7937
@@ -4883,24 +4846,24 @@
7948
7938
do
7949
7939
IFS=$as_save_IFS
7950
7940
test -z "$as_dir" && as_dir=.
7974
7964
$as_echo "no" >&6; }
7975
7965
fi
7976
7966
7977
@@ -4910,9 +4876,9 @@
7967
@@ -4910,9 +4873,9 @@
7978
7968
if test -z "$CC"; then
7979
7969
# Extract the first word of "cc", so it can be a program name with args.
7980
7970
set dummy cc; ac_word=$2
7986
7976
$as_echo_n "(cached) " >&6
7987
7977
else
7988
7978
if test -n "$CC"; then
7989
@@ -4924,18 +4890,18 @@
7979
@@ -4924,18 +4887,18 @@
7990
7980
do
7991
7981
IFS=$as_save_IFS
7992
7982
test -z "$as_dir" && as_dir=.
8008
7998
IFS=$as_save_IFS
8009
7999
8010
8000
if test $ac_prog_rejected = yes; then
8011
@@ -4954,10 +4920,10 @@
8001
@@ -4954,10 +4917,10 @@
8012
8002
fi
8013
8003
CC=$ac_cv_prog_CC
8014
8004
if test -n "$CC"; then
8021
8011
$as_echo "no" >&6; }
8022
8012
fi
8023
8013
8024
@@ -4969,9 +4935,9 @@
8014
@@ -4969,9 +4932,9 @@
8025
8015
do
8026
8016
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
8027
8017
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
8033
8023
$as_echo_n "(cached) " >&6
8034
8024
else
8035
8025
if test -n "$CC"; then
8036
@@ -4982,24 +4948,24 @@
8026
@@ -4982,24 +4945,24 @@
8037
8027
do
8038
8028
IFS=$as_save_IFS
8039
8029
test -z "$as_dir" && as_dir=.
8063
8053
$as_echo "no" >&6; }
8064
8054
fi
8065
8055
8066
@@ -5013,9 +4979,9 @@
8056
@@ -5013,9 +4976,9 @@
8067
8057
do
8068
8058
# Extract the first word of "$ac_prog", so it can be a program name with args.
8069
8059
set dummy $ac_prog; ac_word=$2
8075
8065
$as_echo_n "(cached) " >&6
8076
8066
else
8077
8067
if test -n "$ac_ct_CC"; then
8078
@@ -5026,24 +4992,24 @@
8068
@@ -5026,24 +4989,24 @@
8079
8069
do
8080
8070
IFS=$as_save_IFS
8081
8071
test -z "$as_dir" && as_dir=.
8105
8095
$as_echo "no" >&6; }
8106
8096
fi
8107
8097
8108
@@ -5056,7 +5022,7 @@
8098
@@ -5056,7 +5019,7 @@
8109
8099
else
8110
8100
case $cross_compiling:$ac_tool_warned in
8111
8101
yes:)
8114
8104
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
8115
8105
ac_tool_warned=yes ;;
8116
8106
esac
8117
@@ -5067,62 +5033,42 @@
8107
@@ -5067,62 +5030,42 @@
8118
8108
fi
8119
8109
8120
8110
8199
8189
/* end confdefs.h. */
8200
8190
8201
8191
int
8202
@@ -5136,37 +5082,16 @@
8192
@@ -5136,37 +5079,16 @@
8203
8193
return 0;
8204
8194
}
8205
8195
_ACEOF
8240
8230
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
8241
8231
if test $ac_compiler_gnu = yes; then
8242
8232
GCC=yes
8243
@@ -5175,20 +5100,16 @@
8233
@@ -5175,20 +5097,16 @@
8244
8234
fi
8245
8235
ac_test_CFLAGS=${CFLAGS+set}
8246
8236
ac_save_CFLAGS=$CFLAGS
8264
8254
/* end confdefs.h. */
8265
8255
8266
8256
int
8267
@@ -5199,35 +5120,11 @@
8257
@@ -5199,35 +5117,11 @@
8268
8258
return 0;
8269
8259
}
8270
8260
_ACEOF
8303
8293
/* end confdefs.h. */
8304
8294
8305
8295
int
8306
@@ -5238,36 +5135,12 @@
8296
@@ -5238,36 +5132,12 @@
8307
8297
return 0;
8308
8298
}
8309
8299
_ACEOF
8344
8334
/* end confdefs.h. */
8345
8335
8346
8336
int
8347
@@ -5278,42 +5151,17 @@
8337
@@ -5278,42 +5148,17 @@
8348
8338
return 0;
8349
8339
}
8350
8340
_ACEOF
8389
8379
$as_echo "$ac_cv_prog_cc_g" >&6; }
8390
8380
if test "$ac_test_CFLAGS" = set; then
8391
8381
CFLAGS=$ac_save_CFLAGS
8392
@@ -5330,18 +5178,14 @@
8382
@@ -5330,18 +5175,14 @@
8393
8383
CFLAGS=
8394
8384
fi
8395
8385
fi
8411
8401
/* end confdefs.h. */
8412
8402
#include <stdarg.h>
8413
8403
#include <stdio.h>
8414
@@ -5398,32 +5242,9 @@
8404
@@ -5398,32 +5239,9 @@
8415
8405
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
8416
8406
do
8417
8407
CC="$ac_save_CC $ac_arg"
8445
8435
rm -f core conftest.err conftest.$ac_objext
8446
8436
test "x$ac_cv_prog_cc_c89" != "xno" && break
8447
8437
done
8448
@@ -5434,17 +5255,19 @@
8438
@@ -5434,17 +5252,19 @@
8449
8439
# AC_CACHE_VAL
8450
8440
case "x$ac_cv_prog_cc_c89" in
8451
8441
x)
8468
8458
8469
8459
ac_ext=c
8470
8460
ac_cpp='$CPP $CPPFLAGS'
8471
@@ -5454,9 +5277,9 @@
8461
@@ -5454,9 +5274,9 @@
8472
8462
8473
8463
depcc="$CC" am_compiler_list=
8474
8464
8480
8470
$as_echo_n "(cached) " >&6
8481
8471
else
8482
8472
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
8483
@@ -5564,7 +5387,7 @@
8473
@@ -5564,7 +5384,7 @@
8484
8474
fi
8485
8475
8486
8476
fi
8489
8479
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
8490
8480
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
8491
8481
8492
@@ -5584,14 +5407,14 @@
8482
@@ -5584,14 +5404,14 @@
8493
8483
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
8494
8484
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
8495
8485
ac_compiler_gnu=$ac_cv_c_compiler_gnu
8506
8496
$as_echo_n "(cached) " >&6
8507
8497
else
8508
8498
# Double quotes because CPP needs to be expanded
8509
@@ -5606,11 +5429,7 @@
8499
@@ -5606,11 +5426,7 @@
8510
8500
# <limits.h> exists even on freestanding compilers.
8511
8501
# On the NeXT, cc -E runs the code through the compiler's parser,
8512
8502
# not just through cpp. "Syntax error" is here to catch this case.
8519
8509
/* end confdefs.h. */
8520
8510
#ifdef __STDC__
8521
8511
# include <limits.h>
8522
@@ -5619,78 +5438,34 @@
8512
@@ -5619,78 +5435,34 @@
8523
8513
#endif
8524
8514
Syntax error
8525
8515
_ACEOF
8603
8593
break
8604
8594
fi
8605
8595
8606
@@ -5702,7 +5477,7 @@
8596
@@ -5702,7 +5474,7 @@
8607
8597
else
8608
8598
ac_cv_prog_CPP=$CPP
8609
8599
fi
8612
8602
$as_echo "$CPP" >&6; }
8613
8603
ac_preproc_ok=false
8614
8604
for ac_c_preproc_warn_flag in '' yes
8615
@@ -5713,11 +5488,7 @@
8605
@@ -5713,11 +5485,7 @@
8616
8606
# <limits.h> exists even on freestanding compilers.
8617
8607
# On the NeXT, cc -E runs the code through the compiler's parser,
8618
8608
# not just through cpp. "Syntax error" is here to catch this case.
8625
8615
/* end confdefs.h. */
8626
8616
#ifdef __STDC__
8627
8617
# include <limits.h>
8628
@@ -5726,87 +5497,40 @@
8618
@@ -5726,87 +5494,40 @@
8629
8619
#endif
8630
8620
Syntax error
8631
8621
_ACEOF
8722
8712
fi
8723
8713
8724
8714
ac_ext=c
8725
@@ -5816,9 +5540,9 @@
8715
@@ -5816,9 +5537,9 @@
8726
8716
ac_compiler_gnu=$ac_cv_c_compiler_gnu
8727
8717
8728
8718
8734
8724
$as_echo_n "(cached) " >&6
8735
8725
else
8736
8726
if test -z "$GREP"; then
8737
@@ -5829,7 +5553,7 @@
8727
@@ -5829,7 +5550,7 @@
8738
8728
do
8739
8729
IFS=$as_save_IFS
8740
8730
test -z "$as_dir" && as_dir=.
8743
8733
for ac_exec_ext in '' $ac_executable_extensions; do
8744
8734
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
8745
8735
{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
8746
@@ -5849,7 +5573,7 @@
8736
@@ -5849,7 +5570,7 @@
8747
8737
$as_echo 'GREP' >> "conftest.nl"
8748
8738
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
8749
8739
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
8752
8742
if test $ac_count -gt ${ac_path_GREP_max-0}; then
8753
8743
# Best one so far, save it but keep looking for a better one
8754
8744
ac_cv_path_GREP="$ac_path_GREP"
8755
@@ -5864,26 +5588,24 @@
8745
@@ -5864,26 +5585,24 @@
8756
8746
$ac_path_GREP_found && break 3
8757
8747
done
8758
8748
done
8784
8774
$as_echo_n "(cached) " >&6
8785
8775
else
8786
8776
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
8787
@@ -5897,7 +5619,7 @@
8777
@@ -5897,7 +5616,7 @@
8788
8778
do
8789
8779
IFS=$as_save_IFS
8790
8780
test -z "$as_dir" && as_dir=.
8793
8783
for ac_exec_ext in '' $ac_executable_extensions; do
8794
8784
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
8795
8785
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
8796
@@ -5917,7 +5639,7 @@
8786
@@ -5917,7 +5636,7 @@
8797
8787
$as_echo 'EGREP' >> "conftest.nl"
8798
8788
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
8799
8789
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
8802
8792
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
8803
8793
# Best one so far, save it but keep looking for a better one
8804
8794
ac_cv_path_EGREP="$ac_path_EGREP"
8805
@@ -5932,12 +5654,10 @@
8795
@@ -5932,12 +5651,10 @@
8806
8796
$ac_path_EGREP_found && break 3
8807
8797
done
8808
8798
done
8817
8807
fi
8818
8808
else
8819
8809
ac_cv_path_EGREP=$EGREP
8820
@@ -5945,21 +5665,17 @@
8810
@@ -5945,21 +5662,17 @@
8821
8811
8822
8812
fi
8823
8813
fi
8843
8833
/* end confdefs.h. */
8844
8834
#include <stdlib.h>
8845
8835
#include <stdarg.h>
8846
@@ -5974,48 +5690,23 @@
8836
@@ -5974,48 +5687,23 @@
8847
8837
return 0;
8848
8838
}
8849
8839
_ACEOF
8897
8887
else
8898
8888
ac_cv_header_stdc=no
8899
8889
fi
8900
@@ -6025,18 +5716,14 @@
8890
@@ -6025,18 +5713,14 @@
8901
8891
8902
8892
if test $ac_cv_header_stdc = yes; then
8903
8893
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
8919
8909
else
8920
8910
ac_cv_header_stdc=no
8921
8911
fi
8922
@@ -6046,14 +5733,10 @@
8912
@@ -6046,14 +5730,10 @@
8923
8913
8924
8914
if test $ac_cv_header_stdc = yes; then
8925
8915
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
8936
8926
/* end confdefs.h. */
8937
8927
#include <ctype.h>
8938
8928
#include <stdlib.h>
8939
@@ -6080,85 +5763,48 @@
8929
@@ -6080,85 +5760,48 @@
8940
8930
return 0;
8941
8931
}
8942
8932
_ACEOF
9036
9026
esac
9037
9027
build=$ac_cv_build
9038
9028
ac_save_IFS=$IFS; IFS='-'
9039
@@ -6174,28 +5820,24 @@
9029
@@ -6174,28 +5817,24 @@
9040
9030
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
9041
9031
9042
9032
9070
9060
esac
9071
9061
host=$ac_cv_host
9072
9062
ac_save_IFS=$IFS; IFS='-'
9073
@@ -6218,9 +5860,9 @@
9063
@@ -6218,9 +5857,9 @@
9074
9064
if test -n "$ac_tool_prefix"; then
9075
9065
# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
9076
9066
set dummy ${ac_tool_prefix}as; ac_word=$2
9082
9072
$as_echo_n "(cached) " >&6
9083
9073
else
9084
9074
if test -n "$AS"; then
9085
@@ -6231,24 +5873,24 @@
9075
@@ -6231,24 +5870,24 @@
9086
9076
do
9087
9077
IFS=$as_save_IFS
9088
9078
test -z "$as_dir" && as_dir=.
9112
9102
$as_echo "no" >&6; }
9113
9103
fi
9114
9104
9115
@@ -6258,9 +5900,9 @@
9105
@@ -6258,9 +5897,9 @@
9116
9106
ac_ct_AS=$AS
9117
9107
# Extract the first word of "as", so it can be a program name with args.
9118
9108
set dummy as; ac_word=$2
9124
9114
$as_echo_n "(cached) " >&6
9125
9115
else
9126
9116
if test -n "$ac_ct_AS"; then
9127
@@ -6271,24 +5913,24 @@
9117
@@ -6271,24 +5910,24 @@
9128
9118
do
9129
9119
IFS=$as_save_IFS
9130
9120
test -z "$as_dir" && as_dir=.
9154
9144
$as_echo "no" >&6; }
9155
9145
fi
9156
9146
9157
@@ -6297,7 +5939,7 @@
9147
@@ -6297,7 +5936,7 @@
9158
9148
else
9159
9149
case $cross_compiling:$ac_tool_warned in
9160
9150
yes:)
9163
9153
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
9164
9154
ac_tool_warned=yes ;;
9165
9155
esac
9166
@@ -6310,9 +5952,9 @@
9156
@@ -6310,9 +5949,9 @@
9167
9157
if test -n "$ac_tool_prefix"; then
9168
9158
# Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
9169
9159
set dummy ${ac_tool_prefix}dlltool; ac_word=$2
9175
9165
$as_echo_n "(cached) " >&6
9176
9166
else
9177
9167
if test -n "$DLLTOOL"; then
9178
@@ -6323,24 +5965,24 @@
9168
@@ -6323,24 +5962,24 @@
9179
9169
do
9180
9170
IFS=$as_save_IFS
9181
9171
test -z "$as_dir" && as_dir=.
9205
9195
$as_echo "no" >&6; }
9206
9196
fi
9207
9197
9208
@@ -6350,9 +5992,9 @@
9198
@@ -6350,9 +5989,9 @@
9209
9199
ac_ct_DLLTOOL=$DLLTOOL
9210
9200
# Extract the first word of "dlltool", so it can be a program name with args.
9211
9201
set dummy dlltool; ac_word=$2
9217
9207
$as_echo_n "(cached) " >&6
9218
9208
else
9219
9209
if test -n "$ac_ct_DLLTOOL"; then
9220
@@ -6363,24 +6005,24 @@
9210
@@ -6363,24 +6002,24 @@
9221
9211
do
9222
9212
IFS=$as_save_IFS
9223
9213
test -z "$as_dir" && as_dir=.
9247
9237
$as_echo "no" >&6; }
9248
9238
fi
9249
9239
9250
@@ -6389,7 +6031,7 @@
9240
@@ -6389,7 +6028,7 @@
9251
9241
else
9252
9242
case $cross_compiling:$ac_tool_warned in
9253
9243
yes:)
9256
9246
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
9257
9247
ac_tool_warned=yes ;;
9258
9248
esac
9259
@@ -6402,9 +6044,9 @@
9249
@@ -6402,9 +6041,9 @@
9260
9250
if test -n "$ac_tool_prefix"; then
9261
9251
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
9262
9252
set dummy ${ac_tool_prefix}objdump; ac_word=$2
9268
9258
$as_echo_n "(cached) " >&6
9269
9259
else
9270
9260
if test -n "$OBJDUMP"; then
9271
@@ -6415,24 +6057,24 @@
9261
@@ -6415,24 +6054,24 @@
9272
9262
do
9273
9263
IFS=$as_save_IFS
9274
9264
test -z "$as_dir" && as_dir=.
9298
9288
$as_echo "no" >&6; }
9299
9289
fi
9300
9290
9301
@@ -6442,9 +6084,9 @@
9291
@@ -6442,9 +6081,9 @@
9302
9292
ac_ct_OBJDUMP=$OBJDUMP
9303
9293
# Extract the first word of "objdump", so it can be a program name with args.
9304
9294
set dummy objdump; ac_word=$2
9310
9300
$as_echo_n "(cached) " >&6
9311
9301
else
9312
9302
if test -n "$ac_ct_OBJDUMP"; then
9313
@@ -6455,24 +6097,24 @@
9303
@@ -6455,24 +6094,24 @@
9314
9304
do
9315
9305
IFS=$as_save_IFS
9316
9306
test -z "$as_dir" && as_dir=.
9340
9330
$as_echo "no" >&6; }
9341
9331
fi
9342
9332
9343
@@ -6481,7 +6123,7 @@
9333
@@ -6481,7 +6120,7 @@
9344
9334
else
9345
9335
case $cross_compiling:$ac_tool_warned in
9346
9336
yes:)
9349
9339
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
9350
9340
ac_tool_warned=yes ;;
9351
9341
esac
9352
@@ -6516,14 +6158,14 @@
9342
@@ -6516,14 +6155,14 @@
9353
9343
9354
9344
case `pwd` in
9355
9345
*\ * | *\ *)
9367
9357
9368
9358
9369
9359
9370
@@ -6539,9 +6181,9 @@
9360
@@ -6539,9 +6178,9 @@
9371
9361
9372
9362
ltmain="$ac_aux_dir/ltmain.sh"
9373
9363
9379
9369
$as_echo_n "(cached) " >&6
9380
9370
else
9381
9371
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
9382
@@ -6549,7 +6191,7 @@
9372
@@ -6549,7 +6188,7 @@
9383
9373
ac_script="$ac_script$as_nl$ac_script"
9384
9374
done
9385
9375
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
9388
9378
if test -z "$SED"; then
9389
9379
ac_path_SED_found=false
9390
9380
# Loop through the user's path and test for each of PROGNAME-LIST
9391
@@ -6558,7 +6200,7 @@
9381
@@ -6558,7 +6197,7 @@
9392
9382
do
9393
9383
IFS=$as_save_IFS
9394
9384
test -z "$as_dir" && as_dir=.
9397
9387
for ac_exec_ext in '' $ac_executable_extensions; do
9398
9388
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
9399
9389
{ test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
9400
@@ -6578,7 +6220,7 @@
9390
@@ -6578,7 +6217,7 @@
9401
9391
$as_echo '' >> "conftest.nl"
9402
9392
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
9403
9393
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
9406
9396
if test $ac_count -gt ${ac_path_SED_max-0}; then
9407
9397
# Best one so far, save it but keep looking for a better one
9408
9398
ac_cv_path_SED="$ac_path_SED"
9409
@@ -6593,19 +6235,17 @@
9399
@@ -6593,19 +6232,17 @@
9410
9400
$ac_path_SED_found && break 3
9411
9401
done
9412
9402
done
9429
9419
$as_echo "$ac_cv_path_SED" >&6; }
9430
9420
SED="$ac_cv_path_SED"
9431
9421
rm -f conftest.sed
9432
@@ -6623,9 +6263,9 @@
9422
@@ -6623,9 +6260,9 @@
9433
9423
9434
9424
9435
9425
9441
9431
$as_echo_n "(cached) " >&6
9442
9432
else
9443
9433
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
9444
@@ -6639,7 +6279,7 @@
9434
@@ -6639,7 +6276,7 @@
9445
9435
do
9446
9436
IFS=$as_save_IFS
9447
9437
test -z "$as_dir" && as_dir=.
9450
9440
for ac_exec_ext in '' $ac_executable_extensions; do
9451
9441
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
9452
9442
{ test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
9453
@@ -6659,7 +6299,7 @@
9443
@@ -6659,7 +6296,7 @@
9454
9444
$as_echo 'FGREP' >> "conftest.nl"
9455
9445
"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
9456
9446
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
9459
9449
if test $ac_count -gt ${ac_path_FGREP_max-0}; then
9460
9450
# Best one so far, save it but keep looking for a better one
9461
9451
ac_cv_path_FGREP="$ac_path_FGREP"
9462
@@ -6674,12 +6314,10 @@
9452
@@ -6674,12 +6311,10 @@
9463
9453
$ac_path_FGREP_found && break 3
9464
9454
done
9465
9455
done
9474
9464
fi
9475
9465
else
9476
9466
ac_cv_path_FGREP=$FGREP
9477
@@ -6687,7 +6325,7 @@
9467
@@ -6687,7 +6322,7 @@
9478
9468
9479
9469
fi
9480
9470
fi
9483
9473
$as_echo "$ac_cv_path_FGREP" >&6; }
9484
9474
FGREP="$ac_cv_path_FGREP"
9485
9475
9486
@@ -6713,7 +6351,7 @@
9476
@@ -6713,7 +6348,7 @@
9487
9477
9488
9478
9489
9479
# Check whether --with-gnu-ld was given.
9492
9482
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
9493
9483
else
9494
9484
with_gnu_ld=no
9495
@@ -6722,7 +6360,7 @@
9485
@@ -6722,7 +6357,7 @@
9496
9486
ac_prog=ld
9497
9487
if test "$GCC" = yes; then
9498
9488
# Check if gcc -print-prog-name=ld gives a path.
9501
9491
$as_echo_n "checking for ld used by $CC... " >&6; }
9502
9492
case $host in
9503
9493
*-*-mingw*)
9504
@@ -6752,13 +6390,13 @@
9494
@@ -6752,13 +6387,13 @@
9505
9495
;;
9506
9496
esac
9507
9497
elif test "$with_gnu_ld" = yes; then
9518
9508
$as_echo_n "(cached) " >&6
9519
9509
else
9520
9510
if test -z "$LD"; then
9521
@@ -6789,18 +6427,16 @@
9511
@@ -6789,18 +6424,16 @@
9522
9512
9523
9513
LD="$lt_cv_path_LD"
9524
9514
if test -n "$LD"; then
9542
9532
$as_echo_n "(cached) " >&6
9543
9533
else
9544
9534
# I'd rather use --version here, but apparently some GNU lds only accept -v.
9545
@@ -6813,7 +6449,7 @@
9535
@@ -6813,7 +6446,7 @@
9546
9536
;;
9547
9537
esac
9548
9538
fi
9551
9541
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
9552
9542
with_gnu_ld=$lt_cv_prog_gnu_ld
9553
9543
9554
@@ -6825,9 +6461,9 @@
9544
@@ -6825,9 +6458,9 @@
9555
9545
9556
9546
9557
9547
9563
9553
$as_echo_n "(cached) " >&6
9564
9554
else
9565
9555
if test -n "$NM"; then
9566
@@ -6874,7 +6510,7 @@
9556
@@ -6874,7 +6507,7 @@
9567
9557
: ${lt_cv_path_NM=no}
9568
9558
fi
9569
9559
fi
9572
9562
$as_echo "$lt_cv_path_NM" >&6; }
9573
9563
if test "$lt_cv_path_NM" != "no"; then
9574
9564
NM="$lt_cv_path_NM"
9575
@@ -6885,9 +6521,9 @@
9565
@@ -6885,9 +6518,9 @@
9576
9566
do
9577
9567
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
9578
9568
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
9584
9574
$as_echo_n "(cached) " >&6
9585
9575
else
9586
9576
if test -n "$DUMPBIN"; then
9587
@@ -6898,24 +6534,24 @@
9577
@@ -6898,24 +6531,24 @@
9588
9578
do
9589
9579
IFS=$as_save_IFS
9590
9580
test -z "$as_dir" && as_dir=.
9614
9604
$as_echo "no" >&6; }
9615
9605
fi
9616
9606
9617
@@ -6929,9 +6565,9 @@
9607
@@ -6929,9 +6562,9 @@
9618
9608
do
9619
9609
# Extract the first word of "$ac_prog", so it can be a program name with args.
9620
9610
set dummy $ac_prog; ac_word=$2
9626
9616
$as_echo_n "(cached) " >&6
9627
9617
else
9628
9618
if test -n "$ac_ct_DUMPBIN"; then
9629
@@ -6942,24 +6578,24 @@
9619
@@ -6942,24 +6575,24 @@
9630
9620
do
9631
9621
IFS=$as_save_IFS
9632
9622
test -z "$as_dir" && as_dir=.
9656
9646
$as_echo "no" >&6; }
9657
9647
fi
9658
9648
9659
@@ -6972,7 +6608,7 @@
9649
@@ -6972,7 +6605,7 @@
9660
9650
else
9661
9651
case $cross_compiling:$ac_tool_warned in
9662
9652
yes:)
9665
9655
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
9666
9656
ac_tool_warned=yes ;;
9667
9657
esac
9668
@@ -6992,44 +6628,44 @@
9658
@@ -6992,44 +6625,44 @@
9669
9659
9670
9660
9671
9661
9679
9669
lt_cv_nm_interface="BSD nm"
9680
9670
echo "int some_variable = 0;" > conftest.$ac_ext
9681
9671
- (eval echo "\"\$as_me:7002: $ac_compile\"" >&5)
9682
+ (eval echo "\"\$as_me:6638: $ac_compile\"" >&5)
9672
+ (eval echo "\"\$as_me:6635: $ac_compile\"" >&5)
9683
9673
(eval "$ac_compile" 2>conftest.err)
9684
9674
cat conftest.err >&5
9685
9675
- (eval echo "\"\$as_me:7005: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
9686
+ (eval echo "\"\$as_me:6641: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
9676
+ (eval echo "\"\$as_me:6638: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
9687
9677
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
9688
9678
cat conftest.err >&5
9689
9679
- (eval echo "\"\$as_me:7008: output\"" >&5)
9690
+ (eval echo "\"\$as_me:6644: output\"" >&5)
9680
+ (eval echo "\"\$as_me:6641: output\"" >&5)
9691
9681
cat conftest.out >&5
9692
9682
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
9693
9683
lt_cv_nm_interface="MS dumpbin"
9721
9711
$as_echo_n "(cached) " >&6
9722
9712
else
9723
9713
i=0
9724
@@ -7147,10 +6783,10 @@
9714
@@ -7147,10 +6780,10 @@
9725
9715
fi
9726
9716
9727
9717
if test -n $lt_cv_sys_max_cmd_len ; then
9734
9724
$as_echo "none" >&6; }
9735
9725
fi
9736
9726
max_cmd_len=$lt_cv_sys_max_cmd_len
9737
@@ -7164,7 +6800,7 @@
9727
@@ -7164,7 +6797,7 @@
9738
9728
: ${MV="mv -f"}
9739
9729
: ${RM="rm -f"}
9740
9730
9743
9733
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
9744
9734
# Try some XSI features
9745
9735
xsi_shell=no
9746
@@ -7174,17 +6810,17 @@
9736
@@ -7174,17 +6807,17 @@
9747
9737
&& eval 'test $(( 1 + 1 )) -eq 2 \
9748
9738
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
9749
9739
&& xsi_shell=yes
9764
9754
$as_echo "$lt_shell_append" >&6; }
9765
9755
9766
9756
9767
@@ -7219,14 +6855,14 @@
9757
@@ -7219,14 +6852,14 @@
9768
9758
9769
9759
9770
9760
9782
9772
$as_echo "$lt_cv_ld_reload_flag" >&6; }
9783
9773
reload_flag=$lt_cv_ld_reload_flag
9784
9774
case $reload_flag in
9785
@@ -7255,9 +6891,9 @@
9775
@@ -7255,9 +6888,9 @@
9786
9776
if test -n "$ac_tool_prefix"; then
9787
9777
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
9788
9778
set dummy ${ac_tool_prefix}objdump; ac_word=$2
9794
9784
$as_echo_n "(cached) " >&6
9795
9785
else
9796
9786
if test -n "$OBJDUMP"; then
9797
@@ -7268,24 +6904,24 @@
9787
@@ -7268,24 +6901,24 @@
9798
9788
do
9799
9789
IFS=$as_save_IFS
9800
9790
test -z "$as_dir" && as_dir=.
9824
9814
$as_echo "no" >&6; }
9825
9815
fi
9826
9816
9827
@@ -7295,9 +6931,9 @@
9817
@@ -7295,9 +6928,9 @@
9828
9818
ac_ct_OBJDUMP=$OBJDUMP
9829
9819
# Extract the first word of "objdump", so it can be a program name with args.
9830
9820
set dummy objdump; ac_word=$2
9836
9826
$as_echo_n "(cached) " >&6
9837
9827
else
9838
9828
if test -n "$ac_ct_OBJDUMP"; then
9839
@@ -7308,24 +6944,24 @@
9829
@@ -7308,24 +6941,24 @@
9840
9830
do
9841
9831
IFS=$as_save_IFS
9842
9832
test -z "$as_dir" && as_dir=.
9866
9856
$as_echo "no" >&6; }
9867
9857
fi
9868
9858
9869
@@ -7334,7 +6970,7 @@
9859
@@ -7334,7 +6967,7 @@
9870
9860
else
9871
9861
case $cross_compiling:$ac_tool_warned in
9872
9862
yes:)
9875
9865
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
9876
9866
ac_tool_warned=yes ;;
9877
9867
esac
9878
@@ -7351,9 +6987,9 @@
9868
@@ -7351,9 +6984,9 @@
9879
9869
9880
9870
9881
9871
9887
9877
$as_echo_n "(cached) " >&6
9888
9878
else
9889
9879
lt_cv_file_magic_cmd='$MAGIC_CMD'
9890
@@ -7547,7 +7183,7 @@
9880
@@ -7547,7 +7180,7 @@
9891
9881
esac
9892
9882
9893
9883
fi
9896
9886
$as_echo "$lt_cv_deplibs_check_method" >&6; }
9897
9887
file_magic_cmd=$lt_cv_file_magic_cmd
9898
9888
deplibs_check_method=$lt_cv_deplibs_check_method
9899
@@ -7567,9 +7203,9 @@
9889
@@ -7567,9 +7200,9 @@
9900
9890
if test -n "$ac_tool_prefix"; then
9901
9891
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
9902
9892
set dummy ${ac_tool_prefix}ar; ac_word=$2
9908
9898
$as_echo_n "(cached) " >&6
9909
9899
else
9910
9900
if test -n "$AR"; then
9911
@@ -7580,24 +7216,24 @@
9901
@@ -7580,24 +7213,24 @@
9912
9902
do
9913
9903
IFS=$as_save_IFS
9914
9904
test -z "$as_dir" && as_dir=.
9938
9928
$as_echo "no" >&6; }
9939
9929
fi
9940
9930
9941
@@ -7607,9 +7243,9 @@
9931
@@ -7607,9 +7240,9 @@
9942
9932
ac_ct_AR=$AR
9943
9933
# Extract the first word of "ar", so it can be a program name with args.
9944
9934
set dummy ar; ac_word=$2
9950
9940
$as_echo_n "(cached) " >&6
9951
9941
else
9952
9942
if test -n "$ac_ct_AR"; then
9953
@@ -7620,24 +7256,24 @@
9943
@@ -7620,24 +7253,24 @@
9954
9944
do
9955
9945
IFS=$as_save_IFS
9956
9946
test -z "$as_dir" && as_dir=.
9980
9970
$as_echo "no" >&6; }
9981
9971
fi
9982
9972
9983
@@ -7646,7 +7282,7 @@
9973
@@ -7646,7 +7279,7 @@
9984
9974
else
9985
9975
case $cross_compiling:$ac_tool_warned in
9986
9976
yes:)
9989
9979
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
9990
9980
ac_tool_warned=yes ;;
9991
9981
esac
9992
@@ -7672,9 +7308,9 @@
9982
@@ -7672,9 +7305,9 @@
9993
9983
if test -n "$ac_tool_prefix"; then
9994
9984
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
9995
9985
set dummy ${ac_tool_prefix}strip; ac_word=$2
10001
9991
$as_echo_n "(cached) " >&6
10002
9992
else
10003
9993
if test -n "$STRIP"; then
10004
@@ -7685,24 +7321,24 @@
9994
@@ -7685,24 +7318,24 @@
10005
9995
do
10006
9996
IFS=$as_save_IFS
10007
9997
test -z "$as_dir" && as_dir=.
10031
10021
$as_echo "no" >&6; }
10032
10022
fi
10033
10023
10034
@@ -7712,9 +7348,9 @@
10024
@@ -7712,9 +7345,9 @@
10035
10025
ac_ct_STRIP=$STRIP
10036
10026
# Extract the first word of "strip", so it can be a program name with args.
10037
10027
set dummy strip; ac_word=$2
10043
10033
$as_echo_n "(cached) " >&6
10044
10034
else
10045
10035
if test -n "$ac_ct_STRIP"; then
10046
@@ -7725,24 +7361,24 @@
10036
@@ -7725,24 +7358,24 @@
10047
10037
do
10048
10038
IFS=$as_save_IFS
10049
10039
test -z "$as_dir" && as_dir=.
10073
10063
$as_echo "no" >&6; }
10074
10064
fi
10075
10065
10076
@@ -7751,7 +7387,7 @@
10066
@@ -7751,7 +7384,7 @@
10077
10067
else
10078
10068
case $cross_compiling:$ac_tool_warned in
10079
10069
yes:)
10082
10072
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
10083
10073
ac_tool_warned=yes ;;
10084
10074
esac
10085
@@ -7771,9 +7407,9 @@
10075
@@ -7771,9 +7404,9 @@
10086
10076
if test -n "$ac_tool_prefix"; then
10087
10077
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
10088
10078
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
10094
10084
$as_echo_n "(cached) " >&6
10095
10085
else
10096
10086
if test -n "$RANLIB"; then
10097
@@ -7784,24 +7420,24 @@
10087
@@ -7784,24 +7417,24 @@
10098
10088
do
10099
10089
IFS=$as_save_IFS
10100
10090
test -z "$as_dir" && as_dir=.
10124
10114
$as_echo "no" >&6; }
10125
10115
fi
10126
10116
10127
@@ -7811,9 +7447,9 @@
10117
@@ -7811,9 +7444,9 @@
10128
10118
ac_ct_RANLIB=$RANLIB
10129
10119
# Extract the first word of "ranlib", so it can be a program name with args.
10130
10120
set dummy ranlib; ac_word=$2
10136
10126
$as_echo_n "(cached) " >&6
10137
10127
else
10138
10128
if test -n "$ac_ct_RANLIB"; then
10139
@@ -7824,24 +7460,24 @@
10129
@@ -7824,24 +7457,24 @@
10140
10130
do
10141
10131
IFS=$as_save_IFS
10142
10132
test -z "$as_dir" && as_dir=.
10166
10156
$as_echo "no" >&6; }
10167
10157
fi
10168
10158
10169
@@ -7850,7 +7486,7 @@
10159
@@ -7850,7 +7483,7 @@
10170
10160
else
10171
10161
case $cross_compiling:$ac_tool_warned in
10172
10162
yes:)
10175
10165
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
10176
10166
ac_tool_warned=yes ;;
10177
10167
esac
10178
@@ -7928,9 +7564,9 @@
10168
@@ -7928,9 +7561,9 @@
10179
10169
10180
10170
10181
10171
# Check for command to grab the raw symbol name followed by C symbol from nm.
10187
10177
$as_echo_n "(cached) " >&6
10188
10178
else
10189
10179
10190
@@ -8046,18 +7682,18 @@
10180
@@ -8046,18 +7679,18 @@
10191
10181
int main(){nm_test_var='a';nm_test_func();return(0);}
10192
10182
_LT_EOF
10193
10183
10212
10202
# Try sorting and uniquifying the output.
10213
10203
if sort "$nlist" | uniq > "$nlist"T; then
10214
10204
mv -f "$nlist"T "$nlist"
10215
@@ -8110,11 +7746,11 @@
10205
@@ -8110,11 +7743,11 @@
10216
10206
lt_save_CFLAGS="$CFLAGS"
10217
10207
LIBS="conftstm.$ac_objext"
10218
10208
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
10227
10217
pipe_works=yes
10228
10218
fi
10229
10219
LIBS="$lt_save_LIBS"
10230
@@ -8148,10 +7784,10 @@
10220
@@ -8148,10 +7781,10 @@
10231
10221
lt_cv_sys_global_symbol_to_cdecl=
10232
10222
fi
10233
10223
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
10240
10230
$as_echo "ok" >&6; }
10241
10231
fi
10242
10232
10243
@@ -8177,7 +7813,7 @@
10233
@@ -8177,7 +7810,7 @@
10244
10234
10245
10235
10246
10236
# Check whether --enable-libtool-lock was given.
10249
10239
enableval=$enable_libtool_lock;
10250
10240
fi
10251
10241
10252
@@ -8189,11 +7825,11 @@
10242
@@ -8189,11 +7822,11 @@
10253
10243
ia64-*-hpux*)
10254
10244
# Find out which ABI we are using.
10255
10245
echo 'int i;' > conftest.$ac_ext
10264
10254
case `/usr/bin/file conftest.$ac_objext` in
10265
10255
*ELF-32*)
10266
10256
HPUX_IA64_MODE="32"
10267
@@ -8207,12 +7843,12 @@
10257
@@ -8207,12 +7840,12 @@
10268
10258
;;
10269
10259
*-*-irix6*)
10270
10260
# Find out which ABI we are using.
10271
10261
- echo '#line 8210 "configure"' > conftest.$ac_ext
10272
10262
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
10273
+ echo '#line 7846 "configure"' > conftest.$ac_ext
10263
+ echo '#line 7843 "configure"' > conftest.$ac_ext
10274
10264
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
10275
10265
(eval $ac_compile) 2>&5
10276
10266
ac_status=$?
10281
10271
if test "$lt_cv_prog_gnu_ld" = yes; then
10282
10272
case `/usr/bin/file conftest.$ac_objext` in
10283
10273
*32-bit*)
10284
@@ -8246,11 +7882,11 @@
10274
@@ -8246,11 +7879,11 @@
10285
10275
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
10286
10276
# Find out which ABI we are using.
10287
10277
echo 'int i;' > conftest.$ac_ext
10296
10286
case `/usr/bin/file conftest.o` in
10297
10287
*32-bit*)
10298
10288
case $host in
10299
@@ -8299,9 +7935,9 @@
10289
@@ -8299,9 +7932,9 @@
10300
10290
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
10301
10291
SAVE_CFLAGS="$CFLAGS"
10302
10292
CFLAGS="$CFLAGS -belf"
10308
10298
$as_echo_n "(cached) " >&6
10309
10299
else
10310
10300
ac_ext=c
10311
@@ -8310,11 +7946,7 @@
10301
@@ -8310,11 +7943,7 @@
10312
10302
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
10313
10303
ac_compiler_gnu=$ac_cv_c_compiler_gnu
10314
10304
10321
10311
/* end confdefs.h. */
10322
10312
10323
10313
int
10324
@@ -8325,38 +7957,13 @@
10314
@@ -8325,38 +7954,13 @@
10325
10315
return 0;
10326
10316
}
10327
10317
_ACEOF
10364
10354
ac_ext=c
10365
10355
ac_cpp='$CPP $CPPFLAGS'
10366
10356
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
10367
@@ -8364,7 +7971,7 @@
10357
@@ -8364,7 +7968,7 @@
10368
10358
ac_compiler_gnu=$ac_cv_c_compiler_gnu
10369
10359
10370
10360
fi
10373
10363
$as_echo "$lt_cv_cc_needs_belf" >&6; }
10374
10364
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
10375
10365
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
10376
@@ -8374,11 +7981,11 @@
10366
@@ -8374,11 +7978,11 @@
10377
10367
sparc*-*solaris*)
10378
10368
# Find out which ABI we are using.
10379
10369
echo 'int i;' > conftest.$ac_ext
10388
10378
case `/usr/bin/file conftest.o` in
10389
10379
*64-bit*)
10390
10380
case $lt_cv_prog_gnu_ld in
10391
@@ -8404,9 +8011,9 @@
10381
@@ -8404,9 +8008,9 @@
10392
10382
if test -n "$ac_tool_prefix"; then
10393
10383
# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
10394
10384
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
10400
10390
$as_echo_n "(cached) " >&6
10401
10391
else
10402
10392
if test -n "$DSYMUTIL"; then
10403
@@ -8417,24 +8024,24 @@
10393
@@ -8417,24 +8021,24 @@
10404
10394
do
10405
10395
IFS=$as_save_IFS
10406
10396
test -z "$as_dir" && as_dir=.
10430
10420
$as_echo "no" >&6; }
10431
10421
fi
10432
10422
10433
@@ -8444,9 +8051,9 @@
10423
@@ -8444,9 +8048,9 @@
10434
10424
ac_ct_DSYMUTIL=$DSYMUTIL
10435
10425
# Extract the first word of "dsymutil", so it can be a program name with args.
10436
10426
set dummy dsymutil; ac_word=$2
10442
10432
$as_echo_n "(cached) " >&6
10443
10433
else
10444
10434
if test -n "$ac_ct_DSYMUTIL"; then
10445
@@ -8457,24 +8064,24 @@
10435
@@ -8457,24 +8061,24 @@
10446
10436
do
10447
10437
IFS=$as_save_IFS
10448
10438
test -z "$as_dir" && as_dir=.
10472
10462
$as_echo "no" >&6; }
10473
10463
fi
10474
10464
10475
@@ -8483,7 +8090,7 @@
10465
@@ -8483,7 +8087,7 @@
10476
10466
else
10477
10467
case $cross_compiling:$ac_tool_warned in
10478
10468
yes:)
10481
10471
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
10482
10472
ac_tool_warned=yes ;;
10483
10473
esac
10484
@@ -8496,9 +8103,9 @@
10474
@@ -8496,9 +8100,9 @@
10485
10475
if test -n "$ac_tool_prefix"; then
10486
10476
# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
10487
10477
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
10493
10483
$as_echo_n "(cached) " >&6
10494
10484
else
10495
10485
if test -n "$NMEDIT"; then
10496
@@ -8509,24 +8116,24 @@
10486
@@ -8509,24 +8113,24 @@
10497
10487
do
10498
10488
IFS=$as_save_IFS
10499
10489
test -z "$as_dir" && as_dir=.
10523
10513
$as_echo "no" >&6; }
10524
10514
fi
10525
10515
10526
@@ -8536,9 +8143,9 @@
10516
@@ -8536,9 +8140,9 @@
10527
10517
ac_ct_NMEDIT=$NMEDIT
10528
10518
# Extract the first word of "nmedit", so it can be a program name with args.
10529
10519
set dummy nmedit; ac_word=$2
10535
10525
$as_echo_n "(cached) " >&6
10536
10526
else
10537
10527
if test -n "$ac_ct_NMEDIT"; then
10538
@@ -8549,24 +8156,24 @@
10528
@@ -8549,24 +8153,24 @@
10539
10529
do
10540
10530
IFS=$as_save_IFS
10541
10531
test -z "$as_dir" && as_dir=.
10565
10555
$as_echo "no" >&6; }
10566
10556
fi
10567
10557
10568
@@ -8575,7 +8182,7 @@
10558
@@ -8575,7 +8179,7 @@
10569
10559
else
10570
10560
case $cross_compiling:$ac_tool_warned in
10571
10561
yes:)
10574
10564
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
10575
10565
ac_tool_warned=yes ;;
10576
10566
esac
10577
@@ -8588,9 +8195,9 @@
10567
@@ -8588,9 +8192,9 @@
10578
10568
if test -n "$ac_tool_prefix"; then
10579
10569
# Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
10580
10570
set dummy ${ac_tool_prefix}lipo; ac_word=$2
10586
10576
$as_echo_n "(cached) " >&6
10587
10577
else
10588
10578
if test -n "$LIPO"; then
10589
@@ -8601,24 +8208,24 @@
10579
@@ -8601,24 +8205,24 @@
10590
10580
do
10591
10581
IFS=$as_save_IFS
10592
10582
test -z "$as_dir" && as_dir=.
10616
10606
$as_echo "no" >&6; }
10617
10607
fi
10618
10608
10619
@@ -8628,9 +8235,9 @@
10609
@@ -8628,9 +8232,9 @@
10620
10610
ac_ct_LIPO=$LIPO
10621
10611
# Extract the first word of "lipo", so it can be a program name with args.
10622
10612
set dummy lipo; ac_word=$2
10628
10618
$as_echo_n "(cached) " >&6
10629
10619
else
10630
10620
if test -n "$ac_ct_LIPO"; then
10631
@@ -8641,24 +8248,24 @@
10621
@@ -8641,24 +8245,24 @@
10632
10622
do
10633
10623
IFS=$as_save_IFS
10634
10624
test -z "$as_dir" && as_dir=.
10658
10648
$as_echo "no" >&6; }
10659
10649
fi
10660
10650
10661
@@ -8667,7 +8274,7 @@
10651
@@ -8667,7 +8271,7 @@
10662
10652
else
10663
10653
case $cross_compiling:$ac_tool_warned in
10664
10654
yes:)
10667
10657
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
10668
10658
ac_tool_warned=yes ;;
10669
10659
esac
10670
@@ -8680,9 +8287,9 @@
10660
@@ -8680,9 +8284,9 @@
10671
10661
if test -n "$ac_tool_prefix"; then
10672
10662
# Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
10673
10663
set dummy ${ac_tool_prefix}otool; ac_word=$2
10679
10669
$as_echo_n "(cached) " >&6
10680
10670
else
10681
10671
if test -n "$OTOOL"; then
10682
@@ -8693,24 +8300,24 @@
10672
@@ -8693,24 +8297,24 @@
10683
10673
do
10684
10674
IFS=$as_save_IFS
10685
10675
test -z "$as_dir" && as_dir=.
10709
10699
$as_echo "no" >&6; }
10710
10700
fi
10711
10701
10712
@@ -8720,9 +8327,9 @@
10702
@@ -8720,9 +8324,9 @@
10713
10703
ac_ct_OTOOL=$OTOOL
10714
10704
# Extract the first word of "otool", so it can be a program name with args.
10715
10705
set dummy otool; ac_word=$2
10721
10711
$as_echo_n "(cached) " >&6
10722
10712
else
10723
10713
if test -n "$ac_ct_OTOOL"; then
10724
@@ -8733,24 +8340,24 @@
10714
@@ -8733,24 +8337,24 @@
10725
10715
do
10726
10716
IFS=$as_save_IFS
10727
10717
test -z "$as_dir" && as_dir=.
10751
10741
$as_echo "no" >&6; }
10752
10742
fi
10753
10743
10754
@@ -8759,7 +8366,7 @@
10744
@@ -8759,7 +8363,7 @@
10755
10745
else
10756
10746
case $cross_compiling:$ac_tool_warned in
10757
10747
yes:)
10760
10750
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
10761
10751
ac_tool_warned=yes ;;
10762
10752
esac
10763
@@ -8772,9 +8379,9 @@
10753
@@ -8772,9 +8376,9 @@
10764
10754
if test -n "$ac_tool_prefix"; then
10765
10755
# Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
10766
10756
set dummy ${ac_tool_prefix}otool64; ac_word=$2
10772
10762
$as_echo_n "(cached) " >&6
10773
10763
else
10774
10764
if test -n "$OTOOL64"; then
10775
@@ -8785,24 +8392,24 @@
10765
@@ -8785,24 +8389,24 @@
10776
10766
do
10777
10767
IFS=$as_save_IFS
10778
10768
test -z "$as_dir" && as_dir=.
10802
10792
$as_echo "no" >&6; }
10803
10793
fi
10804
10794
10805
@@ -8812,9 +8419,9 @@
10795
@@ -8812,9 +8416,9 @@
10806
10796
ac_ct_OTOOL64=$OTOOL64
10807
10797
# Extract the first word of "otool64", so it can be a program name with args.
10808
10798
set dummy otool64; ac_word=$2
10814
10804
$as_echo_n "(cached) " >&6
10815
10805
else
10816
10806
if test -n "$ac_ct_OTOOL64"; then
10817
@@ -8825,24 +8432,24 @@
10807
@@ -8825,24 +8429,24 @@
10818
10808
do
10819
10809
IFS=$as_save_IFS
10820
10810
test -z "$as_dir" && as_dir=.
10844
10834
$as_echo "no" >&6; }
10845
10835
fi
10846
10836
10847
@@ -8851,7 +8458,7 @@
10837
@@ -8851,7 +8455,7 @@
10848
10838
else
10849
10839
case $cross_compiling:$ac_tool_warned in
10850
10840
yes:)
10853
10843
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
10854
10844
ac_tool_warned=yes ;;
10855
10845
esac
10856
@@ -8887,9 +8494,9 @@
10846
@@ -8887,9 +8491,9 @@
10857
10847
10858
10848
10859
10849
10865
10855
$as_echo_n "(cached) " >&6
10866
10856
else
10867
10857
lt_cv_apple_cc_single_mod=no
10868
@@ -8914,22 +8521,18 @@
10858
@@ -8914,22 +8518,18 @@
10869
10859
rm -f conftest.*
10870
10860
fi
10871
10861
fi
10892
10882
/* end confdefs.h. */
10893
10883
10894
10884
int
10895
@@ -8940,42 +8543,17 @@
10885
@@ -8940,42 +8540,17 @@
10896
10886
return 0;
10897
10887
}
10898
10888
_ACEOF
10940
10930
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
10941
10931
case $host_os in
10942
10932
rhapsody* | darwin1.[012])
10943
@@ -9013,69 +8591,14 @@
10933
@@ -9013,69 +8588,14 @@
10944
10934
esac
10945
10935
10946
10936
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
11016
11006
cat >>confdefs.h <<_ACEOF
11017
11007
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
11018
11008
_ACEOF
11019
@@ -9085,62 +8608,13 @@
11009
@@ -9085,62 +8605,13 @@
11020
11010
done
11021
11011
11022
11012
11084
11074
_ACEOF
11085
11075
11086
11076
fi
11087
@@ -9158,7 +8632,7 @@
11077
@@ -9158,7 +8629,7 @@
11088
11078
11089
11079
11090
11080
# Check whether --enable-shared was given.
11093
11083
enableval=$enable_shared; p=${PACKAGE-default}
11094
11084
case $enableval in
11095
11085
yes) enable_shared=yes ;;
11096
@@ -9189,7 +8663,7 @@
11086
@@ -9189,7 +8660,7 @@
11097
11087
11098
11088
11099
11089
# Check whether --enable-static was given.
11102
11092
enableval=$enable_static; p=${PACKAGE-default}
11103
11093
case $enableval in
11104
11094
yes) enable_static=yes ;;
11105
@@ -9221,7 +8695,7 @@
11095
@@ -9221,7 +8692,7 @@
11106
11096
11107
11097
11108
11098
# Check whether --with-pic was given.
11111
11101
withval=$with_pic; pic_mode="$withval"
11112
11102
else
11113
11103
pic_mode=default
11114
@@ -9237,7 +8711,7 @@
11104
@@ -9237,7 +8708,7 @@
11115
11105
11116
11106
11117
11107
# Check whether --enable-fast-install was given.
11120
11110
enableval=$enable_fast_install; p=${PACKAGE-default}
11121
11111
case $enableval in
11122
11112
yes) enable_fast_install=yes ;;
11123
@@ -9318,9 +8792,9 @@
11113
@@ -9318,9 +8789,9 @@
11124
11114
setopt NO_GLOB_SUBST
11125
11115
fi
11126
11116
11132
11122
$as_echo_n "(cached) " >&6
11133
11123
else
11134
11124
rm -f .libs 2>/dev/null
11135
@@ -9333,7 +8807,7 @@
11125
@@ -9333,7 +8804,7 @@
11136
11126
fi
11137
11127
rmdir .libs 2>/dev/null
11138
11128
fi
11141
11131
$as_echo "$lt_cv_objdir" >&6; }
11142
11132
objdir=$lt_cv_objdir
11143
11133
11144
@@ -9426,9 +8900,9 @@
11134
@@ -9426,9 +8897,9 @@
11145
11135
case $deplibs_check_method in
11146
11136
file_magic*)
11147
11137
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
11153
11143
$as_echo_n "(cached) " >&6
11154
11144
else
11155
11145
case $MAGIC_CMD in
11156
@@ -9479,10 +8953,10 @@
11146
@@ -9479,10 +8950,10 @@
11157
11147
11158
11148
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
11159
11149
if test -n "$MAGIC_CMD"; then
11166
11156
$as_echo "no" >&6; }
11167
11157
fi
11168
11158
11169
@@ -9492,9 +8966,9 @@
11159
@@ -9492,9 +8963,9 @@
11170
11160
11171
11161
if test -z "$lt_cv_path_MAGIC_CMD"; then
11172
11162
if test -n "$ac_tool_prefix"; then
11178
11168
$as_echo_n "(cached) " >&6
11179
11169
else
11180
11170
case $MAGIC_CMD in
11181
@@ -9545,10 +9019,10 @@
11171
@@ -9545,10 +9016,10 @@
11182
11172
11183
11173
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
11184
11174
if test -n "$MAGIC_CMD"; then
11191
11181
$as_echo "no" >&6; }
11192
11182
fi
11193
11183
11194
@@ -9629,9 +9103,9 @@
11184
@@ -9629,9 +9100,9 @@
11195
11185
if test "$GCC" = yes; then
11196
11186
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
11197
11187
11203
11193
$as_echo_n "(cached) " >&6
11204
11194
else
11205
11195
lt_cv_prog_compiler_rtti_exceptions=no
11206
@@ -9647,11 +9121,11 @@
11196
@@ -9647,11 +9118,11 @@
11207
11197
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
11208
11198
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
11209
11199
-e 's:$: $lt_compiler_flag:'`
11210
11200
- (eval echo "\"\$as_me:9650: $lt_compile\"" >&5)
11211
+ (eval echo "\"\$as_me:9124: $lt_compile\"" >&5)
11201
+ (eval echo "\"\$as_me:9121: $lt_compile\"" >&5)
11212
11202
(eval "$lt_compile" 2>conftest.err)
11213
11203
ac_status=$?
11214
11204
cat conftest.err >&5
11215
11205
- echo "$as_me:9654: \$? = $ac_status" >&5
11216
+ echo "$as_me:9128: \$? = $ac_status" >&5
11206
+ echo "$as_me:9125: \$? = $ac_status" >&5
11217
11207
if (exit $ac_status) && test -s "$ac_outfile"; then
11218
11208
# The compiler can only warn and ignore the option if not recognized
11219
11209
# So say no if there are warnings other than the usual output.
11220
@@ -9664,7 +9138,7 @@
11210
@@ -9664,7 +9135,7 @@
11221
11211
$RM conftest*
11222
11212
11223
11213
fi
11226
11216
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
11227
11217
11228
11218
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
11229
@@ -9684,7 +9158,7 @@
11219
@@ -9684,7 +9155,7 @@
11230
11220
lt_prog_compiler_pic=
11231
11221
lt_prog_compiler_static=
11232
11222
11235
11225
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11236
11226
11237
11227
if test "$GCC" = yes; then
11238
@@ -9956,7 +9430,7 @@
11228
@@ -9956,7 +9427,7 @@
11239
11229
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
11240
11230
;;
11241
11231
esac
11244
11234
$as_echo "$lt_prog_compiler_pic" >&6; }
11245
11235
11246
11236
11247
@@ -9968,9 +9442,9 @@
11237
@@ -9968,9 +9439,9 @@
11248
11238
# Check to make sure the PIC flag actually works.
11249
11239
#
11250
11240
if test -n "$lt_prog_compiler_pic"; then
11256
11246
$as_echo_n "(cached) " >&6
11257
11247
else
11258
11248
lt_cv_prog_compiler_pic_works=no
11259
@@ -9986,11 +9460,11 @@
11249
@@ -9986,11 +9457,11 @@
11260
11250
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
11261
11251
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
11262
11252
-e 's:$: $lt_compiler_flag:'`
11263
11253
- (eval echo "\"\$as_me:9989: $lt_compile\"" >&5)
11264
+ (eval echo "\"\$as_me:9463: $lt_compile\"" >&5)
11254
+ (eval echo "\"\$as_me:9460: $lt_compile\"" >&5)
11265
11255
(eval "$lt_compile" 2>conftest.err)
11266
11256
ac_status=$?
11267
11257
cat conftest.err >&5
11268
11258
- echo "$as_me:9993: \$? = $ac_status" >&5
11269
+ echo "$as_me:9467: \$? = $ac_status" >&5
11259
+ echo "$as_me:9464: \$? = $ac_status" >&5
11270
11260
if (exit $ac_status) && test -s "$ac_outfile"; then
11271
11261
# The compiler can only warn and ignore the option if not recognized
11272
11262
# So say no if there are warnings other than the usual output.
11273
@@ -10003,7 +9477,7 @@
11263
@@ -10003,7 +9474,7 @@
11274
11264
$RM conftest*
11275
11265
11276
11266
fi
11279
11269
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
11280
11270
11281
11271
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
11282
@@ -10027,9 +9501,9 @@
11272
@@ -10027,9 +9498,9 @@
11283
11273
# Check to make sure the static flag actually works.
11284
11274
#
11285
11275
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
11291
11281
$as_echo_n "(cached) " >&6
11292
11282
else
11293
11283
lt_cv_prog_compiler_static_works=no
11294
@@ -10055,7 +9529,7 @@
11284
@@ -10055,7 +9526,7 @@
11295
11285
LDFLAGS="$save_LDFLAGS"
11296
11286
11297
11287
fi
11300
11290
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
11301
11291
11302
11292
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
11303
@@ -10070,9 +9544,9 @@
11293
@@ -10070,9 +9541,9 @@
11304
11294
11305
11295
11306
11296
11312
11302
$as_echo_n "(cached) " >&6
11313
11303
else
11314
11304
lt_cv_prog_compiler_c_o=no
11315
@@ -10091,11 +9565,11 @@
11305
@@ -10091,11 +9562,11 @@
11316
11306
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
11317
11307
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
11318
11308
-e 's:$: $lt_compiler_flag:'`
11319
11309
- (eval echo "\"\$as_me:10094: $lt_compile\"" >&5)
11320
+ (eval echo "\"\$as_me:9568: $lt_compile\"" >&5)
11310
+ (eval echo "\"\$as_me:9565: $lt_compile\"" >&5)
11321
11311
(eval "$lt_compile" 2>out/conftest.err)
11322
11312
ac_status=$?
11323
11313
cat out/conftest.err >&5
11324
11314
- echo "$as_me:10098: \$? = $ac_status" >&5
11325
+ echo "$as_me:9572: \$? = $ac_status" >&5
11315
+ echo "$as_me:9569: \$? = $ac_status" >&5
11326
11316
if (exit $ac_status) && test -s out/conftest2.$ac_objext
11327
11317
then
11328
11318
# The compiler can only warn and ignore the option if not recognized
11329
@@ -10117,7 +9591,7 @@
11319
@@ -10117,7 +9588,7 @@
11330
11320
$RM conftest*
11331
11321
11332
11322
fi
11335
11325
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
11336
11326
11337
11327
11338
@@ -10125,9 +9599,9 @@
11328
@@ -10125,9 +9596,9 @@
11339
11329
11340
11330
11341
11331
11347
11337
$as_echo_n "(cached) " >&6
11348
11338
else
11349
11339
lt_cv_prog_compiler_c_o=no
11350
@@ -10146,11 +9620,11 @@
11340
@@ -10146,11 +9617,11 @@
11351
11341
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
11352
11342
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
11353
11343
-e 's:$: $lt_compiler_flag:'`
11354
11344
- (eval echo "\"\$as_me:10149: $lt_compile\"" >&5)
11355
+ (eval echo "\"\$as_me:9623: $lt_compile\"" >&5)
11345
+ (eval echo "\"\$as_me:9620: $lt_compile\"" >&5)
11356
11346
(eval "$lt_compile" 2>out/conftest.err)
11357
11347
ac_status=$?
11358
11348
cat out/conftest.err >&5
11359
11349
- echo "$as_me:10153: \$? = $ac_status" >&5
11360
+ echo "$as_me:9627: \$? = $ac_status" >&5
11350
+ echo "$as_me:9624: \$? = $ac_status" >&5
11361
11351
if (exit $ac_status) && test -s out/conftest2.$ac_objext
11362
11352
then
11363
11353
# The compiler can only warn and ignore the option if not recognized
11364
@@ -10172,7 +9646,7 @@
11354
@@ -10172,7 +9643,7 @@
11365
11355
$RM conftest*
11366
11356
11367
11357
fi
11370
11360
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
11371
11361
11372
11362
11373
@@ -10181,7 +9655,7 @@
11363
@@ -10181,7 +9652,7 @@
11374
11364
hard_links="nottested"
11375
11365
if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
11376
11366
# do not overwrite the value of need_locks provided by the user
11379
11369
$as_echo_n "checking if we can lock with hard links... " >&6; }
11380
11370
hard_links=yes
11381
11371
$RM conftest*
11382
@@ -10189,10 +9663,10 @@
11372
@@ -10189,10 +9660,10 @@
11383
11373
touch conftest.a
11384
11374
ln conftest.a conftest.b 2>&5 || hard_links=no
11385
11375
ln conftest.a conftest.b 2>/dev/null && hard_links=no
11392
11382
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
11393
11383
need_locks=warn
11394
11384
fi
11395
@@ -10205,7 +9679,7 @@
11385
@@ -10205,7 +9676,7 @@
11396
11386
11397
11387
11398
11388
11401
11391
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
11402
11392
11403
11393
runpath_var=
11404
@@ -10647,11 +10121,7 @@
11394
@@ -10647,11 +10118,7 @@
11405
11395
allow_undefined_flag='-berok'
11406
11396
# Determine the default libpath from the value encoded in an
11407
11397
# empty executable.
11414
11404
/* end confdefs.h. */
11415
11405
11416
11406
int
11417
@@ -10662,27 +10132,7 @@
11407
@@ -10662,27 +10129,7 @@
11418
11408
return 0;
11419
11409
}
11420
11410
_ACEOF
11443
11433
11444
11434
lt_aix_libpath_sed='
11445
11435
/Import File Strings/,/^$/ {
11446
@@ -10696,16 +10146,9 @@
11436
@@ -10696,16 +10143,9 @@
11447
11437
if test -z "$aix_libpath"; then
11448
11438
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11449
11439
fi
11462
11452
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11463
11453
11464
11454
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
11465
@@ -10718,11 +10161,7 @@
11455
@@ -10718,11 +10158,7 @@
11466
11456
else
11467
11457
# Determine the default libpath from the value encoded in an
11468
11458
# empty executable.
11475
11465
/* end confdefs.h. */
11476
11466
11477
11467
int
11478
@@ -10733,27 +10172,7 @@
11468
@@ -10733,27 +10169,7 @@
11479
11469
return 0;
11480
11470
}
11481
11471
_ACEOF
11504
11494
11505
11495
lt_aix_libpath_sed='
11506
11496
/Import File Strings/,/^$/ {
11507
@@ -10767,16 +10186,9 @@
11497
@@ -10767,16 +10183,9 @@
11508
11498
if test -z "$aix_libpath"; then
11509
11499
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11510
11500
fi
11523
11513
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11524
11514
11525
11515
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
11526
@@ -10988,42 +10400,16 @@
11516
@@ -10988,42 +10397,16 @@
11527
11517
# implicitly export all symbols.
11528
11518
save_LDFLAGS="$LDFLAGS"
11529
11519
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
11571
11561
LDFLAGS="$save_LDFLAGS"
11572
11562
else
11573
11563
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'
11574
@@ -11279,7 +10665,7 @@
11564
@@ -11279,7 +10662,7 @@
11575
11565
fi
11576
11566
fi
11577
11567
11580
11570
$as_echo "$ld_shlibs" >&6; }
11581
11571
test "$ld_shlibs" = no && can_build_shared=no
11582
11572
11583
@@ -11316,16 +10702,16 @@
11573
@@ -11316,16 +10699,16 @@
11584
11574
# Test whether the compiler implicitly links with -lc since on some
11585
11575
# systems, -lgcc has to come before -lc. If gcc already passes -lc
11586
11576
# to ld, don't add -lc before -lgcc.
11601
11591
soname=conftest
11602
11592
lib=conftest
11603
11593
libobjs=conftest.$ac_objext
11604
@@ -11339,11 +10725,11 @@
11594
@@ -11339,11 +10722,11 @@
11605
11595
libname=conftest
11606
11596
lt_save_allow_undefined_flag=$allow_undefined_flag
11607
11597
allow_undefined_flag=
11616
11606
then
11617
11607
archive_cmds_need_lc=no
11618
11608
else
11619
@@ -11354,7 +10740,7 @@
11609
@@ -11354,7 +10737,7 @@
11620
11610
cat conftest.err 1>&5
11621
11611
fi
11622
11612
$RM conftest*
11625
11615
$as_echo "$archive_cmds_need_lc" >&6; }
11626
11616
;;
11627
11617
esac
11628
@@ -11518,7 +10904,7 @@
11618
@@ -11518,7 +10901,7 @@
11629
11619
11630
11620
11631
11621
11634
11624
$as_echo_n "checking dynamic linker characteristics... " >&6; }
11635
11625
11636
11626
if test "$GCC" = yes; then
11637
@@ -11940,11 +11326,7 @@
11627
@@ -11940,11 +11323,7 @@
11638
11628
save_libdir=$libdir
11639
11629
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
11640
11630
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
11647
11637
/* end confdefs.h. */
11648
11638
11649
11639
int
11650
@@ -11955,41 +11337,13 @@
11640
@@ -11955,41 +11334,13 @@
11651
11641
return 0;
11652
11642
}
11653
11643
_ACEOF
11693
11683
LDFLAGS=$save_LDFLAGS
11694
11684
libdir=$save_libdir
11695
11685
11696
@@ -12201,7 +11555,7 @@
11686
@@ -12201,7 +11552,7 @@
11697
11687
dynamic_linker=no
11698
11688
;;
11699
11689
esac
11702
11692
$as_echo "$dynamic_linker" >&6; }
11703
11693
test "$dynamic_linker" = no && can_build_shared=no
11704
11694
11705
@@ -12303,7 +11657,7 @@
11695
@@ -12303,7 +11654,7 @@
11706
11696
11707
11697
11708
11698
11711
11701
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
11712
11702
hardcode_action=
11713
11703
if test -n "$hardcode_libdir_flag_spec" ||
11714
@@ -12328,7 +11682,7 @@
11704
@@ -12328,7 +11679,7 @@
11715
11705
# directories.
11716
11706
hardcode_action=unsupported
11717
11707
fi
11720
11710
$as_echo "$hardcode_action" >&6; }
11721
11711
11722
11712
if test "$hardcode_action" = relink ||
11723
@@ -12373,18 +11727,14 @@
11713
@@ -12373,18 +11724,14 @@
11724
11714
11725
11715
darwin*)
11726
11716
# if libdl is installed we need to link against it
11742
11732
/* end confdefs.h. */
11743
11733
11744
11734
/* Override any GCC internal prototype to avoid an error.
11745
@@ -12402,43 +11752,18 @@
11735
@@ -12402,43 +11749,18 @@
11746
11736
return 0;
11747
11737
}
11748
11738
_ACEOF
11792
11782
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
11793
11783
else
11794
11784
11795
@@ -12451,106 +11776,18 @@
11785
@@ -12451,106 +11773,18 @@
11796
11786
;;
11797
11787
11798
11788
*)
11904
11894
/* end confdefs.h. */
11905
11895
11906
11896
/* Override any GCC internal prototype to avoid an error.
11907
@@ -12568,145 +11805,32 @@
11897
@@ -12568,145 +11802,32 @@
11908
11898
return 0;
11909
11899
}
11910
11900
_ACEOF
12061
12051
/* end confdefs.h. */
12062
12052
12063
12053
/* Override any GCC internal prototype to avoid an error.
12064
@@ -12724,57 +11848,28 @@
12054
@@ -12724,57 +11845,28 @@
12065
12055
return 0;
12066
12056
}
12067
12057
_ACEOF
12128
12118
/* end confdefs.h. */
12129
12119
12130
12120
/* Override any GCC internal prototype to avoid an error.
12131
@@ -12792,57 +11887,28 @@
12121
@@ -12792,57 +11884,28 @@
12132
12122
return 0;
12133
12123
}
12134
12124
_ACEOF
12195
12185
/* end confdefs.h. */
12196
12186
12197
12187
/* Override any GCC internal prototype to avoid an error.
12198
@@ -12860,43 +11926,18 @@
12188
@@ -12860,43 +11923,18 @@
12199
12189
return 0;
12200
12190
}
12201
12191
_ACEOF
12245
12235
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
12246
12236
fi
12247
12237
12248
@@ -12935,9 +11976,9 @@
12238
@@ -12935,9 +11973,9 @@
12249
12239
save_LIBS="$LIBS"
12250
12240
LIBS="$lt_cv_dlopen_libs $LIBS"
12251
12241
12257
12247
$as_echo_n "(cached) " >&6
12258
12248
else
12259
12249
if test "$cross_compiling" = yes; then :
12260
@@ -12946,7 +11987,7 @@
12250
@@ -12946,7 +11984,7 @@
12261
12251
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
12262
12252
lt_status=$lt_dlunknown
12263
12253
cat > conftest.$ac_ext <<_LT_EOF
12264
12254
-#line 12949 "configure"
12265
+#line 11990 "configure"
12255
+#line 11987 "configure"
12266
12256
#include "confdefs.h"
12267
12257
12268
12258
#if HAVE_DLFCN_H
12269
@@ -13005,11 +12046,11 @@
12259
@@ -13005,11 +12043,11 @@
12270
12260
return status;
12271
12261
}
12272
12262
_LT_EOF
12281
12271
(./conftest; exit; ) >&5 2>/dev/null
12282
12272
lt_status=$?
12283
12273
case x$lt_status in
12284
@@ -13026,14 +12067,14 @@
12274
@@ -13026,14 +12064,14 @@
12285
12275
12286
12276
12287
12277
fi
12299
12289
$as_echo_n "(cached) " >&6
12300
12290
else
12301
12291
if test "$cross_compiling" = yes; then :
12302
@@ -13042,7 +12083,7 @@
12292
@@ -13042,7 +12080,7 @@
12303
12293
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
12304
12294
lt_status=$lt_dlunknown
12305
12295
cat > conftest.$ac_ext <<_LT_EOF
12306
12296
-#line 13045 "configure"
12307
+#line 12086 "configure"
12297
+#line 12083 "configure"
12308
12298
#include "confdefs.h"
12309
12299
12310
12300
#if HAVE_DLFCN_H
12311
@@ -13101,11 +12142,11 @@
12301
@@ -13101,11 +12139,11 @@
12312
12302
return status;
12313
12303
}
12314
12304
_LT_EOF
12323
12313
(./conftest; exit; ) >&5 2>/dev/null
12324
12314
lt_status=$?
12325
12315
case x$lt_status in
12326
@@ -13122,7 +12163,7 @@
12316
@@ -13122,7 +12160,7 @@
12327
12317
12328
12318
12329
12319
fi
12332
12322
$as_echo "$lt_cv_dlopen_self_static" >&6; }
12333
12323
fi
12334
12324
12335
@@ -13161,12 +12202,12 @@
12325
@@ -13161,12 +12199,12 @@
12336
12326
12337
12327
striplib=
12338
12328
old_striplib=
12347
12337
$as_echo "yes" >&6; }
12348
12338
else
12349
12339
# FIXME - insert some real tests, host_os isn't really good enough
12350
@@ -13175,15 +12216,15 @@
12340
@@ -13175,15 +12213,15 @@
12351
12341
if test -n "$STRIP" ; then
12352
12342
striplib="$STRIP -x"
12353
12343
old_striplib="$STRIP -S"
12366
12356
$as_echo "no" >&6; }
12367
12357
;;
12368
12358
esac
12369
@@ -13201,12 +12242,12 @@
12359
@@ -13201,12 +12239,12 @@
12370
12360
12371
12361
12372
12362
# Report which library types will actually be built
12382
12372
$as_echo_n "checking whether to build shared libraries... " >&6; }
12383
12373
test "$can_build_shared" = "no" && enable_shared=no
12384
12374
12385
@@ -13227,14 +12268,14 @@
12375
@@ -13227,14 +12265,14 @@
12386
12376
fi
12387
12377
;;
12388
12378
esac
12400
12390
$as_echo "$enable_static" >&6; }
12401
12391
12402
12392
12403
@@ -13271,22 +12312,18 @@
12393
@@ -13271,22 +12309,18 @@
12404
12394
12405
12395
#AC_PROG_SED available in 2.59b
12406
12396
if test "x$CC" != xcc; then
12427
12417
/* end confdefs.h. */
12428
12418
12429
12419
int
12430
@@ -13302,63 +12339,63 @@
12420
@@ -13302,63 +12336,63 @@
12431
12421
# existing .o file with -o, though they will create one.
12432
12422
ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
12433
12423
rm -f conftest2.*
12516
12506
then
12517
12507
# cc works too.
12518
12508
:
12519
@@ -13375,15 +12412,13 @@
12509
@@ -13375,15 +12409,13 @@
12520
12510
12521
12511
fi
12522
12512
if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
12535
12525
12536
12526
fi
12537
12527
12538
@@ -13413,9 +12448,9 @@
12528
@@ -13413,9 +12445,9 @@
12539
12529
do
12540
12530
# Extract the first word of "$ac_prog", so it can be a program name with args.
12541
12531
set dummy $ac_prog; ac_word=$2
12547
12537
$as_echo_n "(cached) " >&6
12548
12538
else
12549
12539
case $PYTHON in
12550
@@ -13428,14 +12463,14 @@
12540
@@ -13428,14 +12460,14 @@
12551
12541
do
12552
12542
IFS=$as_save_IFS
12553
12543
test -z "$as_dir" && as_dir=.
12565
12555
IFS=$as_save_IFS
12566
12556
12567
12557
;;
12568
@@ -13443,10 +12478,10 @@
12558
@@ -13443,10 +12475,10 @@
12569
12559
fi
12570
12560
PYTHON=$ac_cv_path_PYTHON
12571
12561
if test -n "$PYTHON"; then
12578
12568
$as_echo "no" >&6; }
12579
12569
fi
12580
12570
12581
@@ -13460,20 +12495,18 @@
12571
@@ -13460,20 +12492,18 @@
12582
12572
12583
12573
12584
12574
if test "$PYTHON" = :; then
12603
12593
$as_echo "$am_cv_python_version" >&6; }
12604
12594
PYTHON_VERSION=$am_cv_python_version
12605
12595
12606
@@ -13485,23 +12518,23 @@
12596
@@ -13485,23 +12515,23 @@
12607
12597
12608
12598
12609
12599
12632
12622
$as_echo_n "(cached) " >&6
12633
12623
else
12634
12624
if test "x$prefix" = xNONE
12635
@@ -13517,10 +12550,18 @@
12625
@@ -13517,10 +12547,18 @@
12636
12626
am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
12637
12627
am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
12638
12628
;;
12652
12642
$as_echo "$am_cv_python_pythondir" >&6; }
12653
12643
pythondir=$am_cv_python_pythondir
12654
12644
12655
@@ -13529,9 +12570,9 @@
12645
@@ -13529,9 +12567,9 @@
12656
12646
pkgpythondir=\${pythondir}/$PACKAGE
12657
12647
12658
12648
12664
12654
$as_echo_n "(cached) " >&6
12665
12655
else
12666
12656
if test "x$exec_prefix" = xNONE
12667
@@ -13547,10 +12588,18 @@
12657
@@ -13547,10 +12585,18 @@
12668
12658
am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
12669
12659
am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
12670
12660
;;
12684
12674
$as_echo "$am_cv_python_pyexecdir" >&6; }
12685
12675
pyexecdir=$am_cv_python_pyexecdir
12686
12676
12687
@@ -13565,9 +12614,9 @@
12677
@@ -13565,9 +12611,9 @@
12688
12678
12689
12679
# Extract the first word of "glib-genmarshal", so it can be a program name with args.
12690
12680
set dummy glib-genmarshal; ac_word=$2
12696
12686
$as_echo_n "(cached) " >&6
12697
12687
else
12698
12688
case $GLIB_GENMARSHAL in
12699
@@ -13580,14 +12629,14 @@
12689
@@ -13580,14 +12626,14 @@
12700
12690
do
12701
12691
IFS=$as_save_IFS
12702
12692
test -z "$as_dir" && as_dir=.
12714
12704
IFS=$as_save_IFS
12715
12705
12716
12706
;;
12717
@@ -13595,19 +12644,19 @@
12707
@@ -13595,19 +12641,19 @@
12718
12708
fi
12719
12709
GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
12720
12710
if test -n "$GLIB_GENMARSHAL"; then
12738
12728
$as_echo_n "(cached) " >&6
12739
12729
else
12740
12730
case $GCONFTOOL in
12741
@@ -13620,14 +12669,14 @@
12731
@@ -13620,14 +12666,14 @@
12742
12732
do
12743
12733
IFS=$as_save_IFS
12744
12734
test -z "$as_dir" && as_dir=.
12756
12746
IFS=$as_save_IFS
12757
12747
12758
12748
;;
12759
@@ -13635,10 +12684,10 @@
12749
@@ -13635,10 +12681,10 @@
12760
12750
fi
12761
12751
GCONFTOOL=$ac_cv_path_GCONFTOOL
12762
12752
if test -n "$GCONFTOOL"; then
12769
12759
$as_echo "no" >&6; }
12770
12760
fi
12771
12761
12772
@@ -13647,7 +12696,7 @@
12762
@@ -13647,7 +12693,7 @@
12773
12763
12774
12764
12775
12765
# Check whether --enable-compile-warnings was given.
12778
12768
enableval=$enable_compile_warnings;
12779
12769
else
12780
12770
enable_compile_warnings="maximum"
12781
@@ -13678,13 +12727,9 @@
12771
@@ -13678,13 +12724,9 @@
12782
12772
for option in -Wno-sign-compare; do
12783
12773
SAVE_CFLAGS="$CFLAGS"
12784
12774
CFLAGS="$CFLAGS $option"
12794
12784
/* end confdefs.h. */
12795
12785
12796
12786
int
12797
@@ -13695,35 +12740,14 @@
12787
@@ -13695,35 +12737,14 @@
12798
12788
return 0;
12799
12789
}
12800
12790
_ACEOF
12833
12823
$as_echo "$has_option" >&6; }
12834
12824
if test $has_option = yes; then
12835
12825
warning_flags="$warning_flags $option"
12836
@@ -13737,26 +12761,24 @@
12826
@@ -13737,26 +12758,24 @@
12837
12827
fi
12838
12828
;;
12839
12829
*)
12865
12855
$as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; }
12866
12856
complCFLAGS=
12867
12857
if test "x$enable_iso_c" != "xno"; then
12868
@@ -13771,7 +12793,7 @@
12858
@@ -13771,7 +12790,7 @@
12869
12859
esac
12870
12860
fi
12871
12861
fi
12874
12864
$as_echo "$complCFLAGS" >&6; }
12875
12865
12876
12866
WARN_CFLAGS="$warning_flags $complCFLAGS"
12877
@@ -13779,7 +12801,7 @@
12867
@@ -13779,7 +12798,7 @@
12878
12868
12879
12869
12880
12870
# Check whether --enable-deprecations was given.
12883
12873
enableval=$enable_deprecations;
12884
12874
else
12885
12875
enable_deprecations=no
12886
@@ -13791,253 +12813,24 @@
12876
@@ -13791,253 +12810,24 @@
12887
12877
12888
12878
fi
12889
12879
13153
13143
_ACEOF
13154
13144
13155
13145
fi
13156
@@ -14048,7 +12841,7 @@
13157
GDK_PIXBUF_REQUIRED=2.7.1
13158
PANGO_REQUIRED=1.15.4
13159
GLIB_REQUIRED=2.18.0
13160
-GTK_REQUIRED=2.19.7
13161
+GTK_REQUIRED=2.19.6
13162
LIBBONOBOUI_REQUIRED=2.1.1
13163
ORBIT_REQUIRED=2.4.0
13164
LIBWNCK_REQUIRED=2.19.5
13165
@@ -14068,9 +12861,9 @@
13146
@@ -14068,9 +12858,9 @@
13166
13147
if test -n "$ac_tool_prefix"; then
13167
13148
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
13168
13149
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
13174
13155
$as_echo_n "(cached) " >&6
13175
13156
else
13176
13157
case $PKG_CONFIG in
13177
@@ -14083,14 +12876,14 @@
13158
@@ -14083,14 +12873,14 @@
13178
13159
do
13179
13160
IFS=$as_save_IFS
13180
13161
test -z "$as_dir" && as_dir=.
13192
13173
IFS=$as_save_IFS
13193
13174
13194
13175
;;
13195
@@ -14098,10 +12891,10 @@
13176
@@ -14098,10 +12888,10 @@
13196
13177
fi
13197
13178
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
13198
13179
if test -n "$PKG_CONFIG"; then
13205
13186
$as_echo "no" >&6; }
13206
13187
fi
13207
13188
13208
@@ -14111,9 +12904,9 @@
13189
@@ -14111,9 +12901,9 @@
13209
13190
ac_pt_PKG_CONFIG=$PKG_CONFIG
13210
13191
# Extract the first word of "pkg-config", so it can be a program name with args.
13211
13192
set dummy pkg-config; ac_word=$2
13217
13198
$as_echo_n "(cached) " >&6
13218
13199
else
13219
13200
case $ac_pt_PKG_CONFIG in
13220
@@ -14126,14 +12919,14 @@
13201
@@ -14126,14 +12916,14 @@
13221
13202
do
13222
13203
IFS=$as_save_IFS
13223
13204
test -z "$as_dir" && as_dir=.
13235
13216
IFS=$as_save_IFS
13236
13217
13237
13218
;;
13238
@@ -14141,10 +12934,10 @@
13219
@@ -14141,10 +12931,10 @@
13239
13220
fi
13240
13221
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
13241
13222
if test -n "$ac_pt_PKG_CONFIG"; then
13248
13229
$as_echo "no" >&6; }
13249
13230
fi
13250
13231
13251
@@ -14153,7 +12946,7 @@
13232
@@ -14153,7 +12943,7 @@
13252
13233
else
13253
13234
case $cross_compiling:$ac_tool_warned in
13254
13235
yes:)
13257
13238
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
13258
13239
ac_tool_warned=yes ;;
13259
13240
esac
13260
@@ -14166,13 +12959,13 @@
13241
@@ -14166,13 +12956,13 @@
13261
13242
fi
13262
13243
if test -n "$PKG_CONFIG"; then
13263
13244
_pkg_min_version=0.9.0
13274
13255
$as_echo "no" >&6; }
13275
13256
PKG_CONFIG=""
13276
13257
fi
13277
@@ -14180,40 +12973,44 @@
13258
@@ -14180,40 +12970,44 @@
13278
13259
fi
13279
13260
13280
13261
pkg_failed=no
13338
13319
fi
13339
13320
13340
13321
13341
@@ -14226,25 +13023,14 @@
13322
@@ -14226,25 +13020,14 @@
13342
13323
_pkg_short_errors_supported=no
13343
13324
fi
13344
13325
if test $_pkg_short_errors_supported = yes; then
13367
13348
13368
13349
$EGG_SMCLIENT_PKG_ERRORS
13369
13350
13370
@@ -14254,22 +13040,11 @@
13351
@@ -14254,22 +13037,11 @@
13371
13352
Alternatively, you may set the environment variables EGG_SMCLIENT_CFLAGS
13372
13353
and EGG_SMCLIENT_LIBS to avoid the need to call pkg-config.
13373
13354
See the pkg-config man page for more details.
13393
13374
is in your PATH or set the PKG_CONFIG environment variable to the full
13394
13375
path to pkg-config.
13395
13376
13396
@@ -14278,52 +13053,55 @@
13377
@@ -14278,52 +13050,55 @@
13397
13378
See the pkg-config man page for more details.
13398
13379
13399
13380
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
13471
13452
fi
13472
13453
13473
13454
13474
@@ -14336,25 +13114,14 @@
13455
@@ -14336,25 +13111,14 @@
13475
13456
_pkg_short_errors_supported=no
13476
13457
fi
13477
13458
if test $_pkg_short_errors_supported = yes; then
13500
13481
13501
13482
$PANEL_PKG_ERRORS
13502
13483
13503
@@ -14364,22 +13131,11 @@
13484
@@ -14364,22 +13128,11 @@
13504
13485
Alternatively, you may set the environment variables PANEL_CFLAGS
13505
13486
and PANEL_LIBS to avoid the need to call pkg-config.
13506
13487
See the pkg-config man page for more details.
13526
13507
is in your PATH or set the PKG_CONFIG environment variable to the full
13527
13508
path to pkg-config.
13528
13509
13529
@@ -14388,12 +13144,11 @@
13510
@@ -14388,12 +13141,11 @@
13530
13511
See the pkg-config man page for more details.
13531
13512
13532
13513
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
13541
13522
$as_echo "yes" >&6; }
13542
13523
:
13543
13524
fi
13544
@@ -14402,40 +13157,44 @@
13525
@@ -14402,40 +13154,44 @@
13545
13526
13546
13527
13547
13528
pkg_failed=no
13605
13586
fi
13606
13587
13607
13588
13608
@@ -14448,14 +13207,14 @@
13589
@@ -14448,14 +13204,14 @@
13609
13590
_pkg_short_errors_supported=no
13610
13591
fi
13611
13592
if test $_pkg_short_errors_supported = yes; then
13623
13604
13624
13605
$LIBPANEL_APPLET_PKG_ERRORS
13625
13606
13626
@@ -14465,33 +13224,11 @@
13607
@@ -14465,33 +13221,11 @@
13627
13608
Alternatively, you may set the environment variables LIBPANEL_APPLET_CFLAGS
13628
13609
and LIBPANEL_APPLET_LIBS to avoid the need to call pkg-config.
13629
13610
See the pkg-config man page for more details.
13660
13641
is in your PATH or set the PKG_CONFIG environment variable to the full
13661
13642
path to pkg-config.
13662
13643
13663
@@ -14500,12 +13237,11 @@
13644
@@ -14500,12 +13234,11 @@
13664
13645
See the pkg-config man page for more details.
13665
13646
13666
13647
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
13675
13656
$as_echo "yes" >&6; }
13676
13657
:
13677
13658
fi
13678
@@ -14514,40 +13250,44 @@
13659
@@ -14514,40 +13247,44 @@
13679
13660
13680
13661
13681
13662
pkg_failed=no
13739
13720
fi
13740
13721
13741
13722
13742
@@ -14560,25 +13300,14 @@
13723
@@ -14560,25 +13297,14 @@
13743
13724
_pkg_short_errors_supported=no
13744
13725
fi
13745
13726
if test $_pkg_short_errors_supported = yes; then
13768
13749
13769
13750
$FISH_PKG_ERRORS
13770
13751
13771
@@ -14588,22 +13317,11 @@
13752
@@ -14588,22 +13314,11 @@
13772
13753
Alternatively, you may set the environment variables FISH_CFLAGS
13773
13754
and FISH_LIBS to avoid the need to call pkg-config.
13774
13755
See the pkg-config man page for more details.
13794
13775
is in your PATH or set the PKG_CONFIG environment variable to the full
13795
13776
path to pkg-config.
13796
13777
13797
@@ -14612,12 +13330,11 @@
13778
@@ -14612,12 +13327,11 @@
13798
13779
See the pkg-config man page for more details.
13799
13780
13800
13781
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
13809
13790
$as_echo "yes" >&6; }
13810
13791
:
13811
13792
fi
13812
@@ -14626,40 +13343,44 @@
13793
@@ -14626,40 +13340,44 @@
13813
13794
13814
13795
13815
13796
pkg_failed=no
13873
13854
fi
13874
13855
13875
13856
13876
@@ -14672,25 +13393,14 @@
13857
@@ -14672,25 +13390,14 @@
13877
13858
_pkg_short_errors_supported=no
13878
13859
fi
13879
13860
if test $_pkg_short_errors_supported = yes; then
13902
13883
13903
13884
$NOTIFICATION_AREA_PKG_ERRORS
13904
13885
13905
@@ -14700,12 +13410,11 @@
13886
@@ -14700,12 +13407,11 @@
13906
13887
Alternatively, you may set the environment variables NOTIFICATION_AREA_CFLAGS
13907
13888
and NOTIFICATION_AREA_LIBS to avoid the need to call pkg-config.
13908
13889
See the pkg-config man page for more details.
13918
13899
is in your PATH or set the PKG_CONFIG environment variable to the full
13919
13900
path to pkg-config.
13920
13901
13921
@@ -14714,22 +13423,11 @@
13902
@@ -14714,22 +13420,11 @@
13922
13903
See the pkg-config man page for more details.
13923
13904
13924
13905
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
13943
13924
$as_echo "yes" >&6; }
13944
13925
:
13945
13926
fi
13946
@@ -14738,40 +13436,44 @@
13927
@@ -14738,40 +13433,44 @@
13947
13928
13948
13929
13949
13930
pkg_failed=no
14007
13988
fi
14008
13989
14009
13990
14010
@@ -14784,25 +13486,14 @@
13991
@@ -14784,25 +13483,14 @@
14011
13992
_pkg_short_errors_supported=no
14012
13993
fi
14013
13994
if test $_pkg_short_errors_supported = yes; then
14036
14017
14037
14018
$WNCKLET_PKG_ERRORS
14038
14019
14039
@@ -14812,22 +13503,11 @@
14020
@@ -14812,22 +13500,11 @@
14040
14021
Alternatively, you may set the environment variables WNCKLET_CFLAGS
14041
14022
and WNCKLET_LIBS to avoid the need to call pkg-config.
14042
14023
See the pkg-config man page for more details.
14062
14043
is in your PATH or set the PKG_CONFIG environment variable to the full
14063
14044
path to pkg-config.
14064
14045
14065
@@ -14836,265 +13516,35 @@
14046
@@ -14836,265 +13513,35 @@
14066
14047
See the pkg-config man page for more details.
14067
14048
14068
14049
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
14338
14319
_ACEOF
14339
14320
14340
14321
fi
14341
@@ -15102,7 +13552,7 @@
14322
@@ -15102,7 +13549,7 @@
14342
14323
14343
14324
14344
14325
# Check whether --enable-eds was given.
14347
14328
enableval=$enable_eds;
14348
14329
else
14349
14330
enable_eds=auto
14350
@@ -15115,25 +13565,23 @@
14331
@@ -15115,25 +13562,23 @@
14351
14332
CLOCK_EDS_ICONDIR=`$PKG_CONFIG --variable=datadir evolution-data-server-1.2`/pixmaps/evolution-data-server
14352
14333
else
14353
14334
if test "x$enable_eds" != "xno"; then
14377
14358
14378
14359
fi
14379
14360
if test -n "$LIBECAL_REQUIREMENT"; then
14380
@@ -15148,40 +13596,44 @@
14361
@@ -15148,40 +13593,44 @@
14381
14362
14382
14363
14383
14364
pkg_failed=no
14441
14422
fi
14442
14423
14443
14424
14444
@@ -15194,25 +13646,14 @@
14425
@@ -15194,25 +13643,14 @@
14445
14426
_pkg_short_errors_supported=no
14446
14427
fi
14447
14428
if test $_pkg_short_errors_supported = yes; then
14470
14451
14471
14452
$CLOCK_PKG_ERRORS
14472
14453
14473
@@ -15222,22 +13663,11 @@
14454
@@ -15222,22 +13660,11 @@
14474
14455
Alternatively, you may set the environment variables CLOCK_CFLAGS
14475
14456
and CLOCK_LIBS to avoid the need to call pkg-config.
14476
14457
See the pkg-config man page for more details.
14496
14477
is in your PATH or set the PKG_CONFIG environment variable to the full
14497
14478
path to pkg-config.
14498
14479
14499
@@ -15246,12 +13676,11 @@
14480
@@ -15246,12 +13673,11 @@
14500
14481
See the pkg-config man page for more details.
14501
14482
14502
14483
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
14511
14492
$as_echo "yes" >&6; }
14512
14493
:
14513
14494
fi
14514
@@ -15260,40 +13689,44 @@
14495
@@ -15260,40 +13686,44 @@
14515
14496
14516
14497
14517
14498
pkg_failed=no
14575
14556
fi
14576
14557
14577
14558
14578
@@ -15306,25 +13739,14 @@
14559
@@ -15306,25 +13736,14 @@
14579
14560
_pkg_short_errors_supported=no
14580
14561
fi
14581
14562
if test $_pkg_short_errors_supported = yes; then
14604
14585
14605
14586
$CLOCK_MECHANISM_PKG_ERRORS
14606
14587
14607
@@ -15334,22 +13756,11 @@
14588
@@ -15334,22 +13753,11 @@
14608
14589
Alternatively, you may set the environment variables CLOCK_MECHANISM_CFLAGS
14609
14590
and CLOCK_MECHANISM_LIBS to avoid the need to call pkg-config.
14610
14591
See the pkg-config man page for more details.
14630
14611
is in your PATH or set the PKG_CONFIG environment variable to the full
14631
14612
path to pkg-config.
14632
14613
14633
@@ -15358,12 +13769,11 @@
14614
@@ -15358,12 +13766,11 @@
14634
14615
See the pkg-config man page for more details.
14635
14616
14636
14617
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
14645
14626
$as_echo "yes" >&6; }
14646
14627
:
14647
14628
fi
14648
@@ -15380,7 +13790,7 @@
14629
@@ -15380,7 +13787,7 @@
14649
14630
POLKIT_CFLAGS=
14650
14631
POLKIT_LIBS=
14651
14632
# Check whether --enable-polkit was given.
14654
14635
enableval=$enable_polkit; enable_polkit=$enableval
14655
14636
else
14656
14637
enable_polkit=auto
14657
@@ -15392,40 +13802,44 @@
14638
@@ -15392,40 +13799,44 @@
14658
14639
HAVE_POLKIT=no
14659
14640
14660
14641
pkg_failed=no
14718
14699
fi
14719
14700
14720
14701
14721
@@ -15438,14 +13852,14 @@
14702
@@ -15438,14 +13849,14 @@
14722
14703
_pkg_short_errors_supported=no
14723
14704
fi
14724
14705
if test $_pkg_short_errors_supported = yes; then
14736
14717
$as_echo "no" >&6; }
14737
14718
HAVE_POLKIT=no
14738
14719
elif test $pkg_failed = untried; then
14739
@@ -15453,22 +13867,18 @@
14720
@@ -15453,22 +13864,18 @@
14740
14721
else
14741
14722
POLKIT_CFLAGS=$pkg_cv_POLKIT_CFLAGS
14742
14723
POLKIT_LIBS=$pkg_cv_POLKIT_LIBS
14762
14743
14763
14744
fi
14764
14745
fi
14765
@@ -15484,7 +13894,7 @@
14746
@@ -15484,7 +13891,7 @@
14766
14747
14767
14748
14768
14749
# Check whether --enable-network_manager was given.
14771
14752
enableval=$enable_network_manager; enable_network_manager=$enableval
14772
14753
else
14773
14754
enable_network_manager=auto
14774
@@ -15495,40 +13905,44 @@
14755
@@ -15495,40 +13902,44 @@
14775
14756
else
14776
14757
14777
14758
pkg_failed=no
14835
14816
fi
14836
14817
14837
14818
14838
@@ -15541,14 +13955,14 @@
14819
@@ -15541,14 +13952,14 @@
14839
14820
_pkg_short_errors_supported=no
14840
14821
fi
14841
14822
if test $_pkg_short_errors_supported = yes; then
14853
14834
$as_echo "no" >&6; }
14854
14835
HAVE_NETWORK_MANAGER=no
14855
14836
elif test $pkg_failed = untried; then
14856
@@ -15556,16 +13970,14 @@
14837
@@ -15556,16 +13967,14 @@
14857
14838
else
14858
14839
NETWORK_MANAGER_CFLAGS=$pkg_cv_NETWORK_MANAGER_CFLAGS
14859
14840
NETWORK_MANAGER_LIBS=$pkg_cv_NETWORK_MANAGER_LIBS
14872
14853
14873
14854
fi
14874
14855
14875
@@ -15575,7 +13987,7 @@
14856
@@ -15575,7 +13984,7 @@
14876
14857
PANEL_INPROCESS_APPLETS=
14877
14858
14878
14859
# Check whether --with-in-process-applets was given.
14881
14862
withval=$with_in_process_applets; for i in `echo $withval | tr , ' '`; do
14882
14863
if test $i = "none"; then
14883
14864
PANEL_INPROCESS_NONE=1
14884
@@ -15606,30 +14018,22 @@
14865
@@ -15606,30 +14015,22 @@
14885
14866
if test $i = "clock"; then
14886
14867
CLOCK_COMPILE_INPROCESS=1
14887
14868
14916
14897
14917
14898
fi; fi; fi; fi
14918
14899
done
14919
@@ -15637,6 +14041,17 @@
14920
PANEL_INPROCESS_APPLETS="(none)"
14921
fi
14922
14923
+# Make it possible to disable initial slide-in animation
14924
+# Check whether --enable-initial-animation was given.
14925
+if test "${enable_initial_animation+set}" = set; then :
14926
+ enableval=$enable_initial_animation; if test "x$enable_initial_animation" = xno; then :
14927
+
14928
+$as_echo "#define DISABLE_INITIAL_ANIMATION 1" >>confdefs.h
14929
+
14930
+fi
14931
+fi
14932
+
14933
+
14934
if test -n "$CLOCK_COMPILE_INPROCESS"; then
14935
CLOCK_INPROCESS_TRUE=
14936
CLOCK_INPROCESS_FALSE='#'
14937
@@ -15671,24 +14086,15 @@
14900
@@ -15671,24 +14072,15 @@
14938
14901
14939
14902
14940
14903
# For the run dialog
14962
14925
/* end confdefs.h. */
14963
14926
#include <sys/types.h>
14964
14927
#include <$ac_hdr>
14965
@@ -15702,41 +14108,18 @@
14928
@@ -15702,41 +14094,18 @@
14966
14929
return 0;
14967
14930
}
14968
14931
_ACEOF
15010
14973
cat >>confdefs.h <<_ACEOF
15011
14974
#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
15012
14975
_ACEOF
15013
@@ -15747,17 +14130,13 @@
14976
@@ -15747,17 +14116,13 @@
15014
14977
done
15015
14978
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
15016
14979
if test $ac_header_dirent = dirent.h; then
15031
14994
/* end confdefs.h. */
15032
14995
15033
14996
/* Override any GCC internal prototype to avoid an error.
15034
@@ -15782,70 +14161,39 @@
14997
@@ -15782,70 +14147,39 @@
15035
14998
ac_res=-l$ac_lib
15036
14999
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
15037
15000
fi
15113
15076
/* end confdefs.h. */
15114
15077
15115
15078
/* Override any GCC internal prototype to avoid an error.
15116
@@ -15870,70 +14218,39 @@
15079
@@ -15870,70 +14204,39 @@
15117
15080
ac_res=-l$ac_lib
15118
15081
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
15119
15082
fi
15195
15158
/* end confdefs.h. */
15196
15159
15197
15160
#include <sys/types.h>
15198
@@ -15960,60 +14277,33 @@
15161
@@ -15960,60 +14263,33 @@
15199
15162
return 0;
15200
15163
}
15201
15164
_ACEOF
15264
15227
withval=$with_x;
15265
15228
fi
15266
15229
15267
@@ -16023,10 +14313,8 @@
15230
@@ -16023,10 +14299,8 @@
15268
15231
have_x=disabled
15269
15232
else
15270
15233
case $x_includes,$x_libraries in #(
15277
15240
$as_echo_n "(cached) " >&6
15278
15241
else
15279
15242
# One or both of the vars are not set, and there is no cached value.
15280
@@ -16074,21 +14362,25 @@
15243
@@ -16074,21 +14348,25 @@
15281
15244
# Check X11 before X11Rn because it is often a symlink to the current release.
15282
15245
ac_x_header_dirs='
15283
15246
/usr/X11/include
15303
15266
/usr/local/include/X11R6
15304
15267
/usr/local/include/X11R5
15305
15268
/usr/local/include/X11R4
15306
@@ -16110,37 +14402,14 @@
15269
@@ -16110,37 +14388,14 @@
15307
15270
if test "$ac_x_includes" = no; then
15308
15271
# Guess where to find include files, by looking for Xlib.h.
15309
15272
# First, try using that file with no special directory specified.
15343
15306
for ac_dir in $ac_x_header_dirs; do
15344
15307
if test -r "$ac_dir/X11/Xlib.h"; then
15345
15308
ac_x_includes=$ac_dir
15346
@@ -16148,7 +14417,6 @@
15309
@@ -16148,7 +14403,6 @@
15347
15310
fi
15348
15311
done
15349
15312
fi
15351
15314
rm -f conftest.err conftest.$ac_ext
15352
15315
fi # $ac_x_includes = no
15353
15316
15354
@@ -16158,11 +14426,7 @@
15317
@@ -16158,11 +14412,7 @@
15355
15318
# Don't add to $LIBS permanently.
15356
15319
ac_save_LIBS=$LIBS
15357
15320
LIBS="-lX11 $LIBS"
15364
15327
/* end confdefs.h. */
15365
15328
#include <X11/Xlib.h>
15366
15329
int
15367
@@ -16173,35 +14437,12 @@
15330
@@ -16173,35 +14423,12 @@
15368
15331
return 0;
15369
15332
}
15370
15333
_ACEOF
15402
15365
for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
15403
15366
do
15404
15367
# Don't even attempt the hair of trying to link an X program!
15405
@@ -16213,10 +14454,8 @@
15368
@@ -16213,10 +14440,8 @@
15406
15369
done
15407
15370
done
15408
15371
fi
15415
15378
fi # $ac_x_libraries = no
15416
15379
15417
15380
case $ac_x_includes,$ac_x_libraries in #(
15418
@@ -16237,7 +14476,7 @@
15381
@@ -16237,7 +14462,7 @@
15419
15382
fi # $with_x != no
15420
15383
15421
15384
if test "$have_x" != yes; then
15424
15387
$as_echo "$have_x" >&6; }
15425
15388
no_x=yes
15426
15389
else
15427
@@ -16248,46 +14487,50 @@
15390
@@ -16248,46 +14473,50 @@
15428
15391
ac_cv_have_x="have_x=yes\
15429
15392
ac_x_includes='$x_includes'\
15430
15393
ac_x_libraries='$x_libraries'"
15495
15458
fi
15496
15459
15497
15460
15498
@@ -16300,14 +14543,14 @@
15461
@@ -16300,14 +14529,14 @@
15499
15462
_pkg_short_errors_supported=no
15500
15463
fi
15501
15464
if test $_pkg_short_errors_supported = yes; then
15513
15476
$as_echo "no" >&6; }
15514
15477
15515
15478
# pkg-config modules not found (only present since X11R7 aka Xorg); use
15516
@@ -16315,9 +14558,7 @@
15479
@@ -16315,9 +14544,7 @@
15517
15480
if test "$no_x" = yes; then
15518
15481
# Not all programs may use this symbol, but it does not hurt to define it.
15519
15482
15524
15487
15525
15488
X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
15526
15489
else
15527
@@ -16330,16 +14571,12 @@
15490
@@ -16330,16 +14557,12 @@
15528
15491
X_LIBS="$X_LIBS -L$x_libraries"
15529
15492
# For Solaris; some versions of Sun CC require a space after -R and
15530
15493
# others require no space. Words are not sufficient . . . .
15543
15506
/* end confdefs.h. */
15544
15507
15545
15508
int
15546
@@ -16350,40 +14587,13 @@
15509
@@ -16350,40 +14573,13 @@
15547
15510
return 0;
15548
15511
}
15549
15512
_ACEOF
15588
15551
/* end confdefs.h. */
15589
15552
15590
15553
int
15591
@@ -16394,46 +14604,19 @@
15554
@@ -16394,46 +14590,19 @@
15592
15555
return 0;
15593
15556
}
15594
15557
_ACEOF
15642
15605
ac_c_werror_flag=$ac_xsave_c_werror_flag
15643
15606
LIBS=$ac_xsave_LIBS
15644
15607
fi
15645
@@ -16449,11 +14632,7 @@
15608
@@ -16449,11 +14618,7 @@
15646
15609
# libraries were built with DECnet support. And Karl Berry says
15647
15610
# the Alpha needs dnet_stub (dnet does not exist).
15648
15611
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
15655
15618
/* end confdefs.h. */
15656
15619
15657
15620
/* Override any GCC internal prototype to avoid an error.
15658
@@ -16471,44 +14650,17 @@
15621
@@ -16471,44 +14636,17 @@
15659
15622
return 0;
15660
15623
}
15661
15624
_ACEOF
15705
15668
/* end confdefs.h. */
15706
15669
15707
15670
/* Override any GCC internal prototype to avoid an error.
15708
@@ -16526,59 +14678,30 @@
15671
@@ -16526,59 +14664,30 @@
15709
15672
return 0;
15710
15673
}
15711
15674
_ACEOF
15774
15737
/* end confdefs.h. */
15775
15738
15776
15739
/* Override any GCC internal prototype to avoid an error.
15777
@@ -16596,52 +14719,25 @@
15740
@@ -16596,52 +14705,25 @@
15778
15741
return 0;
15779
15742
}
15780
15743
_ACEOF
15835
15798
LIBS="$ac_xsave_LIBS"
15836
15799
15837
15800
# msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
15838
@@ -16652,33 +14748,21 @@
15801
@@ -16652,105 +14734,20 @@
15839
15802
# on Irix 5.2, according to T.E. Dickey.
15840
15803
# The functions gethostbyname, getservbyname, and inet_addr are
15841
15804
# in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
15842
15805
- { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5
15843
15806
-$as_echo_n "checking for gethostbyname... " >&6; }
15844
15807
-if test "${ac_cv_func_gethostbyname+set}" = set; then
15845
+ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
15846
+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
15847
+
15848
+fi
15849
+
15850
+ if test $ac_cv_func_gethostbyname = no; then
15851
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
15852
+$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
15853
+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
15854
$as_echo_n "(cached) " >&6
15855
else
15808
- $as_echo_n "(cached) " >&6
15809
-else
15856
15810
- cat >conftest.$ac_ext <<_ACEOF
15857
15811
-/* confdefs.h. */
15858
15812
-_ACEOF
15859
15813
-cat confdefs.h >>conftest.$ac_ext
15860
15814
-cat >>conftest.$ac_ext <<_ACEOF
15861
+ ac_check_lib_save_LIBS=$LIBS
15862
+LIBS="-lnsl $LIBS"
15863
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15864
/* end confdefs.h. */
15815
-/* end confdefs.h. */
15865
15816
-/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
15866
15817
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
15867
15818
-#define gethostbyname innocuous_gethostbyname
15878
15829
-#endif
15879
15830
-
15880
15831
-#undef gethostbyname
15881
15882
/* Override any GCC internal prototype to avoid an error.
15883
Use char because int might match the return type of a GCC
15884
@@ -16687,13 +14771,6 @@
15885
extern "C"
15886
#endif
15887
char gethostbyname ();
15832
-
15833
-/* Override any GCC internal prototype to avoid an error.
15834
- Use char because int might match the return type of a GCC
15835
- builtin and then its argument prototype would still apply. */
15836
-#ifdef __cplusplus
15837
-extern "C"
15838
-#endif
15839
-char gethostbyname ();
15888
15840
-/* The GNU C library defines this for functions which it implements
15889
15841
- to always fail with ENOSYS. Some functions are actually named
15890
15842
- something starting with __ and the normal name is an alias. */
15892
15844
-choke me
15893
15845
-#endif
15894
15846
-
15895
int
15896
main ()
15897
{
15898
@@ -16702,55 +14779,30 @@
15899
return 0;
15900
}
15901
_ACEOF
15847
-int
15848
-main ()
15849
-{
15850
-return gethostbyname ();
15851
- ;
15852
- return 0;
15853
-}
15854
-_ACEOF
15902
15855
-rm -f conftest.$ac_objext conftest$ac_exeext
15903
15856
-if { (ac_try="$ac_link"
15904
15857
-case "(($ac_try" in
15921
15874
- $as_test_x conftest$ac_exeext
15922
15875
- }; then
15923
15876
- ac_cv_func_gethostbyname=yes
15924
+if ac_fn_c_try_link "$LINENO"; then :
15925
+ ac_cv_lib_nsl_gethostbyname=yes
15926
else
15877
-else
15927
15878
- $as_echo "$as_me: failed program was:" >&5
15928
15879
-sed 's/^/| /' conftest.$ac_ext >&5
15929
15880
-
15930
15881
- ac_cv_func_gethostbyname=no
15931
+ ac_cv_lib_nsl_gethostbyname=no
15932
fi
15933
-
15882
-fi
15883
+ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
15884
+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
15885
15934
15886
-rm -rf conftest.dSYM
15935
15887
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15936
15888
- conftest$ac_exeext conftest.$ac_ext
15937
+rm -f core conftest.err conftest.$ac_objext \
15938
+ conftest$ac_exeext conftest.$ac_ext
15939
+LIBS=$ac_check_lib_save_LIBS
15940
+fi
15941
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
15942
+$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
15943
+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
15944
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
15945
15889
fi
15946
15890
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
15947
15891
-$as_echo "$ac_cv_func_gethostbyname" >&6; }
15948
15892
15949
- if test $ac_cv_func_gethostbyname = no; then
15893
if test $ac_cv_func_gethostbyname = no; then
15950
15894
- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
15951
-$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
15895
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
15896
$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
15952
15897
-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
15953
+ if test $ac_cv_lib_nsl_gethostbyname = no; then
15954
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
15955
+$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
15956
+if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
15898
+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
15957
15899
$as_echo_n "(cached) " >&6
15958
15900
else
15959
15901
ac_check_lib_save_LIBS=$LIBS
15960
-LIBS="-lnsl $LIBS"
15902
LIBS="-lnsl $LIBS"
15961
15903
-cat >conftest.$ac_ext <<_ACEOF
15962
15904
-/* confdefs.h. */
15963
15905
-_ACEOF
15964
15906
-cat confdefs.h >>conftest.$ac_ext
15965
15907
-cat >>conftest.$ac_ext <<_ACEOF
15966
+LIBS="-lbsd $LIBS"
15967
15908
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15968
15909
/* end confdefs.h. */
15969
15910
15970
15911
/* Override any GCC internal prototype to avoid an error.
15971
@@ -16768,113 +14820,18 @@
15912
@@ -16768,59 +14765,30 @@
15972
15913
return 0;
15973
15914
}
15974
15915
_ACEOF
15993
15934
- test "$cross_compiling" = yes ||
15994
15935
- $as_test_x conftest$ac_exeext
15995
15936
- }; then
15996
- ac_cv_lib_nsl_gethostbyname=yes
15997
-else
15937
+if ac_fn_c_try_link "$LINENO"; then :
15938
ac_cv_lib_nsl_gethostbyname=yes
15939
else
15998
15940
- $as_echo "$as_me: failed program was:" >&5
15999
15941
-sed 's/^/| /' conftest.$ac_ext >&5
16000
15942
-
16001
15943
- ac_cv_lib_nsl_gethostbyname=no
16002
-fi
15944
+ ac_cv_lib_nsl_gethostbyname=no
15945
fi
16003
15946
-
16004
15947
-rm -rf conftest.dSYM
16005
15948
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16006
15949
- conftest$ac_exeext conftest.$ac_ext
16007
-LIBS=$ac_check_lib_save_LIBS
16008
-fi
15950
+rm -f core conftest.err conftest.$ac_objext \
15951
+ conftest$ac_exeext conftest.$ac_ext
15952
LIBS=$ac_check_lib_save_LIBS
15953
fi
16009
15954
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
16010
-$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
15955
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
15956
$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
16011
15957
-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
16012
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
16013
-fi
16014
-
16015
- if test $ac_cv_lib_nsl_gethostbyname = no; then
15958
+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
15959
X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
15960
fi
15961
15962
if test $ac_cv_lib_nsl_gethostbyname = no; then
16016
15963
- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
16017
-$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
15964
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
15965
$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
16018
15966
-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
16019
- $as_echo_n "(cached) " >&6
16020
-else
16021
- ac_check_lib_save_LIBS=$LIBS
16022
-LIBS="-lbsd $LIBS"
15967
+if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
15968
$as_echo_n "(cached) " >&6
15969
else
15970
ac_check_lib_save_LIBS=$LIBS
15971
LIBS="-lbsd $LIBS"
16023
15972
-cat >conftest.$ac_ext <<_ACEOF
16024
15973
-/* confdefs.h. */
16025
15974
-_ACEOF
16026
15975
-cat confdefs.h >>conftest.$ac_ext
16027
15976
-cat >>conftest.$ac_ext <<_ACEOF
16028
-/* end confdefs.h. */
16029
-
16030
-/* Override any GCC internal prototype to avoid an error.
16031
- Use char because int might match the return type of a GCC
16032
- builtin and then its argument prototype would still apply. */
16033
-#ifdef __cplusplus
16034
-extern "C"
16035
-#endif
16036
-char gethostbyname ();
16037
-int
16038
-main ()
16039
-{
16040
-return gethostbyname ();
16041
- ;
16042
- return 0;
16043
-}
16044
-_ACEOF
15977
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15978
/* end confdefs.h. */
15979
15980
/* Override any GCC internal prototype to avoid an error.
15981
@@ -16838,43 +14806,18 @@
15982
return 0;
15983
}
15984
_ACEOF
16045
15985
-rm -f conftest.$ac_objext conftest$ac_exeext
16046
15986
-if { (ac_try="$ac_link"
16047
15987
-case "(($ac_try" in
16088
16028
X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
16089
16029
fi
16090
16030
16091
@@ -16888,105 +14845,20 @@
16031
@@ -16888,105 +14831,20 @@
16092
16032
# variants that don't use the name server (or something). -lsocket
16093
16033
# must be given before -lnsl if both are needed. We assume that
16094
16034
# if connect needs -lnsl, so does gethostbyname.
16199
16139
/* end confdefs.h. */
16200
16140
16201
16141
/* Override any GCC internal prototype to avoid an error.
16202
@@ -17004,148 +14876,38 @@
16142
@@ -17004,148 +14862,38 @@
16203
16143
return 0;
16204
16144
}
16205
16145
_ACEOF
16359
16299
/* end confdefs.h. */
16360
16300
16361
16301
/* Override any GCC internal prototype to avoid an error.
16362
@@ -17163,76 +14925,39 @@
16302
@@ -17163,148 +14911,38 @@
16363
16303
return 0;
16364
16304
}
16365
16305
_ACEOF
16415
16355
- { $as_echo "$as_me:$LINENO: checking for shmat" >&5
16416
16356
-$as_echo_n "checking for shmat... " >&6; }
16417
16357
-if test "${ac_cv_func_shmat+set}" = set; then
16418
+ ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
16419
+if test "x$ac_cv_func_shmat" = x""yes; then :
16420
+
16421
+fi
16422
+
16423
+ if test $ac_cv_func_shmat = no; then
16424
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
16425
+$as_echo_n "checking for shmat in -lipc... " >&6; }
16426
+if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
16427
$as_echo_n "(cached) " >&6
16428
else
16358
- $as_echo_n "(cached) " >&6
16359
-else
16429
16360
- cat >conftest.$ac_ext <<_ACEOF
16430
16361
-/* confdefs.h. */
16431
16362
-_ACEOF
16432
16363
-cat confdefs.h >>conftest.$ac_ext
16433
16364
-cat >>conftest.$ac_ext <<_ACEOF
16434
+ ac_check_lib_save_LIBS=$LIBS
16435
+LIBS="-lipc $LIBS"
16436
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
16437
/* end confdefs.h. */
16365
-/* end confdefs.h. */
16438
16366
-/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
16439
16367
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
16440
16368
-#define shmat innocuous_shmat
16451
16379
-#endif
16452
16380
-
16453
16381
-#undef shmat
16454
16455
/* Override any GCC internal prototype to avoid an error.
16456
Use char because int might match the return type of a GCC
16457
@@ -17241,13 +14966,6 @@
16458
extern "C"
16459
#endif
16460
char shmat ();
16382
-
16383
-/* Override any GCC internal prototype to avoid an error.
16384
- Use char because int might match the return type of a GCC
16385
- builtin and then its argument prototype would still apply. */
16386
-#ifdef __cplusplus
16387
-extern "C"
16388
-#endif
16389
-char shmat ();
16461
16390
-/* The GNU C library defines this for functions which it implements
16462
16391
- to always fail with ENOSYS. Some functions are actually named
16463
16392
- something starting with __ and the normal name is an alias. */
16465
16394
-choke me
16466
16395
-#endif
16467
16396
-
16468
int
16469
main ()
16470
{
16471
@@ -17256,136 +14974,41 @@
16472
return 0;
16473
}
16474
_ACEOF
16397
-int
16398
-main ()
16399
-{
16400
-return shmat ();
16401
- ;
16402
- return 0;
16403
-}
16404
-_ACEOF
16475
16405
-rm -f conftest.$ac_objext conftest$ac_exeext
16476
16406
-if { (ac_try="$ac_link"
16477
16407
-case "(($ac_try" in
16494
16424
- $as_test_x conftest$ac_exeext
16495
16425
- }; then
16496
16426
- ac_cv_func_shmat=yes
16497
+if ac_fn_c_try_link "$LINENO"; then :
16498
+ ac_cv_lib_ipc_shmat=yes
16499
else
16427
-else
16500
16428
- $as_echo "$as_me: failed program was:" >&5
16501
16429
-sed 's/^/| /' conftest.$ac_ext >&5
16502
16430
-
16503
16431
- ac_cv_func_shmat=no
16504
+ ac_cv_lib_ipc_shmat=no
16505
fi
16506
-
16432
-fi
16433
+ ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
16434
+if test "x$ac_cv_func_shmat" = x""yes; then :
16435
16507
16436
-rm -rf conftest.dSYM
16508
16437
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16509
16438
- conftest$ac_exeext conftest.$ac_ext
16510
+rm -f core conftest.err conftest.$ac_objext \
16511
+ conftest$ac_exeext conftest.$ac_ext
16512
+LIBS=$ac_check_lib_save_LIBS
16513
+fi
16514
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
16515
+$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
16516
+if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
16517
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
16518
16439
fi
16519
16440
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
16520
16441
-$as_echo "$ac_cv_func_shmat" >&6; }
16521
16442
16522
- if test $ac_cv_func_shmat = no; then
16443
if test $ac_cv_func_shmat = no; then
16523
16444
- { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
16524
-$as_echo_n "checking for shmat in -lipc... " >&6; }
16445
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
16446
$as_echo_n "checking for shmat in -lipc... " >&6; }
16525
16447
-if test "${ac_cv_lib_ipc_shmat+set}" = set; then
16526
+ fi
16527
+ fi
16528
+
16529
+ # Check for libraries that X11R6 Xt/Xaw programs need.
16530
+ ac_save_LDFLAGS=$LDFLAGS
16531
+ test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
16532
+ # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
16533
+ # check for ICE first), but we must link in the order -lSM -lICE or
16534
+ # we get undefined symbols. So assume we have SM if we have ICE.
16535
+ # These have to be linked with before -lX11, unlike the other
16536
+ # libraries we check for below, so use a different variable.
16537
+ # John Interrante, Karl Berry
16538
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
16539
+$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
16540
+if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
16448
+if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
16541
16449
$as_echo_n "(cached) " >&6
16542
16450
else
16543
16451
ac_check_lib_save_LIBS=$LIBS
16544
-LIBS="-lipc $LIBS"
16452
LIBS="-lipc $LIBS"
16545
16453
-cat >conftest.$ac_ext <<_ACEOF
16546
16454
-/* confdefs.h. */
16547
16455
-_ACEOF
16548
16456
-cat confdefs.h >>conftest.$ac_ext
16549
16457
-cat >>conftest.$ac_ext <<_ACEOF
16550
-/* end confdefs.h. */
16551
-
16552
-/* Override any GCC internal prototype to avoid an error.
16553
- Use char because int might match the return type of a GCC
16554
- builtin and then its argument prototype would still apply. */
16555
-#ifdef __cplusplus
16556
-extern "C"
16557
-#endif
16558
-char shmat ();
16559
-int
16560
-main ()
16561
-{
16562
-return shmat ();
16563
- ;
16564
- return 0;
16565
-}
16566
-_ACEOF
16458
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
16459
/* end confdefs.h. */
16460
16461
/* Override any GCC internal prototype to avoid an error.
16462
@@ -17322,43 +14960,18 @@
16463
return 0;
16464
}
16465
_ACEOF
16567
16466
-rm -f conftest.$ac_objext conftest$ac_exeext
16568
16467
-if { (ac_try="$ac_link"
16569
16468
-case "(($ac_try" in
16585
16484
- test "$cross_compiling" = yes ||
16586
16485
- $as_test_x conftest$ac_exeext
16587
16486
- }; then
16588
- ac_cv_lib_ipc_shmat=yes
16589
-else
16487
+if ac_fn_c_try_link "$LINENO"; then :
16488
ac_cv_lib_ipc_shmat=yes
16489
else
16590
16490
- $as_echo "$as_me: failed program was:" >&5
16591
16491
-sed 's/^/| /' conftest.$ac_ext >&5
16592
16492
-
16593
16493
- ac_cv_lib_ipc_shmat=no
16594
-fi
16494
+ ac_cv_lib_ipc_shmat=no
16495
fi
16595
16496
-
16596
16497
-rm -rf conftest.dSYM
16597
16498
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16598
16499
- conftest$ac_exeext conftest.$ac_ext
16599
-LIBS=$ac_check_lib_save_LIBS
16600
-fi
16500
+rm -f core conftest.err conftest.$ac_objext \
16501
+ conftest$ac_exeext conftest.$ac_ext
16502
LIBS=$ac_check_lib_save_LIBS
16503
fi
16601
16504
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
16602
-$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
16505
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
16506
$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
16603
16507
-if test "x$ac_cv_lib_ipc_shmat" = x""yes; then
16604
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
16605
-fi
16606
-
16607
- fi
16608
- fi
16609
-
16610
- # Check for libraries that X11R6 Xt/Xaw programs need.
16611
- ac_save_LDFLAGS=$LDFLAGS
16612
- test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
16613
- # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
16614
- # check for ICE first), but we must link in the order -lSM -lICE or
16615
- # we get undefined symbols. So assume we have SM if we have ICE.
16616
- # These have to be linked with before -lX11, unlike the other
16617
- # libraries we check for below, so use a different variable.
16618
- # John Interrante, Karl Berry
16508
+if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
16509
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
16510
fi
16511
16512
@@ -17374,18 +14987,14 @@
16513
# These have to be linked with before -lX11, unlike the other
16514
# libraries we check for below, so use a different variable.
16515
# John Interrante, Karl Berry
16619
16516
- { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
16620
-$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
16517
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
16518
$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
16621
16519
-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
16622
- $as_echo_n "(cached) " >&6
16623
-else
16624
- ac_check_lib_save_LIBS=$LIBS
16625
-LIBS="-lICE $X_EXTRA_LIBS $LIBS"
16520
+if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
16521
$as_echo_n "(cached) " >&6
16522
else
16523
ac_check_lib_save_LIBS=$LIBS
16524
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
16626
16525
-cat >conftest.$ac_ext <<_ACEOF
16627
16526
-/* confdefs.h. */
16628
16527
-_ACEOF
16629
16528
-cat confdefs.h >>conftest.$ac_ext
16630
16529
-cat >>conftest.$ac_ext <<_ACEOF
16631
+LIBS="-lICE $X_EXTRA_LIBS $LIBS"
16632
16530
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
16633
16531
/* end confdefs.h. */
16634
16532
16635
16533
/* Override any GCC internal prototype to avoid an error.
16636
@@ -17403,43 +15026,18 @@
16534
@@ -17403,43 +15012,18 @@
16637
16535
return 0;
16638
16536
}
16639
16537
_ACEOF
16683
16581
X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
16684
16582
fi
16685
16583
16686
@@ -17449,28 +15047,21 @@
16584
@@ -17449,28 +15033,21 @@
16687
16585
16688
16586
# X not found
16689
16587
if test x$no_x = xyes ; then
16716
16614
/* end confdefs.h. */
16717
16615
16718
16616
/* Override any GCC internal prototype to avoid an error.
16719
@@ -17488,43 +15079,18 @@
16617
@@ -17488,43 +15065,18 @@
16720
16618
return 0;
16721
16619
}
16722
16620
_ACEOF
16766
16664
cat >>confdefs.h <<_ACEOF
16767
16665
#define HAVE_LIBX11 1
16768
16666
_ACEOF
16769
@@ -17532,24 +15098,17 @@
16667
@@ -17532,24 +15084,17 @@
16770
16668
LIBS="-lX11 $LIBS"
16771
16669
16772
16670
else
16795
16693
/* end confdefs.h. */
16796
16694
16797
16695
/* Override any GCC internal prototype to avoid an error.
16798
@@ -17567,43 +15126,18 @@
16696
@@ -17567,43 +15112,18 @@
16799
16697
return 0;
16800
16698
}
16801
16699
_ACEOF
16845
16743
cat >>confdefs.h <<_ACEOF
16846
16744
#define HAVE_LIBXAU 1
16847
16745
_ACEOF
16848
@@ -17611,9 +15145,7 @@
16746
@@ -17611,9 +15131,7 @@
16849
16747
LIBS="-lXau $LIBS"
16850
16748
16851
16749
else
16856
16754
fi
16857
16755
16858
16756
CFLAGS="$gp_save_cflags"
16859
@@ -17628,9 +15160,7 @@
16757
@@ -17628,9 +15146,7 @@
16860
16758
if test "$no_x" = yes; then
16861
16759
# Not all programs may use this symbol, but it does not hurt to define it.
16862
16760
16867
16765
16868
16766
X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
16869
16767
else
16870
@@ -17643,16 +15173,12 @@
16768
@@ -17643,16 +15159,12 @@
16871
16769
X_LIBS="$X_LIBS -L$x_libraries"
16872
16770
# For Solaris; some versions of Sun CC require a space after -R and
16873
16771
# others require no space. Words are not sufficient . . . .
16886
16784
/* end confdefs.h. */
16887
16785
16888
16786
int
16889
@@ -17663,40 +15189,13 @@
16787
@@ -17663,40 +15175,13 @@
16890
16788
return 0;
16891
16789
}
16892
16790
_ACEOF
16931
16829
/* end confdefs.h. */
16932
16830
16933
16831
int
16934
@@ -17707,46 +15206,19 @@
16832
@@ -17707,46 +15192,19 @@
16935
16833
return 0;
16936
16834
}
16937
16835
_ACEOF
16985
16883
ac_c_werror_flag=$ac_xsave_c_werror_flag
16986
16884
LIBS=$ac_xsave_LIBS
16987
16885
fi
16988
@@ -17762,11 +15234,7 @@
16886
@@ -17762,11 +15220,7 @@
16989
16887
# libraries were built with DECnet support. And Karl Berry says
16990
16888
# the Alpha needs dnet_stub (dnet does not exist).
16991
16889
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
16998
16896
/* end confdefs.h. */
16999
16897
17000
16898
/* Override any GCC internal prototype to avoid an error.
17001
@@ -17784,44 +15252,17 @@
16899
@@ -17784,44 +15238,17 @@
17002
16900
return 0;
17003
16901
}
17004
16902
_ACEOF
17048
16946
/* end confdefs.h. */
17049
16947
17050
16948
/* Override any GCC internal prototype to avoid an error.
17051
@@ -17839,59 +15280,30 @@
16949
@@ -17839,59 +15266,30 @@
17052
16950
return 0;
17053
16951
}
17054
16952
_ACEOF
17117
17015
/* end confdefs.h. */
17118
17016
17119
17017
/* Override any GCC internal prototype to avoid an error.
17120
@@ -17909,52 +15321,25 @@
17018
@@ -17909,52 +15307,25 @@
17121
17019
return 0;
17122
17020
}
17123
17021
_ACEOF
17178
17076
LIBS="$ac_xsave_LIBS"
17179
17077
17180
17078
# msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
17181
@@ -17965,341 +15350,20 @@
17079
@@ -17965,105 +15336,20 @@
17182
17080
# on Irix 5.2, according to T.E. Dickey.
17183
17081
# The functions gethostbyname, getservbyname, and inet_addr are
17184
17082
# in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
17207
17105
-#else
17208
17106
-# include <assert.h>
17209
17107
-#endif
17210
+ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
17211
+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
17212
17108
-
17213
17109
-#undef gethostbyname
17214
17110
-
17215
17111
-/* Override any GCC internal prototype to avoid an error.
17262
17158
-
17263
17159
- ac_cv_func_gethostbyname=no
17264
17160
-fi
17265
-
17161
+ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
17162
+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
17163
17266
17164
-rm -rf conftest.dSYM
17267
17165
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
17268
17166
- conftest$ac_exeext conftest.$ac_ext
17278
17176
+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
17279
17177
$as_echo_n "(cached) " >&6
17280
17178
else
17281
- ac_check_lib_save_LIBS=$LIBS
17282
-LIBS="-lnsl $LIBS"
17179
ac_check_lib_save_LIBS=$LIBS
17180
LIBS="-lnsl $LIBS"
17283
17181
-cat >conftest.$ac_ext <<_ACEOF
17284
17182
-/* confdefs.h. */
17285
17183
-_ACEOF
17286
17184
-cat confdefs.h >>conftest.$ac_ext
17287
17185
-cat >>conftest.$ac_ext <<_ACEOF
17288
-/* end confdefs.h. */
17289
-
17290
-/* Override any GCC internal prototype to avoid an error.
17291
- Use char because int might match the return type of a GCC
17292
- builtin and then its argument prototype would still apply. */
17293
-#ifdef __cplusplus
17294
-extern "C"
17295
-#endif
17296
-char gethostbyname ();
17297
-int
17298
-main ()
17299
-{
17300
-return gethostbyname ();
17301
- ;
17302
- return 0;
17303
-}
17304
-_ACEOF
17186
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17187
/* end confdefs.h. */
17188
17189
/* Override any GCC internal prototype to avoid an error.
17190
@@ -18081,59 +15367,30 @@
17191
return 0;
17192
}
17193
_ACEOF
17305
17194
-rm -f conftest.$ac_objext conftest$ac_exeext
17306
17195
-if { (ac_try="$ac_link"
17307
17196
-case "(($ac_try" in
17323
17212
- test "$cross_compiling" = yes ||
17324
17213
- $as_test_x conftest$ac_exeext
17325
17214
- }; then
17326
- ac_cv_lib_nsl_gethostbyname=yes
17327
-else
17215
+if ac_fn_c_try_link "$LINENO"; then :
17216
ac_cv_lib_nsl_gethostbyname=yes
17217
else
17328
17218
- $as_echo "$as_me: failed program was:" >&5
17329
17219
-sed 's/^/| /' conftest.$ac_ext >&5
17330
17220
-
17331
17221
- ac_cv_lib_nsl_gethostbyname=no
17332
-fi
17222
+ ac_cv_lib_nsl_gethostbyname=no
17223
fi
17333
17224
-
17334
17225
-rm -rf conftest.dSYM
17335
17226
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
17336
17227
- conftest$ac_exeext conftest.$ac_ext
17337
-LIBS=$ac_check_lib_save_LIBS
17338
-fi
17228
+rm -f core conftest.err conftest.$ac_objext \
17229
+ conftest$ac_exeext conftest.$ac_ext
17230
LIBS=$ac_check_lib_save_LIBS
17231
fi
17339
17232
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
17340
-$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
17233
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
17234
$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
17341
17235
-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
17342
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
17343
-fi
17344
-
17345
- if test $ac_cv_lib_nsl_gethostbyname = no; then
17236
+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
17237
X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
17238
fi
17239
17240
if test $ac_cv_lib_nsl_gethostbyname = no; then
17346
17241
- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
17347
-$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
17242
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
17243
$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
17348
17244
-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
17349
- $as_echo_n "(cached) " >&6
17350
-else
17351
- ac_check_lib_save_LIBS=$LIBS
17352
-LIBS="-lbsd $LIBS"
17245
+if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
17246
$as_echo_n "(cached) " >&6
17247
else
17248
ac_check_lib_save_LIBS=$LIBS
17249
LIBS="-lbsd $LIBS"
17353
17250
-cat >conftest.$ac_ext <<_ACEOF
17354
17251
-/* confdefs.h. */
17355
17252
-_ACEOF
17356
17253
-cat confdefs.h >>conftest.$ac_ext
17357
17254
-cat >>conftest.$ac_ext <<_ACEOF
17358
-/* end confdefs.h. */
17359
-
17360
-/* Override any GCC internal prototype to avoid an error.
17361
- Use char because int might match the return type of a GCC
17362
- builtin and then its argument prototype would still apply. */
17363
-#ifdef __cplusplus
17364
-extern "C"
17365
-#endif
17366
-char gethostbyname ();
17367
-int
17368
-main ()
17369
-{
17370
-return gethostbyname ();
17371
- ;
17372
- return 0;
17373
-}
17374
-_ACEOF
17255
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17256
/* end confdefs.h. */
17257
17258
/* Override any GCC internal prototype to avoid an error.
17259
@@ -18151,43 +15408,18 @@
17260
return 0;
17261
}
17262
_ACEOF
17375
17263
-rm -f conftest.$ac_objext conftest$ac_exeext
17376
17264
-if { (ac_try="$ac_link"
17377
17265
-case "(($ac_try" in
17393
17281
- test "$cross_compiling" = yes ||
17394
17282
- $as_test_x conftest$ac_exeext
17395
17283
- }; then
17396
- ac_cv_lib_bsd_gethostbyname=yes
17397
-else
17284
+if ac_fn_c_try_link "$LINENO"; then :
17285
ac_cv_lib_bsd_gethostbyname=yes
17286
else
17398
17287
- $as_echo "$as_me: failed program was:" >&5
17399
17288
-sed 's/^/| /' conftest.$ac_ext >&5
17400
17289
-
17401
17290
- ac_cv_lib_bsd_gethostbyname=no
17402
-fi
17291
+ ac_cv_lib_bsd_gethostbyname=no
17292
fi
17403
17293
-
17404
17294
-rm -rf conftest.dSYM
17405
17295
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
17406
17296
- conftest$ac_exeext conftest.$ac_ext
17407
-LIBS=$ac_check_lib_save_LIBS
17408
-fi
17297
+rm -f core conftest.err conftest.$ac_objext \
17298
+ conftest$ac_exeext conftest.$ac_ext
17299
LIBS=$ac_check_lib_save_LIBS
17300
fi
17409
17301
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
17410
-$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
17302
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
17303
$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
17411
17304
-if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then
17412
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
17413
-fi
17414
-
17415
- fi
17416
- fi
17417
-
17418
- # lieder@skyler.mavd.honeywell.com says without -lsocket,
17419
- # socket/setsockopt and other routines are undefined under SCO ODT
17420
- # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary
17421
- # on later versions), says Simon Leinen: it contains gethostby*
17422
- # variants that don't use the name server (or something). -lsocket
17423
- # must be given before -lnsl if both are needed. We assume that
17424
- # if connect needs -lnsl, so does gethostbyname.
17305
+if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
17306
X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
17307
fi
17308
17309
@@ -18201,33 +15433,21 @@
17310
# variants that don't use the name server (or something). -lsocket
17311
# must be given before -lnsl if both are needed. We assume that
17312
# if connect needs -lnsl, so does gethostbyname.
17425
17313
- { $as_echo "$as_me:$LINENO: checking for connect" >&5
17426
17314
-$as_echo_n "checking for connect... " >&6; }
17427
17315
-if test "${ac_cv_func_connect+set}" = set; then
17428
- $as_echo_n "(cached) " >&6
17429
-else
17430
- cat >conftest.$ac_ext <<_ACEOF
17431
-/* confdefs.h. */
17432
-_ACEOF
17433
-cat confdefs.h >>conftest.$ac_ext
17434
-cat >>conftest.$ac_ext <<_ACEOF
17435
-/* end confdefs.h. */
17436
-/* Define connect to an innocuous variant, in case <limits.h> declares connect.
17437
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
17438
-#define connect innocuous_connect
17439
-
17440
-/* System header to define __stub macros and hopefully few prototypes,
17441
- which can conflict with char connect (); below.
17442
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
17443
- <limits.h> exists even on freestanding compilers. */
17444
-
17445
-#ifdef __STDC__
17446
-# include <limits.h>
17447
-#else
17448
-# include <assert.h>
17449
-#endif
17450
-
17451
-#undef connect
17452
-
17453
-/* Override any GCC internal prototype to avoid an error.
17454
- Use char because int might match the return type of a GCC
17455
- builtin and then its argument prototype would still apply. */
17456
-#ifdef __cplusplus
17457
-extern "C"
17458
-#endif
17459
-char connect ();
17460
-/* The GNU C library defines this for functions which it implements
17461
- to always fail with ENOSYS. Some functions are actually named
17462
- something starting with __ and the normal name is an alias. */
17463
-#if defined __stub_connect || defined __stub___connect
17464
-choke me
17465
-#endif
17466
-
17467
-int
17468
-main ()
17469
-{
17470
-return connect ();
17471
- ;
17472
- return 0;
17473
-}
17474
-_ACEOF
17475
-rm -f conftest.$ac_objext conftest$ac_exeext
17476
-if { (ac_try="$ac_link"
17477
-case "(($ac_try" in
17478
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17479
- *) ac_try_echo=$ac_try;;
17480
-esac
17481
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
17482
-$as_echo "$ac_try_echo") >&5
17483
- (eval "$ac_link") 2>conftest.er1
17484
- ac_status=$?
17485
- grep -v '^ *+' conftest.er1 >conftest.err
17486
- rm -f conftest.er1
17487
- cat conftest.err >&5
17488
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
17489
- (exit $ac_status); } && {
17490
- test -z "$ac_c_werror_flag" ||
17491
- test ! -s conftest.err
17492
- } && test -s conftest$ac_exeext && {
17493
- test "$cross_compiling" = yes ||
17494
- $as_test_x conftest$ac_exeext
17495
- }; then
17496
- ac_cv_func_connect=yes
17497
-else
17498
- $as_echo "$as_me: failed program was:" >&5
17499
-sed 's/^/| /' conftest.$ac_ext >&5
17500
-
17501
- ac_cv_func_connect=no
17502
-fi
17503
-
17504
-rm -rf conftest.dSYM
17505
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
17506
- conftest$ac_exeext conftest.$ac_ext
17507
-fi
17508
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
17509
-$as_echo "$ac_cv_func_connect" >&6; }
17510
-
17511
- if test $ac_cv_func_connect = no; then
17512
- { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
17513
-$as_echo_n "checking for connect in -lsocket... " >&6; }
17514
-if test "${ac_cv_lib_socket_connect+set}" = set; then
17515
- $as_echo_n "(cached) " >&6
17516
-else
17517
- ac_check_lib_save_LIBS=$LIBS
17518
-LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
17519
-cat >conftest.$ac_ext <<_ACEOF
17520
-/* confdefs.h. */
17521
-_ACEOF
17522
-cat confdefs.h >>conftest.$ac_ext
17523
-cat >>conftest.$ac_ext <<_ACEOF
17524
+ ac_check_lib_save_LIBS=$LIBS
17525
+LIBS="-lnsl $LIBS"
17526
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17527
/* end confdefs.h. */
17528
17529
/* Override any GCC internal prototype to avoid an error.
17530
@@ -18308,85 +15372,40 @@
17531
#ifdef __cplusplus
17532
extern "C"
17533
#endif
17534
-char connect ();
17535
+char gethostbyname ();
17536
int
17537
main ()
17538
{
17539
-return connect ();
17540
+return gethostbyname ();
17541
;
17542
return 0;
17543
}
17544
_ACEOF
17545
-rm -f conftest.$ac_objext conftest$ac_exeext
17546
-if { (ac_try="$ac_link"
17547
-case "(($ac_try" in
17548
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17549
- *) ac_try_echo=$ac_try;;
17550
-esac
17551
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
17552
-$as_echo "$ac_try_echo") >&5
17553
- (eval "$ac_link") 2>conftest.er1
17554
- ac_status=$?
17555
- grep -v '^ *+' conftest.er1 >conftest.err
17556
- rm -f conftest.er1
17557
- cat conftest.err >&5
17558
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
17559
- (exit $ac_status); } && {
17560
- test -z "$ac_c_werror_flag" ||
17561
- test ! -s conftest.err
17562
- } && test -s conftest$ac_exeext && {
17563
- test "$cross_compiling" = yes ||
17564
- $as_test_x conftest$ac_exeext
17565
- }; then
17566
- ac_cv_lib_socket_connect=yes
17567
+if ac_fn_c_try_link "$LINENO"; then :
17568
+ ac_cv_lib_nsl_gethostbyname=yes
17569
else
17570
- $as_echo "$as_me: failed program was:" >&5
17571
-sed 's/^/| /' conftest.$ac_ext >&5
17572
-
17573
- ac_cv_lib_socket_connect=no
17574
+ ac_cv_lib_nsl_gethostbyname=no
17575
fi
17576
-
17577
-rm -rf conftest.dSYM
17578
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
17579
- conftest$ac_exeext conftest.$ac_ext
17580
+rm -f core conftest.err conftest.$ac_objext \
17581
+ conftest$ac_exeext conftest.$ac_ext
17582
LIBS=$ac_check_lib_save_LIBS
17583
fi
17584
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
17585
-$as_echo "$ac_cv_lib_socket_connect" >&6; }
17586
-if test "x$ac_cv_lib_socket_connect" = x""yes; then
17587
- X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
17588
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
17589
+$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
17590
+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
17591
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
17592
fi
17593
17594
- fi
17595
-
17596
- # Guillermo Gomez says -lposix is necessary on A/UX.
17597
- { $as_echo "$as_me:$LINENO: checking for remove" >&5
17598
-$as_echo_n "checking for remove... " >&6; }
17599
-if test "${ac_cv_func_remove+set}" = set; then
17600
+ if test $ac_cv_lib_nsl_gethostbyname = no; then
17601
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
17602
+$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
17603
+if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
17604
$as_echo_n "(cached) " >&6
17605
else
17606
- cat >conftest.$ac_ext <<_ACEOF
17607
-/* confdefs.h. */
17608
-_ACEOF
17609
-cat confdefs.h >>conftest.$ac_ext
17610
-cat >>conftest.$ac_ext <<_ACEOF
17611
+ ac_check_lib_save_LIBS=$LIBS
17612
+LIBS="-lbsd $LIBS"
17613
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17614
/* end confdefs.h. */
17615
-/* Define remove to an innocuous variant, in case <limits.h> declares remove.
17616
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
17617
-#define remove innocuous_remove
17618
-
17619
-/* System header to define __stub macros and hopefully few prototypes,
17620
- which can conflict with char remove (); below.
17621
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
17622
- <limits.h> exists even on freestanding compilers. */
17623
-
17624
-#ifdef __STDC__
17625
-# include <limits.h>
17626
-#else
17627
-# include <assert.h>
17628
-#endif
17629
-
17630
-#undef remove
17631
17632
/* Override any GCC internal prototype to avoid an error.
17633
Use char because int might match the return type of a GCC
17634
@@ -18394,71 +15413,54 @@
17635
#ifdef __cplusplus
17636
extern "C"
17637
#endif
17638
-char remove ();
17639
-/* The GNU C library defines this for functions which it implements
17640
- to always fail with ENOSYS. Some functions are actually named
17641
- something starting with __ and the normal name is an alias. */
17642
-#if defined __stub_remove || defined __stub___remove
17643
-choke me
17644
-#endif
17645
-
17646
+char gethostbyname ();
17647
int
17648
main ()
17649
{
17650
-return remove ();
17651
+return gethostbyname ();
17652
;
17653
return 0;
17654
}
17655
_ACEOF
17656
-rm -f conftest.$ac_objext conftest$ac_exeext
17657
-if { (ac_try="$ac_link"
17658
-case "(($ac_try" in
17659
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17660
- *) ac_try_echo=$ac_try;;
17661
-esac
17662
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
17663
-$as_echo "$ac_try_echo") >&5
17664
- (eval "$ac_link") 2>conftest.er1
17665
- ac_status=$?
17666
- grep -v '^ *+' conftest.er1 >conftest.err
17667
- rm -f conftest.er1
17668
- cat conftest.err >&5
17669
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
17670
- (exit $ac_status); } && {
17671
- test -z "$ac_c_werror_flag" ||
17672
- test ! -s conftest.err
17673
- } && test -s conftest$ac_exeext && {
17674
- test "$cross_compiling" = yes ||
17675
- $as_test_x conftest$ac_exeext
17676
- }; then
17677
- ac_cv_func_remove=yes
17678
+if ac_fn_c_try_link "$LINENO"; then :
17679
+ ac_cv_lib_bsd_gethostbyname=yes
17680
else
17681
- $as_echo "$as_me: failed program was:" >&5
17682
-sed 's/^/| /' conftest.$ac_ext >&5
17683
-
17684
- ac_cv_func_remove=no
17685
+ ac_cv_lib_bsd_gethostbyname=no
17686
fi
17687
+rm -f core conftest.err conftest.$ac_objext \
17688
+ conftest$ac_exeext conftest.$ac_ext
17689
+LIBS=$ac_check_lib_save_LIBS
17690
+fi
17691
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
17692
+$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
17693
+if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
17694
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
17695
+fi
17696
+
17697
+ fi
17698
+ fi
17699
+
17700
+ # lieder@skyler.mavd.honeywell.com says without -lsocket,
17701
+ # socket/setsockopt and other routines are undefined under SCO ODT
17702
+ # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary
17703
+ # on later versions), says Simon Leinen: it contains gethostby*
17704
+ # variants that don't use the name server (or something). -lsocket
17705
+ # must be given before -lnsl if both are needed. We assume that
17706
+ # if connect needs -lnsl, so does gethostbyname.
17707
17316
+ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
17708
17317
+if test "x$ac_cv_func_connect" = x""yes; then :
17709
17710
-rm -rf conftest.dSYM
17711
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
17712
- conftest$ac_exeext conftest.$ac_ext
17713
fi
17714
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
17715
-$as_echo "$ac_cv_func_remove" >&6; }
17716
17717
- if test $ac_cv_func_remove = no; then
17718
- { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
17719
-$as_echo_n "checking for remove in -lposix... " >&6; }
17720
-if test "${ac_cv_lib_posix_remove+set}" = set; then
17318
+
17319
+fi
17320
+
17721
17321
+ if test $ac_cv_func_connect = no; then
17722
17322
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
17723
17323
+$as_echo_n "checking for connect in -lsocket... " >&6; }
17724
17324
+if test "${ac_cv_lib_socket_connect+set}" = set; then :
17725
17325
$as_echo_n "(cached) " >&6
17726
17326
else
17727
ac_check_lib_save_LIBS=$LIBS
17728
-LIBS="-lposix $LIBS"
17729
-cat >conftest.$ac_ext <<_ACEOF
17327
- cat >conftest.$ac_ext <<_ACEOF
17730
17328
-/* confdefs.h. */
17731
17329
-_ACEOF
17732
17330
-cat confdefs.h >>conftest.$ac_ext
17733
17331
-cat >>conftest.$ac_ext <<_ACEOF
17332
+ ac_check_lib_save_LIBS=$LIBS
17734
17333
+LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
17735
17334
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17736
17335
/* end confdefs.h. */
17336
-/* Define connect to an innocuous variant, in case <limits.h> declares connect.
17337
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
17338
-#define connect innocuous_connect
17339
-
17340
-/* System header to define __stub macros and hopefully few prototypes,
17341
- which can conflict with char connect (); below.
17342
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
17343
- <limits.h> exists even on freestanding compilers. */
17344
-
17345
-#ifdef __STDC__
17346
-# include <limits.h>
17347
-#else
17348
-# include <assert.h>
17349
-#endif
17350
-
17351
-#undef connect
17737
17352
17738
17353
/* Override any GCC internal prototype to avoid an error.
17739
@@ -18467,85 +15469,48 @@
17740
#ifdef __cplusplus
17354
Use char because int might match the return type of a GCC
17355
@@ -18236,13 +15456,6 @@
17741
17356
extern "C"
17742
17357
#endif
17743
-char remove ();
17744
+char connect ();
17358
char connect ();
17359
-/* The GNU C library defines this for functions which it implements
17360
- to always fail with ENOSYS. Some functions are actually named
17361
- something starting with __ and the normal name is an alias. */
17362
-#if defined __stub_connect || defined __stub___connect
17363
-choke me
17364
-#endif
17365
-
17745
17366
int
17746
17367
main ()
17747
17368
{
17748
-return remove ();
17749
+return connect ();
17750
;
17369
@@ -18251,55 +15464,38 @@
17751
17370
return 0;
17752
17371
}
17753
17372
_ACEOF
17772
17391
- test "$cross_compiling" = yes ||
17773
17392
- $as_test_x conftest$ac_exeext
17774
17393
- }; then
17775
- ac_cv_lib_posix_remove=yes
17394
- ac_cv_func_connect=yes
17776
17395
+if ac_fn_c_try_link "$LINENO"; then :
17777
17396
+ ac_cv_lib_socket_connect=yes
17778
17397
else
17779
17398
- $as_echo "$as_me: failed program was:" >&5
17780
17399
-sed 's/^/| /' conftest.$ac_ext >&5
17781
17400
-
17782
- ac_cv_lib_posix_remove=no
17401
- ac_cv_func_connect=no
17783
17402
+ ac_cv_lib_socket_connect=no
17784
fi
17785
-
17786
-rm -rf conftest.dSYM
17787
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
17788
- conftest$ac_exeext conftest.$ac_ext
17403
+fi
17789
17404
+rm -f core conftest.err conftest.$ac_objext \
17790
17405
+ conftest$ac_exeext conftest.$ac_ext
17791
LIBS=$ac_check_lib_save_LIBS
17792
fi
17793
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
17794
-$as_echo "$ac_cv_lib_posix_remove" >&6; }
17795
-if test "x$ac_cv_lib_posix_remove" = x""yes; then
17796
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
17406
+LIBS=$ac_check_lib_save_LIBS
17407
+fi
17797
17408
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
17798
17409
+$as_echo "$ac_cv_lib_socket_connect" >&6; }
17799
17410
+if test "x$ac_cv_lib_socket_connect" = x""yes; then :
17800
17411
+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
17801
17412
fi
17802
17413
17803
fi
17804
17805
- # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
17806
- { $as_echo "$as_me:$LINENO: checking for shmat" >&5
17807
-$as_echo_n "checking for shmat... " >&6; }
17808
-if test "${ac_cv_func_shmat+set}" = set; then
17414
-rm -rf conftest.dSYM
17415
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
17416
- conftest$ac_exeext conftest.$ac_ext
17417
+ fi
17418
+
17809
17419
+ # Guillermo Gomez says -lposix is necessary on A/UX.
17810
17420
+ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
17811
17421
+if test "x$ac_cv_func_remove" = x""yes; then :
17812
17422
+
17813
+fi
17814
+
17423
fi
17424
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
17425
-$as_echo "$ac_cv_func_connect" >&6; }
17426
17427
- if test $ac_cv_func_connect = no; then
17428
- { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
17429
-$as_echo_n "checking for connect in -lsocket... " >&6; }
17430
-if test "${ac_cv_lib_socket_connect+set}" = set; then
17815
17431
+ if test $ac_cv_func_remove = no; then
17816
17432
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
17817
17433
+$as_echo_n "checking for remove in -lposix... " >&6; }
17818
17434
+if test "${ac_cv_lib_posix_remove+set}" = set; then :
17819
17435
$as_echo_n "(cached) " >&6
17820
17436
else
17821
- cat >conftest.$ac_ext <<_ACEOF
17437
ac_check_lib_save_LIBS=$LIBS
17438
-LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
17439
-cat >conftest.$ac_ext <<_ACEOF
17822
17440
-/* confdefs.h. */
17823
17441
-_ACEOF
17824
17442
-cat confdefs.h >>conftest.$ac_ext
17825
17443
-cat >>conftest.$ac_ext <<_ACEOF
17826
+ ac_check_lib_save_LIBS=$LIBS
17827
17444
+LIBS="-lposix $LIBS"
17828
17445
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17829
17446
/* end confdefs.h. */
17830
-/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
17831
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
17832
-#define shmat innocuous_shmat
17833
-
17834
-/* System header to define __stub macros and hopefully few prototypes,
17835
- which can conflict with char shmat (); below.
17836
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
17837
- <limits.h> exists even on freestanding compilers. */
17838
-
17839
-#ifdef __STDC__
17840
-# include <limits.h>
17841
-#else
17842
-# include <assert.h>
17843
-#endif
17844
-
17845
-#undef shmat
17846
17447
17847
17448
/* Override any GCC internal prototype to avoid an error.
17848
Use char because int might match the return type of a GCC
17849
@@ -18553,71 +15518,47 @@
17449
@@ -18308,316 +15504,47 @@
17850
17450
#ifdef __cplusplus
17851
17451
extern "C"
17852
17452
#endif
17853
-char shmat ();
17854
-/* The GNU C library defines this for functions which it implements
17855
- to always fail with ENOSYS. Some functions are actually named
17856
- something starting with __ and the normal name is an alias. */
17857
-#if defined __stub_shmat || defined __stub___shmat
17858
-choke me
17859
-#endif
17860
-
17453
-char connect ();
17861
17454
+char remove ();
17862
17455
int
17863
17456
main ()
17864
17457
{
17865
-return shmat ();
17458
-return connect ();
17866
17459
+return remove ();
17867
17460
;
17868
17461
return 0;
17889
17482
- test "$cross_compiling" = yes ||
17890
17483
- $as_test_x conftest$ac_exeext
17891
17484
- }; then
17892
- ac_cv_func_shmat=yes
17485
- ac_cv_lib_socket_connect=yes
17486
-else
17487
- $as_echo "$as_me: failed program was:" >&5
17488
-sed 's/^/| /' conftest.$ac_ext >&5
17489
-
17490
- ac_cv_lib_socket_connect=no
17491
-fi
17492
-
17493
-rm -rf conftest.dSYM
17494
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
17495
- conftest$ac_exeext conftest.$ac_ext
17496
-LIBS=$ac_check_lib_save_LIBS
17497
-fi
17498
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
17499
-$as_echo "$ac_cv_lib_socket_connect" >&6; }
17500
-if test "x$ac_cv_lib_socket_connect" = x""yes; then
17501
- X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
17502
-fi
17503
-
17504
- fi
17505
-
17506
- # Guillermo Gomez says -lposix is necessary on A/UX.
17507
- { $as_echo "$as_me:$LINENO: checking for remove" >&5
17508
-$as_echo_n "checking for remove... " >&6; }
17509
-if test "${ac_cv_func_remove+set}" = set; then
17510
- $as_echo_n "(cached) " >&6
17511
-else
17512
- cat >conftest.$ac_ext <<_ACEOF
17513
-/* confdefs.h. */
17514
-_ACEOF
17515
-cat confdefs.h >>conftest.$ac_ext
17516
-cat >>conftest.$ac_ext <<_ACEOF
17517
-/* end confdefs.h. */
17518
-/* Define remove to an innocuous variant, in case <limits.h> declares remove.
17519
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
17520
-#define remove innocuous_remove
17521
-
17522
-/* System header to define __stub macros and hopefully few prototypes,
17523
- which can conflict with char remove (); below.
17524
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
17525
- <limits.h> exists even on freestanding compilers. */
17526
-
17527
-#ifdef __STDC__
17528
-# include <limits.h>
17529
-#else
17530
-# include <assert.h>
17531
-#endif
17532
-
17533
-#undef remove
17534
-
17535
-/* Override any GCC internal prototype to avoid an error.
17536
- Use char because int might match the return type of a GCC
17537
- builtin and then its argument prototype would still apply. */
17538
-#ifdef __cplusplus
17539
-extern "C"
17540
-#endif
17541
-char remove ();
17542
-/* The GNU C library defines this for functions which it implements
17543
- to always fail with ENOSYS. Some functions are actually named
17544
- something starting with __ and the normal name is an alias. */
17545
-#if defined __stub_remove || defined __stub___remove
17546
-choke me
17547
-#endif
17548
-
17549
-int
17550
-main ()
17551
-{
17552
-return remove ();
17553
- ;
17554
- return 0;
17555
-}
17556
-_ACEOF
17557
-rm -f conftest.$ac_objext conftest$ac_exeext
17558
-if { (ac_try="$ac_link"
17559
-case "(($ac_try" in
17560
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17561
- *) ac_try_echo=$ac_try;;
17562
-esac
17563
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
17564
-$as_echo "$ac_try_echo") >&5
17565
- (eval "$ac_link") 2>conftest.er1
17566
- ac_status=$?
17567
- grep -v '^ *+' conftest.er1 >conftest.err
17568
- rm -f conftest.er1
17569
- cat conftest.err >&5
17570
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
17571
- (exit $ac_status); } && {
17572
- test -z "$ac_c_werror_flag" ||
17573
- test ! -s conftest.err
17574
- } && test -s conftest$ac_exeext && {
17575
- test "$cross_compiling" = yes ||
17576
- $as_test_x conftest$ac_exeext
17577
- }; then
17578
- ac_cv_func_remove=yes
17579
-else
17580
- $as_echo "$as_me: failed program was:" >&5
17581
-sed 's/^/| /' conftest.$ac_ext >&5
17582
-
17583
- ac_cv_func_remove=no
17584
-fi
17585
-
17586
-rm -rf conftest.dSYM
17587
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
17588
- conftest$ac_exeext conftest.$ac_ext
17589
-fi
17590
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
17591
-$as_echo "$ac_cv_func_remove" >&6; }
17592
-
17593
- if test $ac_cv_func_remove = no; then
17594
- { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
17595
-$as_echo_n "checking for remove in -lposix... " >&6; }
17596
-if test "${ac_cv_lib_posix_remove+set}" = set; then
17597
- $as_echo_n "(cached) " >&6
17598
-else
17599
- ac_check_lib_save_LIBS=$LIBS
17600
-LIBS="-lposix $LIBS"
17601
-cat >conftest.$ac_ext <<_ACEOF
17602
-/* confdefs.h. */
17603
-_ACEOF
17604
-cat confdefs.h >>conftest.$ac_ext
17605
-cat >>conftest.$ac_ext <<_ACEOF
17606
-/* end confdefs.h. */
17607
-
17608
-/* Override any GCC internal prototype to avoid an error.
17609
- Use char because int might match the return type of a GCC
17610
- builtin and then its argument prototype would still apply. */
17611
-#ifdef __cplusplus
17612
-extern "C"
17613
-#endif
17614
-char remove ();
17615
-int
17616
-main ()
17617
-{
17618
-return remove ();
17619
- ;
17620
- return 0;
17621
-}
17622
-_ACEOF
17623
-rm -f conftest.$ac_objext conftest$ac_exeext
17624
-if { (ac_try="$ac_link"
17625
-case "(($ac_try" in
17626
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17627
- *) ac_try_echo=$ac_try;;
17628
-esac
17629
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
17630
-$as_echo "$ac_try_echo") >&5
17631
- (eval "$ac_link") 2>conftest.er1
17632
- ac_status=$?
17633
- grep -v '^ *+' conftest.er1 >conftest.err
17634
- rm -f conftest.er1
17635
- cat conftest.err >&5
17636
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
17637
- (exit $ac_status); } && {
17638
- test -z "$ac_c_werror_flag" ||
17639
- test ! -s conftest.err
17640
- } && test -s conftest$ac_exeext && {
17641
- test "$cross_compiling" = yes ||
17642
- $as_test_x conftest$ac_exeext
17643
- }; then
17893
17644
+if ac_fn_c_try_link "$LINENO"; then :
17894
+ ac_cv_lib_posix_remove=yes
17645
ac_cv_lib_posix_remove=yes
17895
17646
else
17896
17647
- $as_echo "$as_me: failed program was:" >&5
17897
17648
-sed 's/^/| /' conftest.$ac_ext >&5
17898
17649
-
17899
- ac_cv_func_shmat=no
17650
- ac_cv_lib_posix_remove=no
17900
17651
+ ac_cv_lib_posix_remove=no
17901
+fi
17652
fi
17653
-
17654
-rm -rf conftest.dSYM
17655
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
17656
- conftest$ac_exeext conftest.$ac_ext
17902
17657
+rm -f core conftest.err conftest.$ac_objext \
17903
17658
+ conftest$ac_exeext conftest.$ac_ext
17904
+LIBS=$ac_check_lib_save_LIBS
17905
+fi
17659
LIBS=$ac_check_lib_save_LIBS
17660
fi
17661
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
17906
17662
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
17907
+$as_echo "$ac_cv_lib_posix_remove" >&6; }
17663
$as_echo "$ac_cv_lib_posix_remove" >&6; }
17664
-if test "x$ac_cv_lib_posix_remove" = x""yes; then
17908
17665
+if test "x$ac_cv_lib_posix_remove" = x""yes; then :
17909
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
17666
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
17910
17667
fi
17911
17668
17912
-rm -rf conftest.dSYM
17913
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
17914
- conftest$ac_exeext conftest.$ac_ext
17915
+ fi
17916
+
17917
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
17669
fi
17670
17671
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
17672
- { $as_echo "$as_me:$LINENO: checking for shmat" >&5
17673
-$as_echo_n "checking for shmat... " >&6; }
17674
-if test "${ac_cv_func_shmat+set}" = set; then
17675
- $as_echo_n "(cached) " >&6
17676
-else
17677
- cat >conftest.$ac_ext <<_ACEOF
17678
-/* confdefs.h. */
17679
-_ACEOF
17680
-cat confdefs.h >>conftest.$ac_ext
17681
-cat >>conftest.$ac_ext <<_ACEOF
17682
-/* end confdefs.h. */
17683
-/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
17684
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
17685
-#define shmat innocuous_shmat
17686
-
17687
-/* System header to define __stub macros and hopefully few prototypes,
17688
- which can conflict with char shmat (); below.
17689
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
17690
- <limits.h> exists even on freestanding compilers. */
17918
17691
+ ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
17919
17692
+if test "x$ac_cv_func_shmat" = x""yes; then :
17920
+
17693
17694
-#ifdef __STDC__
17695
-# include <limits.h>
17696
-#else
17697
-# include <assert.h>
17698
-#endif
17699
-
17700
-#undef shmat
17701
-
17702
-/* Override any GCC internal prototype to avoid an error.
17703
- Use char because int might match the return type of a GCC
17704
- builtin and then its argument prototype would still apply. */
17705
-#ifdef __cplusplus
17706
-extern "C"
17707
-#endif
17708
-char shmat ();
17709
-/* The GNU C library defines this for functions which it implements
17710
- to always fail with ENOSYS. Some functions are actually named
17711
- something starting with __ and the normal name is an alias. */
17712
-#if defined __stub_shmat || defined __stub___shmat
17713
-choke me
17714
-#endif
17715
-
17716
-int
17717
-main ()
17718
-{
17719
-return shmat ();
17720
- ;
17721
- return 0;
17722
-}
17723
-_ACEOF
17724
-rm -f conftest.$ac_objext conftest$ac_exeext
17725
-if { (ac_try="$ac_link"
17726
-case "(($ac_try" in
17727
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17728
- *) ac_try_echo=$ac_try;;
17729
-esac
17730
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
17731
-$as_echo "$ac_try_echo") >&5
17732
- (eval "$ac_link") 2>conftest.er1
17733
- ac_status=$?
17734
- grep -v '^ *+' conftest.er1 >conftest.err
17735
- rm -f conftest.er1
17736
- cat conftest.err >&5
17737
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
17738
- (exit $ac_status); } && {
17739
- test -z "$ac_c_werror_flag" ||
17740
- test ! -s conftest.err
17741
- } && test -s conftest$ac_exeext && {
17742
- test "$cross_compiling" = yes ||
17743
- $as_test_x conftest$ac_exeext
17744
- }; then
17745
- ac_cv_func_shmat=yes
17746
-else
17747
- $as_echo "$as_me: failed program was:" >&5
17748
-sed 's/^/| /' conftest.$ac_ext >&5
17749
-
17750
- ac_cv_func_shmat=no
17921
17751
fi
17752
17753
-rm -rf conftest.dSYM
17754
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
17755
- conftest$ac_exeext conftest.$ac_ext
17756
-fi
17922
17757
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
17923
17758
-$as_echo "$ac_cv_func_shmat" >&6; }
17924
17759
-
17925
17760
if test $ac_cv_func_shmat = no; then
17926
17761
- { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
17927
17762
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
17941
17776
/* end confdefs.h. */
17942
17777
17943
17778
/* Override any GCC internal prototype to avoid an error.
17944
@@ -18635,43 +15576,18 @@
17779
@@ -18635,43 +15562,18 @@
17945
17780
return 0;
17946
17781
}
17947
17782
_ACEOF
17991
17826
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
17992
17827
fi
17993
17828
17994
@@ -18687,18 +15603,14 @@
17829
@@ -18687,18 +15589,14 @@
17995
17830
# These have to be linked with before -lX11, unlike the other
17996
17831
# libraries we check for below, so use a different variable.
17997
17832
# John Interrante, Karl Berry
18013
17848
/* end confdefs.h. */
18014
17849
18015
17850
/* Override any GCC internal prototype to avoid an error.
18016
@@ -18716,43 +15628,18 @@
17851
@@ -18716,43 +15614,18 @@
18017
17852
return 0;
18018
17853
}
18019
17854
_ACEOF
18063
17898
X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
18064
17899
fi
18065
17900
18066
@@ -18762,28 +15649,21 @@
17901
@@ -18762,28 +15635,21 @@
18067
17902
18068
17903
# X not found
18069
17904
if test x$no_x = xyes ; then
18096
17931
/* end confdefs.h. */
18097
17932
18098
17933
/* Override any GCC internal prototype to avoid an error.
18099
@@ -18801,43 +15681,18 @@
17934
@@ -18801,43 +15667,18 @@
18100
17935
return 0;
18101
17936
}
18102
17937
_ACEOF
18146
17981
cat >>confdefs.h <<_ACEOF
18147
17982
#define HAVE_LIBX11 1
18148
17983
_ACEOF
18149
@@ -18845,24 +15700,17 @@
17984
@@ -18845,24 +15686,17 @@
18150
17985
LIBS="-lX11 $LIBS"
18151
17986
18152
17987
else
18175
18010
/* end confdefs.h. */
18176
18011
18177
18012
/* Override any GCC internal prototype to avoid an error.
18178
@@ -18880,43 +15728,18 @@
18013
@@ -18880,43 +15714,18 @@
18179
18014
return 0;
18180
18015
}
18181
18016
_ACEOF
18225
18060
cat >>confdefs.h <<_ACEOF
18226
18061
#define HAVE_LIBXAU 1
18227
18062
_ACEOF
18228
@@ -18924,9 +15747,7 @@
18063
@@ -18924,9 +15733,7 @@
18229
18064
LIBS="-lXau $LIBS"
18230
18065
18231
18066
else
18236
18071
fi
18237
18072
18238
18073
CFLAGS="$gp_save_cflags"
18239
@@ -18937,7 +15758,7 @@
18074
@@ -18937,7 +15744,7 @@
18240
18075
else
18241
18076
X_CFLAGS=$pkg_cv_X_CFLAGS
18242
18077
X_LIBS=$pkg_cv_X_LIBS
18245
18080
$as_echo "yes" >&6; }
18246
18081
:
18247
18082
fi
18248
@@ -18947,9 +15768,7 @@
18083
@@ -18947,9 +15754,7 @@
18249
18084
18250
18085
if $PKG_CONFIG --exists "xrandr >= 1.2.0" ; then
18251
18086
18256
18091
18257
18092
have_randr=yes
18258
18093
else
18259
@@ -18963,164 +15782,25 @@
18260
BONOBO_IDLDIR="`$PKG_CONFIG --variable=idldir libbonobo-2.0`"
18261
18262
18263
-BONOBO_ACT_IDLDIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
18264
-
18265
-
18266
-
18267
-GETTEXT_PACKAGE=gnome-panel-2.0
18268
-
18269
-cat >>confdefs.h <<_ACEOF
18270
-#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
18271
-_ACEOF
18272
-
18273
-
18274
-
18275
-
18276
+BONOBO_ACT_IDLDIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
18277
18094
@@ -18976,151 +15781,12 @@
18095
18096
18097
18098
-
18278
18099
-for ac_header in locale.h
18279
18100
-do
18280
18101
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
18323
18144
-else
18324
18145
- $as_echo "$as_me: failed program was:" >&5
18325
18146
-sed 's/^/| /' conftest.$ac_ext >&5
18326
18147
-
18327
18148
- ac_header_compiler=no
18328
18149
-fi
18329
18150
-
18330
18151
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
18331
18152
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
18332
18153
-$as_echo "$ac_header_compiler" >&6; }
18333
+GETTEXT_PACKAGE=gnome-panel-2.0
18334
18154
-
18335
18155
-# Is the header present?
18336
18156
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
18337
18157
-$as_echo_n "checking $ac_header presence... " >&6; }
18342
18162
-cat >>conftest.$ac_ext <<_ACEOF
18343
18163
-/* end confdefs.h. */
18344
18164
-#include <$ac_header>
18345
+cat >>confdefs.h <<_ACEOF
18346
+#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
18347
_ACEOF
18165
-_ACEOF
18348
18166
-if { (ac_try="$ac_cpp conftest.$ac_ext"
18349
18167
-case "(($ac_try" in
18350
18168
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18366
18184
-else
18367
18185
- $as_echo "$as_me: failed program was:" >&5
18368
18186
-sed 's/^/| /' conftest.$ac_ext >&5
18369
18187
-
18370
18188
- ac_header_preproc=no
18371
18189
-fi
18372
18190
-
18373
18191
-rm -f conftest.err conftest.$ac_ext
18374
18192
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
18375
18193
-$as_echo "$ac_header_preproc" >&6; }
18376
18194
-
18377
18195
-# So? What about this header?
18378
18196
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
18379
18197
- yes:no: )
18415
18233
- $as_echo "$as_val"'`
18416
18234
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
18417
18235
-$as_echo "$ac_res" >&6; }
18418
18236
-
18419
18237
-fi
18420
18238
-as_val=`eval 'as_val=${'$as_ac_Header'}
18421
18239
- $as_echo "$as_val"'`
18430
18248
_ACEOF
18431
18249
18432
18250
fi
18433
@@ -19128,16 +15808,12 @@
18251
@@ -19128,16 +15794,12 @@
18434
18252
done
18435
18253
18436
18254
if test $ac_cv_header_locale_h = yes; then
18450
18268
/* end confdefs.h. */
18451
18269
#include <locale.h>
18452
18270
int
18453
@@ -19148,46 +15824,19 @@
18271
@@ -19148,46 +15810,19 @@
18454
18272
return 0;
18455
18273
}
18456
18274
_ACEOF
18503
18321
18504
18322
fi
18505
18323
fi
18506
@@ -19200,155 +15849,20 @@
18324
@@ -19200,155 +15835,20 @@
18507
18325
XGETTEXT=:
18508
18326
INTLLIBS=
18509
18327
18664
18482
/* end confdefs.h. */
18665
18483
18666
18484
#include <libintl.h>
18667
@@ -19361,54 +15875,25 @@
18485
@@ -19361,54 +15861,25 @@
18668
18486
return 0;
18669
18487
}
18670
18488
_ACEOF
18727
18545
/* end confdefs.h. */
18728
18546
18729
18547
#include <libintl.h>
18730
@@ -19421,141 +15906,26 @@
18548
@@ -19421,141 +15892,26 @@
18731
18549
return 0;
18732
18550
}
18733
18551
_ACEOF
18879
18697
_ACEOF
18880
18698
18881
18699
fi
18882
@@ -19570,18 +15940,14 @@
18700
@@ -19570,18 +15926,14 @@
18883
18701
|| test "$gt_cv_func_ngettext_libc" != "yes" \
18884
18702
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
18885
18703
18901
18719
/* end confdefs.h. */
18902
18720
18903
18721
/* Override any GCC internal prototype to avoid an error.
18904
@@ -19591,63 +15957,34 @@
18722
@@ -19591,63 +15943,34 @@
18905
18723
extern "C"
18906
18724
#endif
18907
18725
char bindtextdomain ();
18982
18800
/* end confdefs.h. */
18983
18801
18984
18802
/* Override any GCC internal prototype to avoid an error.
18985
@@ -19665,55 +16002,26 @@
18803
@@ -19665,55 +15988,26 @@
18986
18804
return 0;
18987
18805
}
18988
18806
_ACEOF
19047
18865
/* end confdefs.h. */
19048
18866
19049
18867
/* Override any GCC internal prototype to avoid an error.
19050
@@ -19731,43 +16039,18 @@
18868
@@ -19731,43 +16025,18 @@
19051
18869
return 0;
19052
18870
}
19053
18871
_ACEOF
19097
18915
gt_cv_func_dgettext_libintl=yes
19098
18916
fi
19099
18917
19100
@@ -19777,22 +16060,18 @@
18918
@@ -19777,22 +16046,18 @@
19101
18919
19102
18920
19103
18921
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
19125
18943
/* end confdefs.h. */
19126
18944
19127
18945
/* Override any GCC internal prototype to avoid an error.
19128
@@ -19810,55 +16089,26 @@
18946
@@ -19810,55 +16075,26 @@
19129
18947
return 0;
19130
18948
}
19131
18949
_ACEOF
19190
19008
/* end confdefs.h. */
19191
19009
19192
19010
/* Override any GCC internal prototype to avoid an error.
19193
@@ -19876,43 +16126,18 @@
19011
@@ -19876,43 +16112,18 @@
19194
19012
return 0;
19195
19013
}
19196
19014
_ACEOF
19240
19058
gt_cv_func_dgettext_libintl=yes
19241
19059
libintl_extra_libs=-liconv
19242
19060
else
19243
@@ -19934,102 +16159,12 @@
19061
@@ -19934,102 +16145,12 @@
19244
19062
glib_save_LIBS="$LIBS"
19245
19063
LIBS="$LIBS -lintl $libintl_extra_libs"
19246
19064
unset ac_cv_func_bind_textdomain_codeset
19348
19166
_ACEOF
19349
19167
19350
19168
fi
19351
@@ -20059,15 +16194,13 @@
19169
@@ -20059,15 +16180,13 @@
19352
19170
19353
19171
if test "$gt_cv_have_gettext" = "yes"; then
19354
19172
19367
19185
$as_echo_n "(cached) " >&6
19368
19186
else
19369
19187
case "$MSGFMT" in
19370
@@ -20092,118 +16225,28 @@
19188
@@ -20092,118 +16211,28 @@
19371
19189
fi
19372
19190
MSGFMT="$ac_cv_path_MSGFMT"
19373
19191
if test "$MSGFMT" != "no"; then
19494
19312
$as_echo_n "checking if msgfmt accepts -c... " >&6; }
19495
19313
cat >conftest.foo <<_ACEOF
19496
19314
19497
@@ -20218,14 +16261,14 @@
19315
@@ -20218,14 +16247,14 @@
19498
19316
"Content-Transfer-Encoding: 8bit\n"
19499
19317
19500
19318
_ACEOF
19514
19332
$as_echo "no" >&6; }
19515
19333
echo "$as_me: failed input was:" >&5
19516
19334
sed 's/^/| /' conftest.foo >&5
19517
@@ -20233,9 +16276,9 @@
19335
@@ -20233,9 +16262,9 @@
19518
19336
19519
19337
# Extract the first word of "gmsgfmt", so it can be a program name with args.
19520
19338
set dummy gmsgfmt; ac_word=$2
19526
19344
$as_echo_n "(cached) " >&6
19527
19345
else
19528
19346
case $GMSGFMT in
19529
@@ -20248,14 +16291,14 @@
19347
@@ -20248,14 +16277,14 @@
19530
19348
do
19531
19349
IFS=$as_save_IFS
19532
19350
test -z "$as_dir" && as_dir=.
19544
19362
IFS=$as_save_IFS
19545
19363
19546
19364
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
19547
@@ -20264,19 +16307,19 @@
19365
@@ -20264,19 +16293,19 @@
19548
19366
fi
19549
19367
GMSGFMT=$ac_cv_path_GMSGFMT
19550
19368
if test -n "$GMSGFMT"; then
19568
19386
$as_echo_n "(cached) " >&6
19569
19387
else
19570
19388
case "$XGETTEXT" in
19571
@@ -20301,144 +16344,33 @@
19389
@@ -20301,144 +16330,33 @@
19572
19390
fi
19573
19391
XGETTEXT="$ac_cv_path_XGETTEXT"
19574
19392
if test "$XGETTEXT" != ":"; then
19729
19547
CATOBJEXT=.gmo
19730
19548
DATADIRNAME=share
19731
19549
else
19732
@@ -20453,10 +16385,8 @@
19550
@@ -20453,10 +16371,8 @@
19733
19551
;;
19734
19552
esac
19735
19553
fi
19742
19560
LIBS="$glib_save_LIBS"
19743
19561
INSTOBJEXT=.mo
19744
19562
else
19745
@@ -20470,9 +16400,7 @@
19563
@@ -20470,9 +16386,7 @@
19746
19564
19747
19565
if test "$gt_cv_have_gettext" = "yes" ; then
19748
19566
19753
19571
19754
19572
fi
19755
19573
19756
@@ -20480,7 +16408,7 @@
19574
@@ -20480,7 +16394,7 @@
19757
19575
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
19758
19576
: ;
19759
19577
else
19762
19580
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
19763
19581
XGETTEXT=":"
19764
19582
fi
19765
@@ -20513,7 +16441,7 @@
19583
@@ -20513,7 +16427,7 @@
19766
19584
if test "x$ALL_LINGUAS" = "x"; then
19767
19585
LINGUAS=
19768
19586
else
19771
19589
$as_echo_n "checking for catalogs to be installed... " >&6; }
19772
19590
NEW_LINGUAS=
19773
19591
for presentlang in $ALL_LINGUAS; do
19774
@@ -20538,7 +16466,7 @@
19592
@@ -20538,7 +16452,7 @@
19775
19593
fi
19776
19594
done
19777
19595
LINGUAS=$NEW_LINGUAS
19780
19598
$as_echo "$LINGUAS" >&6; }
19781
19599
fi
19782
19600
19783
@@ -20576,9 +16504,9 @@
19601
@@ -20576,9 +16490,9 @@
19784
19602
19785
19603
# Extract the first word of "gtkdoc-check", so it can be a program name with args.
19786
19604
set dummy gtkdoc-check; ac_word=$2
19792
19610
$as_echo_n "(cached) " >&6
19793
19611
else
19794
19612
case $GTKDOC_CHECK in
19795
@@ -20591,14 +16519,14 @@
19613
@@ -20591,14 +16505,14 @@
19796
19614
do
19797
19615
IFS=$as_save_IFS
19798
19616
test -z "$as_dir" && as_dir=.
19810
19628
IFS=$as_save_IFS
19811
19629
19812
19630
;;
19813
@@ -20606,10 +16534,10 @@
19631
@@ -20606,10 +16520,10 @@
19814
19632
fi
19815
19633
GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
19816
19634
if test -n "$GTKDOC_CHECK"; then
19823
19641
$as_echo "no" >&6; }
19824
19642
fi
19825
19643
19826
@@ -20618,9 +16546,9 @@
19644
@@ -20618,9 +16532,9 @@
19827
19645
do
19828
19646
# Extract the first word of "$ac_prog", so it can be a program name with args.
19829
19647
set dummy $ac_prog; ac_word=$2
19835
19653
$as_echo_n "(cached) " >&6
19836
19654
else
19837
19655
case $GTKDOC_REBASE in
19838
@@ -20633,14 +16561,14 @@
19656
@@ -20633,14 +16547,14 @@
19839
19657
do
19840
19658
IFS=$as_save_IFS
19841
19659
test -z "$as_dir" && as_dir=.
19853
19671
IFS=$as_save_IFS
19854
19672
19855
19673
;;
19856
@@ -20648,10 +16576,10 @@
19674
@@ -20648,10 +16562,10 @@
19857
19675
fi
19858
19676
GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
19859
19677
if test -n "$GTKDOC_REBASE"; then
19866
19684
$as_echo "no" >&6; }
19867
19685
fi
19868
19686
19869
@@ -20662,9 +16590,9 @@
19687
@@ -20662,9 +16576,9 @@
19870
19688
19871
19689
# Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
19872
19690
set dummy gtkdoc-mkpdf; ac_word=$2
19878
19696
$as_echo_n "(cached) " >&6
19879
19697
else
19880
19698
case $GTKDOC_MKPDF in
19881
@@ -20677,14 +16605,14 @@
19699
@@ -20677,14 +16591,14 @@
19882
19700
do
19883
19701
IFS=$as_save_IFS
19884
19702
test -z "$as_dir" && as_dir=.
19896
19714
IFS=$as_save_IFS
19897
19715
19898
19716
;;
19899
@@ -20692,10 +16620,10 @@
19717
@@ -20692,10 +16606,10 @@
19900
19718
fi
19901
19719
GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
19902
19720
if test -n "$GTKDOC_MKPDF"; then
19909
19727
$as_echo "no" >&6; }
19910
19728
fi
19911
19729
19912
@@ -20703,7 +16631,7 @@
19730
@@ -20703,7 +16617,7 @@
19913
19731
19914
19732
19915
19733
# Check whether --with-html-dir was given.
19918
19736
withval=$with_html_dir;
19919
19737
else
19920
19738
with_html_dir='${datadir}/gtk-doc/html'
19921
@@ -20713,7 +16641,7 @@
19739
@@ -20713,7 +16627,7 @@
19922
19740
19923
19741
19924
19742
# Check whether --enable-gtk-doc was given.
19927
19745
enableval=$enable_gtk_doc;
19928
19746
else
19929
19747
enable_gtk_doc=no
19930
@@ -20722,33 +16650,31 @@
19748
@@ -20722,33 +16636,31 @@
19931
19749
19932
19750
if test x$enable_gtk_doc = xyes; then
19933
19751
if test -n "$PKG_CONFIG" && \
19969
19787
enableval=$enable_gtk_doc_pdf;
19970
19788
else
19971
19789
enable_gtk_doc_pdf=no
19972
@@ -20806,35 +16732,33 @@
19790
@@ -20806,35 +16718,33 @@
19973
19791
19974
19792
gdu_cv_version_required=0.3.2
19975
19793
20013
19831
withval=$with_help_dir;
20014
19832
else
20015
19833
with_help_dir='${datadir}/gnome/help'
20016
@@ -20845,7 +16769,7 @@
19834
@@ -20845,7 +16755,7 @@
20017
19835
20018
19836
20019
19837
# Check whether --with-omf-dir was given.
20022
19840
withval=$with_omf_dir;
20023
19841
else
20024
19842
with_omf_dir='${datadir}/omf'
20025
@@ -20856,7 +16780,7 @@
19843
@@ -20856,7 +16766,7 @@
20026
19844
20027
19845
20028
19846
# Check whether --with-help-formats was given.
20031
19849
withval=$with_help_formats;
20032
19850
else
20033
19851
with_help_formats=''
20034
@@ -20866,7 +16790,7 @@
19852
@@ -20866,7 +16776,7 @@
20035
19853
20036
19854
20037
19855
# Check whether --enable-scrollkeeper was given.
20040
19858
enableval=$enable_scrollkeeper;
20041
19859
else
20042
19860
enable_scrollkeeper=yes
20043
@@ -20904,13 +16828,13 @@
19861
@@ -20904,13 +16814,13 @@
20044
19862
20045
19863
20046
19864
# Check whether --with-gconf-source was given.
20056
19874
$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
20057
19875
20058
19876
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
20059
@@ -20919,22 +16843,20 @@
19877
@@ -20919,22 +16829,20 @@
20060
19878
20061
19879
20062
19880
# Check whether --with-gconf-schema-file-dir was given.
20083
19901
esac
20084
19902
fi
20085
19903
20086
@@ -20952,9 +16874,7 @@
19904
@@ -20952,9 +16860,7 @@
20087
19905
*-*-solaris*)
20088
19906
ostype=solaris
20089
19907
20094
19912
20095
19913
;;
20096
19914
esac
20097
@@ -20963,9 +16883,9 @@
19915
@@ -20963,9 +16869,9 @@
20098
19916
do
20099
19917
# Extract the first word of "$ac_prog", so it can be a program name with args.
20100
19918
set dummy $ac_prog; ac_word=$2
20106
19924
$as_echo_n "(cached) " >&6
20107
19925
else
20108
19926
case $AWK in
20109
@@ -20978,14 +16898,14 @@
19927
@@ -20978,14 +16884,14 @@
20110
19928
do
20111
19929
IFS=$as_save_IFS
20112
19930
test -z "$as_dir" && as_dir=.
20124
19942
IFS=$as_save_IFS
20125
19943
20126
19944
;;
20127
@@ -20993,10 +16913,10 @@
19945
@@ -20993,10 +16899,10 @@
20128
19946
fi
20129
19947
AWK=$ac_cv_path_AWK
20130
19948
if test -n "$AWK"; then
20137
19955
$as_echo "no" >&6; }
20138
19956
fi
20139
19957
20140
@@ -21008,9 +16928,9 @@
19958
@@ -21008,9 +16914,9 @@
20141
19959
do
20142
19960
# Extract the first word of "$ac_prog", so it can be a program name with args.
20143
19961
set dummy $ac_prog; ac_word=$2
20149
19967
$as_echo_n "(cached) " >&6
20150
19968
else
20151
19969
case $PERL in
20152
@@ -21023,14 +16943,14 @@
19970
@@ -21023,14 +16929,14 @@
20153
19971
do
20154
19972
IFS=$as_save_IFS
20155
19973
test -z "$as_dir" && as_dir=.
20167
19985
IFS=$as_save_IFS
20168
19986
20169
19987
;;
20170
@@ -21038,10 +16958,10 @@
19988
@@ -21038,10 +16944,10 @@
20171
19989
fi
20172
19990
PERL=$ac_cv_path_PERL
20173
19991
if test -n "$PERL"; then
20180
19998
$as_echo "no" >&6; }
20181
19999
fi
20182
20000
20183
@@ -21051,7 +16971,7 @@
20001
@@ -21051,7 +16957,7 @@
20184
20002
20185
20003
20186
20004
# Check whether --enable-rebuilds was given.
20189
20007
enableval=$enable_rebuilds;
20190
20008
else
20191
20009
enable_rebuilds=yes
20192
@@ -21095,13 +17015,13 @@
20010
@@ -21095,13 +17001,13 @@
20193
20011
case $ac_val in #(
20194
20012
*${as_nl}*)
20195
20013
case $ac_var in #(
20205
20023
esac ;;
20206
20024
esac
20207
20025
done
20208
@@ -21109,8 +17029,8 @@
20026
@@ -21109,8 +17015,8 @@
20209
20027
(set) 2>&1 |
20210
20028
case $as_nl`(ac_space=' '; set) 2>&1` in #(
20211
20029
*${as_nl}ac_space=\ *)
20216
20034
sed -n \
20217
20035
"s/'/'\\\\''/g;
20218
20036
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
20219
@@ -21133,11 +17053,11 @@
20037
@@ -21133,11 +17039,11 @@
20220
20038
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
20221
20039
if test -w "$cache_file"; then
20222
20040
test "x$cache_file" != "x/dev/null" &&
20230
20048
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
20231
20049
fi
20232
20050
fi
20233
@@ -21157,8 +17077,8 @@
20051
@@ -21157,8 +17063,8 @@
20234
20052
ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
20235
20053
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
20236
20054
# will be set to the directory where LIBOBJS objects are built.
20241
20059
done
20242
20060
LIBOBJS=$ac_libobjs
20243
20061
20244
@@ -21174,143 +17094,90 @@
20062
@@ -21174,143 +17080,90 @@
20245
20063
fi
20246
20064
20247
20065
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
20424
20242
#! $SHELL
20425
20243
# Generated by $as_me.
20426
20244
# Run this file to recreate the current configuration.
20427
@@ -21320,17 +17187,18 @@
20245
@@ -21320,17 +17173,18 @@
20428
20246
debug=false
20429
20247
ac_cs_recheck=false
20430
20248
ac_cs_silent=false
20450
20268
emulate sh
20451
20269
NULLCMD=:
20452
20270
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
20453
@@ -21338,23 +17206,15 @@
20271
@@ -21338,23 +17192,15 @@
20454
20272
alias -g '${1+"$@"}'='"$@"'
20455
20273
setopt NO_GLOB_SUBST
20456
20274
else
20479
20297
as_nl='
20480
20298
'
20481
20299
export as_nl
20482
@@ -21362,7 +17222,13 @@
20300
@@ -21362,7 +17208,13 @@
20483
20301
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
20484
20302
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
20485
20303
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
20494
20312
as_echo='printf %s\n'
20495
20313
as_echo_n='printf %s'
20496
20314
else
20497
@@ -21373,7 +17239,7 @@
20315
@@ -21373,7 +17225,7 @@
20498
20316
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
20499
20317
as_echo_n_body='eval
20500
20318
arg=$1;
20503
20321
*"$as_nl"*)
20504
20322
expr "X$arg" : "X\\(.*\\)$as_nl";
20505
20323
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
20506
@@ -21396,13 +17262,6 @@
20324
@@ -21396,13 +17248,6 @@
20507
20325
}
20508
20326
fi
20509
20327
20517
20335
20518
20336
# IFS
20519
20337
# We need space, tab and new line, in precisely that order. Quoting is
20520
@@ -21412,15 +17271,15 @@
20338
@@ -21412,15 +17257,15 @@
20521
20339
IFS=" "" $as_nl"
20522
20340
20523
20341
# Find who we are. Look in the path if we contain no directory separator.
20536
20354
IFS=$as_save_IFS
20537
20355
20538
20356
;;
20539
@@ -21432,12 +17291,16 @@
20357
@@ -21432,12 +17277,16 @@
20540
20358
fi
20541
20359
if test ! -f "$as_myself"; then
20542
20360
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
20557
20375
done
20558
20376
PS1='$ '
20559
20377
PS2='> '
20560
@@ -21449,7 +17312,89 @@
20378
@@ -21449,7 +17298,89 @@
20561
20379
LANGUAGE=C
20562
20380
export LANGUAGE
20563
20381
20648
20466
if expr a : '\(a\)' >/dev/null 2>&1 &&
20649
20467
test "X`expr 00001 : '.*\(...\)'`" = X001; then
20650
20468
as_expr=expr
20651
@@ -21463,8 +17408,12 @@
20469
@@ -21463,8 +17394,12 @@
20652
20470
as_basename=false
20653
20471
fi
20654
20472
20662
20480
as_me=`$as_basename -- "$0" ||
20663
20481
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
20664
20482
X"$0" : 'X\(//\)$' \| \
20665
@@ -21484,76 +17433,25 @@
20483
@@ -21484,76 +17419,25 @@
20666
20484
}
20667
20485
s/.*/./; q'`
20668
20486
20750
20568
20751
20569
rm -f conf$$ conf$$.exe conf$$.file
20752
20570
if test -d conf$$.dir; then
20753
@@ -21582,8 +17480,56 @@
20571
@@ -21582,8 +17466,56 @@
20754
20572
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
20755
20573
rmdir conf$$.dir 2>/dev/null
20756
20574
20808
20626
else
20809
20627
test -d ./-p && rmdir ./-p
20810
20628
as_mkdir_p=false
20811
@@ -21602,10 +17548,10 @@
20629
@@ -21602,10 +17534,10 @@
20812
20630
if test -d "$1"; then
20813
20631
test -d "$1/.";
20814
20632
else
20821
20639
???[sx]*):;;*)false;;esac;fi
20822
20640
'\'' sh
20823
20641
'
20824
@@ -21620,13 +17566,19 @@
20642
@@ -21620,13 +17552,19 @@
20825
20643
20826
20644
20827
20645
exec 6>&1
20837
20655
# report actual input values of CONFIG_FILES etc. instead of their
20838
20656
# values after options handling.
20839
20657
ac_log="
20840
This file was extended by gnome-panel $as_me 2.29.92.1, which was
20658
This file was extended by gnome-panel $as_me 2.30.0, which was
20841
20659
-generated by GNU Autoconf 2.63. Invocation command line was
20842
20660
+generated by GNU Autoconf 2.65. Invocation command line was
20843
20661
20844
20662
CONFIG_FILES = $CONFIG_FILES
20845
20663
CONFIG_HEADERS = $CONFIG_HEADERS
20846
@@ -21658,13 +17610,15 @@
20664
@@ -21658,13 +17596,15 @@
20847
20665
20848
20666
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
20849
20667
ac_cs_usage="\
20862
20680
-q, --quiet, --silent
20863
20681
do not print progress messages
20864
20682
-d, --debug don't remove temporary files
20865
@@ -21683,16 +17637,17 @@
20683
@@ -21683,16 +17623,17 @@
20866
20684
Configuration commands:
20867
20685
$config_commands
20868
20686
20873
20691
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
20874
20692
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
20875
20693
ac_cs_version="\\
20876
gnome-panel config.status 2.29.92.1
20694
gnome-panel config.status 2.30.0
20877
20695
-configured by $0, generated by GNU Autoconf 2.63,
20878
20696
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
20879
20697
+configured by $0, generated by GNU Autoconf 2.65,
20884
20702
This config.status script is free software; the Free Software Foundation
20885
20703
gives unlimited permission to copy, distribute and modify it."
20886
20704
20887
@@ -21728,6 +17683,8 @@
20705
@@ -21728,6 +17669,8 @@
20888
20706
ac_cs_recheck=: ;;
20889
20707
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
20890
20708
$as_echo "$ac_cs_version"; exit ;;
20893
20711
--debug | --debu | --deb | --de | --d | -d )
20894
20712
debug=: ;;
20895
20713
--file | --fil | --fi | --f )
20896
@@ -21735,20 +17692,19 @@
20714
@@ -21735,20 +17678,19 @@
20897
20715
case $ac_optarg in
20898
20716
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
20899
20717
esac
20918
20736
--help | --hel | -h )
20919
20737
$as_echo "$ac_cs_usage"; exit ;;
20920
20738
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
20921
@@ -21756,11 +17712,10 @@
20739
@@ -21756,11 +17698,10 @@
20922
20740
ac_cs_silent=: ;;
20923
20741
20924
20742
# This is an error.
20933
20751
ac_need_defaults=false ;;
20934
20752
20935
20753
esac
20936
@@ -22104,9 +18059,7 @@
20754
@@ -22104,9 +18045,7 @@
20937
20755
"man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
20938
20756
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
20939
20757
20944
20762
esac
20945
20763
done
20946
20764
20947
@@ -22133,7 +18086,7 @@
20765
@@ -22133,7 +18072,7 @@
20948
20766
trap 'exit_status=$?
20949
20767
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
20950
20768
' 0
20953
20771
}
20954
20772
# Create a (secure) tmp directory for tmp files.
20955
20773
20956
@@ -22144,11 +18097,7 @@
20774
@@ -22144,11 +18083,7 @@
20957
20775
{
20958
20776
tmp=./conf$$-$RANDOM
20959
20777
(umask 077 && mkdir "$tmp")
20966
20784
20967
20785
# Set up the scripts for CONFIG_FILES section.
20968
20786
# No need to generate them if there are no CONFIG_FILES.
20969
@@ -22156,10 +18105,16 @@
20787
@@ -22156,10 +18091,16 @@
20970
20788
if test -n "$CONFIG_FILES"; then
20971
20789
20972
20790
20985
20803
else
20986
20804
ac_cs_awk_cr=$ac_cr
20987
20805
fi
20988
@@ -22173,24 +18128,18 @@
20806
@@ -22173,24 +18114,18 @@
20989
20807
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
20990
20808
echo "_ACEOF"
20991
20809
} >conf$$subs.sh ||
21013
20831
else
21014
20832
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
21015
20833
fi
21016
@@ -22212,7 +18161,7 @@
20834
@@ -22212,7 +18147,7 @@
21017
20835
t delim
21018
20836
:nl
21019
20837
h
21022
20840
t more1
21023
20841
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
21024
20842
p
21025
@@ -22226,7 +18175,7 @@
20843
@@ -22226,7 +18161,7 @@
21026
20844
t nl
21027
20845
:delim
21028
20846
h
21031
20849
t more2
21032
20850
s/["\\]/\\&/g; s/^/"/; s/$/"/
21033
20851
p
21034
@@ -22279,9 +18228,7 @@
20852
@@ -22279,9 +18214,7 @@
21035
20853
else
21036
20854
cat
21037
20855
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
21042
20860
_ACEOF
21043
20861
21044
20862
# VPATH may cause trouble with some makes, so we remove $(srcdir),
21045
@@ -22322,9 +18269,7 @@
20863
@@ -22322,9 +18255,7 @@
21046
20864
if test -z "$ac_t"; then
21047
20865
break
21048
20866
elif $ac_last_try; then
21053
20871
else
21054
20872
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
21055
20873
fi
21056
@@ -22409,9 +18354,7 @@
20874
@@ -22409,9 +18340,7 @@
21057
20875
_ACAWK
21058
20876
_ACEOF
21059
20877
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
21064
20882
fi # test -n "$CONFIG_HEADERS"
21065
20883
21066
20884
21067
@@ -22424,9 +18367,7 @@
20885
@@ -22424,9 +18353,7 @@
21068
20886
esac
21069
20887
case $ac_mode$ac_tag in
21070
20888
:[FHL]*:*);;
21075
20893
:[FH]-) ac_tag=-:-;;
21076
20894
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
21077
20895
esac
21078
@@ -22454,12 +18395,10 @@
20896
@@ -22454,12 +18381,10 @@
21079
20897
[\\/$]*) false;;
21080
20898
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
21081
20899
esac ||
21090
20908
done
21091
20909
21092
20910
# Let's still pretend it is `configure' which instantiates (i.e., don't
21093
@@ -22470,7 +18409,7 @@
20911
@@ -22470,7 +18395,7 @@
21094
20912
`' by configure.'
21095
20913
if test x"$ac_file" != x-; then
21096
20914
configure_input="$ac_file. $configure_input"
21099
20917
$as_echo "$as_me: creating $ac_file" >&6;}
21100
20918
fi
21101
20919
# Neutralize special characters interpreted by sed in replacement strings.
21102
@@ -22483,9 +18422,7 @@
20920
@@ -22483,9 +18408,7 @@
21103
20921
21104
20922
case $ac_tag in
21105
20923
*:-:* | *:-) cat >"$tmp/stdin" \
21110
20928
esac
21111
20929
;;
21112
20930
esac
21113
@@ -22513,47 +18450,7 @@
20931
@@ -22513,47 +18436,7 @@
21114
20932
q
21115
20933
}
21116
20934
s/.*/./; q'`
21159
20977
ac_builddir=.
21160
20978
21161
20979
case "$ac_dir" in
21162
@@ -22610,7 +18507,6 @@
20980
@@ -22610,7 +18493,6 @@
21163
20981
# If the template does not know about datarootdir, expand it.
21164
20982
# FIXME: This hack should be removed a few years after 2.60.
21165
20983
ac_datarootdir_hack=; ac_datarootdir_seen=
21167
20985
ac_sed_dataroot='
21168
20986
/datarootdir/ {
21169
20987
p
21170
@@ -22620,12 +18516,11 @@
20988
@@ -22620,12 +18502,11 @@
21171
20989
/@docdir@/p
21172
20990
/@infodir@/p
21173
20991
/@localedir@/p
21182
21000
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
21183
21001
_ACEOF
21184
21002
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
21185
@@ -22635,7 +18530,7 @@
21003
@@ -22635,7 +18516,7 @@
21186
21004
s&@infodir@&$infodir&g
21187
21005
s&@localedir@&$localedir&g
21188
21006
s&@mandir@&$mandir&g
21191
21009
esac
21192
21010
_ACEOF
21193
21011
21194
@@ -22664,14 +18559,12 @@
21012
@@ -22664,14 +18545,12 @@
21195
21013
$ac_datarootdir_hack
21196
21014
"
21197
21015
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
21208
21026
which seems to be undefined. Please make sure it is defined." >&5
21209
21027
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
21210
21028
which seems to be undefined. Please make sure it is defined." >&2;}
21211
@@ -22681,9 +18574,7 @@
21029
@@ -22681,9 +18560,7 @@
21212
21030
-) cat "$tmp/out" && rm -f "$tmp/out";;
21213
21031
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
21214
21032
esac \
21219
21037
;;
21220
21038
:H)
21221
21039
#
21222
@@ -22694,25 +18585,19 @@
21040
@@ -22694,25 +18571,19 @@
21223
21041
$as_echo "/* $configure_input */" \
21224
21042
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
21225
21043
} >"$tmp/config.h" \
21249
21067
fi
21250
21068
# Compute "$ac_file"'s index in $config_headers.
21251
21069
_am_arg="$ac_file"
21252
@@ -22750,7 +18635,7 @@
21070
@@ -22750,7 +18621,7 @@
21253
21071
s/.*/./; q'`/stamp-h$_am_stamp_count
21254
21072
;;
21255
21073
21258
21076
$as_echo "$as_me: executing $ac_file commands" >&6;}
21259
21077
;;
21260
21078
esac
21261
@@ -22845,47 +18730,7 @@
21079
@@ -22845,47 +18716,7 @@
21262
21080
q
21263
21081
}
21264
21082
s/.*/./; q'`
21307
21125
# echo "creating $dirpart/$file"
21308
21126
echo '# dummy' > "$dirpart/$file"
21309
21127
done
21310
@@ -23538,9 +19383,7 @@
21128
@@ -23538,9 +19369,7 @@
21311
21129
esac ;;
21312
21130
"po/stamp-it":C)
21313
21131
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
21318
21136
fi
21319
21137
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
21320
21138
>"po/stamp-it.tmp"
21321
@@ -23563,15 +19406,12 @@
21139
@@ -23563,15 +19392,12 @@
21322
21140
done # for ac_tag
21323
21141
21324
21142
21336
21154
21337
21155
21338
21156
# configure is writing to config.log, and then calls config.status.
21339
@@ -23592,10 +19432,10 @@
21157
@@ -23592,10 +19418,10 @@
21340
21158
exec 5>>config.log
21341
21159
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
21342
21160
# would make configure fail if this is the last instruction.
21349
21167
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
21350
21168
fi
21351
21169
21352
diff -Nur gnome-panel-2.29.92.1/configure.in gnome-panel-2.29.92.1.ubuntu/configure.in
21353
--- gnome-panel-2.29.92.1/configure.in 2010-03-10 01:11:20.000000000 +0100
21354
+++ gnome-panel-2.29.92.1.ubuntu/configure.in 2010-03-10 01:11:56.000000000 +0100
21355
@@ -54,7 +54,7 @@
21356
GDK_PIXBUF_REQUIRED=2.7.1
21357
PANGO_REQUIRED=1.15.4
21358
GLIB_REQUIRED=2.18.0
21359
-GTK_REQUIRED=2.19.7
21360
+GTK_REQUIRED=2.19.6
21361
LIBBONOBOUI_REQUIRED=2.1.1
21362
ORBIT_REQUIRED=2.4.0
21363
LIBWNCK_REQUIRED=2.19.5
21364
diff -Nur gnome-panel-2.29.92.1/doc/Makefile.in gnome-panel-2.29.92.1.ubuntu/doc/Makefile.in
21365
--- gnome-panel-2.29.92.1/doc/Makefile.in 2010-03-09 23:56:22.000000000 +0100
21366
+++ gnome-panel-2.29.92.1.ubuntu/doc/Makefile.in 2010-03-10 01:11:38.000000000 +0100
21170
diff -Nur gnome-panel-2.30.0/doc/Makefile.in gnome-panel-2.30.0.ubuntu/doc/Makefile.in
21171
--- gnome-panel-2.30.0/doc/Makefile.in 2010-03-30 02:52:45.000000000 +0200
21172
+++ gnome-panel-2.30.0.ubuntu/doc/Makefile.in 2010-03-30 12:08:10.000000000 +0200
21367
21173
@@ -1,4 +1,4 @@
21368
21174
-# Makefile.in generated by automake 1.11 from Makefile.am.
21369
21175
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
21396
21202
for f in x $$MAKEFLAGS; do \
21397
21203
case $$f in \
21398
21204
*=* | --[!k]*);; \
21399
diff -Nur gnome-panel-2.29.92.1/doc/reference/Makefile.in gnome-panel-2.29.92.1.ubuntu/doc/reference/Makefile.in
21400
--- gnome-panel-2.29.92.1/doc/reference/Makefile.in 2010-03-09 23:56:22.000000000 +0100
21401
+++ gnome-panel-2.29.92.1.ubuntu/doc/reference/Makefile.in 2010-03-10 01:11:38.000000000 +0100
21205
diff -Nur gnome-panel-2.30.0/doc/reference/Makefile.in gnome-panel-2.30.0.ubuntu/doc/reference/Makefile.in
21206
--- gnome-panel-2.30.0/doc/reference/Makefile.in 2010-03-30 02:52:45.000000000 +0200
21207
+++ gnome-panel-2.30.0.ubuntu/doc/reference/Makefile.in 2010-03-30 12:08:10.000000000 +0200
21402
21208
@@ -1,4 +1,4 @@
21403
21209
-# Makefile.in generated by automake 1.11 from Makefile.am.
21404
21210
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
21431
21237
for f in x $$MAKEFLAGS; do \
21432
21238
case $$f in \
21433
21239
*=* | --[!k]*);; \
21434
diff -Nur gnome-panel-2.29.92.1/doc/reference/panel-applet/Makefile.in gnome-panel-2.29.92.1.ubuntu/doc/reference/panel-applet/Makefile.in
21435
--- gnome-panel-2.29.92.1/doc/reference/panel-applet/Makefile.in 2010-03-09 23:56:22.000000000 +0100
21436
+++ gnome-panel-2.29.92.1.ubuntu/doc/reference/panel-applet/Makefile.in 2010-03-10 01:11:38.000000000 +0100
21240
diff -Nur gnome-panel-2.30.0/doc/reference/panel-applet/Makefile.in gnome-panel-2.30.0.ubuntu/doc/reference/panel-applet/Makefile.in
21241
--- gnome-panel-2.30.0/doc/reference/panel-applet/Makefile.in 2010-03-30 02:52:46.000000000 +0200
21242
+++ gnome-panel-2.30.0.ubuntu/doc/reference/panel-applet/Makefile.in 2010-03-30 12:08:10.000000000 +0200
21437
21243
@@ -1,4 +1,4 @@
21438
21244
-# Makefile.in generated by automake 1.11 from Makefile.am.
21439
21245
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
21448
21254
PACKAGE_VERSION = @PACKAGE_VERSION@
21449
21255
PANEL_CFLAGS = @PANEL_CFLAGS@
21450
21256
PANEL_LIBS = @PANEL_LIBS@
21451
diff -Nur gnome-panel-2.29.92.1/gnome-panel/libegg/Makefile.in gnome-panel-2.29.92.1.ubuntu/gnome-panel/libegg/Makefile.in
21452
--- gnome-panel-2.29.92.1/gnome-panel/libegg/Makefile.in 2010-03-09 23:56:23.000000000 +0100
21453
+++ gnome-panel-2.29.92.1.ubuntu/gnome-panel/libegg/Makefile.in 2010-03-10 01:11:38.000000000 +0100
21257
diff -Nur gnome-panel-2.30.0/gnome-panel/libegg/Makefile.in gnome-panel-2.30.0.ubuntu/gnome-panel/libegg/Makefile.in
21258
--- gnome-panel-2.30.0/gnome-panel/libegg/Makefile.in 2010-03-30 02:52:46.000000000 +0200
21259
+++ gnome-panel-2.30.0.ubuntu/gnome-panel/libegg/Makefile.in 2010-03-30 12:08:10.000000000 +0200
21454
21260
@@ -1,4 +1,4 @@
21455
21261
-# Makefile.in generated by automake 1.11 from Makefile.am.
21456
21262
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
21465
21271
PACKAGE_VERSION = @PACKAGE_VERSION@
21466
21272
PANEL_CFLAGS = @PANEL_CFLAGS@
21467
21273
PANEL_LIBS = @PANEL_LIBS@
21468
diff -Nur gnome-panel-2.29.92.1/gnome-panel/libpanel-util/Makefile.in gnome-panel-2.29.92.1.ubuntu/gnome-panel/libpanel-util/Makefile.in
21469
--- gnome-panel-2.29.92.1/gnome-panel/libpanel-util/Makefile.in 2010-03-09 23:56:23.000000000 +0100
21470
+++ gnome-panel-2.29.92.1.ubuntu/gnome-panel/libpanel-util/Makefile.in 2010-03-10 01:11:38.000000000 +0100
21274
diff -Nur gnome-panel-2.30.0/gnome-panel/libpanel-util/Makefile.in gnome-panel-2.30.0.ubuntu/gnome-panel/libpanel-util/Makefile.in
21275
--- gnome-panel-2.30.0/gnome-panel/libpanel-util/Makefile.in 2010-03-30 02:52:46.000000000 +0200
21276
+++ gnome-panel-2.30.0.ubuntu/gnome-panel/libpanel-util/Makefile.in 2010-03-30 12:08:10.000000000 +0200
21471
21277
@@ -1,4 +1,4 @@
21472
21278
-# Makefile.in generated by automake 1.11 from Makefile.am.
21473
21279
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
21482
21288
PACKAGE_VERSION = @PACKAGE_VERSION@
21483
21289
PANEL_CFLAGS = @PANEL_CFLAGS@
21484
21290
PANEL_LIBS = @PANEL_LIBS@
21485
diff -Nur gnome-panel-2.29.92.1/gnome-panel/Makefile.in gnome-panel-2.29.92.1.ubuntu/gnome-panel/Makefile.in
21486
--- gnome-panel-2.29.92.1/gnome-panel/Makefile.in 2010-03-09 23:56:22.000000000 +0100
21487
+++ gnome-panel-2.29.92.1.ubuntu/gnome-panel/Makefile.in 2010-03-10 01:11:38.000000000 +0100
21291
diff -Nur gnome-panel-2.30.0/gnome-panel/Makefile.in gnome-panel-2.30.0.ubuntu/gnome-panel/Makefile.in
21292
--- gnome-panel-2.30.0/gnome-panel/Makefile.in 2010-03-30 02:52:46.000000000 +0200
21293
+++ gnome-panel-2.30.0.ubuntu/gnome-panel/Makefile.in 2010-03-30 12:08:10.000000000 +0200
21488
21294
@@ -1,4 +1,4 @@
21489
21295
-# Makefile.in generated by automake 1.11 from Makefile.am.
21490
21296
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
21557
21363
for f in x $$MAKEFLAGS; do \
21558
21364
case $$f in \
21559
21365
*=* | --[!k]*);; \
21560
diff -Nur gnome-panel-2.29.92.1/help/clock/Makefile.in gnome-panel-2.29.92.1.ubuntu/help/clock/Makefile.in
21561
--- gnome-panel-2.29.92.1/help/clock/Makefile.in 2010-03-09 23:56:24.000000000 +0100
21562
+++ gnome-panel-2.29.92.1.ubuntu/help/clock/Makefile.in 2010-03-10 01:11:39.000000000 +0100
21563
@@ -1,4 +1,4 @@
21564
-# Makefile.in generated by automake 1.11 from Makefile.am.
21565
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
21566
# @configure_input@
21567
21568
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
21569
@@ -187,6 +187,7 @@
21570
PACKAGE_NAME = @PACKAGE_NAME@
21571
PACKAGE_STRING = @PACKAGE_STRING@
21572
PACKAGE_TARNAME = @PACKAGE_TARNAME@
21573
+PACKAGE_URL = @PACKAGE_URL@
21574
PACKAGE_VERSION = @PACKAGE_VERSION@
21575
PANEL_CFLAGS = @PANEL_CFLAGS@
21576
PANEL_LIBS = @PANEL_LIBS@
21577
diff -Nur gnome-panel-2.29.92.1/help/fish/Makefile.in gnome-panel-2.29.92.1.ubuntu/help/fish/Makefile.in
21578
--- gnome-panel-2.29.92.1/help/fish/Makefile.in 2010-03-09 23:56:24.000000000 +0100
21579
+++ gnome-panel-2.29.92.1.ubuntu/help/fish/Makefile.in 2010-03-10 01:11:39.000000000 +0100
21580
@@ -1,4 +1,4 @@
21581
-# Makefile.in generated by automake 1.11 from Makefile.am.
21582
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
21583
# @configure_input@
21584
21585
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
21586
@@ -187,6 +187,7 @@
21587
PACKAGE_NAME = @PACKAGE_NAME@
21588
PACKAGE_STRING = @PACKAGE_STRING@
21589
PACKAGE_TARNAME = @PACKAGE_TARNAME@
21590
+PACKAGE_URL = @PACKAGE_URL@
21591
PACKAGE_VERSION = @PACKAGE_VERSION@
21592
PANEL_CFLAGS = @PANEL_CFLAGS@
21593
PANEL_LIBS = @PANEL_LIBS@
21594
diff -Nur gnome-panel-2.29.92.1/help/Makefile.in gnome-panel-2.29.92.1.ubuntu/help/Makefile.in
21595
--- gnome-panel-2.29.92.1/help/Makefile.in 2010-03-09 23:56:23.000000000 +0100
21596
+++ gnome-panel-2.29.92.1.ubuntu/help/Makefile.in 2010-03-10 01:11:39.000000000 +0100
21366
diff -Nur gnome-panel-2.30.0/help/clock/Makefile.in gnome-panel-2.30.0.ubuntu/help/clock/Makefile.in
21367
--- gnome-panel-2.30.0/help/clock/Makefile.in 2010-03-30 02:52:46.000000000 +0200
21368
+++ gnome-panel-2.30.0.ubuntu/help/clock/Makefile.in 2010-03-30 12:08:10.000000000 +0200
21369
@@ -1,4 +1,4 @@
21370
-# Makefile.in generated by automake 1.11 from Makefile.am.
21371
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
21372
# @configure_input@
21373
21374
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
21375
@@ -187,6 +187,7 @@
21376
PACKAGE_NAME = @PACKAGE_NAME@
21377
PACKAGE_STRING = @PACKAGE_STRING@
21378
PACKAGE_TARNAME = @PACKAGE_TARNAME@
21379
+PACKAGE_URL = @PACKAGE_URL@
21380
PACKAGE_VERSION = @PACKAGE_VERSION@
21381
PANEL_CFLAGS = @PANEL_CFLAGS@
21382
PANEL_LIBS = @PANEL_LIBS@
21383
diff -Nur gnome-panel-2.30.0/help/fish/Makefile.in gnome-panel-2.30.0.ubuntu/help/fish/Makefile.in
21384
--- gnome-panel-2.30.0/help/fish/Makefile.in 2010-03-30 02:52:46.000000000 +0200
21385
+++ gnome-panel-2.30.0.ubuntu/help/fish/Makefile.in 2010-03-30 12:08:10.000000000 +0200
21386
@@ -1,4 +1,4 @@
21387
-# Makefile.in generated by automake 1.11 from Makefile.am.
21388
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
21389
# @configure_input@
21390
21391
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
21392
@@ -187,6 +187,7 @@
21393
PACKAGE_NAME = @PACKAGE_NAME@
21394
PACKAGE_STRING = @PACKAGE_STRING@
21395
PACKAGE_TARNAME = @PACKAGE_TARNAME@
21396
+PACKAGE_URL = @PACKAGE_URL@
21397
PACKAGE_VERSION = @PACKAGE_VERSION@
21398
PANEL_CFLAGS = @PANEL_CFLAGS@
21399
PANEL_LIBS = @PANEL_LIBS@
21400
diff -Nur gnome-panel-2.30.0/help/Makefile.in gnome-panel-2.30.0.ubuntu/help/Makefile.in
21401
--- gnome-panel-2.30.0/help/Makefile.in 2010-03-30 02:52:46.000000000 +0200
21402
+++ gnome-panel-2.30.0.ubuntu/help/Makefile.in 2010-03-30 12:08:10.000000000 +0200
21597
21403
@@ -1,4 +1,4 @@
21598
21404
-# Makefile.in generated by automake 1.11 from Makefile.am.
21599
21405
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
21626
21432
for f in x $$MAKEFLAGS; do \
21627
21433
case $$f in \
21628
21434
*=* | --[!k]*);; \
21629
diff -Nur gnome-panel-2.29.92.1/icons/16x16/Makefile.in gnome-panel-2.29.92.1.ubuntu/icons/16x16/Makefile.in
21630
--- gnome-panel-2.29.92.1/icons/16x16/Makefile.in 2010-03-09 23:56:24.000000000 +0100
21631
+++ gnome-panel-2.29.92.1.ubuntu/icons/16x16/Makefile.in 2010-03-10 01:11:39.000000000 +0100
21632
@@ -1,4 +1,4 @@
21633
-# Makefile.in generated by automake 1.11 from Makefile.am.
21634
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
21635
# @configure_input@
21636
21637
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
21638
@@ -186,6 +186,7 @@
21639
PACKAGE_NAME = @PACKAGE_NAME@
21640
PACKAGE_STRING = @PACKAGE_STRING@
21641
PACKAGE_TARNAME = @PACKAGE_TARNAME@
21642
+PACKAGE_URL = @PACKAGE_URL@
21643
PACKAGE_VERSION = @PACKAGE_VERSION@
21644
PANEL_CFLAGS = @PANEL_CFLAGS@
21645
PANEL_LIBS = @PANEL_LIBS@
21646
diff -Nur gnome-panel-2.29.92.1/icons/22x22/Makefile.in gnome-panel-2.29.92.1.ubuntu/icons/22x22/Makefile.in
21647
--- gnome-panel-2.29.92.1/icons/22x22/Makefile.in 2010-03-09 23:56:24.000000000 +0100
21648
+++ gnome-panel-2.29.92.1.ubuntu/icons/22x22/Makefile.in 2010-03-10 01:11:39.000000000 +0100
21649
@@ -1,4 +1,4 @@
21650
-# Makefile.in generated by automake 1.11 from Makefile.am.
21651
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
21652
# @configure_input@
21653
21654
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
21655
@@ -186,6 +186,7 @@
21656
PACKAGE_NAME = @PACKAGE_NAME@
21657
PACKAGE_STRING = @PACKAGE_STRING@
21658
PACKAGE_TARNAME = @PACKAGE_TARNAME@
21659
+PACKAGE_URL = @PACKAGE_URL@
21660
PACKAGE_VERSION = @PACKAGE_VERSION@
21661
PANEL_CFLAGS = @PANEL_CFLAGS@
21662
PANEL_LIBS = @PANEL_LIBS@
21663
diff -Nur gnome-panel-2.29.92.1/icons/24x24/Makefile.in gnome-panel-2.29.92.1.ubuntu/icons/24x24/Makefile.in
21664
--- gnome-panel-2.29.92.1/icons/24x24/Makefile.in 2010-03-09 23:56:24.000000000 +0100
21665
+++ gnome-panel-2.29.92.1.ubuntu/icons/24x24/Makefile.in 2010-03-10 01:11:39.000000000 +0100
21666
@@ -1,4 +1,4 @@
21667
-# Makefile.in generated by automake 1.11 from Makefile.am.
21668
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
21669
# @configure_input@
21670
21671
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
21672
@@ -186,6 +186,7 @@
21673
PACKAGE_NAME = @PACKAGE_NAME@
21674
PACKAGE_STRING = @PACKAGE_STRING@
21675
PACKAGE_TARNAME = @PACKAGE_TARNAME@
21676
+PACKAGE_URL = @PACKAGE_URL@
21677
PACKAGE_VERSION = @PACKAGE_VERSION@
21678
PANEL_CFLAGS = @PANEL_CFLAGS@
21679
PANEL_LIBS = @PANEL_LIBS@
21680
diff -Nur gnome-panel-2.29.92.1/icons/32x32/Makefile.in gnome-panel-2.29.92.1.ubuntu/icons/32x32/Makefile.in
21681
--- gnome-panel-2.29.92.1/icons/32x32/Makefile.in 2010-03-09 23:56:25.000000000 +0100
21682
+++ gnome-panel-2.29.92.1.ubuntu/icons/32x32/Makefile.in 2010-03-10 01:11:39.000000000 +0100
21683
@@ -1,4 +1,4 @@
21684
-# Makefile.in generated by automake 1.11 from Makefile.am.
21685
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
21686
# @configure_input@
21687
21688
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
21689
@@ -186,6 +186,7 @@
21690
PACKAGE_NAME = @PACKAGE_NAME@
21691
PACKAGE_STRING = @PACKAGE_STRING@
21692
PACKAGE_TARNAME = @PACKAGE_TARNAME@
21693
+PACKAGE_URL = @PACKAGE_URL@
21694
PACKAGE_VERSION = @PACKAGE_VERSION@
21695
PANEL_CFLAGS = @PANEL_CFLAGS@
21696
PANEL_LIBS = @PANEL_LIBS@
21697
diff -Nur gnome-panel-2.29.92.1/icons/48x48/Makefile.in gnome-panel-2.29.92.1.ubuntu/icons/48x48/Makefile.in
21698
--- gnome-panel-2.29.92.1/icons/48x48/Makefile.in 2010-03-09 23:56:25.000000000 +0100
21699
+++ gnome-panel-2.29.92.1.ubuntu/icons/48x48/Makefile.in 2010-03-10 01:11:39.000000000 +0100
21700
@@ -1,4 +1,4 @@
21701
-# Makefile.in generated by automake 1.11 from Makefile.am.
21702
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
21703
# @configure_input@
21704
21705
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
21706
@@ -186,6 +186,7 @@
21707
PACKAGE_NAME = @PACKAGE_NAME@
21708
PACKAGE_STRING = @PACKAGE_STRING@
21709
PACKAGE_TARNAME = @PACKAGE_TARNAME@
21710
+PACKAGE_URL = @PACKAGE_URL@
21711
PACKAGE_VERSION = @PACKAGE_VERSION@
21712
PANEL_CFLAGS = @PANEL_CFLAGS@
21713
PANEL_LIBS = @PANEL_LIBS@
21714
diff -Nur gnome-panel-2.29.92.1/icons/Makefile.in gnome-panel-2.29.92.1.ubuntu/icons/Makefile.in
21715
--- gnome-panel-2.29.92.1/icons/Makefile.in 2010-03-09 23:56:25.000000000 +0100
21716
+++ gnome-panel-2.29.92.1.ubuntu/icons/Makefile.in 2010-03-10 01:11:39.000000000 +0100
21435
diff -Nur gnome-panel-2.30.0/icons/16x16/Makefile.in gnome-panel-2.30.0.ubuntu/icons/16x16/Makefile.in
21436
--- gnome-panel-2.30.0/icons/16x16/Makefile.in 2010-03-30 02:52:46.000000000 +0200
21437
+++ gnome-panel-2.30.0.ubuntu/icons/16x16/Makefile.in 2010-03-30 12:08:10.000000000 +0200
21438
@@ -1,4 +1,4 @@
21439
-# Makefile.in generated by automake 1.11 from Makefile.am.
21440
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
21441
# @configure_input@
21442
21443
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
21444
@@ -186,6 +186,7 @@
21445
PACKAGE_NAME = @PACKAGE_NAME@
21446
PACKAGE_STRING = @PACKAGE_STRING@
21447
PACKAGE_TARNAME = @PACKAGE_TARNAME@
21448
+PACKAGE_URL = @PACKAGE_URL@
21449
PACKAGE_VERSION = @PACKAGE_VERSION@
21450
PANEL_CFLAGS = @PANEL_CFLAGS@
21451
PANEL_LIBS = @PANEL_LIBS@
21452
diff -Nur gnome-panel-2.30.0/icons/22x22/Makefile.in gnome-panel-2.30.0.ubuntu/icons/22x22/Makefile.in
21453
--- gnome-panel-2.30.0/icons/22x22/Makefile.in 2010-03-30 02:52:47.000000000 +0200
21454
+++ gnome-panel-2.30.0.ubuntu/icons/22x22/Makefile.in 2010-03-30 12:08:10.000000000 +0200
21455
@@ -1,4 +1,4 @@
21456
-# Makefile.in generated by automake 1.11 from Makefile.am.
21457
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
21458
# @configure_input@
21459
21460
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
21461
@@ -186,6 +186,7 @@
21462
PACKAGE_NAME = @PACKAGE_NAME@
21463
PACKAGE_STRING = @PACKAGE_STRING@
21464
PACKAGE_TARNAME = @PACKAGE_TARNAME@
21465
+PACKAGE_URL = @PACKAGE_URL@
21466
PACKAGE_VERSION = @PACKAGE_VERSION@
21467
PANEL_CFLAGS = @PANEL_CFLAGS@
21468
PANEL_LIBS = @PANEL_LIBS@
21469
diff -Nur gnome-panel-2.30.0/icons/24x24/Makefile.in gnome-panel-2.30.0.ubuntu/icons/24x24/Makefile.in
21470
--- gnome-panel-2.30.0/icons/24x24/Makefile.in 2010-03-30 02:52:47.000000000 +0200
21471
+++ gnome-panel-2.30.0.ubuntu/icons/24x24/Makefile.in 2010-03-30 12:08:10.000000000 +0200
21472
@@ -1,4 +1,4 @@
21473
-# Makefile.in generated by automake 1.11 from Makefile.am.
21474
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
21475
# @configure_input@
21476
21477
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
21478
@@ -186,6 +186,7 @@
21479
PACKAGE_NAME = @PACKAGE_NAME@
21480
PACKAGE_STRING = @PACKAGE_STRING@
21481
PACKAGE_TARNAME = @PACKAGE_TARNAME@
21482
+PACKAGE_URL = @PACKAGE_URL@
21483
PACKAGE_VERSION = @PACKAGE_VERSION@
21484
PANEL_CFLAGS = @PANEL_CFLAGS@
21485
PANEL_LIBS = @PANEL_LIBS@
21486
diff -Nur gnome-panel-2.30.0/icons/32x32/Makefile.in gnome-panel-2.30.0.ubuntu/icons/32x32/Makefile.in
21487
--- gnome-panel-2.30.0/icons/32x32/Makefile.in 2010-03-30 02:52:47.000000000 +0200
21488
+++ gnome-panel-2.30.0.ubuntu/icons/32x32/Makefile.in 2010-03-30 12:08:10.000000000 +0200
21489
@@ -1,4 +1,4 @@
21490
-# Makefile.in generated by automake 1.11 from Makefile.am.
21491
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
21492
# @configure_input@
21493
21494
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
21495
@@ -186,6 +186,7 @@
21496
PACKAGE_NAME = @PACKAGE_NAME@
21497
PACKAGE_STRING = @PACKAGE_STRING@
21498
PACKAGE_TARNAME = @PACKAGE_TARNAME@
21499
+PACKAGE_URL = @PACKAGE_URL@
21500
PACKAGE_VERSION = @PACKAGE_VERSION@
21501
PANEL_CFLAGS = @PANEL_CFLAGS@
21502
PANEL_LIBS = @PANEL_LIBS@
21503
diff -Nur gnome-panel-2.30.0/icons/48x48/Makefile.in gnome-panel-2.30.0.ubuntu/icons/48x48/Makefile.in
21504
--- gnome-panel-2.30.0/icons/48x48/Makefile.in 2010-03-30 02:52:47.000000000 +0200
21505
+++ gnome-panel-2.30.0.ubuntu/icons/48x48/Makefile.in 2010-03-30 12:08:10.000000000 +0200
21506
@@ -1,4 +1,4 @@
21507
-# Makefile.in generated by automake 1.11 from Makefile.am.
21508
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
21509
# @configure_input@
21510
21511
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
21512
@@ -186,6 +186,7 @@
21513
PACKAGE_NAME = @PACKAGE_NAME@
21514
PACKAGE_STRING = @PACKAGE_STRING@
21515
PACKAGE_TARNAME = @PACKAGE_TARNAME@
21516
+PACKAGE_URL = @PACKAGE_URL@
21517
PACKAGE_VERSION = @PACKAGE_VERSION@
21518
PANEL_CFLAGS = @PANEL_CFLAGS@
21519
PANEL_LIBS = @PANEL_LIBS@
21520
diff -Nur gnome-panel-2.30.0/icons/Makefile.in gnome-panel-2.30.0.ubuntu/icons/Makefile.in
21521
--- gnome-panel-2.30.0/icons/Makefile.in 2010-03-30 02:52:47.000000000 +0200
21522
+++ gnome-panel-2.30.0.ubuntu/icons/Makefile.in 2010-03-30 12:08:10.000000000 +0200
21717
21523
@@ -1,4 +1,4 @@
21718
21524
-# Makefile.in generated by automake 1.11 from Makefile.am.
21719
21525
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
21746
21552
for f in x $$MAKEFLAGS; do \
21747
21553
case $$f in \
21748
21554
*=* | --[!k]*);; \
21749
diff -Nur gnome-panel-2.29.92.1/icons/scalable/Makefile.in gnome-panel-2.29.92.1.ubuntu/icons/scalable/Makefile.in
21750
--- gnome-panel-2.29.92.1/icons/scalable/Makefile.in 2010-03-09 23:56:25.000000000 +0100
21751
+++ gnome-panel-2.29.92.1.ubuntu/icons/scalable/Makefile.in 2010-03-10 01:11:39.000000000 +0100
21752
@@ -1,4 +1,4 @@
21753
-# Makefile.in generated by automake 1.11 from Makefile.am.
21754
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
21755
# @configure_input@
21756
21757
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
21758
@@ -186,6 +186,7 @@
21759
PACKAGE_NAME = @PACKAGE_NAME@
21760
PACKAGE_STRING = @PACKAGE_STRING@
21761
PACKAGE_TARNAME = @PACKAGE_TARNAME@
21762
+PACKAGE_URL = @PACKAGE_URL@
21763
PACKAGE_VERSION = @PACKAGE_VERSION@
21764
PANEL_CFLAGS = @PANEL_CFLAGS@
21765
PANEL_LIBS = @PANEL_LIBS@
21766
diff -Nur gnome-panel-2.29.92.1/idl/Makefile.in gnome-panel-2.29.92.1.ubuntu/idl/Makefile.in
21767
--- gnome-panel-2.29.92.1/idl/Makefile.in 2010-03-09 23:56:25.000000000 +0100
21768
+++ gnome-panel-2.29.92.1.ubuntu/idl/Makefile.in 2010-03-10 01:11:39.000000000 +0100
21769
@@ -1,4 +1,4 @@
21770
-# Makefile.in generated by automake 1.11 from Makefile.am.
21771
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
21772
# @configure_input@
21773
21774
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
21775
@@ -186,6 +186,7 @@
21776
PACKAGE_NAME = @PACKAGE_NAME@
21777
PACKAGE_STRING = @PACKAGE_STRING@
21778
PACKAGE_TARNAME = @PACKAGE_TARNAME@
21779
+PACKAGE_URL = @PACKAGE_URL@
21780
PACKAGE_VERSION = @PACKAGE_VERSION@
21781
PANEL_CFLAGS = @PANEL_CFLAGS@
21782
PANEL_LIBS = @PANEL_LIBS@
21783
diff -Nur gnome-panel-2.29.92.1/libpanel-applet/Makefile.in gnome-panel-2.29.92.1.ubuntu/libpanel-applet/Makefile.in
21784
--- gnome-panel-2.29.92.1/libpanel-applet/Makefile.in 2010-03-09 23:56:25.000000000 +0100
21785
+++ gnome-panel-2.29.92.1.ubuntu/libpanel-applet/Makefile.in 2010-03-10 01:11:39.000000000 +0100
21555
diff -Nur gnome-panel-2.30.0/icons/scalable/Makefile.in gnome-panel-2.30.0.ubuntu/icons/scalable/Makefile.in
21556
--- gnome-panel-2.30.0/icons/scalable/Makefile.in 2010-03-30 02:52:47.000000000 +0200
21557
+++ gnome-panel-2.30.0.ubuntu/icons/scalable/Makefile.in 2010-03-30 12:08:11.000000000 +0200
21558
@@ -1,4 +1,4 @@
21559
-# Makefile.in generated by automake 1.11 from Makefile.am.
21560
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
21561
# @configure_input@
21562
21563
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
21564
@@ -186,6 +186,7 @@
21565
PACKAGE_NAME = @PACKAGE_NAME@
21566
PACKAGE_STRING = @PACKAGE_STRING@
21567
PACKAGE_TARNAME = @PACKAGE_TARNAME@
21568
+PACKAGE_URL = @PACKAGE_URL@
21569
PACKAGE_VERSION = @PACKAGE_VERSION@
21570
PANEL_CFLAGS = @PANEL_CFLAGS@
21571
PANEL_LIBS = @PANEL_LIBS@
21572
diff -Nur gnome-panel-2.30.0/idl/Makefile.in gnome-panel-2.30.0.ubuntu/idl/Makefile.in
21573
--- gnome-panel-2.30.0/idl/Makefile.in 2010-03-30 02:52:47.000000000 +0200
21574
+++ gnome-panel-2.30.0.ubuntu/idl/Makefile.in 2010-03-30 12:08:11.000000000 +0200
21575
@@ -1,4 +1,4 @@
21576
-# Makefile.in generated by automake 1.11 from Makefile.am.
21577
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
21578
# @configure_input@
21579
21580
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
21581
@@ -186,6 +186,7 @@
21582
PACKAGE_NAME = @PACKAGE_NAME@
21583
PACKAGE_STRING = @PACKAGE_STRING@
21584
PACKAGE_TARNAME = @PACKAGE_TARNAME@
21585
+PACKAGE_URL = @PACKAGE_URL@
21586
PACKAGE_VERSION = @PACKAGE_VERSION@
21587
PANEL_CFLAGS = @PANEL_CFLAGS@
21588
PANEL_LIBS = @PANEL_LIBS@
21589
diff -Nur gnome-panel-2.30.0/libpanel-applet/Makefile.in gnome-panel-2.30.0.ubuntu/libpanel-applet/Makefile.in
21590
--- gnome-panel-2.30.0/libpanel-applet/Makefile.in 2010-03-30 02:52:47.000000000 +0200
21591
+++ gnome-panel-2.30.0.ubuntu/libpanel-applet/Makefile.in 2010-03-30 12:08:11.000000000 +0200
21786
21592
@@ -1,4 +1,4 @@
21787
21593
-# Makefile.in generated by automake 1.11 from Makefile.am.
21788
21594
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
21797
21603
PACKAGE_VERSION = @PACKAGE_VERSION@
21798
21604
PANEL_CFLAGS = @PANEL_CFLAGS@
21799
21605
PANEL_LIBS = @PANEL_LIBS@
21800
diff -Nur gnome-panel-2.29.92.1/ltmain.sh gnome-panel-2.29.92.1.ubuntu/ltmain.sh
21801
--- gnome-panel-2.29.92.1/ltmain.sh 2010-03-09 23:56:07.000000000 +0100
21802
+++ gnome-panel-2.29.92.1.ubuntu/ltmain.sh 2010-03-10 01:11:33.000000000 +0100
21606
diff -Nur gnome-panel-2.30.0/ltmain.sh gnome-panel-2.30.0.ubuntu/ltmain.sh
21607
--- gnome-panel-2.30.0/ltmain.sh 2010-03-30 02:52:32.000000000 +0200
21608
+++ gnome-panel-2.30.0.ubuntu/ltmain.sh 2010-03-30 12:08:04.000000000 +0200
21803
21609
@@ -1,6 +1,6 @@
21804
21610
# Generated from ltmain.m4sh.
21805
21611
21909
21715
esac
21910
21716
;;
21911
21717
no)
21912
diff -Nur gnome-panel-2.29.92.1/m4/ltversion.m4 gnome-panel-2.29.92.1.ubuntu/m4/ltversion.m4
21913
--- gnome-panel-2.29.92.1/m4/ltversion.m4 2010-03-09 23:56:08.000000000 +0100
21914
+++ gnome-panel-2.29.92.1.ubuntu/m4/ltversion.m4 2010-03-10 01:11:33.000000000 +0100
21718
diff -Nur gnome-panel-2.30.0/m4/ltversion.m4 gnome-panel-2.30.0.ubuntu/m4/ltversion.m4
21719
--- gnome-panel-2.30.0/m4/ltversion.m4 2010-03-30 02:52:32.000000000 +0200
21720
+++ gnome-panel-2.30.0.ubuntu/m4/ltversion.m4 2010-03-30 12:08:04.000000000 +0200
21915
21721
@@ -9,15 +9,15 @@
21916
21722
21917
21723
# Generated from ltversion.in.
21933
21739
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
21934
21740
_LT_DECL(, macro_revision, 0)
21935
21741
])
21936
diff -Nur gnome-panel-2.29.92.1/Makefile.in gnome-panel-2.29.92.1.ubuntu/Makefile.in
21937
--- gnome-panel-2.29.92.1/Makefile.in 2010-03-09 23:56:26.000000000 +0100
21938
+++ gnome-panel-2.29.92.1.ubuntu/Makefile.in 2010-03-10 01:11:39.000000000 +0100
21742
diff -Nur gnome-panel-2.30.0/Makefile.in gnome-panel-2.30.0.ubuntu/Makefile.in
21743
--- gnome-panel-2.30.0/Makefile.in 2010-03-30 02:52:48.000000000 +0200
21744
+++ gnome-panel-2.30.0.ubuntu/Makefile.in 2010-03-30 12:08:11.000000000 +0200
21939
21745
@@ -1,4 +1,4 @@
21940
21746
-# Makefile.in generated by automake 1.11 from Makefile.am.
21941
21747
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
22000
21806
*.zip*) \
22001
21807
unzip $(distdir).zip ;;\
22002
21808
esac
22003
diff -Nur gnome-panel-2.29.92.1/man/Makefile.in gnome-panel-2.29.92.1.ubuntu/man/Makefile.in
22004
--- gnome-panel-2.29.92.1/man/Makefile.in 2010-03-09 23:56:26.000000000 +0100
22005
+++ gnome-panel-2.29.92.1.ubuntu/man/Makefile.in 2010-03-10 01:11:39.000000000 +0100
21809
diff -Nur gnome-panel-2.30.0/man/Makefile.in gnome-panel-2.30.0.ubuntu/man/Makefile.in
21810
--- gnome-panel-2.30.0/man/Makefile.in 2010-03-30 02:52:47.000000000 +0200
21811
+++ gnome-panel-2.30.0.ubuntu/man/Makefile.in 2010-03-30 12:08:11.000000000 +0200
22006
21812
@@ -1,4 +1,4 @@
22007
21813
-# Makefile.in generated by automake 1.11 from Makefile.am.
22008
21814
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
Loggerhead is a web-based interface for Breezy
Version: 2.0.1