~bratsche/ubuntu/maverick/gtk+2.0/menu-activation-fix
» Revision
175
: debian/patches/070_mandatory-relibtoolize.patch
« back to all changes in this revision
Viewing changes to debian/patches/070_mandatory-relibtoolize.patch
- browse files at revision 175
- compare with another revision
- download diff
- download tarball
- view history from revision 175
- Committer: Bazaar Package Importer
- Author(s): Robert Ancell
- Date: 2010-07-22 21:41:30 UTC
- mfrom: (1.11.7 upstream) (72.1.16 experimental)
- Revision ID: james.westby@ubuntu.com-20100722214130-5uzyvpb9g4m0ts2c
Tags: 2.21.5-1ubuntu1
* Merge with Debian experimental, Ubuntu changes:
* debian/control.in:
- Add introspection build-depends
- Add Vcs-Bzr link
- Add gir1.0-gtk-2.0 package
- libgtk2.0-dev replaces gir-repository-dev
- Conflict with appmenu-gtk (<< 0.1.3) to prevent menu proxy breakage
* debian/rules:
- Build with --enable-introspection
- Add gir1.0-gtk-2.0 package to BINARY_ARCH_PKGS
- Add dh_girepository call
- Disable devhelp files
* debian/dh_gtkmodules.in:
- Remove obsolete script content
* debian/libgtk2.0-0.symbols:
- Add Ubuntu specific symbols
* debian/libgtk2.0-dev.install.in:
- Add gir files
* debian/libgtk2.0-doc.install.in
- Disable devhelp files
* debian/gir1.0-gtk-2.0.install.in
- Introspection package
* debian/patches/043_menu_proxy.patch
- Add GtkMenuProxy support for remoting menus.
* debian/patches/062_dnd_menubar.patch:
- Allow click on menubars for dnd
* debian/patches/063_treeview_almost_fixed.patch:
- Add an ubuntu-almost-fixed-height-mode property, (required for
software-center)
* debian/patches/071_no_offscreen_widgets_grabbing.patch:
- Don't let offscreen widgets do grabbing
* debian/patches/072_indicator_menu_update.patch:
- change by Cody Russell to send an update event on menu changes,
should make the bluetooth indicator refresh correctly
* debian/patches/091_bugzilla_tooltip_refresh.patch:
- Upstream bugzilla change to have better looking tooltips the gtk theme
need to set "new-tooltip-style" to use those
* debian/watch:
- Watch for unstable versions
* debian/control.in:
- Add introspection build-depends
- Add Vcs-Bzr link
- Add gir1.0-gtk-2.0 package
- libgtk2.0-dev replaces gir-repository-dev
- Conflict with appmenu-gtk (<< 0.1.3) to prevent menu proxy breakage
* debian/rules:
- Build with --enable-introspection
- Add gir1.0-gtk-2.0 package to BINARY_ARCH_PKGS
- Add dh_girepository call
- Disable devhelp files
* debian/dh_gtkmodules.in:
- Remove obsolete script content
* debian/libgtk2.0-0.symbols:
- Add Ubuntu specific symbols
* debian/libgtk2.0-dev.install.in:
- Add gir files
* debian/libgtk2.0-doc.install.in
- Disable devhelp files
* debian/gir1.0-gtk-2.0.install.in
- Introspection package
* debian/patches/043_menu_proxy.patch
- Add GtkMenuProxy support for remoting menus.
* debian/patches/062_dnd_menubar.patch:
- Allow click on menubars for dnd
* debian/patches/063_treeview_almost_fixed.patch:
- Add an ubuntu-almost-fixed-height-mode property, (required for
software-center)
* debian/patches/071_no_offscreen_widgets_grabbing.patch:
- Don't let offscreen widgets do grabbing
* debian/patches/072_indicator_menu_update.patch:
- change by Cody Russell to send an update event on menu changes,
should make the bluetooth indicator refresh correctly
* debian/patches/091_bugzilla_tooltip_refresh.patch:
- Upstream bugzilla change to have better looking tooltips the gtk theme
need to set "new-tooltip-style" to use those
* debian/watch:
- Watch for unstable versions
- files added:
- debian/libgtk2.0-0.triggers.in
- files removed:
- contrib
- contrib/gdk-pixbuf-xlib
- docs/reference/gdk-pixbuf
- docs/reference/gdk-pixbuf/html
- docs/reference/gdk-pixbuf/tmpl
- gdk-pixbuf
- gdk-pixbuf/pixops
- files modified:
- ChangeLog
added
removed
debian/patches/070_mandatory-relibtoolize.patch
1
diff -Nur gtk+2.0-2.21.2/aclocal.m4 gtk+2.0-2.21.2.ubuntu/aclocal.m4
2
--- gtk+2.0-2.21.2/aclocal.m4 2010-06-10 19:18:17.000000000 +0200
3
+++ gtk+2.0-2.21.2.ubuntu/aclocal.m4 2010-06-11 12:15:17.000000000 +0200
4
@@ -726,7957 +726,7 @@
5
AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
6
])
7
1
Index: gtk+-2.21.5/aclocal.m4
2
===================================================================
3
--- gtk+-2.21.5.orig/aclocal.m4 2010-07-22 21:44:03.140072001 +0200
4
+++ gtk+-2.21.5/aclocal.m4 2010-07-22 21:44:16.090072000 +0200
5
@@ -13,8 +13,8 @@
6
7
m4_ifndef([AC_AUTOCONF_VERSION],
8
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
9
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.66],,
10
-[m4_warning([this file was generated for autoconf 2.66.
11
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
12
+[m4_warning([this file was generated for autoconf 2.65.
13
You have another version of autoconf. It may work, but is not guaranteed to.
14
If you have problems, you may need to regenerate the build system entirely.
15
To do so, use the procedure documented by the package, typically `autoreconf'.])])
16
@@ -664,8105 +664,6 @@
17
fi])
18
19
20
-dnl -*- mode: autoconf -*-
21
-
22
-# serial 1
23
-
24
-dnl Usage:
25
-dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
26
-AC_DEFUN([GTK_DOC_CHECK],
27
-[
28
- AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
29
- AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
30
-
31
- dnl check for tools we added during development
32
- AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
33
- AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
34
- AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
35
-
36
- dnl for overriding the documentation installation directory
37
- AC_ARG_WITH([html-dir],
38
- AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
39
- [with_html_dir='${datadir}/gtk-doc/html'])
40
- HTML_DIR="$with_html_dir"
41
- AC_SUBST([HTML_DIR])
42
-
43
- dnl enable/disable documentation building
44
- AC_ARG_ENABLE([gtk-doc],
45
- AS_HELP_STRING([--enable-gtk-doc],
46
- [use gtk-doc to build documentation [[default=no]]]),,
47
- [enable_gtk_doc=no])
48
-
49
- if test x$enable_gtk_doc = xyes; then
50
- ifelse([$1],[],
51
- [PKG_CHECK_EXISTS([gtk-doc],,
52
- AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
53
- [PKG_CHECK_EXISTS([gtk-doc >= $1],,
54
- AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
55
- fi
56
-
57
- AC_MSG_CHECKING([whether to build gtk-doc documentation])
58
- AC_MSG_RESULT($enable_gtk_doc)
59
-
60
- dnl enable/disable output formats
61
- AC_ARG_ENABLE([gtk-doc-html],
62
- AS_HELP_STRING([--enable-gtk-doc-html],
63
- [build documentation in html format [[default=yes]]]),,
64
- [enable_gtk_doc_html=yes])
65
- AC_ARG_ENABLE([gtk-doc-pdf],
66
- AS_HELP_STRING([--enable-gtk-doc-pdf],
67
- [build documentation in pdf format [[default=no]]]),,
68
- [enable_gtk_doc_pdf=no])
69
-
70
- if test -z "$GTKDOC_MKPDF"; then
71
- enable_gtk_doc_pdf=no
72
- fi
73
-
74
-
75
- AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
76
- AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
77
- AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
78
- AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
79
- AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
80
-])
81
-
8
82
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
9
83
-#
10
84
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
11
-# 2006, 2007, 2008 Free Software Foundation, Inc.
85
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
86
-# Inc.
12
87
-# Written by Gordon Matzigkeit, 1996
13
88
-#
14
89
-# This file is free software; the Free Software Foundation gives
17
92
-
18
93
-m4_define([_LT_COPYING], [dnl
19
94
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
20
-# 2006, 2007, 2008 Free Software Foundation, Inc.
95
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
96
-# Inc.
21
97
-# Written by Gordon Matzigkeit, 1996
22
98
-#
23
99
-# This file is part of GNU Libtool.
44
120
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
45
121
-])
46
122
-
47
-# serial 56 LT_INIT
123
-# serial 57 LT_INIT
48
124
-
49
125
-
50
126
-# LT_PREREQ(VERSION)
73
149
-# ------------------
74
150
-AC_DEFUN([LT_INIT],
75
151
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
152
-AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
76
153
-AC_BEFORE([$0], [LT_LANG])dnl
77
154
-AC_BEFORE([$0], [LT_OUTPUT])dnl
78
155
-AC_BEFORE([$0], [LTDL_INIT])dnl
89
166
-AC_REQUIRE([LTOBSOLETE_VERSION])dnl
90
167
-m4_require([_LT_PROG_LTMAIN])dnl
91
168
-
169
-_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
170
-
92
171
-dnl Parse OPTIONS
93
172
-_LT_SET_OPTIONS([$0], [$1])
94
173
-
125
204
- *) break;;
126
205
- esac
127
206
-done
128
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
207
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
129
208
-])
130
209
-
131
210
-
145
224
-m4_defun([_LT_SETUP],
146
225
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
147
226
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
227
-AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
228
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
229
-
148
230
-_LT_DECL([], [host_alias], [0], [The host system])dnl
149
231
-_LT_DECL([], [host], [0])dnl
150
232
-_LT_DECL([], [host_os], [0])dnl
186
268
-_LT_CHECK_OBJDIR
187
269
-
188
270
-m4_require([_LT_TAG_COMPILER])dnl
189
-_LT_PROG_ECHO_BACKSLASH
190
271
-
191
272
-case $host_os in
192
273
-aix3*)
200
281
- ;;
201
282
-esac
202
283
-
203
-# Sed substitution that helps us do robust quoting. It backslashifies
204
-# metacharacters that are still active within double-quoted strings.
205
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
206
-
207
-# Same as above, but do not quote variable references.
208
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
209
-
210
-# Sed substitution to delay expansion of an escaped shell variable in a
211
-# double_quote_subst'ed string.
212
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
213
-
214
-# Sed substitution to delay expansion of an escaped single quote.
215
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
216
-
217
-# Sed substitution to avoid accidental globbing in evaled expressions
218
-no_glob_subst='s/\*/\\\*/g'
219
-
220
284
-# Global variables:
221
285
-ofile=libtool
222
286
-can_build_shared=yes
257
321
-])# _LT_SETUP
258
322
-
259
323
-
324
-# _LT_PREPARE_SED_QUOTE_VARS
325
-# --------------------------
326
-# Define a few sed substitution that help us do robust quoting.
327
-m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
328
-[# Backslashify metacharacters that are still active within
329
-# double-quoted strings.
330
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
331
-
332
-# Same as above, but do not quote variable references.
333
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
334
-
335
-# Sed substitution to delay expansion of an escaped shell variable in a
336
-# double_quote_subst'ed string.
337
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
338
-
339
-# Sed substitution to delay expansion of an escaped single quote.
340
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
341
-
342
-# Sed substitution to avoid accidental globbing in evaled expressions
343
-no_glob_subst='s/\*/\\\*/g'
344
-])
345
-
260
346
-# _LT_PROG_LTMAIN
261
347
-# ---------------
262
348
-# Note that this code is called both from `configure', and `config.status'
409
495
-# declaration there will have the same value as in `configure'. VARNAME
410
496
-# must have a single quote delimited value for this to work.
411
497
-m4_define([_LT_CONFIG_STATUS_DECLARE],
412
-[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
498
-[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
413
499
-
414
500
-
415
501
-# _LT_CONFIG_STATUS_DECLARATIONS
419
505
-# embedded single quotes properly. In configure, this macro expands
420
506
-# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
421
507
-#
422
-# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
508
-# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
423
509
-m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
424
510
-[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
425
511
- [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
518
604
-LTCFLAGS='$LTCFLAGS'
519
605
-compiler='$compiler_DEFAULT'
520
606
-
607
-# A function that is used when there is no print builtin or printf.
608
-func_fallback_echo ()
609
-{
610
- eval 'cat <<_LTECHO_EOF
611
-\$[]1
612
-_LTECHO_EOF'
613
-}
614
-
521
615
-# Quote evaled strings.
522
616
-for var in lt_decl_all_varnames([[ \
523
617
-]], lt_decl_quote_varnames); do
524
- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
618
- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
525
619
- *[[\\\\\\\`\\"\\\$]]*)
526
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
620
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
527
621
- ;;
528
622
- *)
529
623
- eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
534
628
-# Double-quote double-evaled strings.
535
629
-for var in lt_decl_all_varnames([[ \
536
630
-]], lt_decl_dquote_varnames); do
537
- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
631
- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
538
632
- *[[\\\\\\\`\\"\\\$]]*)
539
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
633
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
540
634
- ;;
541
635
- *)
542
636
- eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
544
638
- esac
545
639
-done
546
640
-
547
-# Fix-up fallback echo if it was mangled by the above quoting rules.
548
-case \$lt_ECHO in
549
-*'\\\[$]0 --fallback-echo"')dnl "
550
- lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
551
- ;;
552
-esac
553
-
554
641
-_LT_OUTPUT_LIBTOOL_INIT
555
642
-])
556
643
-
644
-# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
645
-# ------------------------------------
646
-# Generate a child script FILE with all initialization necessary to
647
-# reuse the environment learned by the parent script, and make the
648
-# file executable. If COMMENT is supplied, it is inserted after the
649
-# `#!' sequence but before initialization text begins. After this
650
-# macro, additional text can be appended to FILE to form the body of
651
-# the child script. The macro ends with non-zero status if the
652
-# file could not be fully written (such as if the disk is full).
653
-m4_ifdef([AS_INIT_GENERATED],
654
-[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
655
-[m4_defun([_LT_GENERATED_FILE_INIT],
656
-[m4_require([AS_PREPARE])]dnl
657
-[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
658
-[lt_write_fail=0
659
-cat >$1 <<_ASEOF || lt_write_fail=1
660
-#! $SHELL
661
-# Generated by $as_me.
662
-$2
663
-SHELL=\${CONFIG_SHELL-$SHELL}
664
-export SHELL
665
-_ASEOF
666
-cat >>$1 <<\_ASEOF || lt_write_fail=1
667
-AS_SHELL_SANITIZE
668
-_AS_PREPARE
669
-exec AS_MESSAGE_FD>&1
670
-_ASEOF
671
-test $lt_write_fail = 0 && chmod +x $1[]dnl
672
-m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
557
673
-
558
674
-# LT_OUTPUT
559
675
-# ---------
563
679
-AC_DEFUN([LT_OUTPUT],
564
680
-[: ${CONFIG_LT=./config.lt}
565
681
-AC_MSG_NOTICE([creating $CONFIG_LT])
566
-cat >"$CONFIG_LT" <<_LTEOF
567
-#! $SHELL
568
-# Generated by $as_me.
569
-# Run this file to recreate a libtool stub with the current configuration.
682
-_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
683
-[# Run this file to recreate a libtool stub with the current configuration.])
570
684
-
685
-cat >>"$CONFIG_LT" <<\_LTEOF
571
686
-lt_cl_silent=false
572
-SHELL=\${CONFIG_SHELL-$SHELL}
573
-_LTEOF
574
-
575
-cat >>"$CONFIG_LT" <<\_LTEOF
576
-AS_SHELL_SANITIZE
577
-_AS_PREPARE
578
-
579
-exec AS_MESSAGE_FD>&1
580
687
-exec AS_MESSAGE_LOG_FD>>config.log
581
688
-{
582
689
- echo
602
709
-m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
603
710
-configured by $[0], generated by m4_PACKAGE_STRING.
604
711
-
605
-Copyright (C) 2008 Free Software Foundation, Inc.
712
-Copyright (C) 2010 Free Software Foundation, Inc.
606
713
-This config.lt script is free software; the Free Software Foundation
607
714
-gives unlimited permision to copy, distribute and modify it."
608
715
-
647
754
-# appending to config.log, which fails on DOS, as config.log is still kept
648
755
-# open by configure. Here we exec the FD to /dev/null, effectively closing
649
756
-# config.log, so it can be properly (re)opened and appended to by config.lt.
650
-if test "$no_create" != yes; then
651
- lt_cl_success=:
652
- test "$silent" = yes &&
653
- lt_config_lt_args="$lt_config_lt_args --quiet"
654
- exec AS_MESSAGE_LOG_FD>/dev/null
655
- $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
656
- exec AS_MESSAGE_LOG_FD>>config.log
657
- $lt_cl_success || AS_EXIT(1)
658
-fi
757
-lt_cl_success=:
758
-test "$silent" = yes &&
759
- lt_config_lt_args="$lt_config_lt_args --quiet"
760
-exec AS_MESSAGE_LOG_FD>/dev/null
761
-$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
762
-exec AS_MESSAGE_LOG_FD>>config.log
763
-$lt_cl_success || AS_EXIT(1)
659
764
-])# LT_OUTPUT
660
765
-
661
766
-
832
937
-AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
833
938
-AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
834
939
-AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
940
-AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
835
941
-dnl aclocal-1.4 backwards compatibility:
836
942
-dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
837
943
-dnl AC_DEFUN([AC_LIBTOOL_F77], [])
838
944
-dnl AC_DEFUN([AC_LIBTOOL_FC], [])
839
945
-dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
946
-dnl AC_DEFUN([AC_LIBTOOL_RC], [])
840
947
-
841
948
-
842
949
-# _LT_TAG_COMPILER
941
1048
- [lt_cv_ld_exported_symbols_list=no])
942
1049
- LDFLAGS="$save_LDFLAGS"
943
1050
- ])
1051
- AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
1052
- [lt_cv_ld_force_load=no
1053
- cat > conftest.c << _LT_EOF
1054
-int forced_loaded() { return 2;}
1055
-_LT_EOF
1056
- echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
1057
- $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
1058
- echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
1059
- $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
1060
- echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
1061
- $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
1062
- cat > conftest.c << _LT_EOF
1063
-int main() { return 0;}
1064
-_LT_EOF
1065
- echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
1066
- $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
1067
- _lt_result=$?
1068
- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
1069
- lt_cv_ld_force_load=yes
1070
- else
1071
- cat conftest.err >&AS_MESSAGE_LOG_FD
1072
- fi
1073
- rm -f conftest.err libconftest.a conftest conftest.c
1074
- rm -rf conftest.dSYM
1075
- ])
944
1076
- case $host_os in
945
1077
- rhapsody* | darwin1.[[012]])
946
1078
- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
968
1100
- else
969
1101
- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
970
1102
- fi
971
- if test "$DSYMUTIL" != ":"; then
1103
- if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
972
1104
- _lt_dsymutil='~$DSYMUTIL $lib || :'
973
1105
- else
974
1106
- _lt_dsymutil=
988
1120
- _LT_TAGVAR(hardcode_direct, $1)=no
989
1121
- _LT_TAGVAR(hardcode_automatic, $1)=yes
990
1122
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
991
- _LT_TAGVAR(whole_archive_flag_spec, $1)=''
1123
- if test "$lt_cv_ld_force_load" = "yes"; then
1124
- _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
1125
- else
1126
- _LT_TAGVAR(whole_archive_flag_spec, $1)=''
1127
- fi
992
1128
- _LT_TAGVAR(link_all_deplibs, $1)=yes
993
1129
- _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
994
1130
- case $cc_basename in
996
1132
- *) _lt_dar_can_shared=$GCC ;;
997
1133
- esac
998
1134
- if test "$_lt_dar_can_shared" = "yes"; then
999
- output_verbose_link_cmd=echo
1135
- output_verbose_link_cmd=func_echo_all
1000
1136
- _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
1001
1137
- _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
1002
1138
- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
1042
1178
-# _LT_SHELL_INIT(ARG)
1043
1179
-# -------------------
1044
1180
-m4_define([_LT_SHELL_INIT],
1045
-[ifdef([AC_DIVERSION_NOTICE],
1046
- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
1047
- [AC_DIVERT_PUSH(NOTICE)])
1048
-$1
1049
-AC_DIVERT_POP
1050
-])# _LT_SHELL_INIT
1181
-[m4_divert_text([M4SH-INIT], [$1
1182
-])])# _LT_SHELL_INIT
1183
-
1051
1184
-
1052
1185
-
1053
1186
-# _LT_PROG_ECHO_BACKSLASH
1054
1187
-# -----------------------
1055
-# Add some code to the start of the generated configure script which
1056
-# will find an echo command which doesn't interpret backslashes.
1188
-# Find how we can fake an echo command that does not interpret backslash.
1189
-# In particular, with Autoconf 2.60 or later we add some code to the start
1190
-# of the generated configure script which will find a shell with a builtin
1191
-# printf (which we can use as an echo command).
1057
1192
-m4_defun([_LT_PROG_ECHO_BACKSLASH],
1058
-[_LT_SHELL_INIT([
1059
-# Check that we are running under the correct shell.
1060
-SHELL=${CONFIG_SHELL-/bin/sh}
1061
-
1062
-case X$lt_ECHO in
1063
-X*--fallback-echo)
1064
- # Remove one level of quotation (which was required for Make).
1065
- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
1066
- ;;
1193
-[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
1194
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
1195
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
1196
-
1197
-AC_MSG_CHECKING([how to print strings])
1198
-# Test print first, because it will be a builtin if present.
1199
-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
1200
- test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
1201
- ECHO='print -r --'
1202
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
1203
- ECHO='printf %s\n'
1204
-else
1205
- # Use this function as a fallback that always works.
1206
- func_fallback_echo ()
1207
- {
1208
- eval 'cat <<_LTECHO_EOF
1209
-$[]1
1210
-_LTECHO_EOF'
1211
- }
1212
- ECHO='func_fallback_echo'
1213
-fi
1214
-
1215
-# func_echo_all arg...
1216
-# Invoke $ECHO with all args, space-separated.
1217
-func_echo_all ()
1218
-{
1219
- $ECHO "$*"
1220
-}
1221
-
1222
-case "$ECHO" in
1223
- printf*) AC_MSG_RESULT([printf]) ;;
1224
- print*) AC_MSG_RESULT([print -r]) ;;
1225
- *) AC_MSG_RESULT([cat]) ;;
1067
1226
-esac
1068
1227
-
1069
-ECHO=${lt_ECHO-echo}
1070
-if test "X[$]1" = X--no-reexec; then
1071
- # Discard the --no-reexec flag, and continue.
1072
- shift
1073
-elif test "X[$]1" = X--fallback-echo; then
1074
- # Avoid inline document here, it may be left over
1075
- :
1076
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
1077
- # Yippee, $ECHO works!
1078
- :
1079
-else
1080
- # Restart under the correct shell.
1081
- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
1082
-fi
1083
-
1084
-if test "X[$]1" = X--fallback-echo; then
1085
- # used as fallback echo
1086
- shift
1087
- cat <<_LT_EOF
1088
-[$]*
1089
-_LT_EOF
1090
- exit 0
1091
-fi
1092
-
1093
-# The HP-UX ksh and POSIX shell print the target directory to stdout
1094
-# if CDPATH is set.
1095
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
1096
-
1097
-if test -z "$lt_ECHO"; then
1098
- if test "X${echo_test_string+set}" != Xset; then
1099
- # find a string as large as possible, as long as the shell can cope with it
1100
- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
1101
- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
1102
- if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
1103
- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
1104
- then
1105
- break
1106
- fi
1107
- done
1108
- fi
1109
-
1110
- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
1111
- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
1112
- test "X$echo_testing_string" = "X$echo_test_string"; then
1113
- :
1114
- else
1115
- # The Solaris, AIX, and Digital Unix default echo programs unquote
1116
- # backslashes. This makes it impossible to quote backslashes using
1117
- # echo "$something" | sed 's/\\/\\\\/g'
1118
- #
1119
- # So, first we look for a working echo in the user's PATH.
1120
-
1121
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
1122
- for dir in $PATH /usr/ucb; do
1123
- IFS="$lt_save_ifs"
1124
- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
1125
- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
1126
- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
1127
- test "X$echo_testing_string" = "X$echo_test_string"; then
1128
- ECHO="$dir/echo"
1129
- break
1130
- fi
1131
- done
1132
- IFS="$lt_save_ifs"
1133
-
1134
- if test "X$ECHO" = Xecho; then
1135
- # We didn't find a better echo, so look for alternatives.
1136
- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
1137
- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
1138
- test "X$echo_testing_string" = "X$echo_test_string"; then
1139
- # This shell has a builtin print -r that does the trick.
1140
- ECHO='print -r'
1141
- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
1142
- test "X$CONFIG_SHELL" != X/bin/ksh; then
1143
- # If we have ksh, try running configure again with it.
1144
- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
1145
- export ORIGINAL_CONFIG_SHELL
1146
- CONFIG_SHELL=/bin/ksh
1147
- export CONFIG_SHELL
1148
- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
1149
- else
1150
- # Try using printf.
1151
- ECHO='printf %s\n'
1152
- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
1153
- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
1154
- test "X$echo_testing_string" = "X$echo_test_string"; then
1155
- # Cool, printf works
1156
- :
1157
- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
1158
- test "X$echo_testing_string" = 'X\t' &&
1159
- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
1160
- test "X$echo_testing_string" = "X$echo_test_string"; then
1161
- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
1162
- export CONFIG_SHELL
1163
- SHELL="$CONFIG_SHELL"
1164
- export SHELL
1165
- ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
1166
- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
1167
- test "X$echo_testing_string" = 'X\t' &&
1168
- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
1169
- test "X$echo_testing_string" = "X$echo_test_string"; then
1170
- ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
1171
- else
1172
- # maybe with a smaller string...
1173
- prev=:
1174
-
1175
- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
1176
- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
1177
- then
1178
- break
1179
- fi
1180
- prev="$cmd"
1181
- done
1182
-
1183
- if test "$prev" != 'sed 50q "[$]0"'; then
1184
- echo_test_string=`eval $prev`
1185
- export echo_test_string
1186
- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
1187
- else
1188
- # Oops. We lost completely, so just stick with echo.
1189
- ECHO=echo
1190
- fi
1191
- fi
1192
- fi
1193
- fi
1194
- fi
1195
-fi
1196
-
1197
-# Copy echo and quote the copy suitably for passing to libtool from
1198
-# the Makefile, instead of quoting the original, which is used later.
1199
-lt_ECHO=$ECHO
1200
-if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
1201
- lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
1202
-fi
1203
-
1204
-AC_SUBST(lt_ECHO)
1205
-])
1228
-m4_ifdef([_AS_DETECT_SUGGESTED],
1229
-[_AS_DETECT_SUGGESTED([
1230
- test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
1231
- ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
1232
- ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
1233
- ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
1234
- PATH=/empty FPATH=/empty; export PATH FPATH
1235
- test "X`printf %s $ECHO`" = "X$ECHO" \
1236
- || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
1237
-
1206
1238
-_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
1207
-_LT_DECL([], [ECHO], [1],
1208
- [An echo program that does not interpret backslashes])
1239
-_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
1209
1240
-])# _LT_PROG_ECHO_BACKSLASH
1210
1241
-
1211
1242
-
1237
1268
- ;;
1238
1269
-*-*-irix6*)
1239
1270
- # Find out which ABI we are using.
1240
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
1271
- echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
1241
1272
- if AC_TRY_EVAL(ac_compile); then
1242
1273
- if test "$lt_cv_prog_gnu_ld" = yes; then
1243
1274
- case `/usr/bin/file conftest.$ac_objext` in
1389
1420
- esac
1390
1421
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
1391
1422
-fi
1423
-
1424
-case $host_os in
1425
- darwin*)
1426
- lock_old_archive_extraction=yes ;;
1427
- *)
1428
- lock_old_archive_extraction=no ;;
1429
-esac
1392
1430
-_LT_DECL([], [old_postinstall_cmds], [2])
1393
1431
-_LT_DECL([], [old_postuninstall_cmds], [2])
1394
1432
-_LT_TAGDECL([], [old_archive_cmds], [2],
1395
1433
- [Commands used to build an old-style archive])
1434
-_LT_DECL([], [lock_old_archive_extraction], [0],
1435
- [Whether to use a lock for old archive extraction])
1396
1436
-])# _LT_CMD_OLD_ARCHIVE
1397
1437
-
1398
1438
-
1417
1457
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1418
1458
- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
1419
1459
- -e 's:$: $lt_compiler_flag:'`
1420
- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
1460
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
1421
1461
- (eval "$lt_compile" 2>conftest.err)
1422
1462
- ac_status=$?
1423
1463
- cat conftest.err >&AS_MESSAGE_LOG_FD
1424
- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
1464
- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
1425
1465
- if (exit $ac_status) && test -s "$ac_outfile"; then
1426
1466
- # The compiler can only warn and ignore the option if not recognized
1427
1467
- # So say no if there are warnings other than the usual output.
1428
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
1468
- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
1429
1469
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
1430
1470
- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
1431
1471
- $2=yes
1465
1505
- if test -s conftest.err; then
1466
1506
- # Append any errors to the config.log.
1467
1507
- cat conftest.err 1>&AS_MESSAGE_LOG_FD
1468
- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
1508
- $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
1469
1509
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
1470
1510
- if diff conftest.exp conftest.er2 >/dev/null; then
1471
1511
- $2=yes
1528
1568
- lt_cv_sys_max_cmd_len=8192;
1529
1569
- ;;
1530
1570
-
1571
- mint*)
1572
- # On MiNT this can take a long time and run out of memory.
1573
- lt_cv_sys_max_cmd_len=8192;
1574
- ;;
1575
-
1531
1576
- amigaos*)
1532
1577
- # On AmigaOS with pdksh, this test takes hours, literally.
1533
1578
- # So we just punt and use a minimum line length of 8192.
1592
1637
- # If test is not a shell built-in, we'll probably end up computing a
1593
1638
- # maximum length that is only half of the actual maximum length, but
1594
1639
- # we can't tell.
1595
- while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
1596
- = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
1640
- while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
1641
- = "X$teststring$teststring"; } >/dev/null 2>&1 &&
1597
1642
- test $i != 17 # 1/2 MB should be enough
1598
1643
- do
1599
1644
- i=`expr $i + 1`
1644
1689
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1645
1690
- lt_status=$lt_dlunknown
1646
1691
- cat > conftest.$ac_ext <<_LT_EOF
1647
-[#line __oline__ "configure"
1692
-[#line $LINENO "configure"
1648
1693
-#include "confdefs.h"
1649
1694
-
1650
1695
-#if HAVE_DLFCN_H
1685
1730
-# endif
1686
1731
-#endif
1687
1732
-
1688
-void fnord() { int i=42;}
1733
-/* When -fvisbility=hidden is used, assume the code has been annotated
1734
- correspondingly for the symbols needed. */
1735
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
1736
-void fnord () __attribute__((visibility("default")));
1737
-#endif
1738
-
1739
-void fnord () { int i=42; }
1689
1740
-int main ()
1690
1741
-{
1691
1742
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1694
1745
- if (self)
1695
1746
- {
1696
1747
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
1697
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
1748
- else
1749
- {
1750
- if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
1751
- else puts (dlerror ());
1752
- }
1698
1753
- /* dlclose (self); */
1699
1754
- }
1700
1755
- else
1870
1925
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1871
1926
- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
1872
1927
- -e 's:$: $lt_compiler_flag:'`
1873
- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
1928
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
1874
1929
- (eval "$lt_compile" 2>out/conftest.err)
1875
1930
- ac_status=$?
1876
1931
- cat out/conftest.err >&AS_MESSAGE_LOG_FD
1877
- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
1932
- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
1878
1933
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
1879
1934
- then
1880
1935
- # The compiler can only warn and ignore the option if not recognized
1881
1936
- # So say no if there are warnings
1882
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
1937
- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
1883
1938
- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
1884
1939
- if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
1885
1940
- _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
2038
2093
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
2039
2094
-m4_require([_LT_DECL_OBJDUMP])dnl
2040
2095
-m4_require([_LT_DECL_SED])dnl
2096
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
2041
2097
-AC_MSG_CHECKING([dynamic linker characteristics])
2042
2098
-m4_if([$1],
2043
2099
- [], [
2046
2102
- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
2047
2103
- *) lt_awk_arg="/^libraries:/" ;;
2048
2104
- esac
2049
- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
2050
- if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
2105
- case $host_os in
2106
- mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
2107
- *) lt_sed_strip_eq="s,=/,/,g" ;;
2108
- esac
2109
- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
2110
- case $lt_search_path_spec in
2111
- *\;*)
2051
2112
- # if the path contains ";" then we assume it to be the separator
2052
2113
- # otherwise default to the standard path separator (i.e. ":") - it is
2053
2114
- # assumed that no part of a normal pathname contains ";" but that should
2054
2115
- # okay in the real world where ";" in dirpaths is itself problematic.
2055
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
2056
- else
2057
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
2058
- fi
2116
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
2117
- ;;
2118
- *)
2119
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
2120
- ;;
2121
- esac
2059
2122
- # Ok, now we have the path, separated by spaces, we can step through it
2060
2123
- # and add multilib dir if necessary.
2061
2124
- lt_tmp_lt_search_path_spec=
2068
2131
- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
2069
2132
- fi
2070
2133
- done
2071
- lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
2134
- lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
2072
2135
-BEGIN {RS=" "; FS="/|\n";} {
2073
2136
- lt_foo="";
2074
2137
- lt_count=0;
2088
2151
- if (lt_foo != "") { lt_freq[[lt_foo]]++; }
2089
2152
- if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
2090
2153
-}'`
2091
- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
2154
- # AWK program above erroneously prepends '/' to C:/dos/paths
2155
- # for these hosts.
2156
- case $host_os in
2157
- mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
2158
- $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
2159
- esac
2160
- sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
2092
2161
-else
2093
2162
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
2094
2163
-fi])
2176
2245
- m68k)
2177
2246
- library_names_spec='$libname.ixlibrary $libname.a'
2178
2247
- # Create ${libname}_ixlibrary.a entries in /sys/libs.
2179
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
2248
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
2180
2249
- ;;
2181
2250
- esac
2182
2251
- ;;
2229
2298
- cygwin*)
2230
2299
- # Cygwin DLLs use 'cyg' prefix rather than 'lib'
2231
2300
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
2232
- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
2301
-m4_if([$1], [],[
2302
- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
2233
2303
- ;;
2234
2304
- mingw* | cegcc*)
2235
2305
- # MinGW DLLs use traditional 'lib' prefix
2236
2306
- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
2237
- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
2238
- if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
2239
- # It is most probably a Windows format PATH printed by
2240
- # mingw gcc, but we are running on Cygwin. Gcc prints its search
2241
- # path with ; separators, and with drive letters. We can handle the
2242
- # drive letters (cygwin fileutils understands them), so leave them,
2243
- # especially as we might pass files found there to a mingw objdump,
2244
- # which wouldn't understand a cygwinified path. Ahh.
2245
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
2246
- else
2247
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
2248
- fi
2249
2307
- ;;
2250
2308
- pw32*)
2251
2309
- # pw32 DLLs use 'pw' prefix rather than 'lib'
2345
2403
- hardcode_into_libs=yes
2346
2404
- ;;
2347
2405
-
2406
-haiku*)
2407
- version_type=linux
2408
- need_lib_prefix=no
2409
- need_version=no
2410
- dynamic_linker="$host_os runtime_loader"
2411
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
2412
- soname_spec='${libname}${release}${shared_ext}$major'
2413
- shlibpath_var=LIBRARY_PATH
2414
- shlibpath_overrides_runpath=yes
2415
- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
2416
- hardcode_into_libs=yes
2417
- ;;
2418
-
2348
2419
-hpux9* | hpux10* | hpux11*)
2349
2420
- # Give a soname corresponding to the major version so that dld.sl refuses to
2350
2421
- # link against other versions.
2387
2458
- soname_spec='${libname}${release}${shared_ext}$major'
2388
2459
- ;;
2389
2460
- esac
2390
- # HP-UX runs *really* slowly unless shared libraries are mode 555.
2461
- # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
2391
2462
- postinstall_cmds='chmod 555 $lib'
2463
- # or fails outright, so override atomically:
2464
- install_override_mode=555
2392
2465
- ;;
2393
2466
-
2394
2467
-interix[[3-9]]*)
2446
2519
- ;;
2447
2520
-
2448
2521
-# This must be Linux ELF.
2449
-linux* | k*bsd*-gnu)
2522
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
2450
2523
- version_type=linux
2451
2524
- need_lib_prefix=no
2452
2525
- need_version=no
2455
2528
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
2456
2529
- shlibpath_var=LD_LIBRARY_PATH
2457
2530
- shlibpath_overrides_runpath=no
2531
-
2458
2532
- # Some binutils ld are patched to set DT_RUNPATH
2459
- save_LDFLAGS=$LDFLAGS
2460
- save_libdir=$libdir
2461
- eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
2462
- LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
2463
- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
2464
- [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
2465
- [shlibpath_overrides_runpath=yes])])
2466
- LDFLAGS=$save_LDFLAGS
2467
- libdir=$save_libdir
2533
- AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
2534
- [lt_cv_shlibpath_overrides_runpath=no
2535
- save_LDFLAGS=$LDFLAGS
2536
- save_libdir=$libdir
2537
- eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
2538
- LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
2539
- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
2540
- [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
2541
- [lt_cv_shlibpath_overrides_runpath=yes])])
2542
- LDFLAGS=$save_LDFLAGS
2543
- libdir=$save_libdir
2544
- ])
2545
- shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
2468
2546
-
2469
2547
- # This implies no fast_install, which is unacceptable.
2470
2548
- # Some rework will be needed to allow for fast_install
2476
2554
-
2477
2555
- # Append ld.so.conf contents to the search path
2478
2556
- if test -f /etc/ld.so.conf; then
2479
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
2557
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
2480
2558
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
2559
-
2481
2560
- fi
2482
2561
-
2483
2562
- # We used to test for /lib/ld.so.1 and disable shared libraries on
2709
2788
- The last name is the one that the linker finds with -lNAME]])
2710
2789
-_LT_DECL([], [soname_spec], [1],
2711
2790
- [[The coded name of the library, if different from the real name]])
2791
-_LT_DECL([], [install_override_mode], [1],
2792
- [Permission mode override for installation of shared libraries])
2712
2793
-_LT_DECL([], [postinstall_cmds], [2],
2713
2794
- [Command to use after installation of a shared archive])
2714
2795
-_LT_DECL([], [postuninstall_cmds], [2],
2821
2902
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
2822
2903
-m4_require([_LT_DECL_SED])dnl
2823
2904
-m4_require([_LT_DECL_EGREP])dnl
2905
-m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
2824
2906
-
2825
2907
-AC_ARG_WITH([gnu-ld],
2826
2908
- [AS_HELP_STRING([--with-gnu-ld],
2950
3032
- fi
2951
3033
- ;;
2952
3034
-esac
2953
-_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
2954
-_LT_DECL([], [reload_cmds], [2])dnl
3035
-_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
3036
-_LT_TAGDECL([], [reload_cmds], [2])dnl
2955
3037
-])# _LT_CMD_RELOAD
2956
3038
-
2957
3039
-
3003
3085
- # Base MSYS/MinGW do not provide the 'file' command needed by
3004
3086
- # func_win32_libid shell function, so use a weaker test based on 'objdump',
3005
3087
- # unless we find 'file', for example because we are cross-compiling.
3006
- if ( file / ) >/dev/null 2>&1; then
3088
- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
3089
- if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
3007
3090
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
3008
3091
- lt_cv_file_magic_cmd='func_win32_libid'
3009
3092
- else
3010
- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
3093
- # Keep this pattern in sync with the one in func_win32_libid.
3094
- lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
3011
3095
- lt_cv_file_magic_cmd='$OBJDUMP -f'
3012
3096
- fi
3013
3097
- ;;
3014
3098
-
3015
-cegcc)
3099
-cegcc*)
3016
3100
- # use the weaker test based on 'objdump'. See mingw*.
3017
3101
- lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
3018
3102
- lt_cv_file_magic_cmd='$OBJDUMP -f'
3042
3126
- lt_cv_deplibs_check_method=pass_all
3043
3127
- ;;
3044
3128
-
3129
-haiku*)
3130
- lt_cv_deplibs_check_method=pass_all
3131
- ;;
3132
-
3045
3133
-hpux10.20* | hpux11*)
3046
3134
- lt_cv_file_magic_cmd=/usr/bin/file
3047
3135
- case $host_cpu in
3050
3138
- lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
3051
3139
- ;;
3052
3140
- hppa*64*)
3053
- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
3141
- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
3054
3142
- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
3055
3143
- ;;
3056
3144
- *)
3057
- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
3145
- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
3058
3146
- lt_cv_file_magic_test_file=/usr/lib/libc.sl
3059
3147
- ;;
3060
3148
- esac
3076
3164
- ;;
3077
3165
-
3078
3166
-# This must be Linux ELF.
3079
-linux* | k*bsd*-gnu)
3167
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
3080
3168
- lt_cv_deplibs_check_method=pass_all
3081
3169
- ;;
3082
3170
-
3218
3306
- NM="$lt_cv_path_NM"
3219
3307
-else
3220
3308
- # Didn't find any BSD compatible name lister, look for dumpbin.
3221
- AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
3309
- if test -n "$DUMPBIN"; then :
3310
- # Let the user override the test.
3311
- else
3312
- AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
3313
- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
3314
- *COFF*)
3315
- DUMPBIN="$DUMPBIN -symbols"
3316
- ;;
3317
- *)
3318
- DUMPBIN=:
3319
- ;;
3320
- esac
3321
- fi
3222
3322
- AC_SUBST([DUMPBIN])
3223
3323
- if test "$DUMPBIN" != ":"; then
3224
3324
- NM="$DUMPBIN"
3231
3331
-AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
3232
3332
- [lt_cv_nm_interface="BSD nm"
3233
3333
- echo "int some_variable = 0;" > conftest.$ac_ext
3234
- (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
3334
- (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
3235
3335
- (eval "$ac_compile" 2>conftest.err)
3236
3336
- cat conftest.err >&AS_MESSAGE_LOG_FD
3237
- (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
3337
- (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
3238
3338
- (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
3239
3339
- cat conftest.err >&AS_MESSAGE_LOG_FD
3240
- (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
3340
- (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
3241
3341
- cat conftest.out >&AS_MESSAGE_LOG_FD
3242
3342
- if $GREP 'External.*some_variable' conftest.out > /dev/null; then
3243
3343
- lt_cv_nm_interface="MS dumpbin"
3260
3360
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
3261
3361
-LIBM=
3262
3362
-case $host in
3263
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
3363
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
3264
3364
- # These system don't have libm, or don't need it
3265
3365
- ;;
3266
3366
-*-ncr-sysv4.3*)
3288
3388
-_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
3289
3389
-
3290
3390
-if test "$GCC" = yes; then
3291
- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
3391
- case $cc_basename in
3392
- nvcc*)
3393
- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
3394
- *)
3395
- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
3396
- esac
3292
3397
-
3293
3398
- _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
3294
3399
- lt_cv_prog_compiler_rtti_exceptions,
3305
3410
-m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
3306
3411
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
3307
3412
-AC_REQUIRE([AC_PROG_CC])dnl
3413
-AC_REQUIRE([AC_PROG_AWK])dnl
3308
3414
-AC_REQUIRE([LT_PATH_NM])dnl
3309
3415
-AC_REQUIRE([LT_PATH_LD])dnl
3310
3416
-m4_require([_LT_DECL_SED])dnl
3430
3536
- if AC_TRY_EVAL(ac_compile); then
3431
3537
- # Now try to grab the symbols.
3432
3538
- nlist=conftest.nm
3433
- if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
3539
- if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
3434
3540
- # Try sorting and uniquifying the output.
3435
3541
- if sort "$nlist" | uniq > "$nlist"T; then
3436
3542
- mv -f "$nlist"T "$nlist"
3592
3698
- # DJGPP does not support shared libraries at all
3593
3699
- _LT_TAGVAR(lt_prog_compiler_pic, $1)=
3594
3700
- ;;
3701
- haiku*)
3702
- # PIC is the default for Haiku.
3703
- # The "-static" flag exists, but is broken.
3704
- _LT_TAGVAR(lt_prog_compiler_static, $1)=
3705
- ;;
3595
3706
- interix[[3-9]]*)
3596
3707
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
3597
3708
- # Instead, we relocate shared libraries at runtime.
3697
3808
- ;;
3698
3809
- esac
3699
3810
- ;;
3700
- linux* | k*bsd*-gnu)
3811
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
3701
3812
- case $cc_basename in
3702
3813
- KCC*)
3703
3814
- # KAI C++ Compiler
3730
3841
- _LT_TAGVAR(lt_prog_compiler_pic, $1)=
3731
3842
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
3732
3843
- ;;
3733
- xlc* | xlC*)
3734
- # IBM XL 8.0 on PPC
3844
- xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
3845
- # IBM XL 8.0, 9.0 on PPC and BlueGene
3735
3846
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
3736
3847
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
3737
3848
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
3793
3904
- ;;
3794
3905
- solaris*)
3795
3906
- case $cc_basename in
3796
- CC*)
3907
- CC* | sunCC*)
3797
3908
- # Sun C++ 4.2, 5.x and Centerline C++
3798
3909
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
3799
3910
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
3897
4008
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
3898
4009
- ;;
3899
4010
-
4011
- haiku*)
4012
- # PIC is the default for Haiku.
4013
- # The "-static" flag exists, but is broken.
4014
- _LT_TAGVAR(lt_prog_compiler_static, $1)=
4015
- ;;
4016
-
3900
4017
- hpux*)
3901
4018
- # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
3902
4019
- # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
3939
4056
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
3940
4057
- ;;
3941
4058
- esac
4059
-
4060
- case $cc_basename in
4061
- nvcc*) # Cuda Compiler Driver 2.2
4062
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
4063
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
4064
- ;;
4065
- esac
3942
4066
- else
3943
4067
- # PORTME Check for flag to pass linker flags through the system compiler.
3944
4068
- case $host_os in
3981
4105
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
3982
4106
- ;;
3983
4107
-
3984
- linux* | k*bsd*-gnu)
4108
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
3985
4109
- case $cc_basename in
3986
4110
- # old Intel for x86_64 which still supported -KPIC.
3987
4111
- ecc*)
4002
4126
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
4003
4127
- _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
4004
4128
- ;;
4005
- pgcc* | pgf77* | pgf90* | pgf95*)
4129
- pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
4006
4130
- # Portland Group compilers (*not* the Pentium gcc compiler,
4007
4131
- # which looks to be a dead project)
4008
4132
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4014
4138
- # All Alpha code is PIC.
4015
4139
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
4016
4140
- ;;
4017
- xl*)
4018
- # IBM XL C 8.0/Fortran 10.1 on PPC
4141
- xl* | bgxl* | bgf* | mpixl*)
4142
- # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
4019
4143
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4020
4144
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
4021
4145
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
4022
4146
- ;;
4023
4147
- *)
4024
4148
- case `$CC -V 2>&1 | sed 5q` in
4149
- *Sun\ F* | *Sun*Fortran*)
4150
- # Sun Fortran 8.3 passes all unrecognized flags to the linker
4151
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
4152
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
4153
- _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
4154
- ;;
4025
4155
- *Sun\ C*)
4026
4156
- # Sun C 5.9
4027
4157
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
4028
4158
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
4029
4159
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4030
4160
- ;;
4031
- *Sun\ F*)
4032
- # Sun Fortran 8.3 passes all unrecognized flags to the linker
4033
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
4034
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
4035
- _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
4036
- ;;
4037
4161
- esac
4038
4162
- ;;
4039
4163
- esac
4064
4188
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
4065
4189
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
4066
4190
- case $cc_basename in
4067
- f77* | f90* | f95*)
4191
- f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
4068
4192
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
4069
4193
- *)
4070
4194
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
4174
4298
- aix[[4-9]]*)
4175
4299
- # If we're using GNU nm, then we don't want the "-C" option.
4176
4300
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
4301
- # Also, AIX nm treats weak defined symbols like other global defined
4302
- # symbols, whereas GNU nm marks them as "W".
4177
4303
- if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
4178
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
4304
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
4179
4305
- else
4180
4306
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
4181
4307
- fi
4253
4379
- esac
4254
4380
-
4255
4381
- _LT_TAGVAR(ld_shlibs, $1)=yes
4382
-
4383
- # On some targets, GNU ld is compatible enough with the native linker
4384
- # that we're better off using the native interface for both.
4385
- lt_use_gnu_ld_interface=no
4256
4386
- if test "$with_gnu_ld" = yes; then
4387
- case $host_os in
4388
- aix*)
4389
- # The AIX port of GNU ld has always aspired to compatibility
4390
- # with the native linker. However, as the warning in the GNU ld
4391
- # block says, versions before 2.19.5* couldn't really create working
4392
- # shared libraries, regardless of the interface used.
4393
- case `$LD -v 2>&1` in
4394
- *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
4395
- *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
4396
- *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
4397
- *)
4398
- lt_use_gnu_ld_interface=yes
4399
- ;;
4400
- esac
4401
- ;;
4402
- *)
4403
- lt_use_gnu_ld_interface=yes
4404
- ;;
4405
- esac
4406
- fi
4407
-
4408
- if test "$lt_use_gnu_ld_interface" = yes; then
4257
4409
- # If archive_cmds runs LD, not CC, wlarc should be empty
4258
4410
- wlarc='${wl}'
4259
4411
-
4271
4423
- fi
4272
4424
- supports_anon_versioning=no
4273
4425
- case `$LD -v 2>&1` in
4426
- *GNU\ gold*) supports_anon_versioning=yes ;;
4274
4427
- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
4275
4428
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
4276
4429
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
4286
4439
- _LT_TAGVAR(ld_shlibs, $1)=no
4287
4440
- cat <<_LT_EOF 1>&2
4288
4441
-
4289
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
4442
-*** Warning: the GNU linker, at least up to release 2.19, is reported
4290
4443
-*** to be unable to reliably create shared libraries on AIX.
4291
4444
-*** Therefore, libtool is disabling shared libraries support. If you
4292
-*** really care for shared libraries, you may want to modify your PATH
4293
-*** so that a non-GNU linker is found, and then restart.
4445
-*** really care for shared libraries, you may want to install binutils
4446
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
4447
-*** You will then need to restart the configuration process.
4294
4448
-
4295
4449
-_LT_EOF
4296
4450
- fi
4326
4480
- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
4327
4481
- # as there is no search path for DLLs.
4328
4482
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
4483
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
4329
4484
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
4330
4485
- _LT_TAGVAR(always_export_symbols, $1)=no
4331
4486
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
4347
4502
- fi
4348
4503
- ;;
4349
4504
-
4505
- haiku*)
4506
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4507
- _LT_TAGVAR(link_all_deplibs, $1)=yes
4508
- ;;
4509
-
4350
4510
- interix[[3-9]]*)
4351
4511
- _LT_TAGVAR(hardcode_direct, $1)=no
4352
4512
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
4362
4522
- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
4363
4523
- ;;
4364
4524
-
4365
- gnu* | linux* | tpf* | k*bsd*-gnu)
4525
- gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
4366
4526
- tmp_diet=no
4367
4527
- if test "$host_os" = linux-dietlibc; then
4368
4528
- case $cc_basename in
4376
4536
- tmp_sharedflag='-shared'
4377
4537
- case $cc_basename,$host_cpu in
4378
4538
- pgcc*) # Portland Group C compiler
4379
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
4539
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
4380
4540
- tmp_addflag=' $pic_flag'
4381
4541
- ;;
4382
- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
4383
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
4542
- pgf77* | pgf90* | pgf95* | pgfortran*)
4543
- # Portland Group f77 and f90 compilers
4544
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
4384
4545
- tmp_addflag=' $pic_flag -Mnomain' ;;
4385
4546
- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
4386
4547
- tmp_addflag=' -i_dynamic' ;;
4391
4552
- lf95*) # Lahey Fortran 8.1
4392
4553
- _LT_TAGVAR(whole_archive_flag_spec, $1)=
4393
4554
- tmp_sharedflag='--shared' ;;
4394
- xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
4555
- xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
4395
4556
- tmp_sharedflag='-qmkshrobj'
4396
4557
- tmp_addflag= ;;
4558
- nvcc*) # Cuda Compiler Driver 2.2
4559
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
4560
- _LT_TAGVAR(compiler_needs_object, $1)=yes
4561
- ;;
4397
4562
- esac
4398
4563
- case `$CC -V 2>&1 | sed 5q` in
4399
4564
- *Sun\ C*) # Sun C 5.9
4400
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
4565
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
4401
4566
- _LT_TAGVAR(compiler_needs_object, $1)=yes
4402
4567
- tmp_sharedflag='-G' ;;
4403
4568
- *Sun\ F*) # Sun Fortran 8.3
4413
4578
- fi
4414
4579
-
4415
4580
- case $cc_basename in
4416
- xlf*)
4581
- xlf* | bgf* | bgxlf* | mpixlf*)
4417
4582
- # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
4418
4583
- _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
4419
4584
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
4420
4585
- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
4421
- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
4586
- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
4422
4587
- if test "x$supports_anon_versioning" = xyes; then
4423
4588
- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
4424
4589
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
4425
4590
- echo "local: *; };" >> $output_objdir/$libname.ver~
4426
- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
4591
- $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
4427
4592
- fi
4428
4593
- ;;
4429
4594
- esac
4544
4709
- else
4545
4710
- # If we're using GNU nm, then we don't want the "-C" option.
4546
4711
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
4712
- # Also, AIX nm treats weak defined symbols like other global
4713
- # defined symbols, whereas GNU nm marks them as "W".
4547
4714
- if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
4548
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
4715
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
4549
4716
- else
4550
4717
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
4551
4718
- fi
4634
4801
- # empty executable.
4635
4802
- _LT_SYS_MODULE_PATH_AIX
4636
4803
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
4637
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
4804
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
4638
4805
- else
4639
4806
- if test "$host_cpu" = ia64; then
4640
4807
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
4649
4816
- # -berok will link without error, but may produce a broken library.
4650
4817
- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
4651
4818
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
4652
- # Exported symbols can be pulled into shared objects from archives
4653
- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
4819
- if test "$with_gnu_ld" = yes; then
4820
- # We only use this code for GNU lds that support --whole-archive.
4821
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
4822
- else
4823
- # Exported symbols can be pulled into shared objects from archives
4824
- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
4825
- fi
4654
4826
- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
4655
4827
- # This is similar to how AIX traditionally builds its shared libraries.
4656
4828
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
4689
4861
- # Tell ltmain to make .dll files, not .so files.
4690
4862
- shrext_cmds=".dll"
4691
4863
- # FIXME: Setting linknames here is a bad hack.
4692
- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
4864
- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
4693
4865
- # The linker will automatically build a .lib file if we build a DLL.
4694
4866
- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
4695
4867
- # FIXME: Should let the user specify the lib program.
4756
4928
- ;;
4757
4929
-
4758
4930
- hpux10*)
4759
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
4931
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
4760
4932
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
4761
4933
- else
4762
4934
- _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
4775
4947
- ;;
4776
4948
-
4777
4949
- hpux11*)
4778
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
4950
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
4779
4951
- case $host_cpu in
4780
4952
- hppa*64*)
4781
4953
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
4796
4968
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
4797
4969
- ;;
4798
4970
- *)
4799
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
4971
- m4_if($1, [], [
4972
- # Older versions of the 11.00 compiler do not understand -b yet
4973
- # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
4974
- _LT_LINKER_OPTION([if $CC understands -b],
4975
- _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
4976
- [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
4977
- [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
4978
- [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
4800
4979
- ;;
4801
4980
- esac
4802
4981
- fi
4824
5003
-
4825
5004
- irix5* | irix6* | nonstopux*)
4826
5005
- if test "$GCC" = yes; then
4827
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
5006
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
4828
5007
- # Try to use the -exported_symbol ld option, if it does not
4829
5008
- # work, assume that -exports_file does not work either and
4830
5009
- # implicitly export all symbols.
4831
5010
- save_LDFLAGS="$LDFLAGS"
4832
5011
- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
4833
5012
- AC_LINK_IFELSE(int foo(void) {},
4834
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
5013
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
4835
5014
- )
4836
5015
- LDFLAGS="$save_LDFLAGS"
4837
5016
- else
4838
- _LT_TAGVAR(archive_cmds, $1)='$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'
4839
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
5017
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
5018
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
4840
5019
- fi
4841
5020
- _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
4842
5021
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
4898
5077
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
4899
5078
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
4900
5079
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
4901
- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
5080
- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
4902
5081
- _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
4903
5082
- ;;
4904
5083
-
4905
5084
- osf3*)
4906
5085
- if test "$GCC" = yes; then
4907
5086
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
4908
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
5087
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
4909
5088
- else
4910
5089
- _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
4911
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
5090
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
4912
5091
- fi
4913
5092
- _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
4914
5093
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
4918
5097
- osf4* | osf5*) # as osf3* with the addition of -msym flag
4919
5098
- if test "$GCC" = yes; then
4920
5099
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
4921
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
5100
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
4922
5101
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
4923
5102
- else
4924
5103
- _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
4925
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
5104
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
4926
5105
- _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
4927
- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
5106
- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
4928
5107
-
4929
5108
- # Both c and cxx compiler support -rpath directly
4930
5109
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
5115
5294
- # Test whether the compiler implicitly links with -lc since on some
5116
5295
- # systems, -lgcc has to come before -lc. If gcc already passes -lc
5117
5296
- # to ld, don't add -lc before -lgcc.
5118
- AC_MSG_CHECKING([whether -lc should be explicitly linked in])
5119
- $RM conftest*
5120
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
5297
- AC_CACHE_CHECK([whether -lc should be explicitly linked in],
5298
- [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
5299
- [$RM conftest*
5300
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
5121
5301
-
5122
- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
5123
- soname=conftest
5124
- lib=conftest
5125
- libobjs=conftest.$ac_objext
5126
- deplibs=
5127
- wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
5128
- pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
5129
- compiler_flags=-v
5130
- linker_flags=-v
5131
- verstring=
5132
- output_objdir=.
5133
- libname=conftest
5134
- lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
5135
- _LT_TAGVAR(allow_undefined_flag, $1)=
5136
- if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
5137
- then
5138
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
5139
- else
5140
- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
5141
- fi
5142
- _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
5143
- else
5144
- cat conftest.err 1>&5
5145
- fi
5146
- $RM conftest*
5147
- AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
5302
- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
5303
- soname=conftest
5304
- lib=conftest
5305
- libobjs=conftest.$ac_objext
5306
- deplibs=
5307
- wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
5308
- pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
5309
- compiler_flags=-v
5310
- linker_flags=-v
5311
- verstring=
5312
- output_objdir=.
5313
- libname=conftest
5314
- lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
5315
- _LT_TAGVAR(allow_undefined_flag, $1)=
5316
- if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
5317
- then
5318
- lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
5319
- else
5320
- lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
5321
- fi
5322
- _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
5323
- else
5324
- cat conftest.err 1>&5
5325
- fi
5326
- $RM conftest*
5327
- ])
5328
- _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
5148
5329
- ;;
5149
5330
- esac
5150
5331
- fi
5310
5491
-])# _LT_LANG_C_CONFIG
5311
5492
-
5312
5493
-
5313
-# _LT_PROG_CXX
5314
-# ------------
5315
-# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
5316
-# compiler, we have our own version here.
5317
-m4_defun([_LT_PROG_CXX],
5318
-[
5319
-pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
5320
-AC_PROG_CXX
5321
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
5322
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
5323
- (test "X$CXX" != "Xg++"))) ; then
5324
- AC_PROG_CXXCPP
5325
-else
5326
- _lt_caught_CXX_error=yes
5327
-fi
5328
-popdef([AC_MSG_ERROR])
5329
-])# _LT_PROG_CXX
5330
-
5331
-dnl aclocal-1.4 backwards compatibility:
5332
-dnl AC_DEFUN([_LT_PROG_CXX], [])
5333
-
5334
-
5335
5494
-# _LT_LANG_CXX_CONFIG([TAG])
5336
5495
-# --------------------------
5337
5496
-# Ensure that the configuration variables for a C++ compiler are suitably
5338
5497
-# defined. These variables are subsequently used by _LT_CONFIG to write
5339
5498
-# the compiler configuration to `libtool'.
5340
5499
-m4_defun([_LT_LANG_CXX_CONFIG],
5341
-[AC_REQUIRE([_LT_PROG_CXX])dnl
5342
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
5500
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
5343
5501
-m4_require([_LT_DECL_EGREP])dnl
5502
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
5503
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
5504
- (test "X$CXX" != "Xg++"))) ; then
5505
- AC_PROG_CXXCPP
5506
-else
5507
- _lt_caught_CXX_error=yes
5508
-fi
5344
5509
-
5345
5510
-AC_LANG_PUSH(C++)
5346
5511
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
5362
5527
-_LT_TAGVAR(module_expsym_cmds, $1)=
5363
5528
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
5364
5529
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
5530
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
5531
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
5365
5532
-_LT_TAGVAR(no_undefined_flag, $1)=
5366
5533
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
5367
5534
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
5464
5631
- # Commands to make compiler produce verbose output that lists
5465
5632
- # what "hidden" libraries, object files and flags are used when
5466
5633
- # linking a shared library.
5467
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
5634
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
5468
5635
-
5469
5636
- else
5470
5637
- GXX=no
5576
5743
- _LT_SYS_MODULE_PATH_AIX
5577
5744
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
5578
5745
-
5579
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
5746
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
5580
5747
- else
5581
5748
- if test "$host_cpu" = ia64; then
5582
5749
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
5591
5758
- # -berok will link without error, but may produce a broken library.
5592
5759
- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
5593
5760
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
5594
- # Exported symbols can be pulled into shared objects from archives
5595
- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
5761
- if test "$with_gnu_ld" = yes; then
5762
- # We only use this code for GNU lds that support --whole-archive.
5763
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
5764
- else
5765
- # Exported symbols can be pulled into shared objects from archives
5766
- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
5767
- fi
5596
5768
- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
5597
5769
- # This is similar to how AIX traditionally builds its shared
5598
5770
- # libraries.
5625
5797
- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
5626
5798
- # as there is no search path for DLLs.
5627
5799
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
5800
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
5628
5801
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
5629
5802
- _LT_TAGVAR(always_export_symbols, $1)=no
5630
5803
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
5685
5858
- gnu*)
5686
5859
- ;;
5687
5860
-
5861
- haiku*)
5862
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
5863
- _LT_TAGVAR(link_all_deplibs, $1)=yes
5864
- ;;
5865
-
5688
5866
- hpux9*)
5689
5867
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
5690
5868
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
5709
5887
- # explicitly linking system object files so we need to strip them
5710
5888
- # from the output so that they don't get included in the library
5711
5889
- # dependencies.
5712
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
5890
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
5713
5891
- ;;
5714
5892
- *)
5715
5893
- if test "$GXX" = yes; then
5774
5952
- # explicitly linking system object files so we need to strip them
5775
5953
- # from the output so that they don't get included in the library
5776
5954
- # dependencies.
5777
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
5955
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
5778
5956
- ;;
5779
5957
- *)
5780
5958
- if test "$GXX" = yes; then
5817
5995
- case $cc_basename in
5818
5996
- CC*)
5819
5997
- # SGI C++
5820
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
5998
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
5821
5999
-
5822
6000
- # Archives containing C++ object files must be created using
5823
6001
- # "CC -ar", where "CC" is the IRIX C++ compiler. This is
5828
6006
- *)
5829
6007
- if test "$GXX" = yes; then
5830
6008
- if test "$with_gnu_ld" = no; then
5831
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
6009
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
5832
6010
- else
5833
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
6011
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
5834
6012
- fi
5835
6013
- fi
5836
6014
- _LT_TAGVAR(link_all_deplibs, $1)=yes
5841
6019
- _LT_TAGVAR(inherit_rpath, $1)=yes
5842
6020
- ;;
5843
6021
-
5844
- linux* | k*bsd*-gnu)
6022
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
5845
6023
- case $cc_basename in
5846
6024
- KCC*)
5847
6025
- # Kuck and Associates, Inc. (KAI) C++ Compiler
5859
6037
- # explicitly linking system object files so we need to strip them
5860
6038
- # from the output so that they don't get included in the library
5861
6039
- # dependencies.
5862
- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
6040
- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
5863
6041
-
5864
6042
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
5865
6043
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
5896
6074
- pgCC* | pgcpp*)
5897
6075
- # Portland Group C++ compiler
5898
6076
- case `$CC -V` in
5899
- *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
6077
- *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
5900
6078
- _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
5901
6079
- rm -rf $tpldir~
5902
6080
- $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
5903
- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
6081
- compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
5904
6082
- _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
5905
6083
- rm -rf $tpldir~
5906
6084
- $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
5907
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
6085
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
5908
6086
- $RANLIB $oldlib'
5909
6087
- _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
5910
6088
- rm -rf $tpldir~
5911
6089
- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
5912
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
6090
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
5913
6091
- _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
5914
6092
- rm -rf $tpldir~
5915
6093
- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
5916
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
6094
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
5917
6095
- ;;
5918
- *) # Version 6 will use weak symbols
6096
- *) # Version 6 and above use weak symbols
5919
6097
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
5920
6098
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
5921
6099
- ;;
5923
6101
-
5924
6102
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
5925
6103
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
5926
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
6104
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
5927
6105
- ;;
5928
6106
- cxx*)
5929
6107
- # Compaq C++
5942
6120
- # explicitly linking system object files so we need to strip them
5943
6121
- # from the output so that they don't get included in the library
5944
6122
- # dependencies.
5945
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
6123
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
5946
6124
- ;;
5947
- xl*)
6125
- xl* | mpixl* | bgxl*)
5948
6126
- # IBM XL 8.0 on PPC, with GNU ld
5949
6127
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
5950
6128
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
5964
6142
- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
5965
6143
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
5966
6144
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
5967
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
6145
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
5968
6146
- _LT_TAGVAR(compiler_needs_object, $1)=yes
5969
6147
-
5970
6148
- # Not sure whether something based on
5971
6149
- # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
5972
6150
- # would be better.
5973
- output_verbose_link_cmd='echo'
6151
- output_verbose_link_cmd='func_echo_all'
5974
6152
-
5975
6153
- # Archives containing C++ object files must be created using
5976
6154
- # "CC -xar", where "CC" is the Sun C++ compiler. This is
6039
6217
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
6040
6218
- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
6041
6219
- fi
6042
- output_verbose_link_cmd=echo
6220
- output_verbose_link_cmd=func_echo_all
6043
6221
- else
6044
6222
- _LT_TAGVAR(ld_shlibs, $1)=no
6045
6223
- fi
6074
6252
- case $host in
6075
6253
- osf3*)
6076
6254
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
6077
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
6255
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
6078
6256
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
6079
6257
- ;;
6080
6258
- *)
6081
6259
- _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
6082
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
6260
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
6083
6261
- _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
6084
6262
- echo "-hidden">> $lib.exp~
6085
- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
6263
- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
6086
6264
- $RM $lib.exp'
6087
6265
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
6088
6266
- ;;
6098
6276
- # explicitly linking system object files so we need to strip them
6099
6277
- # from the output so that they don't get included in the library
6100
6278
- # dependencies.
6101
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
6279
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
6102
6280
- ;;
6103
6281
- *)
6104
6282
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
6105
6283
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
6106
6284
- case $host in
6107
6285
- osf3*)
6108
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
6286
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
6109
6287
- ;;
6110
6288
- *)
6111
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
6289
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
6112
6290
- ;;
6113
6291
- esac
6114
6292
-
6118
6296
- # Commands to make compiler produce verbose output that lists
6119
6297
- # what "hidden" libraries, object files and flags are used when
6120
6298
- # linking a shared library.
6121
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
6299
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
6122
6300
-
6123
6301
- else
6124
6302
- # FIXME: insert proper C++ library support
6154
6332
-
6155
6333
- solaris*)
6156
6334
- case $cc_basename in
6157
- CC*)
6335
- CC* | sunCC*)
6158
6336
- # Sun C++ 4.2, 5.x and Centerline C++
6159
6337
- _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
6160
6338
- _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
6175
6353
- esac
6176
6354
- _LT_TAGVAR(link_all_deplibs, $1)=yes
6177
6355
-
6178
- output_verbose_link_cmd='echo'
6356
- output_verbose_link_cmd='func_echo_all'
6179
6357
-
6180
6358
- # Archives containing C++ object files must be created using
6181
6359
- # "CC -xar", where "CC" is the Sun C++ compiler. This is
6202
6380
- # Commands to make compiler produce verbose output that lists
6203
6381
- # what "hidden" libraries, object files and flags are used when
6204
6382
- # linking a shared library.
6205
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
6383
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
6206
6384
- else
6207
6385
- # g++ 2.7 appears to require `-G' NOT `-shared' on this
6208
6386
- # platform.
6213
6391
- # Commands to make compiler produce verbose output that lists
6214
6392
- # what "hidden" libraries, object files and flags are used when
6215
6393
- # linking a shared library.
6216
- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
6394
- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
6217
6395
- fi
6218
6396
-
6219
6397
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
6267
6445
- CC*)
6268
6446
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
6269
6447
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
6448
- _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
6449
- '"$_LT_TAGVAR(old_archive_cmds, $1)"
6450
- _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
6451
- '"$_LT_TAGVAR(reload_cmds, $1)"
6270
6452
- ;;
6271
6453
- *)
6272
6454
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
6513
6695
-
6514
6696
-solaris*)
6515
6697
- case $cc_basename in
6516
- CC*)
6698
- CC* | sunCC*)
6517
6699
- # The more standards-conforming stlport4 library is
6518
6700
- # incompatible with the Cstd library. Avoid specifying
6519
6701
- # it if it's in CXXFLAGS. Ignore libCrun as
6557
6739
-])# _LT_SYS_HIDDEN_LIBDEPS
6558
6740
-
6559
6741
-
6560
-# _LT_PROG_F77
6561
-# ------------
6562
-# Since AC_PROG_F77 is broken, in that it returns the empty string
6563
-# if there is no fortran compiler, we have our own version here.
6564
-m4_defun([_LT_PROG_F77],
6565
-[
6566
-pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
6567
-AC_PROG_F77
6568
-if test -z "$F77" || test "X$F77" = "Xno"; then
6569
- _lt_disable_F77=yes
6570
-fi
6571
-popdef([AC_MSG_ERROR])
6572
-])# _LT_PROG_F77
6573
-
6574
-dnl aclocal-1.4 backwards compatibility:
6575
-dnl AC_DEFUN([_LT_PROG_F77], [])
6576
-
6577
-
6578
6742
-# _LT_LANG_F77_CONFIG([TAG])
6579
6743
-# --------------------------
6580
6744
-# Ensure that the configuration variables for a Fortran 77 compiler are
6581
6745
-# suitably defined. These variables are subsequently used by _LT_CONFIG
6582
6746
-# to write the compiler configuration to `libtool'.
6583
6747
-m4_defun([_LT_LANG_F77_CONFIG],
6584
-[AC_REQUIRE([_LT_PROG_F77])dnl
6585
-AC_LANG_PUSH(Fortran 77)
6748
-[AC_LANG_PUSH(Fortran 77)
6749
-if test -z "$F77" || test "X$F77" = "Xno"; then
6750
- _lt_disable_F77=yes
6751
-fi
6586
6752
-
6587
6753
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
6588
6754
-_LT_TAGVAR(allow_undefined_flag, $1)=
6601
6767
-_LT_TAGVAR(module_expsym_cmds, $1)=
6602
6768
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
6603
6769
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
6770
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
6771
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
6604
6772
-_LT_TAGVAR(no_undefined_flag, $1)=
6605
6773
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
6606
6774
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
6700
6868
-])# _LT_LANG_F77_CONFIG
6701
6869
-
6702
6870
-
6703
-# _LT_PROG_FC
6704
-# -----------
6705
-# Since AC_PROG_FC is broken, in that it returns the empty string
6706
-# if there is no fortran compiler, we have our own version here.
6707
-m4_defun([_LT_PROG_FC],
6708
-[
6709
-pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
6710
-AC_PROG_FC
6711
-if test -z "$FC" || test "X$FC" = "Xno"; then
6712
- _lt_disable_FC=yes
6713
-fi
6714
-popdef([AC_MSG_ERROR])
6715
-])# _LT_PROG_FC
6716
-
6717
-dnl aclocal-1.4 backwards compatibility:
6718
-dnl AC_DEFUN([_LT_PROG_FC], [])
6719
-
6720
-
6721
6871
-# _LT_LANG_FC_CONFIG([TAG])
6722
6872
-# -------------------------
6723
6873
-# Ensure that the configuration variables for a Fortran compiler are
6724
6874
-# suitably defined. These variables are subsequently used by _LT_CONFIG
6725
6875
-# to write the compiler configuration to `libtool'.
6726
6876
-m4_defun([_LT_LANG_FC_CONFIG],
6727
-[AC_REQUIRE([_LT_PROG_FC])dnl
6728
-AC_LANG_PUSH(Fortran)
6877
-[AC_LANG_PUSH(Fortran)
6878
-
6879
-if test -z "$FC" || test "X$FC" = "Xno"; then
6880
- _lt_disable_FC=yes
6881
-fi
6729
6882
-
6730
6883
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
6731
6884
-_LT_TAGVAR(allow_undefined_flag, $1)=
6744
6897
-_LT_TAGVAR(module_expsym_cmds, $1)=
6745
6898
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
6746
6899
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
6900
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
6901
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
6747
6902
-_LT_TAGVAR(no_undefined_flag, $1)=
6748
6903
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
6749
6904
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
6889
7044
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
6890
7045
-
6891
7046
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
7047
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
7048
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
6892
7049
-
6893
7050
-if test -n "$compiler"; then
6894
7051
- _LT_COMPILER_NO_RTTI($1)
7250
7407
-func_dirname ()
7251
7408
-{
7252
7409
- # Extract subdirectory from the argument.
7253
- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
7410
- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
7254
7411
- if test "X$func_dirname_result" = "X${1}"; then
7255
7412
- func_dirname_result="${3}"
7256
7413
- else
7261
7418
-# func_basename file
7262
7419
-func_basename ()
7263
7420
-{
7264
- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
7421
- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
7265
7422
-}
7266
7423
-
7267
7424
-dnl func_dirname_and_basename
7277
7434
-func_stripname ()
7278
7435
-{
7279
7436
- case ${2} in
7280
- .*) func_stripname_result=`$ECHO "X${3}" \
7281
- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
7282
- *) func_stripname_result=`$ECHO "X${3}" \
7283
- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
7437
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
7438
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
7284
7439
- esac
7285
7440
-}
7286
7441
-
7291
7446
-# func_opt_split
7292
7447
-func_opt_split ()
7293
7448
-{
7294
- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
7295
- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
7449
- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
7450
- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
7296
7451
-}
7297
7452
-
7298
7453
-# func_lo2o object
7299
7454
-func_lo2o ()
7300
7455
-{
7301
- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
7456
- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
7302
7457
-}
7303
7458
-
7304
7459
-# func_xform libobj-or-source
7305
7460
-func_xform ()
7306
7461
-{
7307
- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
7462
- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
7308
7463
-}
7309
7464
-
7310
7465
-# func_arith arithmetic-term...
7352
7507
-
7353
7508
-# Helper functions for option handling. -*- Autoconf -*-
7354
7509
-#
7355
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
7510
-# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
7511
-# Inc.
7356
7512
-# Written by Gary V. Vaughan, 2004
7357
7513
-#
7358
7514
-# This file is free software; the Free Software Foundation gives
7359
7515
-# unlimited permission to copy and/or distribute it, with or without
7360
7516
-# modifications, as long as this notice is preserved.
7361
7517
-
7362
-# serial 6 ltoptions.m4
7518
-# serial 7 ltoptions.m4
7363
7519
-
7364
7520
-# This is to help aclocal find these macros, as it can't see m4_define.
7365
7521
-AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
7474
7630
-[enable_win32_dll=yes
7475
7631
-
7476
7632
-case $host in
7477
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
7633
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
7478
7634
- AC_CHECK_TOOL(AS, as, false)
7479
7635
- AC_CHECK_TOOL(DLLTOOL, dlltool, false)
7480
7636
- AC_CHECK_TOOL(OBJDUMP, objdump, false)
7482
7638
-esac
7483
7639
-
7484
7640
-test -z "$AS" && AS=as
7485
-_LT_DECL([], [AS], [0], [Assembler program])dnl
7641
-_LT_DECL([], [AS], [1], [Assembler program])dnl
7486
7642
-
7487
7643
-test -z "$DLLTOOL" && DLLTOOL=dlltool
7488
-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
7644
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
7489
7645
-
7490
7646
-test -z "$OBJDUMP" && OBJDUMP=objdump
7491
-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
7647
-_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
7492
7648
-])# win32-dll
7493
7649
-
7494
7650
-AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
7848
8004
-
7849
8005
-# Generated from ltversion.in.
7850
8006
-
7851
-# serial 3017 ltversion.m4
8007
-# serial 3175 ltversion.m4
7852
8008
-# This file is part of GNU Libtool
7853
8009
-
7854
-m4_define([LT_PACKAGE_VERSION], [2.2.6b])
7855
-m4_define([LT_PACKAGE_REVISION], [1.3017])
8010
-m4_define([LT_PACKAGE_VERSION], [2.2.10])
8011
-m4_define([LT_PACKAGE_REVISION], [1.3175])
7856
8012
-
7857
8013
-AC_DEFUN([LTVERSION_VERSION],
7858
-[macro_version='2.2.6b'
7859
-macro_revision='1.3017'
8014
-[macro_version='2.2.10'
8015
-macro_revision='1.3175'
7860
8016
-_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
7861
8017
-_LT_DECL(, macro_revision, 0)
7862
8018
-])
7863
8019
-
7864
8020
-# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
7865
8021
-#
7866
-# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
8022
-# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
7867
8023
-# Written by Scott James Remnant, 2004.
7868
8024
-#
7869
8025
-# This file is free software; the Free Software Foundation gives
7870
8026
-# unlimited permission to copy and/or distribute it, with or without
7871
8027
-# modifications, as long as this notice is preserved.
7872
8028
-
7873
-# serial 4 lt~obsolete.m4
8029
-# serial 5 lt~obsolete.m4
7874
8030
-
7875
8031
-# These exist entirely to fool aclocal when bootstrapping libtool.
7876
8032
-#
7940
8096
-m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])
7941
8097
-m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])
7942
8098
-m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])
7943
-m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])])
7944
8099
-m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
7945
8100
-m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
7946
8101
-m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
7953
8108
-m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
7954
8109
-m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
7955
8110
-m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
8111
-m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
8112
-m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])])
8113
-m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
8114
-m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
8115
-m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
8116
-m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
8117
-m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
7956
8118
-
7957
8119
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
7958
-# serial 1 (pkg-config-0.24)
8120
# serial 1 (pkg-config-0.24)
7959
8121
#
7960
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
7961
#
7962
@@ -8704,10 +754,7 @@
7963
AC_DEFUN([PKG_PROG_PKG_CONFIG],
7964
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
7965
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
7966
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
7967
-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
7968
-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
7969
-
7970
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
7971
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
7972
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
7973
fi
7974
@@ -8720,6 +767,7 @@
8122
@@ -8808,7 +709,7 @@
7975
8123
AC_MSG_RESULT([no])
7976
8124
PKG_CONFIG=""
7977
8125
fi
7978
+
7979
fi[]dnl
8126
-fi[]
8127
+fi[]dnl
7980
8128
])# PKG_PROG_PKG_CONFIG
7981
8129
7982
@@ -8728,31 +776,34 @@
7983
# Check to see whether a particular set of modules exists. Similar
7984
# to PKG_CHECK_MODULES(), but does not set variables or print errors.
7985
#
7986
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
7987
-# only at the first occurence in configure.ac, so if the first place
7988
-# it's called might be skipped (such as if it is within an "if", you
7989
-# have to call PKG_CHECK_EXISTS manually
7990
+#
7991
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
7992
+# this or PKG_CHECK_MODULES is called, or make sure to call
7993
+# PKG_CHECK_EXISTS manually
8130
# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
8131
@@ -8822,12 +723,12 @@
8132
# have to call PKG_CHECK_EXISTS manually
7994
8133
# --------------------------------------------------------------
7995
8134
AC_DEFUN([PKG_CHECK_EXISTS],
7996
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
8135
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
8136
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
7997
8137
if test -n "$PKG_CONFIG" && \
7998
8138
AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
7999
- m4_default([$2], [:])
8000
+ m4_ifval([$2], [$2], [:])
8139
m4_default([$2], [:])
8001
8140
m4_ifvaln([$3], [else
8002
$3])dnl
8141
- $3])
8142
+ $3])dnl
8003
8143
fi])
8004
8144
8005
+
8006
8145
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
8007
# ---------------------------------------------
8008
m4_define([_PKG_CONFIG],
8009
-[if test -n "$$1"; then
8010
- pkg_cv_[]$1="$$1"
8011
- elif test -n "$PKG_CONFIG"; then
8012
- PKG_CHECK_EXISTS([$3],
8013
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
8014
- [pkg_failed=yes])
8015
- else
8016
- pkg_failed=untried
8017
+[if test -n "$PKG_CONFIG"; then
8018
+ if test -n "$$1"; then
8019
+ pkg_cv_[]$1="$$1"
8020
+ else
8021
+ PKG_CHECK_EXISTS([$3],
8022
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
8023
+ [pkg_failed=yes])
8024
+ fi
8025
+else
8026
+ pkg_failed=untried
8027
fi[]dnl
8146
@@ -8841,7 +742,7 @@
8147
[pkg_failed=yes])
8148
else
8149
pkg_failed=untried
8150
-fi[]
8151
+fi[]dnl
8028
8152
])# _PKG_CONFIG
8029
8153
8030
@@ -8794,17 +845,16 @@
8031
See the pkg-config man page for more details.])
8032
8033
if test $pkg_failed = yes; then
8034
- AC_MSG_RESULT([no])
8035
_PKG_SHORT_ERRORS_SUPPORTED
8036
if test $_pkg_short_errors_supported = yes; then
8037
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
8038
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
8039
else
8040
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
8041
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
8042
fi
8043
# Put the nasty error message in config.log where it belongs
8044
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
8045
8046
- m4_default([$4], [AC_MSG_ERROR(
8047
+ ifelse([$4], , [AC_MSG_ERROR(dnl
8048
[Package requirements ($2) were not met:
8049
8050
$$1_PKG_ERRORS
8051
@@ -8812,24 +862,25 @@
8154
# _PKG_SHORT_ERRORS_SUPPORTED
8155
@@ -8852,7 +753,7 @@
8156
_pkg_short_errors_supported=yes
8157
else
8158
_pkg_short_errors_supported=no
8159
-fi[]
8160
+fi[]dnl
8161
])# _PKG_SHORT_ERRORS_SUPPORTED
8162
8163
8164
@@ -8867,9 +768,9 @@
8165
#
8166
# --------------------------------------------------------------
8167
AC_DEFUN([PKG_CHECK_MODULES],
8168
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
8169
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])
8170
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])
8171
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
8172
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
8173
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
8174
8175
pkg_failed=no
8176
AC_MSG_CHECKING([for $1])
8177
@@ -8900,7 +801,7 @@
8052
8178
Consider adjusting the PKG_CONFIG_PATH environment variable if you
8053
8179
installed software in a non-standard prefix.
8054
8180
8055
-_PKG_TEXT])dnl
8056
- ])
8057
+_PKG_TEXT
8058
+])],
8059
+ [AC_MSG_RESULT([no])
8060
+ $4])
8181
-_PKG_TEXT])
8182
+_PKG_TEXT])dnl
8183
])
8061
8184
elif test $pkg_failed = untried; then
8062
- AC_MSG_RESULT([no])
8063
- m4_default([$4], [AC_MSG_FAILURE(
8064
+ ifelse([$4], , [AC_MSG_FAILURE(dnl
8065
[The pkg-config script could not be found or is too old. Make sure it
8066
is in your PATH or set the PKG_CONFIG environment variable to the full
8067
path to pkg-config.
8185
AC_MSG_RESULT([no])
8186
@@ -8911,14 +812,14 @@
8068
8187
8069
8188
_PKG_TEXT
8070
8189
8071
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
8072
- ])
8073
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
8074
+ [$4])
8190
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
8191
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
8192
])
8075
8193
else
8076
8194
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
8077
8195
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
8078
8196
AC_MSG_RESULT([yes])
8079
- $3
8080
+ ifelse([$3], , :, [$3])
8081
fi[]dnl
8197
$3
8198
-fi[]
8199
+fi[]dnl
8082
8200
])# PKG_CHECK_MODULES
8083
8201
8084
@@ -9923,4 +1974,9 @@
8202
# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
8203
@@ -10010,5 +1911,11 @@
8204
AC_SUBST([am__untar])
8085
8205
]) # _AM_PROG_TAR
8086
8206
8207
+m4_include([m4/gtk-doc.m4])
8087
8208
m4_include([m4/introspection.m4])
8088
8209
+m4_include([m4/libtool.m4])
8089
8210
+m4_include([m4/ltoptions.m4])
8091
8212
+m4_include([m4/ltversion.m4])
8092
8213
+m4_include([m4/lt~obsolete.m4])
8093
8214
m4_include([acinclude.m4])
8094
diff -Nur gtk+2.0-2.21.2/build/Makefile.in gtk+2.0-2.21.2.ubuntu/build/Makefile.in
8095
--- gtk+2.0-2.21.2/build/Makefile.in 2010-06-10 19:18:21.000000000 +0200
8096
+++ gtk+2.0-2.21.2.ubuntu/build/Makefile.in 2010-06-11 12:15:20.000000000 +0200
8097
@@ -40,7 +40,10 @@
8215
Index: gtk+-2.21.5/build/Makefile.in
8216
===================================================================
8217
--- gtk+-2.21.5.orig/build/Makefile.in 2010-07-22 21:44:03.180072001 +0200
8218
+++ gtk+-2.21.5/build/Makefile.in 2010-07-22 21:44:19.020072000 +0200
8219
@@ -39,11 +39,14 @@
8220
$(top_srcdir)/Makefile.decl
8098
8221
subdir = build
8099
8222
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
8100
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
8101
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
8102
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
8103
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
8104
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
8105
+ $(top_srcdir)/configure.in
8223
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
8224
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
8225
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
8226
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
8227
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
8228
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
8106
8229
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
8107
8230
$(ACLOCAL_M4)
8108
mkinstalldirs = $(install_sh) -d
8109
@@ -170,6 +173,7 @@
8110
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
8111
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
8112
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
8231
-mkinstalldirs = $(install_sh) -d
8232
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
8233
CONFIG_HEADER = $(top_builddir)/config.h
8234
CONFIG_CLEAN_FILES =
8235
CONFIG_CLEAN_VPATH_FILES =
8236
@@ -157,6 +160,7 @@
8237
GDK_PACKAGES = @GDK_PACKAGES@
8238
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
8239
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
8113
8240
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
8114
8241
GDK_WLIBS = @GDK_WLIBS@
8115
8242
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
8116
8243
GLIB_CFLAGS = @GLIB_CFLAGS@
8117
@@ -262,8 +266,6 @@
8118
PATH_SEPARATOR = @PATH_SEPARATOR@
8119
PERL = @PERL@
8120
PKG_CONFIG = @PKG_CONFIG@
8121
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
8122
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
8123
POFILES = @POFILES@
8124
POSUB = @POSUB@
8125
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
8126
diff -Nur gtk+2.0-2.21.2/build/win32/Makefile.in gtk+2.0-2.21.2.ubuntu/build/win32/Makefile.in
8127
--- gtk+2.0-2.21.2/build/win32/Makefile.in 2010-06-10 19:18:21.000000000 +0200
8128
+++ gtk+2.0-2.21.2.ubuntu/build/win32/Makefile.in 2010-06-11 12:15:20.000000000 +0200
8129
@@ -40,7 +40,10 @@
8244
@@ -307,6 +311,7 @@
8245
libexecdir = @libexecdir@
8246
localedir = @localedir@
8247
localstatedir = @localstatedir@
8248
+lt_ECHO = @lt_ECHO@
8249
mandir = @mandir@
8250
mkdir_p = @mkdir_p@
8251
ms_librarian = @ms_librarian@
8252
Index: gtk+-2.21.5/build/win32/Makefile.in
8253
===================================================================
8254
--- gtk+-2.21.5.orig/build/win32/Makefile.in 2010-07-22 21:44:03.170072001 +0200
8255
+++ gtk+-2.21.5/build/win32/Makefile.in 2010-07-22 21:44:19.080072000 +0200
8256
@@ -39,11 +39,14 @@
8257
$(top_srcdir)/Makefile.decl
8130
8258
subdir = build/win32
8131
8259
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
8132
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
8133
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
8134
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
8135
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
8136
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
8137
+ $(top_srcdir)/configure.in
8260
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
8261
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
8262
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
8263
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
8264
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
8265
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
8138
8266
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
8139
8267
$(ACLOCAL_M4)
8140
mkinstalldirs = $(install_sh) -d
8141
@@ -170,6 +173,7 @@
8142
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
8143
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
8144
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
8268
-mkinstalldirs = $(install_sh) -d
8269
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
8270
CONFIG_HEADER = $(top_builddir)/config.h
8271
CONFIG_CLEAN_FILES =
8272
CONFIG_CLEAN_VPATH_FILES =
8273
@@ -157,6 +160,7 @@
8274
GDK_PACKAGES = @GDK_PACKAGES@
8275
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
8276
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
8145
8277
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
8146
8278
GDK_WLIBS = @GDK_WLIBS@
8147
8279
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
8148
8280
GLIB_CFLAGS = @GLIB_CFLAGS@
8149
@@ -262,8 +266,6 @@
8150
PATH_SEPARATOR = @PATH_SEPARATOR@
8151
PERL = @PERL@
8152
PKG_CONFIG = @PKG_CONFIG@
8153
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
8154
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
8155
POFILES = @POFILES@
8156
POSUB = @POSUB@
8157
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
8158
diff -Nur gtk+2.0-2.21.2/build/win32/vs9/Makefile.in gtk+2.0-2.21.2.ubuntu/build/win32/vs9/Makefile.in
8159
--- gtk+2.0-2.21.2/build/win32/vs9/Makefile.in 2010-06-10 19:18:21.000000000 +0200
8160
+++ gtk+2.0-2.21.2.ubuntu/build/win32/vs9/Makefile.in 2010-06-11 12:15:20.000000000 +0200
8161
@@ -40,7 +40,10 @@
8281
@@ -307,6 +311,7 @@
8282
libexecdir = @libexecdir@
8283
localedir = @localedir@
8284
localstatedir = @localstatedir@
8285
+lt_ECHO = @lt_ECHO@
8286
mandir = @mandir@
8287
mkdir_p = @mkdir_p@
8288
ms_librarian = @ms_librarian@
8289
Index: gtk+-2.21.5/build/win32/vs9/Makefile.in
8290
===================================================================
8291
--- gtk+-2.21.5.orig/build/win32/vs9/Makefile.in 2010-07-22 21:44:03.180072001 +0200
8292
+++ gtk+-2.21.5/build/win32/vs9/Makefile.in 2010-07-22 21:44:19.140072000 +0200
8293
@@ -39,11 +39,14 @@
8294
$(top_srcdir)/Makefile.decl
8162
8295
subdir = build/win32/vs9
8163
8296
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
8164
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
8165
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
8166
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
8167
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
8168
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
8169
+ $(top_srcdir)/configure.in
8297
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
8298
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
8299
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
8300
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
8301
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
8302
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
8170
8303
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
8171
8304
$(ACLOCAL_M4)
8172
mkinstalldirs = $(install_sh) -d
8173
@@ -130,6 +133,7 @@
8174
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
8175
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
8176
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
8305
-mkinstalldirs = $(install_sh) -d
8306
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
8307
CONFIG_HEADER = $(top_builddir)/config.h
8308
CONFIG_CLEAN_FILES =
8309
CONFIG_CLEAN_VPATH_FILES =
8310
@@ -117,6 +120,7 @@
8311
GDK_PACKAGES = @GDK_PACKAGES@
8312
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
8313
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
8177
8314
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
8178
8315
GDK_WLIBS = @GDK_WLIBS@
8179
8316
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
8180
8317
GLIB_CFLAGS = @GLIB_CFLAGS@
8181
@@ -222,8 +226,6 @@
8182
PATH_SEPARATOR = @PATH_SEPARATOR@
8183
PERL = @PERL@
8184
PKG_CONFIG = @PKG_CONFIG@
8185
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
8186
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
8187
POFILES = @POFILES@
8188
POSUB = @POSUB@
8189
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
8190
diff -Nur gtk+2.0-2.21.2/configure gtk+2.0-2.21.2.ubuntu/configure
8191
--- gtk+2.0-2.21.2/configure 2010-06-10 19:18:28.000000000 +0200
8192
+++ gtk+2.0-2.21.2.ubuntu/configure 2010-06-11 12:15:19.000000000 +0200
8193
@@ -816,6 +816,7 @@
8318
@@ -267,6 +271,7 @@
8319
libexecdir = @libexecdir@
8320
localedir = @localedir@
8321
localstatedir = @localstatedir@
8322
+lt_ECHO = @lt_ECHO@
8323
mandir = @mandir@
8324
mkdir_p = @mkdir_p@
8325
ms_librarian = @ms_librarian@
8326
Index: gtk+-2.21.5/configure
8327
===================================================================
8328
--- gtk+-2.21.5.orig/configure 2010-07-22 21:44:03.150072001 +0200
8329
+++ gtk+-2.21.5/configure 2010-07-22 21:44:17.510072000 +0200
8330
@@ -1,13 +1,13 @@
8331
#! /bin/sh
8332
# Guess values for system-dependent variables and create Makefiles.
8333
-# Generated by GNU Autoconf 2.66 for gtk+ 2.21.5.
8334
+# Generated by GNU Autoconf 2.65 for gtk+ 2.21.5.
8335
#
8336
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B>.
8337
#
8338
#
8339
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
8340
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
8341
-# Foundation, Inc.
8342
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
8343
+# Inc.
8344
#
8345
#
8346
# This configure script is free software; the Free Software Foundation
8347
@@ -173,14 +173,6 @@
8348
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
8349
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
8350
test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
8351
-
8352
- test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
8353
- ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
8354
- ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
8355
- ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
8356
- PATH=/empty FPATH=/empty; export PATH FPATH
8357
- test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
8358
- || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1
8359
test \$(( 1 + 1 )) = 2 || exit 1"
8360
if (eval "$as_required") 2>/dev/null; then :
8361
as_have_required=yes
8362
@@ -328,7 +320,7 @@
8363
test -d "$as_dir" && break
8364
done
8365
test -z "$as_dirs" || eval "mkdir $as_dirs"
8366
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
8367
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
8368
8369
8370
} # as_fn_mkdir_p
8371
@@ -368,19 +360,19 @@
8372
fi # as_fn_arith
8373
8374
8375
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
8376
-# ----------------------------------------
8377
+# as_fn_error ERROR [LINENO LOG_FD]
8378
+# ---------------------------------
8379
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
8380
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
8381
-# script with STATUS, using 1 if that was 0.
8382
+# script with status $?, using 1 if that was 0.
8383
as_fn_error ()
8384
{
8385
- as_status=$1; test $as_status -eq 0 && as_status=1
8386
- if test "$4"; then
8387
- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
8388
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
8389
+ as_status=$?; test $as_status -eq 0 && as_status=1
8390
+ if test "$3"; then
8391
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
8392
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
8393
fi
8394
- $as_echo "$as_me: error: $2" >&2
8395
+ $as_echo "$as_me: error: $1" >&2
8396
as_fn_exit $as_status
8397
} # as_fn_error
8398
8399
@@ -537,14 +529,161 @@
8400
# Sed expression to map a string onto a valid variable name.
8401
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
8402
8403
+
8404
+
8405
+# Check that we are running under the correct shell.
8406
SHELL=${CONFIG_SHELL-/bin/sh}
8407
8408
+case X$lt_ECHO in
8409
+X*--fallback-echo)
8410
+ # Remove one level of quotation (which was required for Make).
8411
+ ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
8412
+ ;;
8413
+esac
8414
+
8415
+ECHO=${lt_ECHO-echo}
8416
+if test "X$1" = X--no-reexec; then
8417
+ # Discard the --no-reexec flag, and continue.
8418
+ shift
8419
+elif test "X$1" = X--fallback-echo; then
8420
+ # Avoid inline document here, it may be left over
8421
+ :
8422
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
8423
+ # Yippee, $ECHO works!
8424
+ :
8425
+else
8426
+ # Restart under the correct shell.
8427
+ exec $SHELL "$0" --no-reexec ${1+"$@"}
8428
+fi
8429
+
8430
+if test "X$1" = X--fallback-echo; then
8431
+ # used as fallback echo
8432
+ shift
8433
+ cat <<_LT_EOF
8434
+$*
8435
+_LT_EOF
8436
+ exit 0
8437
+fi
8438
+
8439
+# The HP-UX ksh and POSIX shell print the target directory to stdout
8440
+# if CDPATH is set.
8441
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
8442
+
8443
+if test -z "$lt_ECHO"; then
8444
+ if test "X${echo_test_string+set}" != Xset; then
8445
+ # find a string as large as possible, as long as the shell can cope with it
8446
+ for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
8447
+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
8448
+ if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
8449
+ { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
8450
+ then
8451
+ break
8452
+ fi
8453
+ done
8454
+ fi
8455
+
8456
+ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
8457
+ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
8458
+ test "X$echo_testing_string" = "X$echo_test_string"; then
8459
+ :
8460
+ else
8461
+ # The Solaris, AIX, and Digital Unix default echo programs unquote
8462
+ # backslashes. This makes it impossible to quote backslashes using
8463
+ # echo "$something" | sed 's/\\/\\\\/g'
8464
+ #
8465
+ # So, first we look for a working echo in the user's PATH.
8466
+
8467
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
8468
+ for dir in $PATH /usr/ucb; do
8469
+ IFS="$lt_save_ifs"
8470
+ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
8471
+ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
8472
+ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
8473
+ test "X$echo_testing_string" = "X$echo_test_string"; then
8474
+ ECHO="$dir/echo"
8475
+ break
8476
+ fi
8477
+ done
8478
+ IFS="$lt_save_ifs"
8479
+
8480
+ if test "X$ECHO" = Xecho; then
8481
+ # We didn't find a better echo, so look for alternatives.
8482
+ if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
8483
+ echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
8484
+ test "X$echo_testing_string" = "X$echo_test_string"; then
8485
+ # This shell has a builtin print -r that does the trick.
8486
+ ECHO='print -r'
8487
+ elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
8488
+ test "X$CONFIG_SHELL" != X/bin/ksh; then
8489
+ # If we have ksh, try running configure again with it.
8490
+ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
8491
+ export ORIGINAL_CONFIG_SHELL
8492
+ CONFIG_SHELL=/bin/ksh
8493
+ export CONFIG_SHELL
8494
+ exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
8495
+ else
8496
+ # Try using printf.
8497
+ ECHO='printf %s\n'
8498
+ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
8499
+ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
8500
+ test "X$echo_testing_string" = "X$echo_test_string"; then
8501
+ # Cool, printf works
8502
+ :
8503
+ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
8504
+ test "X$echo_testing_string" = 'X\t' &&
8505
+ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
8506
+ test "X$echo_testing_string" = "X$echo_test_string"; then
8507
+ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
8508
+ export CONFIG_SHELL
8509
+ SHELL="$CONFIG_SHELL"
8510
+ export SHELL
8511
+ ECHO="$CONFIG_SHELL $0 --fallback-echo"
8512
+ elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
8513
+ test "X$echo_testing_string" = 'X\t' &&
8514
+ echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
8515
+ test "X$echo_testing_string" = "X$echo_test_string"; then
8516
+ ECHO="$CONFIG_SHELL $0 --fallback-echo"
8517
+ else
8518
+ # maybe with a smaller string...
8519
+ prev=:
8520
+
8521
+ for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
8522
+ if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
8523
+ then
8524
+ break
8525
+ fi
8526
+ prev="$cmd"
8527
+ done
8528
+
8529
+ if test "$prev" != 'sed 50q "$0"'; then
8530
+ echo_test_string=`eval $prev`
8531
+ export echo_test_string
8532
+ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
8533
+ else
8534
+ # Oops. We lost completely, so just stick with echo.
8535
+ ECHO=echo
8536
+ fi
8537
+ fi
8538
+ fi
8539
+ fi
8540
+ fi
8541
+fi
8542
+
8543
+# Copy echo and quote the copy suitably for passing to libtool from
8544
+# the Makefile, instead of quoting the original, which is used later.
8545
+lt_ECHO=$ECHO
8546
+if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
8547
+ lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
8548
+fi
8549
+
8550
+
8551
+
8552
8553
test -n "$DJDIR" || exec 7<&0 </dev/null
8554
exec 6>&1
8555
8556
# Name of the host.
8557
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
8558
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
8559
# so uname gets run too.
8560
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
8561
8562
@@ -673,6 +812,7 @@
8194
8563
GDK_DEP_LIBS
8195
8564
GDK_EXTRA_CFLAGS
8196
8565
GDK_EXTRA_LIBS
8198
8567
GDK_PACKAGES
8199
8568
USE_DIRECTFB_FALSE
8200
8569
USE_DIRECTFB_TRUE
8201
@@ -967,8 +968,6 @@
8202
CAIRO_BACKEND_CFLAGS
8203
BASE_DEPENDENCIES_LIBS
8204
BASE_DEPENDENCIES_CFLAGS
8205
-PKG_CONFIG_LIBDIR
8206
-PKG_CONFIG_PATH
8207
PKG_CONFIG
8208
gtktargetlib
8209
gdktargetlib
8210
@@ -1026,6 +1025,8 @@
8570
@@ -797,6 +937,7 @@
8571
LIPO
8572
NMEDIT
8573
DSYMUTIL
8574
+lt_ECHO
8575
RANLIB
8576
AR
8577
LN_S
8578
@@ -822,6 +963,8 @@
8211
8579
CXXFLAGS
8212
8580
ac_ct_CXX
8213
8581
CXX
8216
8584
am__fastdepCC_FALSE
8217
8585
am__fastdepCC_TRUE
8218
8586
CCDEPMODE
8219
@@ -1149,6 +1150,10 @@
8587
@@ -941,6 +1084,10 @@
8220
8588
enable_shm
8221
8589
enable_xkb
8222
8590
enable_xinerama
8227
8595
enable_rebuilds
8228
8596
enable_visibility
8229
8597
with_xinput
8230
@@ -1191,8 +1196,6 @@
8231
CCAS
8232
CCASFLAGS
8233
PKG_CONFIG
8234
-PKG_CONFIG_PATH
8235
-PKG_CONFIG_LIBDIR
8236
BASE_DEPENDENCIES_CFLAGS
8237
BASE_DEPENDENCIES_LIBS
8238
CAIRO_BACKEND_CFLAGS
8239
@@ -1841,6 +1844,12 @@
8598
@@ -1094,7 +1241,7 @@
8599
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
8600
# Reject names that are not valid shell variable names.
8601
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
8602
- as_fn_error $? "invalid feature name: $ac_useropt"
8603
+ as_fn_error "invalid feature name: $ac_useropt"
8604
ac_useropt_orig=$ac_useropt
8605
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
8606
case $ac_user_opts in
8607
@@ -1120,7 +1267,7 @@
8608
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
8609
# Reject names that are not valid shell variable names.
8610
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
8611
- as_fn_error $? "invalid feature name: $ac_useropt"
8612
+ as_fn_error "invalid feature name: $ac_useropt"
8613
ac_useropt_orig=$ac_useropt
8614
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
8615
case $ac_user_opts in
8616
@@ -1324,7 +1471,7 @@
8617
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
8618
# Reject names that are not valid shell variable names.
8619
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
8620
- as_fn_error $? "invalid package name: $ac_useropt"
8621
+ as_fn_error "invalid package name: $ac_useropt"
8622
ac_useropt_orig=$ac_useropt
8623
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
8624
case $ac_user_opts in
8625
@@ -1340,7 +1487,7 @@
8626
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
8627
# Reject names that are not valid shell variable names.
8628
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
8629
- as_fn_error $? "invalid package name: $ac_useropt"
8630
+ as_fn_error "invalid package name: $ac_useropt"
8631
ac_useropt_orig=$ac_useropt
8632
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
8633
case $ac_user_opts in
8634
@@ -1370,8 +1517,8 @@
8635
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
8636
x_libraries=$ac_optarg ;;
8637
8638
- -*) as_fn_error $? "unrecognized option: \`$ac_option'
8639
-Try \`$0 --help' for more information"
8640
+ -*) as_fn_error "unrecognized option: \`$ac_option'
8641
+Try \`$0 --help' for more information."
8642
;;
8643
8644
*=*)
8645
@@ -1379,7 +1526,7 @@
8646
# Reject names that are not valid shell variable names.
8647
case $ac_envvar in #(
8648
'' | [0-9]* | *[!_$as_cr_alnum]* )
8649
- as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
8650
+ as_fn_error "invalid variable name: \`$ac_envvar'" ;;
8651
esac
8652
eval $ac_envvar=\$ac_optarg
8653
export $ac_envvar ;;
8654
@@ -1397,13 +1544,13 @@
8655
8656
if test -n "$ac_prev"; then
8657
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
8658
- as_fn_error $? "missing argument to $ac_option"
8659
+ as_fn_error "missing argument to $ac_option"
8660
fi
8661
8662
if test -n "$ac_unrecognized_opts"; then
8663
case $enable_option_checking in
8664
no) ;;
8665
- fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
8666
+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
8667
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
8668
esac
8669
fi
8670
@@ -1426,7 +1573,7 @@
8671
[\\/$]* | ?:[\\/]* ) continue;;
8672
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
8673
esac
8674
- as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
8675
+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
8676
done
8677
8678
# There might be people who depend on the old broken behavior: `$host'
8679
@@ -1440,8 +1587,8 @@
8680
if test "x$host_alias" != x; then
8681
if test "x$build_alias" = x; then
8682
cross_compiling=maybe
8683
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
8684
- If a cross compiler is detected then cross compile mode will be used" >&2
8685
+ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
8686
+ If a cross compiler is detected then cross compile mode will be used." >&2
8687
elif test "x$build_alias" != "x$host_alias"; then
8688
cross_compiling=yes
8689
fi
8690
@@ -1456,9 +1603,9 @@
8691
ac_pwd=`pwd` && test -n "$ac_pwd" &&
8692
ac_ls_di=`ls -di .` &&
8693
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
8694
- as_fn_error $? "working directory cannot be determined"
8695
+ as_fn_error "working directory cannot be determined"
8696
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
8697
- as_fn_error $? "pwd does not report name of working directory"
8698
+ as_fn_error "pwd does not report name of working directory"
8699
8700
8701
# Find the source files, if location was not specified.
8702
@@ -1497,11 +1644,11 @@
8703
fi
8704
if test ! -r "$srcdir/$ac_unique_file"; then
8705
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
8706
- as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
8707
+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
8708
fi
8709
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
8710
ac_abs_confdir=`(
8711
- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
8712
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
8713
pwd)`
8714
# When building in place, set srcdir=.
8715
if test "$ac_abs_confdir" = "$ac_pwd"; then
8716
@@ -1541,7 +1688,7 @@
8717
--help=short display options specific to this package
8718
--help=recursive display the short help of all the included packages
8719
-V, --version display version information and exit
8720
- -q, --quiet, --silent do not print \`checking ...' messages
8721
+ -q, --quiet, --silent do not print \`checking...' messages
8722
--cache-file=FILE cache test results in FILE [disabled]
8723
-C, --config-cache alias for \`--cache-file=config.cache'
8724
-n, --no-create do not create output files
8725
@@ -1627,6 +1774,12 @@
8240
8726
--enable-xkb support XKB [default=maybe]
8241
8727
--enable-xinerama support xinerama extension if available
8242
8728
[default=yes]
8249
8735
--disable-rebuilds disable all source autogeneration rules
8250
8736
--disable-visibility don't use ELF visibility attributes
8251
8737
--enable-explicit-deps=[yes/no/auto]
8252
@@ -1901,10 +1910,6 @@
8253
CCAS assembler compiler command (defaults to CC)
8254
CCASFLAGS assembler compiler flags (defaults to CFLAGS)
8255
PKG_CONFIG path to pkg-config utility
8256
- PKG_CONFIG_PATH
8257
- directories to add to pkg-config's search path
8258
- PKG_CONFIG_LIBDIR
8259
- path overriding pkg-config's built-in search path
8260
BASE_DEPENDENCIES_CFLAGS
8261
C compiler flags for BASE_DEPENDENCIES, overriding pkg-config
8262
BASE_DEPENDENCIES_LIBS
8263
@@ -4594,6 +4599,14 @@
8738
@@ -1764,9 +1917,9 @@
8739
if $ac_init_version; then
8740
cat <<\_ACEOF
8741
gtk+ configure 2.21.5
8742
-generated by GNU Autoconf 2.66
8743
+generated by GNU Autoconf 2.65
8744
8745
-Copyright (C) 2010 Free Software Foundation, Inc.
8746
+Copyright (C) 2009 Free Software Foundation, Inc.
8747
This configure script is free software; the Free Software Foundation
8748
gives unlimited permission to copy, distribute and modify it.
8749
_ACEOF
8750
@@ -1908,7 +2061,7 @@
8751
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
8752
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
8753
$as_echo_n "checking for $2... " >&6; }
8754
-if eval "test \"\${$3+set}\"" = set; then :
8755
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
8756
$as_echo_n "(cached) " >&6
8757
else
8758
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8759
@@ -2017,7 +2170,7 @@
8760
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
8761
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
8762
$as_echo_n "checking for $2... " >&6; }
8763
-if eval "test \"\${$3+set}\"" = set; then :
8764
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
8765
$as_echo_n "(cached) " >&6
8766
else
8767
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8768
@@ -2167,10 +2320,10 @@
8769
ac_fn_c_check_header_mongrel ()
8770
{
8771
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
8772
- if eval "test \"\${$3+set}\"" = set; then :
8773
+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
8774
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
8775
$as_echo_n "checking for $2... " >&6; }
8776
-if eval "test \"\${$3+set}\"" = set; then :
8777
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
8778
$as_echo_n "(cached) " >&6
8779
fi
8780
eval ac_res=\$$3
8781
@@ -2229,15 +2382,17 @@
8782
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
8783
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
8784
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
8785
-( $as_echo "## --------------------------------------------------------------------- ##
8786
+( cat <<\_ASBOX
8787
+## --------------------------------------------------------------------- ##
8788
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ##
8789
-## --------------------------------------------------------------------- ##"
8790
+## --------------------------------------------------------------------- ##
8791
+_ASBOX
8792
) | sed "s/^/$as_me: WARNING: /" >&2
8793
;;
8794
esac
8795
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
8796
$as_echo_n "checking for $2... " >&6; }
8797
-if eval "test \"\${$3+set}\"" = set; then :
8798
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
8799
$as_echo_n "(cached) " >&6
8800
else
8801
eval "$3=\$ac_header_compiler"
8802
@@ -2259,7 +2414,7 @@
8803
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
8804
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
8805
$as_echo_n "checking for $2.$3... " >&6; }
8806
-if eval "test \"\${$4+set}\"" = set; then :
8807
+if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
8808
$as_echo_n "(cached) " >&6
8809
else
8810
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8811
@@ -2311,7 +2466,7 @@
8812
running configure, to aid debugging if configure makes a mistake.
8813
8814
It was created by gtk+ $as_me 2.21.5, which was
8815
-generated by GNU Autoconf 2.66. Invocation command line was
8816
+generated by GNU Autoconf 2.65. Invocation command line was
8817
8818
$ $0 $@
8819
8820
@@ -2421,9 +2576,11 @@
8821
{
8822
echo
8823
8824
- $as_echo "## ---------------- ##
8825
+ cat <<\_ASBOX
8826
+## ---------------- ##
8827
## Cache variables. ##
8828
-## ---------------- ##"
8829
+## ---------------- ##
8830
+_ASBOX
8831
echo
8832
# The following way of writing the cache mishandles newlines in values,
8833
(
8834
@@ -2457,9 +2614,11 @@
8835
)
8836
echo
8837
8838
- $as_echo "## ----------------- ##
8839
+ cat <<\_ASBOX
8840
+## ----------------- ##
8841
## Output variables. ##
8842
-## ----------------- ##"
8843
+## ----------------- ##
8844
+_ASBOX
8845
echo
8846
for ac_var in $ac_subst_vars
8847
do
8848
@@ -2472,9 +2631,11 @@
8849
echo
8850
8851
if test -n "$ac_subst_files"; then
8852
- $as_echo "## ------------------- ##
8853
+ cat <<\_ASBOX
8854
+## ------------------- ##
8855
## File substitutions. ##
8856
-## ------------------- ##"
8857
+## ------------------- ##
8858
+_ASBOX
8859
echo
8860
for ac_var in $ac_subst_files
8861
do
8862
@@ -2488,9 +2649,11 @@
8863
fi
8864
8865
if test -s confdefs.h; then
8866
- $as_echo "## ----------- ##
8867
+ cat <<\_ASBOX
8868
+## ----------- ##
8869
## confdefs.h. ##
8870
-## ----------- ##"
8871
+## ----------- ##
8872
+_ASBOX
8873
echo
8874
cat confdefs.h
8875
echo
8876
@@ -2545,12 +2708,7 @@
8877
ac_site_file1=NONE
8878
ac_site_file2=NONE
8879
if test -n "$CONFIG_SITE"; then
8880
- # We do not want a PATH search for config.site.
8881
- case $CONFIG_SITE in #((
8882
- -*) ac_site_file1=./$CONFIG_SITE;;
8883
- */*) ac_site_file1=$CONFIG_SITE;;
8884
- *) ac_site_file1=./$CONFIG_SITE;;
8885
- esac
8886
+ ac_site_file1=$CONFIG_SITE
8887
elif test "x$prefix" != xNONE; then
8888
ac_site_file1=$prefix/share/config.site
8889
ac_site_file2=$prefix/etc/config.site
8890
@@ -2565,11 +2723,7 @@
8891
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
8892
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
8893
sed 's/^/| /' "$ac_site_file" >&5
8894
- . "$ac_site_file" \
8895
- || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
8896
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
8897
-as_fn_error $? "failed to load site script $ac_site_file
8898
-See \`config.log' for more details" "$LINENO" 5; }
8899
+ . "$ac_site_file"
8900
fi
8901
done
8902
8903
@@ -2648,7 +2802,7 @@
8904
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
8905
{ $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
8906
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
8907
- as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
8908
+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
8909
fi
8910
## -------------------- ##
8911
## Main body of script. ##
8912
@@ -2673,22 +2827,16 @@
8913
8914
ac_aux_dir=
8915
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
8916
- if test -f "$ac_dir/install-sh"; then
8917
- ac_aux_dir=$ac_dir
8918
- ac_install_sh="$ac_aux_dir/install-sh -c"
8919
- break
8920
- elif test -f "$ac_dir/install.sh"; then
8921
- ac_aux_dir=$ac_dir
8922
- ac_install_sh="$ac_aux_dir/install.sh -c"
8923
- break
8924
- elif test -f "$ac_dir/shtool"; then
8925
- ac_aux_dir=$ac_dir
8926
- ac_install_sh="$ac_aux_dir/shtool install -c"
8927
- break
8928
- fi
8929
+ for ac_t in install-sh install.sh shtool; do
8930
+ if test -f "$ac_dir/$ac_t"; then
8931
+ ac_aux_dir=$ac_dir
8932
+ ac_install_sh="$ac_aux_dir/$ac_t -c"
8933
+ break 2
8934
+ fi
8935
+ done
8936
done
8937
if test -z "$ac_aux_dir"; then
8938
- as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
8939
+ as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
8940
fi
8941
8942
# These three variables are undocumented and unsupported,
8943
@@ -2804,11 +2952,11 @@
8944
'
8945
case `pwd` in
8946
*[\\\"\#\$\&\'\`$am_lf]*)
8947
- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
8948
+ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
8949
esac
8950
case $srcdir in
8951
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
8952
- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
8953
+ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
8954
esac
8955
8956
# Do `set' in a subshell so we don't clobber the current shell's
8957
@@ -2830,7 +2978,7 @@
8958
# if, for instance, CONFIG_SHELL is bash and it inherits a
8959
# broken ls alias from the environment. This has actually
8960
# happened. Such a system could not be considered "sane".
8961
- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
8962
+ as_fn_error "ls -t appears to fail. Make sure there is not a broken
8963
alias in your environment" "$LINENO" 5
8964
fi
8965
8966
@@ -2840,7 +2988,7 @@
8967
# Ok.
8968
:
8969
else
8970
- as_fn_error $? "newly created file is older than distributed files!
8971
+ as_fn_error "newly created file is older than distributed files!
8972
Check your system clock" "$LINENO" 5
8973
fi
8974
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
8975
@@ -3078,7 +3226,7 @@
8976
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
8977
set x ${MAKE-make}
8978
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
8979
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
8980
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
8981
$as_echo_n "(cached) " >&6
8982
else
8983
cat >conftest.make <<\_ACEOF
8984
@@ -3086,7 +3234,7 @@
8985
all:
8986
@echo '@@@%%%=$(MAKE)=@@@%%%'
8987
_ACEOF
8988
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
8989
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
8990
case `${MAKE-make} -f conftest.make 2>/dev/null` in
8991
*@@@%%%=?*=@@@%%%*)
8992
eval ac_cv_prog_make_${ac_make}_set=yes;;
8993
@@ -3120,7 +3268,7 @@
8994
am__isrc=' -I$(srcdir)'
8995
# test to see if srcdir already configured
8996
if test -f $srcdir/config.status; then
8997
- as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
8998
+ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
8999
fi
9000
fi
9001
9002
@@ -3250,7 +3398,7 @@
9003
9004
# Make sure we can run config.sub.
9005
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
9006
- as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
9007
+ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
9008
9009
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
9010
$as_echo_n "checking build system type... " >&6; }
9011
@@ -3261,16 +3409,16 @@
9012
test "x$ac_build_alias" = x &&
9013
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
9014
test "x$ac_build_alias" = x &&
9015
- as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
9016
+ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
9017
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
9018
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
9019
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
9020
9021
fi
9022
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
9023
$as_echo "$ac_cv_build" >&6; }
9024
case $ac_cv_build in
9025
*-*-*) ;;
9026
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
9027
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
9028
esac
9029
build=$ac_cv_build
9030
ac_save_IFS=$IFS; IFS='-'
9031
@@ -3295,7 +3443,7 @@
9032
ac_cv_host=$ac_cv_build
9033
else
9034
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
9035
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
9036
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
9037
fi
9038
9039
fi
9040
@@ -3303,7 +3451,7 @@
9041
$as_echo "$ac_cv_host" >&6; }
9042
case $ac_cv_host in
9043
*-*-*) ;;
9044
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
9045
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
9046
esac
9047
host=$ac_cv_host
9048
ac_save_IFS=$IFS; IFS='-'
9049
@@ -3653,8 +3801,8 @@
9050
9051
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
9052
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
9053
-as_fn_error $? "no acceptable C compiler found in \$PATH
9054
-See \`config.log' for more details" "$LINENO" 5; }
9055
+as_fn_error "no acceptable C compiler found in \$PATH
9056
+See \`config.log' for more details." "$LINENO" 5; }
9057
9058
# Provide some information about the compiler.
9059
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
9060
@@ -3768,8 +3916,9 @@
9061
9062
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
9063
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
9064
-as_fn_error 77 "C compiler cannot create executables
9065
-See \`config.log' for more details" "$LINENO" 5; }
9066
+{ as_fn_set_status 77
9067
+as_fn_error "C compiler cannot create executables
9068
+See \`config.log' for more details." "$LINENO" 5; }; }
9069
else
9070
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
9071
$as_echo "yes" >&6; }
9072
@@ -3811,8 +3960,8 @@
9073
else
9074
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
9075
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
9076
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
9077
-See \`config.log' for more details" "$LINENO" 5; }
9078
+as_fn_error "cannot compute suffix of executables: cannot compile and link
9079
+See \`config.log' for more details." "$LINENO" 5; }
9080
fi
9081
rm -f conftest conftest$ac_cv_exeext
9082
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
9083
@@ -3869,9 +4018,9 @@
9084
else
9085
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
9086
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
9087
-as_fn_error $? "cannot run C compiled programs.
9088
+as_fn_error "cannot run C compiled programs.
9089
If you meant to cross compile, use \`--host'.
9090
-See \`config.log' for more details" "$LINENO" 5; }
9091
+See \`config.log' for more details." "$LINENO" 5; }
9092
fi
9093
fi
9094
fi
9095
@@ -3922,8 +4071,8 @@
9096
9097
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
9098
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
9099
-as_fn_error $? "cannot compute suffix of object files: cannot compile
9100
-See \`config.log' for more details" "$LINENO" 5; }
9101
+as_fn_error "cannot compute suffix of object files: cannot compile
9102
+See \`config.log' for more details." "$LINENO" 5; }
9103
fi
9104
rm -f conftest.$ac_cv_objext conftest.$ac_ext
9105
fi
9106
@@ -4363,6 +4512,14 @@
8264
9107
8265
9108
8266
9109
8275
9118
8276
9119
if test -n "$ac_tool_prefix"; then
8277
9120
for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
8278
@@ -6074,13 +6087,13 @@
9121
@@ -4934,7 +5091,7 @@
9122
enable_win32_dll=yes
9123
9124
case $host in
9125
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
9126
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
9127
if test -n "$ac_tool_prefix"; then
9128
# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
9129
set dummy ${ac_tool_prefix}as; ac_word=$2
9130
@@ -5242,8 +5399,8 @@
9131
9132
9133
9134
-macro_version='2.2.10'
9135
-macro_revision='1.3175'
9136
+macro_version='2.2.6b'
9137
+macro_revision='1.3017'
9138
9139
9140
9141
@@ -5259,75 +5416,6 @@
9142
9143
ltmain="$ac_aux_dir/ltmain.sh"
9144
9145
-# Backslashify metacharacters that are still active within
9146
-# double-quoted strings.
9147
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
9148
-
9149
-# Same as above, but do not quote variable references.
9150
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
9151
-
9152
-# Sed substitution to delay expansion of an escaped shell variable in a
9153
-# double_quote_subst'ed string.
9154
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
9155
-
9156
-# Sed substitution to delay expansion of an escaped single quote.
9157
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
9158
-
9159
-# Sed substitution to avoid accidental globbing in evaled expressions
9160
-no_glob_subst='s/\*/\\\*/g'
9161
-
9162
-ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
9163
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
9164
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
9165
-
9166
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
9167
-$as_echo_n "checking how to print strings... " >&6; }
9168
-# Test print first, because it will be a builtin if present.
9169
-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
9170
- test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
9171
- ECHO='print -r --'
9172
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
9173
- ECHO='printf %s\n'
9174
-else
9175
- # Use this function as a fallback that always works.
9176
- func_fallback_echo ()
9177
- {
9178
- eval 'cat <<_LTECHO_EOF
9179
-$1
9180
-_LTECHO_EOF'
9181
- }
9182
- ECHO='func_fallback_echo'
9183
-fi
9184
-
9185
-# func_echo_all arg...
9186
-# Invoke $ECHO with all args, space-separated.
9187
-func_echo_all ()
9188
-{
9189
- $ECHO ""
9190
-}
9191
-
9192
-case "$ECHO" in
9193
- printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
9194
-$as_echo "printf" >&6; } ;;
9195
- print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
9196
-$as_echo "print -r" >&6; } ;;
9197
- *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
9198
-$as_echo "cat" >&6; } ;;
9199
-esac
9200
-
9201
-
9202
-
9203
-
9204
-
9205
-
9206
-
9207
-
9208
-
9209
-
9210
-
9211
-
9212
-
9213
-
9214
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
9215
$as_echo_n "checking for a sed that does not truncate output... " >&6; }
9216
if test "${ac_cv_path_SED+set}" = set; then :
9217
@@ -5385,7 +5473,7 @@
9218
done
9219
IFS=$as_save_IFS
9220
if test -z "$ac_cv_path_SED"; then
9221
- as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
9222
+ as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
9223
fi
9224
else
9225
ac_cv_path_SED=$SED
9226
@@ -5461,7 +5549,7 @@
9227
done
9228
IFS=$as_save_IFS
9229
if test -z "$ac_cv_path_GREP"; then
9230
- as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
9231
+ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
9232
fi
9233
else
9234
ac_cv_path_GREP=$GREP
9235
@@ -5527,7 +5615,7 @@
9236
done
9237
IFS=$as_save_IFS
9238
if test -z "$ac_cv_path_EGREP"; then
9239
- as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
9240
+ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
9241
fi
9242
else
9243
ac_cv_path_EGREP=$EGREP
9244
@@ -5594,7 +5682,7 @@
9245
done
9246
IFS=$as_save_IFS
9247
if test -z "$ac_cv_path_FGREP"; then
9248
- as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
9249
+ as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
9250
fi
9251
else
9252
ac_cv_path_FGREP=$FGREP
9253
@@ -5710,7 +5798,7 @@
9254
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9255
$as_echo "no" >&6; }
9256
fi
9257
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
9258
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
9259
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
9260
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
9261
if test "${lt_cv_prog_gnu_ld+set}" = set; then :
9262
@@ -5793,11 +5881,8 @@
9263
NM="$lt_cv_path_NM"
9264
else
9265
# Didn't find any BSD compatible name lister, look for dumpbin.
9266
- if test -n "$DUMPBIN"; then :
9267
- # Let the user override the test.
9268
- else
9269
- if test -n "$ac_tool_prefix"; then
9270
- for ac_prog in dumpbin "link -dump"
9271
+ if test -n "$ac_tool_prefix"; then
9272
+ for ac_prog in "dumpbin -symbols" "link -dump -symbols"
9273
do
9274
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
9275
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
9276
@@ -5841,7 +5926,7 @@
9277
fi
9278
if test -z "$DUMPBIN"; then
9279
ac_ct_DUMPBIN=$DUMPBIN
9280
- for ac_prog in dumpbin "link -dump"
9281
+ for ac_prog in "dumpbin -symbols" "link -dump -symbols"
9282
do
9283
# Extract the first word of "$ac_prog", so it can be a program name with args.
9284
set dummy $ac_prog; ac_word=$2
9285
@@ -5896,15 +5981,6 @@
9286
fi
9287
fi
9288
9289
- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
9290
- *COFF*)
9291
- DUMPBIN="$DUMPBIN -symbols"
9292
- ;;
9293
- *)
9294
- DUMPBIN=:
9295
- ;;
9296
- esac
9297
- fi
9298
9299
if test "$DUMPBIN" != ":"; then
9300
NM="$DUMPBIN"
9301
@@ -5924,13 +6000,13 @@
8279
9302
else
8280
9303
lt_cv_nm_interface="BSD nm"
8281
9304
echo "int some_variable = 0;" > conftest.$ac_ext
8282
- (eval echo "\"\$as_me:6077: $ac_compile\"" >&5)
8283
+ (eval echo "\"\$as_me:6090: $ac_compile\"" >&5)
9305
- (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
9306
+ (eval echo "\"\$as_me:6003: $ac_compile\"" >&5)
8284
9307
(eval "$ac_compile" 2>conftest.err)
8285
9308
cat conftest.err >&5
8286
- (eval echo "\"\$as_me:6080: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
8287
+ (eval echo "\"\$as_me:6093: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
9309
- (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
9310
+ (eval echo "\"\$as_me:6006: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
8288
9311
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
8289
9312
cat conftest.err >&5
8290
- (eval echo "\"\$as_me:6083: output\"" >&5)
8291
+ (eval echo "\"\$as_me:6096: output\"" >&5)
9313
- (eval echo "\"\$as_me:$LINENO: output\"" >&5)
9314
+ (eval echo "\"\$as_me:6009: output\"" >&5)
8292
9315
cat conftest.out >&5
8293
9316
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
8294
9317
lt_cv_nm_interface="MS dumpbin"
8295
@@ -6543,11 +6556,11 @@
8296
;;
8297
8298
# This must be Linux ELF.
8299
-linux* | k*bsd*-gnu)
8300
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
9318
@@ -5987,11 +6063,6 @@
9319
lt_cv_sys_max_cmd_len=8192;
9320
;;
9321
9322
- mint*)
9323
- # On MiNT this can take a long time and run out of memory.
9324
- lt_cv_sys_max_cmd_len=8192;
9325
- ;;
9326
-
9327
amigaos*)
9328
# On AmigaOS with pdksh, this test takes hours, literally.
9329
# So we just punt and use a minimum line length of 8192.
9330
@@ -6056,8 +6127,8 @@
9331
# If test is not a shell built-in, we'll probably end up computing a
9332
# maximum length that is only half of the actual maximum length, but
9333
# we can't tell.
9334
- while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
9335
- = "X$teststring$teststring"; } >/dev/null 2>&1 &&
9336
+ while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
9337
+ = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
9338
test $i != 17 # 1/2 MB should be enough
9339
do
9340
i=`expr $i + 1`
9341
@@ -6325,18 +6396,16 @@
9342
# Base MSYS/MinGW do not provide the 'file' command needed by
9343
# func_win32_libid shell function, so use a weaker test based on 'objdump',
9344
# unless we find 'file', for example because we are cross-compiling.
9345
- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
9346
- if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
9347
+ if ( file / ) >/dev/null 2>&1; then
9348
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
9349
lt_cv_file_magic_cmd='func_win32_libid'
9350
else
9351
- # Keep this pattern in sync with the one in func_win32_libid.
9352
- lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
9353
+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
9354
lt_cv_file_magic_cmd='$OBJDUMP -f'
9355
fi
9356
;;
9357
9358
-cegcc*)
9359
+cegcc)
9360
# use the weaker test based on 'objdump'. See mingw*.
9361
lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
9362
lt_cv_file_magic_cmd='$OBJDUMP -f'
9363
@@ -6366,10 +6435,6 @@
9364
lt_cv_deplibs_check_method=pass_all
9365
;;
9366
9367
-haiku*)
9368
- lt_cv_deplibs_check_method=pass_all
9369
- ;;
9370
-
9371
hpux10.20* | hpux11*)
9372
lt_cv_file_magic_cmd=/usr/bin/file
9373
case $host_cpu in
9374
@@ -6378,11 +6443,11 @@
9375
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
9376
;;
9377
hppa*64*)
9378
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
9379
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
9380
lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
9381
;;
9382
*)
9383
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
9384
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
9385
lt_cv_file_magic_test_file=/usr/lib/libc.sl
9386
;;
9387
esac
9388
@@ -6408,7 +6473,7 @@
8301
9389
lt_cv_deplibs_check_method=pass_all
8302
9390
;;
8303
9391
8306
9394
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
8307
9395
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
8308
9396
else
8309
@@ -7283,7 +7296,7 @@
9397
@@ -6820,18 +6885,6 @@
9398
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
9399
fi
9400
9401
-case $host_os in
9402
- darwin*)
9403
- lock_old_archive_extraction=yes ;;
9404
- *)
9405
- lock_old_archive_extraction=no ;;
9406
-esac
9407
-
9408
-
9409
-
9410
-
9411
-
9412
-
9413
9414
9415
9416
@@ -7001,8 +7054,8 @@
9417
test $ac_status = 0; }; then
9418
# Now try to grab the symbols.
9419
nlist=conftest.nm
9420
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
9421
- (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
9422
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
9423
+ (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
9424
ac_status=$?
9425
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9426
test $ac_status = 0; } && test -s "$nlist"; then
9427
@@ -7156,7 +7209,7 @@
8310
9428
;;
8311
9429
*-*-irix6*)
8312
9430
# Find out which ABI we are using.
8313
- echo '#line 7286 "configure"' > conftest.$ac_ext
8314
+ echo '#line 7299 "configure"' > conftest.$ac_ext
9431
- echo '#line '$LINENO' "configure"' > conftest.$ac_ext
9432
+ echo '#line 7212 "configure"' > conftest.$ac_ext
8315
9433
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
8316
9434
(eval $ac_compile) 2>&5
8317
9435
ac_status=$?
8318
@@ -9278,6 +9291,10 @@
9436
@@ -7868,38 +7921,6 @@
9437
fi
9438
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
9439
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
9440
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
9441
-$as_echo_n "checking for -force_load linker flag... " >&6; }
9442
-if test "${lt_cv_ld_force_load+set}" = set; then :
9443
- $as_echo_n "(cached) " >&6
9444
-else
9445
- lt_cv_ld_force_load=no
9446
- cat > conftest.c << _LT_EOF
9447
-int forced_loaded() { return 2;}
9448
-_LT_EOF
9449
- echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
9450
- $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
9451
- echo "$AR cru libconftest.a conftest.o" >&5
9452
- $AR cru libconftest.a conftest.o 2>&5
9453
- echo "$RANLIB libconftest.a" >&5
9454
- $RANLIB libconftest.a 2>&5
9455
- cat > conftest.c << _LT_EOF
9456
-int main() { return 0;}
9457
-_LT_EOF
9458
- echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
9459
- $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
9460
- _lt_result=$?
9461
- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
9462
- lt_cv_ld_force_load=yes
9463
- else
9464
- cat conftest.err >&5
9465
- fi
9466
- rm -f conftest.err libconftest.a conftest conftest.c
9467
- rm -rf conftest.dSYM
9468
-
9469
-fi
9470
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
9471
-$as_echo "$lt_cv_ld_force_load" >&6; }
9472
case $host_os in
9473
rhapsody* | darwin1.[012])
9474
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
9475
@@ -7927,7 +7948,7 @@
9476
else
9477
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
9478
fi
9479
- if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
9480
+ if test "$DSYMUTIL" != ":"; then
9481
_lt_dsymutil='~$DSYMUTIL $lib || :'
9482
else
9483
_lt_dsymutil=
9484
@@ -8062,8 +8083,8 @@
9485
else
9486
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
9487
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
9488
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
9489
-See \`config.log' for more details" "$LINENO" 5; }
9490
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
9491
+See \`config.log' for more details." "$LINENO" 5; }
9492
fi
9493
9494
ac_ext=c
9495
@@ -8192,7 +8213,8 @@
9496
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
9497
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
9498
"
9499
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
9500
+eval as_val=\$$as_ac_Header
9501
+ if test "x$as_val" = x""yes; then :
9502
cat >>confdefs.h <<_ACEOF
9503
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
9504
_ACEOF
9505
@@ -8217,20 +8239,544 @@
9506
9507
9508
9509
+ac_ext=cpp
9510
+ac_cpp='$CXXCPP $CPPFLAGS'
9511
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
9512
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
9513
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
9514
+if test -z "$CXX"; then
9515
+ if test -n "$CCC"; then
9516
+ CXX=$CCC
9517
+ else
9518
+ if test -n "$ac_tool_prefix"; then
9519
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
9520
+ do
9521
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
9522
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
9523
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9524
+$as_echo_n "checking for $ac_word... " >&6; }
9525
+if test "${ac_cv_prog_CXX+set}" = set; then :
9526
+ $as_echo_n "(cached) " >&6
9527
+else
9528
+ if test -n "$CXX"; then
9529
+ ac_cv_prog_CXX="$CXX" # Let the user override the test.
9530
+else
9531
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9532
+for as_dir in $PATH
9533
+do
9534
+ IFS=$as_save_IFS
9535
+ test -z "$as_dir" && as_dir=.
9536
+ for ac_exec_ext in '' $ac_executable_extensions; do
9537
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9538
+ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
9539
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9540
+ break 2
9541
+ fi
9542
+done
9543
+ done
9544
+IFS=$as_save_IFS
9545
9546
+fi
9547
+fi
9548
+CXX=$ac_cv_prog_CXX
9549
+if test -n "$CXX"; then
9550
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
9551
+$as_echo "$CXX" >&6; }
9552
+else
9553
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9554
+$as_echo "no" >&6; }
9555
+fi
9556
9557
-# Set options
9558
9559
+ test -n "$CXX" && break
9560
+ done
9561
+fi
9562
+if test -z "$CXX"; then
9563
+ ac_ct_CXX=$CXX
9564
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
9565
+do
9566
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
9567
+set dummy $ac_prog; ac_word=$2
9568
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9569
+$as_echo_n "checking for $ac_word... " >&6; }
9570
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
9571
+ $as_echo_n "(cached) " >&6
9572
+else
9573
+ if test -n "$ac_ct_CXX"; then
9574
+ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
9575
+else
9576
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9577
+for as_dir in $PATH
9578
+do
9579
+ IFS=$as_save_IFS
9580
+ test -z "$as_dir" && as_dir=.
9581
+ for ac_exec_ext in '' $ac_executable_extensions; do
9582
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9583
+ ac_cv_prog_ac_ct_CXX="$ac_prog"
9584
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9585
+ break 2
9586
+ fi
9587
+done
9588
+ done
9589
+IFS=$as_save_IFS
9590
9591
+fi
9592
+fi
9593
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
9594
+if test -n "$ac_ct_CXX"; then
9595
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
9596
+$as_echo "$ac_ct_CXX" >&6; }
9597
+else
9598
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9599
+$as_echo "no" >&6; }
9600
+fi
9601
9602
- enable_dlopen=no
9603
9604
+ test -n "$ac_ct_CXX" && break
9605
+done
9606
9607
+ if test "x$ac_ct_CXX" = x; then
9608
+ CXX="g++"
9609
+ else
9610
+ case $cross_compiling:$ac_tool_warned in
9611
+yes:)
9612
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
9613
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
9614
+ac_tool_warned=yes ;;
9615
+esac
9616
+ CXX=$ac_ct_CXX
9617
+ fi
9618
+fi
9619
9620
- # Check whether --enable-shared was given.
9621
-if test "${enable_shared+set}" = set; then :
9622
- enableval=$enable_shared; p=${PACKAGE-default}
9623
- case $enableval in
9624
+ fi
9625
+fi
9626
+# Provide some information about the compiler.
9627
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
9628
+set X $ac_compile
9629
+ac_compiler=$2
9630
+for ac_option in --version -v -V -qversion; do
9631
+ { { ac_try="$ac_compiler $ac_option >&5"
9632
+case "(($ac_try" in
9633
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9634
+ *) ac_try_echo=$ac_try;;
9635
+esac
9636
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
9637
+$as_echo "$ac_try_echo"; } >&5
9638
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
9639
+ ac_status=$?
9640
+ if test -s conftest.err; then
9641
+ sed '10a\
9642
+... rest of stderr output deleted ...
9643
+ 10q' conftest.err >conftest.er1
9644
+ cat conftest.er1 >&5
9645
+ fi
9646
+ rm -f conftest.er1 conftest.err
9647
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9648
+ test $ac_status = 0; }
9649
+done
9650
+
9651
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
9652
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
9653
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
9654
+ $as_echo_n "(cached) " >&6
9655
+else
9656
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9657
+/* end confdefs.h. */
9658
+
9659
+int
9660
+main ()
9661
+{
9662
+#ifndef __GNUC__
9663
+ choke me
9664
+#endif
9665
+
9666
+ ;
9667
+ return 0;
9668
+}
9669
+_ACEOF
9670
+if ac_fn_cxx_try_compile "$LINENO"; then :
9671
+ ac_compiler_gnu=yes
9672
+else
9673
+ ac_compiler_gnu=no
9674
+fi
9675
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9676
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
9677
+
9678
+fi
9679
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
9680
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
9681
+if test $ac_compiler_gnu = yes; then
9682
+ GXX=yes
9683
+else
9684
+ GXX=
9685
+fi
9686
+ac_test_CXXFLAGS=${CXXFLAGS+set}
9687
+ac_save_CXXFLAGS=$CXXFLAGS
9688
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
9689
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
9690
+if test "${ac_cv_prog_cxx_g+set}" = set; then :
9691
+ $as_echo_n "(cached) " >&6
9692
+else
9693
+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag
9694
+ ac_cxx_werror_flag=yes
9695
+ ac_cv_prog_cxx_g=no
9696
+ CXXFLAGS="-g"
9697
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9698
+/* end confdefs.h. */
9699
+
9700
+int
9701
+main ()
9702
+{
9703
+
9704
+ ;
9705
+ return 0;
9706
+}
9707
+_ACEOF
9708
+if ac_fn_cxx_try_compile "$LINENO"; then :
9709
+ ac_cv_prog_cxx_g=yes
9710
+else
9711
+ CXXFLAGS=""
9712
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9713
+/* end confdefs.h. */
9714
+
9715
+int
9716
+main ()
9717
+{
9718
+
9719
+ ;
9720
+ return 0;
9721
+}
9722
+_ACEOF
9723
+if ac_fn_cxx_try_compile "$LINENO"; then :
9724
+
9725
+else
9726
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
9727
+ CXXFLAGS="-g"
9728
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9729
+/* end confdefs.h. */
9730
+
9731
+int
9732
+main ()
9733
+{
9734
+
9735
+ ;
9736
+ return 0;
9737
+}
9738
+_ACEOF
9739
+if ac_fn_cxx_try_compile "$LINENO"; then :
9740
+ ac_cv_prog_cxx_g=yes
9741
+fi
9742
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9743
+fi
9744
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9745
+fi
9746
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9747
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
9748
+fi
9749
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
9750
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
9751
+if test "$ac_test_CXXFLAGS" = set; then
9752
+ CXXFLAGS=$ac_save_CXXFLAGS
9753
+elif test $ac_cv_prog_cxx_g = yes; then
9754
+ if test "$GXX" = yes; then
9755
+ CXXFLAGS="-g -O2"
9756
+ else
9757
+ CXXFLAGS="-g"
9758
+ fi
9759
+else
9760
+ if test "$GXX" = yes; then
9761
+ CXXFLAGS="-O2"
9762
+ else
9763
+ CXXFLAGS=
9764
+ fi
9765
+fi
9766
+ac_ext=c
9767
+ac_cpp='$CPP $CPPFLAGS'
9768
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
9769
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
9770
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
9771
+
9772
+depcc="$CXX" am_compiler_list=
9773
+
9774
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
9775
+$as_echo_n "checking dependency style of $depcc... " >&6; }
9776
+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
9777
+ $as_echo_n "(cached) " >&6
9778
+else
9779
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
9780
+ # We make a subdir and do the tests there. Otherwise we can end up
9781
+ # making bogus files that we don't know about and never remove. For
9782
+ # instance it was reported that on HP-UX the gcc test will end up
9783
+ # making a dummy file named `D' -- because `-MD' means `put the output
9784
+ # in D'.
9785
+ mkdir conftest.dir
9786
+ # Copy depcomp to subdir because otherwise we won't find it if we're
9787
+ # using a relative directory.
9788
+ cp "$am_depcomp" conftest.dir
9789
+ cd conftest.dir
9790
+ # We will build objects and dependencies in a subdirectory because
9791
+ # it helps to detect inapplicable dependency modes. For instance
9792
+ # both Tru64's cc and ICC support -MD to output dependencies as a
9793
+ # side effect of compilation, but ICC will put the dependencies in
9794
+ # the current directory while Tru64 will put them in the object
9795
+ # directory.
9796
+ mkdir sub
9797
+
9798
+ am_cv_CXX_dependencies_compiler_type=none
9799
+ if test "$am_compiler_list" = ""; then
9800
+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
9801
+ fi
9802
+ am__universal=false
9803
+ case " $depcc " in #(
9804
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
9805
+ esac
9806
+
9807
+ for depmode in $am_compiler_list; do
9808
+ # Setup a source with many dependencies, because some compilers
9809
+ # like to wrap large dependency lists on column 80 (with \), and
9810
+ # we should not choose a depcomp mode which is confused by this.
9811
+ #
9812
+ # We need to recreate these files for each test, as the compiler may
9813
+ # overwrite some of them when testing with obscure command lines.
9814
+ # This happens at least with the AIX C compiler.
9815
+ : > sub/conftest.c
9816
+ for i in 1 2 3 4 5 6; do
9817
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
9818
+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
9819
+ # Solaris 8's {/usr,}/bin/sh.
9820
+ touch sub/conftst$i.h
9821
+ done
9822
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
9823
+
9824
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
9825
+ # mode. It turns out that the SunPro C++ compiler does not properly
9826
+ # handle `-M -o', and we need to detect this. Also, some Intel
9827
+ # versions had trouble with output in subdirs
9828
+ am__obj=sub/conftest.${OBJEXT-o}
9829
+ am__minus_obj="-o $am__obj"
9830
+ case $depmode in
9831
+ gcc)
9832
+ # This depmode causes a compiler race in universal mode.
9833
+ test "$am__universal" = false || continue
9834
+ ;;
9835
+ nosideeffect)
9836
+ # after this tag, mechanisms are not by side-effect, so they'll
9837
+ # only be used when explicitly requested
9838
+ if test "x$enable_dependency_tracking" = xyes; then
9839
+ continue
9840
+ else
9841
+ break
9842
+ fi
9843
+ ;;
9844
+ msvisualcpp | msvcmsys)
9845
+ # This compiler won't grok `-c -o', but also, the minuso test has
9846
+ # not run yet. These depmodes are late enough in the game, and
9847
+ # so weak that their functioning should not be impacted.
9848
+ am__obj=conftest.${OBJEXT-o}
9849
+ am__minus_obj=
9850
+ ;;
9851
+ none) break ;;
9852
+ esac
9853
+ if depmode=$depmode \
9854
+ source=sub/conftest.c object=$am__obj \
9855
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
9856
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
9857
+ >/dev/null 2>conftest.err &&
9858
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
9859
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
9860
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
9861
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
9862
+ # icc doesn't choke on unknown options, it will just issue warnings
9863
+ # or remarks (even with -Werror). So we grep stderr for any message
9864
+ # that says an option was ignored or not supported.
9865
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
9866
+ # icc: Command line warning: ignoring option '-M'; no argument required
9867
+ # The diagnosis changed in icc 8.0:
9868
+ # icc: Command line remark: option '-MP' not supported
9869
+ if (grep 'ignoring option' conftest.err ||
9870
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
9871
+ am_cv_CXX_dependencies_compiler_type=$depmode
9872
+ break
9873
+ fi
9874
+ fi
9875
+ done
9876
+
9877
+ cd ..
9878
+ rm -rf conftest.dir
9879
+else
9880
+ am_cv_CXX_dependencies_compiler_type=none
9881
+fi
9882
+
9883
+fi
9884
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
9885
+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
9886
+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
9887
+
9888
+ if
9889
+ test "x$enable_dependency_tracking" != xno \
9890
+ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
9891
+ am__fastdepCXX_TRUE=
9892
+ am__fastdepCXX_FALSE='#'
9893
+else
9894
+ am__fastdepCXX_TRUE='#'
9895
+ am__fastdepCXX_FALSE=
9896
+fi
9897
+
9898
+
9899
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
9900
+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
9901
+ (test "X$CXX" != "Xg++"))) ; then
9902
+ ac_ext=cpp
9903
+ac_cpp='$CXXCPP $CPPFLAGS'
9904
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
9905
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
9906
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
9907
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
9908
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
9909
+if test -z "$CXXCPP"; then
9910
+ if test "${ac_cv_prog_CXXCPP+set}" = set; then :
9911
+ $as_echo_n "(cached) " >&6
9912
+else
9913
+ # Double quotes because CXXCPP needs to be expanded
9914
+ for CXXCPP in "$CXX -E" "/lib/cpp"
9915
+ do
9916
+ ac_preproc_ok=false
9917
+for ac_cxx_preproc_warn_flag in '' yes
9918
+do
9919
+ # Use a header file that comes with gcc, so configuring glibc
9920
+ # with a fresh cross-compiler works.
9921
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
9922
+ # <limits.h> exists even on freestanding compilers.
9923
+ # On the NeXT, cc -E runs the code through the compiler's parser,
9924
+ # not just through cpp. "Syntax error" is here to catch this case.
9925
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9926
+/* end confdefs.h. */
9927
+#ifdef __STDC__
9928
+# include <limits.h>
9929
+#else
9930
+# include <assert.h>
9931
+#endif
9932
+ Syntax error
9933
+_ACEOF
9934
+if ac_fn_cxx_try_cpp "$LINENO"; then :
9935
+
9936
+else
9937
+ # Broken: fails on valid input.
9938
+continue
9939
+fi
9940
+rm -f conftest.err conftest.$ac_ext
9941
+
9942
+ # OK, works on sane cases. Now check whether nonexistent headers
9943
+ # can be detected and how.
9944
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9945
+/* end confdefs.h. */
9946
+#include <ac_nonexistent.h>
9947
+_ACEOF
9948
+if ac_fn_cxx_try_cpp "$LINENO"; then :
9949
+ # Broken: success on invalid input.
9950
+continue
9951
+else
9952
+ # Passes both tests.
9953
+ac_preproc_ok=:
9954
+break
9955
+fi
9956
+rm -f conftest.err conftest.$ac_ext
9957
+
9958
+done
9959
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
9960
+rm -f conftest.err conftest.$ac_ext
9961
+if $ac_preproc_ok; then :
9962
+ break
9963
+fi
9964
+
9965
+ done
9966
+ ac_cv_prog_CXXCPP=$CXXCPP
9967
+
9968
+fi
9969
+ CXXCPP=$ac_cv_prog_CXXCPP
9970
+else
9971
+ ac_cv_prog_CXXCPP=$CXXCPP
9972
+fi
9973
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
9974
+$as_echo "$CXXCPP" >&6; }
9975
+ac_preproc_ok=false
9976
+for ac_cxx_preproc_warn_flag in '' yes
9977
+do
9978
+ # Use a header file that comes with gcc, so configuring glibc
9979
+ # with a fresh cross-compiler works.
9980
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
9981
+ # <limits.h> exists even on freestanding compilers.
9982
+ # On the NeXT, cc -E runs the code through the compiler's parser,
9983
+ # not just through cpp. "Syntax error" is here to catch this case.
9984
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9985
+/* end confdefs.h. */
9986
+#ifdef __STDC__
9987
+# include <limits.h>
9988
+#else
9989
+# include <assert.h>
9990
+#endif
9991
+ Syntax error
9992
+_ACEOF
9993
+if ac_fn_cxx_try_cpp "$LINENO"; then :
9994
+
9995
+else
9996
+ # Broken: fails on valid input.
9997
+continue
9998
+fi
9999
+rm -f conftest.err conftest.$ac_ext
10000
+
10001
+ # OK, works on sane cases. Now check whether nonexistent headers
10002
+ # can be detected and how.
10003
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10004
+/* end confdefs.h. */
10005
+#include <ac_nonexistent.h>
10006
+_ACEOF
10007
+if ac_fn_cxx_try_cpp "$LINENO"; then :
10008
+ # Broken: success on invalid input.
10009
+continue
10010
+else
10011
+ # Passes both tests.
10012
+ac_preproc_ok=:
10013
+break
10014
+fi
10015
+rm -f conftest.err conftest.$ac_ext
10016
+
10017
+done
10018
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
10019
+rm -f conftest.err conftest.$ac_ext
10020
+if $ac_preproc_ok; then :
10021
+
10022
+else
10023
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
10024
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
10025
+_lt_caught_CXX_error=yes; }
10026
+fi
10027
+
10028
+ac_ext=c
10029
+ac_cpp='$CPP $CPPFLAGS'
10030
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
10031
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
10032
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
10033
+
10034
+else
10035
+ _lt_caught_CXX_error=yes
10036
+fi
10037
+
10038
+
10039
+
10040
+
10041
+# Set options
10042
+
10043
+
10044
+
10045
+ enable_dlopen=no
10046
+
10047
+
10048
+
10049
+ # Check whether --enable-shared was given.
10050
+if test "${enable_shared+set}" = set; then :
10051
+ enableval=$enable_shared; p=${PACKAGE-default}
10052
+ case $enableval in
10053
yes) enable_shared=yes ;;
10054
no) enable_shared=no ;;
10055
*)
10056
@@ -8339,7 +8885,6 @@
10057
10058
10059
10060
-
10061
test -z "$LN_S" && LN_S="ln -s"
10062
10063
10064
@@ -8389,6 +8934,19 @@
10065
10066
10067
10068
+
10069
+
10070
+
10071
+
10072
+
10073
+
10074
+
10075
+
10076
+
10077
+
10078
+
10079
+
10080
+
10081
case $host_os in
10082
aix3*)
10083
# AIX sometimes has problems with the GCC collect2 program. For some
10084
@@ -8401,6 +8959,23 @@
10085
;;
10086
esac
10087
10088
+# Sed substitution that helps us do robust quoting. It backslashifies
10089
+# metacharacters that are still active within double-quoted strings.
10090
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
10091
+
10092
+# Same as above, but do not quote variable references.
10093
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
10094
+
10095
+# Sed substitution to delay expansion of an escaped shell variable in a
10096
+# double_quote_subst'ed string.
10097
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
10098
+
10099
+# Sed substitution to delay expansion of an escaped single quote.
10100
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
10101
+
10102
+# Sed substitution to avoid accidental globbing in evaled expressions
10103
+no_glob_subst='s/\*/\\\*/g'
10104
+
10105
# Global variables:
10106
ofile=libtool
10107
can_build_shared=yes
10108
@@ -8429,7 +9004,7 @@
10109
*) break;;
10110
esac
10111
done
10112
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
10113
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
10114
10115
10116
# Only perform the check for file, if the check method requires it
10117
@@ -8629,17 +9204,16 @@
8319
10118
$RM -r conftest*
8320
10119
8321
10120
8326
10125
if test -n "$compiler"; then
8327
10126
8328
10127
lt_prog_compiler_no_builtin_flag=
8329
@@ -9303,11 +9320,11 @@
10128
10129
if test "$GCC" = yes; then
10130
- case $cc_basename in
10131
- nvcc*)
10132
- lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
10133
- *)
10134
- lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
10135
- esac
10136
+ lt_prog_compiler_no_builtin_flag=' -fno-builtin'
10137
10138
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
10139
$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
10140
@@ -8659,15 +9233,15 @@
8330
10141
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
8331
10142
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
8332
10143
-e 's:$: $lt_compiler_flag:'`
8333
- (eval echo "\"\$as_me:9306: $lt_compile\"" >&5)
8334
+ (eval echo "\"\$as_me:9323: $lt_compile\"" >&5)
10144
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
10145
+ (eval echo "\"\$as_me:9236: $lt_compile\"" >&5)
8335
10146
(eval "$lt_compile" 2>conftest.err)
8336
10147
ac_status=$?
8337
10148
cat conftest.err >&5
8338
- echo "$as_me:9310: \$? = $ac_status" >&5
8339
+ echo "$as_me:9327: \$? = $ac_status" >&5
10149
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
10150
+ echo "$as_me:9240: \$? = $ac_status" >&5
8340
10151
if (exit $ac_status) && test -s "$ac_outfile"; then
8341
10152
# The compiler can only warn and ignore the option if not recognized
8342
10153
# So say no if there are warnings other than the usual output.
8343
@@ -9472,7 +9489,7 @@
8344
lt_prog_compiler_static='-non_shared'
10154
- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
10155
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
10156
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
10157
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
10158
lt_cv_prog_compiler_rtti_exceptions=yes
10159
@@ -8745,12 +9319,6 @@
10160
lt_prog_compiler_pic='-fno-common'
8345
10161
;;
8346
10162
8347
- linux* | k*bsd*-gnu)
8348
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
10163
- haiku*)
10164
- # PIC is the default for Haiku.
10165
- # The "-static" flag exists, but is broken.
10166
- lt_prog_compiler_static=
10167
- ;;
10168
-
10169
hpux*)
10170
# PIC is the default for 64-bit PA HP-UX, but not for 32-bit
10171
# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
10172
@@ -8793,13 +9361,6 @@
10173
lt_prog_compiler_pic='-fPIC'
10174
;;
10175
esac
10176
-
10177
- case $cc_basename in
10178
- nvcc*) # Cuda Compiler Driver 2.2
10179
- lt_prog_compiler_wl='-Xlinker '
10180
- lt_prog_compiler_pic='-Xcompiler -fPIC'
10181
- ;;
10182
- esac
10183
else
10184
# PORTME Check for flag to pass linker flags through the system compiler.
10185
case $host_os in
10186
@@ -8862,7 +9423,7 @@
10187
lt_prog_compiler_pic='--shared'
10188
lt_prog_compiler_static='--static'
10189
;;
10190
- pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
10191
+ pgcc* | pgf77* | pgf90* | pgf95*)
10192
# Portland Group compilers (*not* the Pentium gcc compiler,
10193
# which looks to be a dead project)
10194
lt_prog_compiler_wl='-Wl,'
10195
@@ -8874,26 +9435,26 @@
10196
# All Alpha code is PIC.
10197
lt_prog_compiler_static='-non_shared'
10198
;;
10199
- xl* | bgxl* | bgf* | mpixl*)
10200
- # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
10201
+ xl*)
10202
+ # IBM XL C 8.0/Fortran 10.1 on PPC
10203
lt_prog_compiler_wl='-Wl,'
10204
lt_prog_compiler_pic='-qpic'
10205
lt_prog_compiler_static='-qstaticlink'
10206
;;
10207
*)
10208
case `$CC -V 2>&1 | sed 5q` in
10209
- *Sun\ F* | *Sun*Fortran*)
10210
- # Sun Fortran 8.3 passes all unrecognized flags to the linker
10211
- lt_prog_compiler_pic='-KPIC'
10212
- lt_prog_compiler_static='-Bstatic'
10213
- lt_prog_compiler_wl=''
10214
- ;;
10215
*Sun\ C*)
10216
# Sun C 5.9
10217
lt_prog_compiler_pic='-KPIC'
10218
lt_prog_compiler_static='-Bstatic'
10219
lt_prog_compiler_wl='-Wl,'
10220
;;
10221
+ *Sun\ F*)
10222
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
10223
+ lt_prog_compiler_pic='-KPIC'
10224
+ lt_prog_compiler_static='-Bstatic'
10225
+ lt_prog_compiler_wl=''
10226
+ ;;
10227
esac
10228
;;
10229
esac
10230
@@ -8924,7 +9485,7 @@
10231
lt_prog_compiler_pic='-KPIC'
10232
lt_prog_compiler_static='-Bstatic'
8349
10233
case $cc_basename in
8350
# old Intel for x86_64 which still supported -KPIC.
8351
ecc*)
8352
@@ -9642,11 +9659,11 @@
10234
- f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
10235
+ f77* | f90* | f95*)
10236
lt_prog_compiler_wl='-Qoption ld ';;
10237
*)
10238
lt_prog_compiler_wl='-Wl,';;
10239
@@ -9011,15 +9572,15 @@
8353
10240
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
8354
10241
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
8355
10242
-e 's:$: $lt_compiler_flag:'`
8356
- (eval echo "\"\$as_me:9645: $lt_compile\"" >&5)
8357
+ (eval echo "\"\$as_me:9662: $lt_compile\"" >&5)
10243
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
10244
+ (eval echo "\"\$as_me:9575: $lt_compile\"" >&5)
8358
10245
(eval "$lt_compile" 2>conftest.err)
8359
10246
ac_status=$?
8360
10247
cat conftest.err >&5
8361
- echo "$as_me:9649: \$? = $ac_status" >&5
8362
+ echo "$as_me:9666: \$? = $ac_status" >&5
10248
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
10249
+ echo "$as_me:9579: \$? = $ac_status" >&5
8363
10250
if (exit $ac_status) && test -s "$ac_outfile"; then
8364
10251
# The compiler can only warn and ignore the option if not recognized
8365
10252
# So say no if there are warnings other than the usual output.
8366
@@ -9747,11 +9764,11 @@
8367
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
8368
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
8369
-e 's:$: $lt_compiler_flag:'`
8370
- (eval echo "\"\$as_me:9750: $lt_compile\"" >&5)
8371
+ (eval echo "\"\$as_me:9767: $lt_compile\"" >&5)
8372
(eval "$lt_compile" 2>out/conftest.err)
8373
ac_status=$?
8374
cat out/conftest.err >&5
8375
- echo "$as_me:9754: \$? = $ac_status" >&5
8376
+ echo "$as_me:9771: \$? = $ac_status" >&5
8377
if (exit $ac_status) && test -s out/conftest2.$ac_objext
8378
then
8379
# The compiler can only warn and ignore the option if not recognized
8380
@@ -9802,11 +9819,11 @@
8381
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
8382
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
8383
-e 's:$: $lt_compiler_flag:'`
8384
- (eval echo "\"\$as_me:9805: $lt_compile\"" >&5)
8385
+ (eval echo "\"\$as_me:9822: $lt_compile\"" >&5)
8386
(eval "$lt_compile" 2>out/conftest.err)
8387
ac_status=$?
8388
cat out/conftest.err >&5
8389
- echo "$as_me:9809: \$? = $ac_status" >&5
8390
+ echo "$as_me:9826: \$? = $ac_status" >&5
8391
if (exit $ac_status) && test -s out/conftest2.$ac_objext
8392
then
8393
# The compiler can only warn and ignore the option if not recognized
8394
@@ -9921,6 +9938,9 @@
10253
- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
10254
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
10255
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
10256
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
10257
lt_cv_prog_compiler_pic_works=yes
10258
@@ -9067,7 +9628,7 @@
10259
if test -s conftest.err; then
10260
# Append any errors to the config.log.
10261
cat conftest.err 1>&5
10262
- $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
10263
+ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
10264
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
10265
if diff conftest.exp conftest.er2 >/dev/null; then
10266
lt_cv_prog_compiler_static_works=yes
10267
@@ -9116,16 +9677,16 @@
10268
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
10269
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
10270
-e 's:$: $lt_compiler_flag:'`
10271
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
10272
+ (eval echo "\"\$as_me:9680: $lt_compile\"" >&5)
10273
(eval "$lt_compile" 2>out/conftest.err)
10274
ac_status=$?
10275
cat out/conftest.err >&5
10276
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
10277
+ echo "$as_me:9684: \$? = $ac_status" >&5
10278
if (exit $ac_status) && test -s out/conftest2.$ac_objext
10279
then
10280
# The compiler can only warn and ignore the option if not recognized
10281
# So say no if there are warnings
10282
- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
10283
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
10284
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
10285
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
10286
lt_cv_prog_compiler_c_o=yes
10287
@@ -9171,16 +9732,16 @@
10288
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
10289
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
10290
-e 's:$: $lt_compiler_flag:'`
10291
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
10292
+ (eval echo "\"\$as_me:9735: $lt_compile\"" >&5)
10293
(eval "$lt_compile" 2>out/conftest.err)
10294
ac_status=$?
10295
cat out/conftest.err >&5
10296
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
10297
+ echo "$as_me:9739: \$? = $ac_status" >&5
10298
if (exit $ac_status) && test -s out/conftest2.$ac_objext
10299
then
10300
# The compiler can only warn and ignore the option if not recognized
10301
# So say no if there are warnings
10302
- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
10303
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
10304
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
10305
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
10306
lt_cv_prog_compiler_c_o=yes
10307
@@ -9290,36 +9851,13 @@
8395
10308
openbsd*)
8396
10309
with_gnu_ld=no
8397
10310
;;
8401
10314
esac
8402
10315
8403
10316
ld_shlibs=yes
8404
@@ -9942,6 +9962,7 @@
8405
fi
8406
supports_anon_versioning=no
8407
case `$LD -v 2>&1` in
8408
+ *GNU\ gold*) supports_anon_versioning=yes ;;
8409
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
8410
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
8411
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
8412
@@ -10033,7 +10054,7 @@
8413
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
10317
-
10318
- # On some targets, GNU ld is compatible enough with the native linker
10319
- # that we're better off using the native interface for both.
10320
- lt_use_gnu_ld_interface=no
10321
if test "$with_gnu_ld" = yes; then
10322
- case $host_os in
10323
- aix*)
10324
- # The AIX port of GNU ld has always aspired to compatibility
10325
- # with the native linker. However, as the warning in the GNU ld
10326
- # block says, versions before 2.19.5* couldn't really create working
10327
- # shared libraries, regardless of the interface used.
10328
- case `$LD -v 2>&1` in
10329
- *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
10330
- *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
10331
- *\ \(GNU\ Binutils\)\ [3-9]*) ;;
10332
- *)
10333
- lt_use_gnu_ld_interface=yes
10334
- ;;
10335
- esac
10336
- ;;
10337
- *)
10338
- lt_use_gnu_ld_interface=yes
10339
- ;;
10340
- esac
10341
- fi
10342
-
10343
- if test "$lt_use_gnu_ld_interface" = yes; then
10344
# If archive_cmds runs LD, not CC, wlarc should be empty
10345
wlarc='${wl}'
10346
10347
@@ -9353,12 +9891,11 @@
10348
ld_shlibs=no
10349
cat <<_LT_EOF 1>&2
10350
10351
-*** Warning: the GNU linker, at least up to release 2.19, is reported
10352
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
10353
*** to be unable to reliably create shared libraries on AIX.
10354
*** Therefore, libtool is disabling shared libraries support. If you
10355
-*** really care for shared libraries, you may want to install binutils
10356
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
10357
-*** You will then need to restart the configuration process.
10358
+*** really care for shared libraries, you may want to modify your PATH
10359
+*** so that a non-GNU linker is found, and then restart.
10360
10361
_LT_EOF
10362
fi
10363
@@ -9394,7 +9931,6 @@
10364
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
10365
# as there is no search path for DLLs.
10366
hardcode_libdir_flag_spec='-L$libdir'
10367
- export_dynamic_flag_spec='${wl}--export-all-symbols'
10368
allow_undefined_flag=unsupported
10369
always_export_symbols=no
10370
enable_shared_with_static_runtimes=yes
10371
@@ -9416,11 +9952,6 @@
10372
fi
8414
10373
;;
8415
10374
8416
- gnu* | linux* | tpf* | k*bsd*-gnu)
8417
+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
8418
tmp_diet=no
8419
if test "$host_os" = linux-dietlibc; then
10375
- haiku*)
10376
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
10377
- link_all_deplibs=yes
10378
- ;;
10379
-
10380
interix[3-9]*)
10381
hardcode_direct=no
10382
hardcode_shlibpath_var=no
10383
@@ -9450,12 +9981,11 @@
10384
tmp_sharedflag='-shared'
10385
case $cc_basename,$host_cpu in
10386
pgcc*) # Portland Group C compiler
10387
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
10388
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
10389
tmp_addflag=' $pic_flag'
10390
;;
10391
- pgf77* | pgf90* | pgf95* | pgfortran*)
10392
- # Portland Group f77 and f90 compilers
10393
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
10394
+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
10395
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
10396
tmp_addflag=' $pic_flag -Mnomain' ;;
10397
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
10398
tmp_addflag=' -i_dynamic' ;;
10399
@@ -9466,17 +9996,13 @@
10400
lf95*) # Lahey Fortran 8.1
10401
whole_archive_flag_spec=
10402
tmp_sharedflag='--shared' ;;
10403
- xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
10404
+ xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
10405
tmp_sharedflag='-qmkshrobj'
10406
tmp_addflag= ;;
10407
- nvcc*) # Cuda Compiler Driver 2.2
10408
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
10409
- compiler_needs_object=yes
10410
- ;;
10411
esac
10412
case `$CC -V 2>&1 | sed 5q` in
10413
*Sun\ C*) # Sun C 5.9
10414
- whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
10415
+ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
10416
compiler_needs_object=yes
10417
tmp_sharedflag='-G' ;;
10418
*Sun\ F*) # Sun Fortran 8.3
10419
@@ -9492,17 +10018,17 @@
10420
fi
10421
8420
10422
case $cc_basename in
8421
@@ -10103,7 +10124,7 @@
10423
- xlf* | bgf* | bgxlf* | mpixlf*)
10424
+ xlf*)
10425
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
10426
whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
10427
hardcode_libdir_flag_spec=
10428
hardcode_libdir_flag_spec_ld='-rpath $libdir'
10429
- archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
10430
+ archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
10431
if test "x$supports_anon_versioning" = xyes; then
10432
archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
10433
cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
10434
echo "local: *; };" >> $output_objdir/$libname.ver~
10435
- $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
10436
+ $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
10437
fi
10438
;;
10439
esac
10440
@@ -9511,7 +10037,7 @@
8422
10441
fi
8423
10442
;;
8424
10443
8427
10446
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
8428
10447
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
8429
10448
wlarc=
8430
@@ -10278,6 +10299,7 @@
10449
@@ -9623,10 +10149,8 @@
10450
else
10451
# If we're using GNU nm, then we don't want the "-C" option.
10452
# -C means demangle to AIX nm, but means don't demangle with GNU nm
10453
- # Also, AIX nm treats weak defined symbols like other global
10454
- # defined symbols, whereas GNU nm marks them as "W".
10455
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
10456
- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
10457
+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
10458
else
10459
export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
10460
fi
10461
@@ -9688,6 +10212,7 @@
8431
10462
if test "$aix_use_runtimelinking" = yes; then
8432
10463
shared_flag="$shared_flag "'${wl}-G'
8433
10464
fi
8435
10466
else
8436
10467
# not using gcc
8437
10468
if test "$host_cpu" = ia64; then
8438
@@ -10604,7 +10626,7 @@
10469
@@ -9744,7 +10269,7 @@
10470
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
10471
10472
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
10473
- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
10474
+ archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
10475
else
10476
if test "$host_cpu" = ia64; then
10477
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
10478
@@ -9788,13 +10313,8 @@
10479
# -berok will link without error, but may produce a broken library.
10480
no_undefined_flag=' ${wl}-bernotok'
10481
allow_undefined_flag=' ${wl}-berok'
10482
- if test "$with_gnu_ld" = yes; then
10483
- # We only use this code for GNU lds that support --whole-archive.
10484
- whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
10485
- else
10486
- # Exported symbols can be pulled into shared objects from archives
10487
- whole_archive_flag_spec='$convenience'
10488
- fi
10489
+ # Exported symbols can be pulled into shared objects from archives
10490
+ whole_archive_flag_spec='$convenience'
10491
archive_cmds_need_lc=yes
10492
# This is similar to how AIX traditionally builds its shared libraries.
10493
archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
10494
@@ -9833,7 +10353,7 @@
10495
# Tell ltmain to make .dll files, not .so files.
10496
shrext_cmds=".dll"
10497
# FIXME: Setting linknames here is a bad hack.
10498
- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
10499
+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
10500
# The linker will automatically build a .lib file if we build a DLL.
10501
old_archive_from_new_cmds='true'
10502
# FIXME: Should let the user specify the lib program.
10503
@@ -9849,11 +10369,7 @@
10504
hardcode_direct=no
10505
hardcode_automatic=yes
10506
hardcode_shlibpath_var=unsupported
10507
- if test "$lt_cv_ld_force_load" = "yes"; then
10508
- whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
10509
- else
10510
- whole_archive_flag_spec=''
10511
- fi
10512
+ whole_archive_flag_spec=''
10513
link_all_deplibs=yes
10514
allow_undefined_flag="$_lt_dar_allow_undefined"
10515
case $cc_basename in
10516
@@ -9861,7 +10377,7 @@
10517
*) _lt_dar_can_shared=$GCC ;;
10518
esac
10519
if test "$_lt_dar_can_shared" = "yes"; then
10520
- output_verbose_link_cmd=func_echo_all
10521
+ output_verbose_link_cmd=echo
10522
archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
10523
module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
10524
archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
10525
@@ -9927,7 +10443,7 @@
10526
;;
10527
10528
hpux10*)
10529
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
10530
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
10531
archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
10532
else
10533
archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
10534
@@ -9946,7 +10462,7 @@
10535
;;
10536
10537
hpux11*)
10538
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
10539
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
10540
case $host_cpu in
10541
hppa*64*)
10542
archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
10543
@@ -9967,46 +10483,7 @@
10544
archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
10545
;;
10546
*)
10547
-
10548
- # Older versions of the 11.00 compiler do not understand -b yet
10549
- # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
10550
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
10551
-$as_echo_n "checking if $CC understands -b... " >&6; }
10552
-if test "${lt_cv_prog_compiler__b+set}" = set; then :
10553
- $as_echo_n "(cached) " >&6
10554
-else
10555
- lt_cv_prog_compiler__b=no
10556
- save_LDFLAGS="$LDFLAGS"
10557
- LDFLAGS="$LDFLAGS -b"
10558
- echo "$lt_simple_link_test_code" > conftest.$ac_ext
10559
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
10560
- # The linker can only warn and ignore the option if not recognized
10561
- # So say no if there are warnings
10562
- if test -s conftest.err; then
10563
- # Append any errors to the config.log.
10564
- cat conftest.err 1>&5
10565
- $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
10566
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
10567
- if diff conftest.exp conftest.er2 >/dev/null; then
10568
- lt_cv_prog_compiler__b=yes
10569
- fi
10570
- else
10571
- lt_cv_prog_compiler__b=yes
10572
- fi
10573
- fi
10574
- $RM -r conftest*
10575
- LDFLAGS="$save_LDFLAGS"
10576
-
10577
-fi
10578
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
10579
-$as_echo "$lt_cv_prog_compiler__b" >&6; }
10580
-
10581
-if test x"$lt_cv_prog_compiler__b" = xyes; then
10582
- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
10583
-else
10584
- archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
10585
-fi
10586
-
10587
+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
10588
;;
10589
esac
10590
fi
10591
@@ -10034,7 +10511,7 @@
10592
10593
irix5* | irix6* | nonstopux*)
10594
if test "$GCC" = yes; then
10595
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
10596
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
10597
# Try to use the -exported_symbol ld option, if it does not
10598
# work, assume that -exports_file does not work either and
10599
# implicitly export all symbols.
10600
@@ -10045,15 +10522,15 @@
10601
int foo(void) {}
10602
_ACEOF
10603
if ac_fn_c_try_link "$LINENO"; then :
10604
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
10605
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
10606
10607
fi
10608
rm -f core conftest.err conftest.$ac_objext \
10609
conftest$ac_exeext conftest.$ac_ext
10610
LDFLAGS="$save_LDFLAGS"
10611
else
10612
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
10613
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
10614
+ 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'
10615
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
10616
fi
10617
archive_cmds_need_lc='no'
10618
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
10619
@@ -10062,7 +10539,7 @@
8439
10620
link_all_deplibs=yes
8440
10621
;;
8441
10622
8444
10625
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
8445
10626
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
8446
10627
else
8447
@@ -11494,7 +11516,7 @@
8448
;;
8449
8450
# This must be Linux ELF.
8451
-linux* | k*bsd*-gnu)
8452
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
8453
version_type=linux
8454
need_lib_prefix=no
8455
need_version=no
8456
@@ -11534,13 +11556,10 @@
10628
@@ -10115,17 +10592,17 @@
10629
hardcode_libdir_flag_spec='-L$libdir'
10630
hardcode_minus_L=yes
10631
allow_undefined_flag=unsupported
10632
- archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
10633
+ archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
10634
old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
10635
;;
10636
10637
osf3*)
10638
if test "$GCC" = yes; then
10639
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
10640
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
10641
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
10642
else
10643
allow_undefined_flag=' -expect_unresolved \*'
10644
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
10645
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
10646
fi
10647
archive_cmds_need_lc='no'
10648
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
10649
@@ -10135,13 +10612,13 @@
10650
osf4* | osf5*) # as osf3* with the addition of -msym flag
10651
if test "$GCC" = yes; then
10652
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
10653
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
10654
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
10655
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
10656
else
10657
allow_undefined_flag=' -expect_unresolved \*'
10658
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
10659
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
10660
archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
10661
- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
10662
+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
10663
10664
# Both c and cxx compiler support -rpath directly
10665
hardcode_libdir_flag_spec='-rpath $libdir'
10666
@@ -10344,50 +10821,44 @@
10667
# to ld, don't add -lc before -lgcc.
10668
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
10669
$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
10670
-if test "${lt_cv_archive_cmds_need_lc+set}" = set; then :
10671
- $as_echo_n "(cached) " >&6
10672
-else
10673
- $RM conftest*
10674
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
10675
+ $RM conftest*
10676
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
10677
10678
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
10679
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
10680
(eval $ac_compile) 2>&5
10681
ac_status=$?
10682
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10683
test $ac_status = 0; } 2>conftest.err; then
10684
- soname=conftest
10685
- lib=conftest
10686
- libobjs=conftest.$ac_objext
10687
- deplibs=
10688
- wl=$lt_prog_compiler_wl
10689
- pic_flag=$lt_prog_compiler_pic
10690
- compiler_flags=-v
10691
- linker_flags=-v
10692
- verstring=
10693
- output_objdir=.
10694
- libname=conftest
10695
- lt_save_allow_undefined_flag=$allow_undefined_flag
10696
- allow_undefined_flag=
10697
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
10698
+ soname=conftest
10699
+ lib=conftest
10700
+ libobjs=conftest.$ac_objext
10701
+ deplibs=
10702
+ wl=$lt_prog_compiler_wl
10703
+ pic_flag=$lt_prog_compiler_pic
10704
+ compiler_flags=-v
10705
+ linker_flags=-v
10706
+ verstring=
10707
+ output_objdir=.
10708
+ libname=conftest
10709
+ lt_save_allow_undefined_flag=$allow_undefined_flag
10710
+ allow_undefined_flag=
10711
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
10712
(eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
10713
ac_status=$?
10714
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10715
test $ac_status = 0; }
10716
- then
10717
- lt_cv_archive_cmds_need_lc=no
10718
- else
10719
- lt_cv_archive_cmds_need_lc=yes
10720
- fi
10721
- allow_undefined_flag=$lt_save_allow_undefined_flag
10722
- else
10723
- cat conftest.err 1>&5
10724
- fi
10725
- $RM conftest*
10726
-
10727
-fi
10728
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
10729
-$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
10730
- archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
10731
+ then
10732
+ archive_cmds_need_lc=no
10733
+ else
10734
+ archive_cmds_need_lc=yes
10735
+ fi
10736
+ allow_undefined_flag=$lt_save_allow_undefined_flag
10737
+ else
10738
+ cat conftest.err 1>&5
10739
+ fi
10740
+ $RM conftest*
10741
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
10742
+$as_echo "$archive_cmds_need_lc" >&6; }
10743
;;
10744
esac
10745
fi
10746
@@ -10558,23 +11029,16 @@
10747
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
10748
*) lt_awk_arg="/^libraries:/" ;;
10749
esac
10750
- case $host_os in
10751
- mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
10752
- *) lt_sed_strip_eq="s,=/,/,g" ;;
10753
- esac
10754
- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
10755
- case $lt_search_path_spec in
10756
- *\;*)
10757
+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
10758
+ if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
10759
# if the path contains ";" then we assume it to be the separator
10760
# otherwise default to the standard path separator (i.e. ":") - it is
10761
# assumed that no part of a normal pathname contains ";" but that should
10762
# okay in the real world where ";" in dirpaths is itself problematic.
10763
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
10764
- ;;
10765
- *)
10766
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
10767
- ;;
10768
- esac
10769
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
10770
+ else
10771
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
10772
+ fi
10773
# Ok, now we have the path, separated by spaces, we can step through it
10774
# and add multilib dir if necessary.
10775
lt_tmp_lt_search_path_spec=
10776
@@ -10587,7 +11051,7 @@
10777
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
10778
fi
10779
done
10780
- lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
10781
+ lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
10782
BEGIN {RS=" "; FS="/|\n";} {
10783
lt_foo="";
10784
lt_count=0;
10785
@@ -10607,13 +11071,7 @@
10786
if (lt_foo != "") { lt_freq[lt_foo]++; }
10787
if (lt_freq[lt_foo] == 1) { print lt_foo; }
10788
}'`
10789
- # AWK program above erroneously prepends '/' to C:/dos/paths
10790
- # for these hosts.
10791
- case $host_os in
10792
- mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
10793
- $SED 's,/\([A-Za-z]:\),\1,g'` ;;
10794
- esac
10795
- sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
10796
+ sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
10797
else
10798
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
10799
fi
10800
@@ -10701,7 +11159,7 @@
10801
m68k)
10802
library_names_spec='$libname.ixlibrary $libname.a'
10803
# Create ${libname}_ixlibrary.a entries in /sys/libs.
10804
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
10805
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
10806
;;
10807
esac
10808
;;
10809
@@ -10754,12 +11212,23 @@
10810
cygwin*)
10811
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
10812
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
10813
-
10814
- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
10815
+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
10816
;;
10817
mingw* | cegcc*)
10818
# MinGW DLLs use traditional 'lib' prefix
10819
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
10820
+ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
10821
+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
10822
+ # It is most probably a Windows format PATH printed by
10823
+ # mingw gcc, but we are running on Cygwin. Gcc prints its search
10824
+ # path with ; separators, and with drive letters. We can handle the
10825
+ # drive letters (cygwin fileutils understands them), so leave them,
10826
+ # especially as we might pass files found there to a mingw objdump,
10827
+ # which wouldn't understand a cygwinified path. Ahh.
10828
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
10829
+ else
10830
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
10831
+ fi
10832
;;
10833
pw32*)
10834
# pw32 DLLs use 'pw' prefix rather than 'lib'
10835
@@ -10859,19 +11328,6 @@
10836
hardcode_into_libs=yes
10837
;;
10838
10839
-haiku*)
10840
- version_type=linux
10841
- need_lib_prefix=no
10842
- need_version=no
10843
- dynamic_linker="$host_os runtime_loader"
10844
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
10845
- soname_spec='${libname}${release}${shared_ext}$major'
10846
- shlibpath_var=LIBRARY_PATH
10847
- shlibpath_overrides_runpath=yes
10848
- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
10849
- hardcode_into_libs=yes
10850
- ;;
10851
-
10852
hpux9* | hpux10* | hpux11*)
10853
# Give a soname corresponding to the major version so that dld.sl refuses to
10854
# link against other versions.
10855
@@ -10914,10 +11370,8 @@
10856
soname_spec='${libname}${release}${shared_ext}$major'
10857
;;
10858
esac
10859
- # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
10860
+ # HP-UX runs *really* slowly unless shared libraries are mode 555.
10861
postinstall_cmds='chmod 555 $lib'
10862
- # or fails outright, so override atomically:
10863
- install_override_mode=555
10864
;;
10865
10866
interix[3-9]*)
10867
@@ -10984,17 +11438,12 @@
10868
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
10869
shlibpath_var=LD_LIBRARY_PATH
10870
shlibpath_overrides_runpath=no
10871
-
10872
# Some binutils ld are patched to set DT_RUNPATH
10873
- if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then :
10874
- $as_echo_n "(cached) " >&6
10875
-else
10876
- lt_cv_shlibpath_overrides_runpath=no
10877
- save_LDFLAGS=$LDFLAGS
10878
- save_libdir=$libdir
10879
- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
10880
- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
10881
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10882
+ save_LDFLAGS=$LDFLAGS
10883
+ save_libdir=$libdir
10884
+ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
10885
+ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
10886
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10887
/* end confdefs.h. */
10888
10889
int
10890
@@ -11007,31 +11456,23 @@
10891
_ACEOF
10892
if ac_fn_c_try_link "$LINENO"; then :
10893
if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
10894
- lt_cv_shlibpath_overrides_runpath=yes
10895
+ shlibpath_overrides_runpath=yes
10896
fi
10897
fi
10898
rm -f core conftest.err conftest.$ac_objext \
10899
conftest$ac_exeext conftest.$ac_ext
10900
- LDFLAGS=$save_LDFLAGS
10901
- libdir=$save_libdir
10902
-
10903
-fi
10904
-
10905
- shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
10906
+ LDFLAGS=$save_LDFLAGS
10907
+ libdir=$save_libdir
10908
10909
# This implies no fast_install, which is unacceptable.
10910
# Some rework will be needed to allow for fast_install
8457
10911
# before this can be enabled.
8458
10912
hardcode_into_libs=yes
8459
10913
8462
10916
-
8463
10917
# Append ld.so.conf contents to the search path
8464
10918
if test -f /etc/ld.so.conf; then
8465
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
10919
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
8466
10920
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
10921
-
10922
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
8467
10923
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
8468
10924
fi
8469
10925
8470
10926
# We used to test for /lib/ld.so.1 and disable shared libraries on
8471
@@ -11552,6 +11571,18 @@
10927
@@ -11043,6 +11484,18 @@
8472
10928
dynamic_linker='GNU/Linux ld.so'
8473
10929
;;
8474
10930
8487
10943
netbsd*)
8488
10944
version_type=sunos
8489
10945
need_lib_prefix=no
8490
@@ -12172,7 +12203,7 @@
8491
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
8492
lt_status=$lt_dlunknown
8493
cat > conftest.$ac_ext <<_LT_EOF
8494
-#line 12175 "configure"
8495
+#line 12206 "configure"
8496
#include "confdefs.h"
8497
8498
#if HAVE_DLFCN_H
8499
@@ -12268,7 +12299,7 @@
8500
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
8501
lt_status=$lt_dlunknown
8502
cat > conftest.$ac_ext <<_LT_EOF
8503
-#line 12271 "configure"
8504
+#line 12302 "configure"
8505
#include "confdefs.h"
8506
8507
#if HAVE_DLFCN_H
8508
@@ -13208,7 +13239,7 @@
8509
inherit_rpath_CXX=yes
10946
@@ -11333,11 +11786,6 @@
10947
10948
10949
10950
-
10951
-
10952
-
10953
-
10954
-
10955
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
10956
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
10957
hardcode_action=
10958
@@ -11668,7 +12116,7 @@
10959
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10960
lt_status=$lt_dlunknown
10961
cat > conftest.$ac_ext <<_LT_EOF
10962
-#line $LINENO "configure"
10963
+#line 12119 "configure"
10964
#include "confdefs.h"
10965
10966
#if HAVE_DLFCN_H
10967
@@ -11709,13 +12157,7 @@
10968
# endif
10969
#endif
10970
10971
-/* When -fvisbility=hidden is used, assume the code has been annotated
10972
- correspondingly for the symbols needed. */
10973
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
10974
-void fnord () __attribute__((visibility("default")));
10975
-#endif
10976
-
10977
-void fnord () { int i=42; }
10978
+void fnord() { int i=42;}
10979
int main ()
10980
{
10981
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
10982
@@ -11724,11 +12166,7 @@
10983
if (self)
10984
{
10985
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
10986
- else
10987
- {
10988
- if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
10989
- else puts (dlerror ());
10990
- }
10991
+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
10992
/* dlclose (self); */
10993
}
10994
else
10995
@@ -11774,7 +12212,7 @@
10996
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10997
lt_status=$lt_dlunknown
10998
cat > conftest.$ac_ext <<_LT_EOF
10999
-#line $LINENO "configure"
11000
+#line 12215 "configure"
11001
#include "confdefs.h"
11002
11003
#if HAVE_DLFCN_H
11004
@@ -11815,13 +12253,7 @@
11005
# endif
11006
#endif
11007
11008
-/* When -fvisbility=hidden is used, assume the code has been annotated
11009
- correspondingly for the symbols needed. */
11010
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
11011
-void fnord () __attribute__((visibility("default")));
11012
-#endif
11013
-
11014
-void fnord () { int i=42; }
11015
+void fnord() { int i=42;}
11016
int main ()
11017
{
11018
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
11019
@@ -11830,11 +12262,7 @@
11020
if (self)
11021
{
11022
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
11023
- else
11024
- {
11025
- if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
11026
- else puts (dlerror ());
11027
- }
11028
+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
11029
/* dlclose (self); */
11030
}
11031
else
11032
@@ -11970,166 +12398,27 @@
11033
;;
11034
esac
11035
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
11036
-$as_echo "$enable_shared" >&6; }
11037
-
11038
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
11039
-$as_echo_n "checking whether to build static libraries... " >&6; }
11040
- # Make sure either enable_shared or enable_static is yes.
11041
- test "$enable_shared" = yes || enable_static=yes
11042
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
11043
-$as_echo "$enable_static" >&6; }
11044
-
11045
-
11046
-
11047
-
11048
-fi
11049
-ac_ext=c
11050
-ac_cpp='$CPP $CPPFLAGS'
11051
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
11052
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
11053
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
11054
-
11055
-CC="$lt_save_CC"
11056
-
11057
- if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
11058
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
11059
- (test "X$CXX" != "Xg++"))) ; then
11060
- ac_ext=cpp
11061
-ac_cpp='$CXXCPP $CPPFLAGS'
11062
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
11063
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
11064
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
11065
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
11066
-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
11067
-if test -z "$CXXCPP"; then
11068
- if test "${ac_cv_prog_CXXCPP+set}" = set; then :
11069
- $as_echo_n "(cached) " >&6
11070
-else
11071
- # Double quotes because CXXCPP needs to be expanded
11072
- for CXXCPP in "$CXX -E" "/lib/cpp"
11073
- do
11074
- ac_preproc_ok=false
11075
-for ac_cxx_preproc_warn_flag in '' yes
11076
-do
11077
- # Use a header file that comes with gcc, so configuring glibc
11078
- # with a fresh cross-compiler works.
11079
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
11080
- # <limits.h> exists even on freestanding compilers.
11081
- # On the NeXT, cc -E runs the code through the compiler's parser,
11082
- # not just through cpp. "Syntax error" is here to catch this case.
11083
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11084
-/* end confdefs.h. */
11085
-#ifdef __STDC__
11086
-# include <limits.h>
11087
-#else
11088
-# include <assert.h>
11089
-#endif
11090
- Syntax error
11091
-_ACEOF
11092
-if ac_fn_cxx_try_cpp "$LINENO"; then :
11093
-
11094
-else
11095
- # Broken: fails on valid input.
11096
-continue
11097
-fi
11098
-rm -f conftest.err conftest.$ac_ext
11099
-
11100
- # OK, works on sane cases. Now check whether nonexistent headers
11101
- # can be detected and how.
11102
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11103
-/* end confdefs.h. */
11104
-#include <ac_nonexistent.h>
11105
-_ACEOF
11106
-if ac_fn_cxx_try_cpp "$LINENO"; then :
11107
- # Broken: success on invalid input.
11108
-continue
11109
-else
11110
- # Passes both tests.
11111
-ac_preproc_ok=:
11112
-break
11113
-fi
11114
-rm -f conftest.err conftest.$ac_ext
11115
-
11116
-done
11117
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
11118
-rm -f conftest.err conftest.$ac_ext
11119
-if $ac_preproc_ok; then :
11120
- break
11121
-fi
11122
-
11123
- done
11124
- ac_cv_prog_CXXCPP=$CXXCPP
11125
-
11126
-fi
11127
- CXXCPP=$ac_cv_prog_CXXCPP
11128
-else
11129
- ac_cv_prog_CXXCPP=$CXXCPP
11130
-fi
11131
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
11132
-$as_echo "$CXXCPP" >&6; }
11133
-ac_preproc_ok=false
11134
-for ac_cxx_preproc_warn_flag in '' yes
11135
-do
11136
- # Use a header file that comes with gcc, so configuring glibc
11137
- # with a fresh cross-compiler works.
11138
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
11139
- # <limits.h> exists even on freestanding compilers.
11140
- # On the NeXT, cc -E runs the code through the compiler's parser,
11141
- # not just through cpp. "Syntax error" is here to catch this case.
11142
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11143
-/* end confdefs.h. */
11144
-#ifdef __STDC__
11145
-# include <limits.h>
11146
-#else
11147
-# include <assert.h>
11148
-#endif
11149
- Syntax error
11150
-_ACEOF
11151
-if ac_fn_cxx_try_cpp "$LINENO"; then :
11152
+$as_echo "$enable_shared" >&6; }
11153
11154
-else
11155
- # Broken: fails on valid input.
11156
-continue
11157
-fi
11158
-rm -f conftest.err conftest.$ac_ext
11159
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
11160
+$as_echo_n "checking whether to build static libraries... " >&6; }
11161
+ # Make sure either enable_shared or enable_static is yes.
11162
+ test "$enable_shared" = yes || enable_static=yes
11163
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
11164
+$as_echo "$enable_static" >&6; }
11165
11166
- # OK, works on sane cases. Now check whether nonexistent headers
11167
- # can be detected and how.
11168
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11169
-/* end confdefs.h. */
11170
-#include <ac_nonexistent.h>
11171
-_ACEOF
11172
-if ac_fn_cxx_try_cpp "$LINENO"; then :
11173
- # Broken: success on invalid input.
11174
-continue
11175
-else
11176
- # Passes both tests.
11177
-ac_preproc_ok=:
11178
-break
11179
-fi
11180
-rm -f conftest.err conftest.$ac_ext
11181
11182
-done
11183
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
11184
-rm -f conftest.err conftest.$ac_ext
11185
-if $ac_preproc_ok; then :
11186
11187
-else
11188
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
11189
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
11190
-as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
11191
-See \`config.log' for more details" "$LINENO" 5; }
11192
-fi
11193
11194
+fi
11195
ac_ext=c
11196
ac_cpp='$CPP $CPPFLAGS'
11197
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
11198
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
11199
ac_compiler_gnu=$ac_cv_c_compiler_gnu
11200
11201
-else
11202
- _lt_caught_CXX_error=yes
11203
-fi
11204
+CC="$lt_save_CC"
11205
+
11206
11207
ac_ext=cpp
11208
ac_cpp='$CXXCPP $CPPFLAGS'
11209
@@ -12156,8 +12445,6 @@
11210
module_expsym_cmds_CXX=
11211
link_all_deplibs_CXX=unknown
11212
old_archive_cmds_CXX=$old_archive_cmds
11213
-reload_flag_CXX=$reload_flag
11214
-reload_cmds_CXX=$reload_cmds
11215
no_undefined_flag_CXX=
11216
whole_archive_flag_spec_CXX=
11217
enable_shared_with_static_runtimes_CXX=no
11218
@@ -12240,7 +12527,7 @@
11219
*) break;;
11220
esac
11221
done
11222
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
11223
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
11224
11225
11226
if test -n "$compiler"; then
11227
@@ -12340,7 +12627,7 @@
11228
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11229
$as_echo "no" >&6; }
11230
fi
11231
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
11232
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
11233
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
11234
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
11235
if test "${lt_cv_prog_gnu_ld+set}" = set; then :
11236
@@ -12402,7 +12689,7 @@
11237
# Commands to make compiler produce verbose output that lists
11238
# what "hidden" libraries, object files and flags are used when
11239
# linking a shared library.
11240
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
11241
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
11242
11243
else
11244
GXX=no
11245
@@ -12544,7 +12831,7 @@
11246
11247
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
11248
11249
- archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
11250
+ archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
11251
else
11252
if test "$host_cpu" = ia64; then
11253
hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
11254
@@ -12588,13 +12875,8 @@
11255
# -berok will link without error, but may produce a broken library.
11256
no_undefined_flag_CXX=' ${wl}-bernotok'
11257
allow_undefined_flag_CXX=' ${wl}-berok'
11258
- if test "$with_gnu_ld" = yes; then
11259
- # We only use this code for GNU lds that support --whole-archive.
11260
- whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
11261
- else
11262
- # Exported symbols can be pulled into shared objects from archives
11263
- whole_archive_flag_spec_CXX='$convenience'
11264
- fi
11265
+ # Exported symbols can be pulled into shared objects from archives
11266
+ whole_archive_flag_spec_CXX='$convenience'
11267
archive_cmds_need_lc_CXX=yes
11268
# This is similar to how AIX traditionally builds its shared
11269
# libraries.
11270
@@ -12627,7 +12909,6 @@
11271
# _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
11272
# as there is no search path for DLLs.
11273
hardcode_libdir_flag_spec_CXX='-L$libdir'
11274
- export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
11275
allow_undefined_flag_CXX=unsupported
11276
always_export_symbols_CXX=no
11277
enable_shared_with_static_runtimes_CXX=yes
11278
@@ -12654,11 +12935,7 @@
11279
hardcode_direct_CXX=no
11280
hardcode_automatic_CXX=yes
11281
hardcode_shlibpath_var_CXX=unsupported
11282
- if test "$lt_cv_ld_force_load" = "yes"; then
11283
- whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
11284
- else
11285
- whole_archive_flag_spec_CXX=''
11286
- fi
11287
+ whole_archive_flag_spec_CXX=''
11288
link_all_deplibs_CXX=yes
11289
allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
11290
case $cc_basename in
11291
@@ -12666,7 +12943,7 @@
11292
*) _lt_dar_can_shared=$GCC ;;
11293
esac
11294
if test "$_lt_dar_can_shared" = "yes"; then
11295
- output_verbose_link_cmd=func_echo_all
11296
+ output_verbose_link_cmd=echo
11297
archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
11298
module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
11299
archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
11300
@@ -12719,11 +12996,6 @@
11301
gnu*)
8510
11302
;;
8511
11303
8512
- linux* | k*bsd*-gnu)
8513
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
8514
case $cc_basename in
8515
KCC*)
8516
# Kuck and Associates, Inc. (KAI) C++ Compiler
8517
@@ -14036,7 +14067,7 @@
8518
;;
8519
esac
8520
;;
8521
- linux* | k*bsd*-gnu)
8522
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
8523
case $cc_basename in
8524
KCC*)
8525
# KAI C++ Compiler
8526
@@ -14100,7 +14131,7 @@
11304
- haiku*)
11305
- archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11306
- link_all_deplibs_CXX=yes
11307
- ;;
11308
-
11309
hpux9*)
11310
hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
11311
hardcode_libdir_separator_CXX=:
11312
@@ -12748,7 +13020,7 @@
11313
# explicitly linking system object files so we need to strip them
11314
# from the output so that they don't get included in the library
11315
# dependencies.
11316
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
11317
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
11318
;;
11319
*)
11320
if test "$GXX" = yes; then
11321
@@ -12813,7 +13085,7 @@
11322
# explicitly linking system object files so we need to strip them
11323
# from the output so that they don't get included in the library
11324
# dependencies.
11325
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
11326
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
11327
;;
11328
*)
11329
if test "$GXX" = yes; then
11330
@@ -12856,7 +13128,7 @@
11331
case $cc_basename in
11332
CC*)
11333
# SGI C++
11334
- archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
11335
+ archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
11336
11337
# Archives containing C++ object files must be created using
11338
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
11339
@@ -12867,9 +13139,9 @@
11340
*)
11341
if test "$GXX" = yes; then
11342
if test "$with_gnu_ld" = no; then
11343
- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
11344
+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
11345
else
11346
- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
11347
+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
11348
fi
11349
fi
11350
link_all_deplibs_CXX=yes
11351
@@ -12898,7 +13170,7 @@
11352
# explicitly linking system object files so we need to strip them
11353
# from the output so that they don't get included in the library
11354
# dependencies.
11355
- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
11356
+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
11357
11358
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
11359
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
11360
@@ -12935,26 +13207,26 @@
11361
pgCC* | pgcpp*)
11362
# Portland Group C++ compiler
11363
case `$CC -V` in
11364
- *pgCC\ [1-5].* | *pgcpp\ [1-5].*)
11365
+ *pgCC\ [1-5]* | *pgcpp\ [1-5]*)
11366
prelink_cmds_CXX='tpldir=Template.dir~
11367
rm -rf $tpldir~
11368
$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
11369
- compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
11370
+ compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
11371
old_archive_cmds_CXX='tpldir=Template.dir~
11372
rm -rf $tpldir~
11373
$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
11374
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
11375
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
11376
$RANLIB $oldlib'
11377
archive_cmds_CXX='tpldir=Template.dir~
11378
rm -rf $tpldir~
11379
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
11380
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
11381
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
11382
archive_expsym_cmds_CXX='tpldir=Template.dir~
11383
rm -rf $tpldir~
11384
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
11385
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
11386
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
11387
;;
11388
- *) # Version 6 and above use weak symbols
11389
+ *) # Version 6 will use weak symbols
11390
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
11391
archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
11392
;;
11393
@@ -12962,7 +13234,7 @@
11394
11395
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
11396
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
11397
- whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
11398
+ whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
11399
;;
11400
cxx*)
11401
# Compaq C++
11402
@@ -12981,9 +13253,9 @@
11403
# explicitly linking system object files so we need to strip them
11404
# from the output so that they don't get included in the library
11405
# dependencies.
11406
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
11407
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
11408
;;
11409
- xl* | mpixl* | bgxl*)
11410
+ xl*)
11411
# IBM XL 8.0 on PPC, with GNU ld
11412
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
11413
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
11414
@@ -13003,13 +13275,13 @@
11415
archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
11416
archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
11417
hardcode_libdir_flag_spec_CXX='-R$libdir'
11418
- whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
11419
+ whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
11420
compiler_needs_object_CXX=yes
11421
11422
# Not sure whether something based on
11423
# $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
11424
# would be better.
11425
- output_verbose_link_cmd='func_echo_all'
11426
+ output_verbose_link_cmd='echo'
11427
11428
# Archives containing C++ object files must be created using
11429
# "CC -xar", where "CC" is the Sun C++ compiler. This is
11430
@@ -13078,7 +13350,7 @@
11431
export_dynamic_flag_spec_CXX='${wl}-E'
11432
whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
11433
fi
11434
- output_verbose_link_cmd=func_echo_all
11435
+ output_verbose_link_cmd=echo
11436
else
11437
ld_shlibs_CXX=no
11438
fi
11439
@@ -13113,15 +13385,15 @@
11440
case $host in
11441
osf3*)
11442
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
11443
- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
11444
+ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
11445
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
11446
;;
11447
*)
11448
allow_undefined_flag_CXX=' -expect_unresolved \*'
11449
- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
11450
+ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
11451
archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
11452
echo "-hidden">> $lib.exp~
11453
- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
11454
+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
11455
$RM $lib.exp'
11456
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
11457
;;
11458
@@ -13137,17 +13409,17 @@
11459
# explicitly linking system object files so we need to strip them
11460
# from the output so that they don't get included in the library
11461
# dependencies.
11462
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
11463
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
11464
;;
11465
*)
11466
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
11467
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
11468
case $host in
11469
osf3*)
11470
- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
11471
+ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
11472
;;
11473
*)
11474
- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
11475
+ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
11476
;;
11477
esac
11478
11479
@@ -13157,7 +13429,7 @@
11480
# Commands to make compiler produce verbose output that lists
11481
# what "hidden" libraries, object files and flags are used when
11482
# linking a shared library.
11483
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
11484
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
11485
11486
else
11487
# FIXME: insert proper C++ library support
11488
@@ -13193,7 +13465,7 @@
11489
11490
solaris*)
11491
case $cc_basename in
11492
- CC* | sunCC*)
11493
+ CC*)
11494
# Sun C++ 4.2, 5.x and Centerline C++
11495
archive_cmds_need_lc_CXX=yes
11496
no_undefined_flag_CXX=' -zdefs'
11497
@@ -13214,7 +13486,7 @@
11498
esac
11499
link_all_deplibs_CXX=yes
11500
11501
- output_verbose_link_cmd='func_echo_all'
11502
+ output_verbose_link_cmd='echo'
11503
11504
# Archives containing C++ object files must be created using
11505
# "CC -xar", where "CC" is the Sun C++ compiler. This is
11506
@@ -13241,7 +13513,7 @@
11507
# Commands to make compiler produce verbose output that lists
11508
# what "hidden" libraries, object files and flags are used when
11509
# linking a shared library.
11510
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
11511
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
11512
else
11513
# g++ 2.7 appears to require `-G' NOT `-shared' on this
11514
# platform.
11515
@@ -13252,7 +13524,7 @@
11516
# Commands to make compiler produce verbose output that lists
11517
# what "hidden" libraries, object files and flags are used when
11518
# linking a shared library.
11519
- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
11520
+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
11521
fi
11522
11523
hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
11524
@@ -13306,10 +13578,6 @@
11525
CC*)
11526
archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
11527
archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
11528
- old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
11529
- '"$old_archive_cmds_CXX"
11530
- reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
11531
- '"$reload_cmds_CXX"
11532
;;
11533
*)
11534
archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
11535
@@ -13491,7 +13759,7 @@
11536
11537
solaris*)
11538
case $cc_basename in
11539
- CC* | sunCC*)
11540
+ CC*)
11541
# The more standards-conforming stlport4 library is
11542
# incompatible with the Cstd library. Avoid specifying
11543
# it if it's in CXXFLAGS. Ignore libCrun as
11544
@@ -13607,11 +13875,6 @@
11545
# DJGPP does not support shared libraries at all
11546
lt_prog_compiler_pic_CXX=
11547
;;
11548
- haiku*)
11549
- # PIC is the default for Haiku.
11550
- # The "-static" flag exists, but is broken.
11551
- lt_prog_compiler_static_CXX=
11552
- ;;
11553
interix[3-9]*)
11554
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
11555
# Instead, we relocate shared libraries at runtime.
11556
@@ -13750,8 +14013,8 @@
11557
lt_prog_compiler_pic_CXX=
11558
lt_prog_compiler_static_CXX='-non_shared'
11559
;;
11560
- xlc* | xlC* | bgxl[cC]* | mpixl[cC]*)
11561
- # IBM XL 8.0, 9.0 on PPC and BlueGene
11562
+ xlc* | xlC*)
11563
+ # IBM XL 8.0 on PPC
11564
lt_prog_compiler_wl_CXX='-Wl,'
11565
lt_prog_compiler_pic_CXX='-qpic'
11566
lt_prog_compiler_static_CXX='-qstaticlink'
11567
@@ -13781,7 +14044,7 @@
8527
11568
;;
8528
11569
esac
8529
11570
;;
8532
11573
;;
8533
11574
*qnx* | *nto*)
8534
11575
# QNX uses GNU C++, but need to define -shared option too, otherwise
8535
@@ -14224,11 +14255,11 @@
11576
@@ -13813,7 +14076,7 @@
11577
;;
11578
solaris*)
11579
case $cc_basename in
11580
- CC* | sunCC*)
11581
+ CC*)
11582
# Sun C++ 4.2, 5.x and Centerline C++
11583
lt_prog_compiler_pic_CXX='-KPIC'
11584
lt_prog_compiler_static_CXX='-Bstatic'
11585
@@ -13905,15 +14168,15 @@
8536
11586
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
8537
11587
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
8538
11588
-e 's:$: $lt_compiler_flag:'`
8539
- (eval echo "\"\$as_me:14227: $lt_compile\"" >&5)
8540
+ (eval echo "\"\$as_me:14258: $lt_compile\"" >&5)
11589
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
11590
+ (eval echo "\"\$as_me:14171: $lt_compile\"" >&5)
8541
11591
(eval "$lt_compile" 2>conftest.err)
8542
11592
ac_status=$?
8543
11593
cat conftest.err >&5
8544
- echo "$as_me:14231: \$? = $ac_status" >&5
8545
+ echo "$as_me:14262: \$? = $ac_status" >&5
11594
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
11595
+ echo "$as_me:14175: \$? = $ac_status" >&5
8546
11596
if (exit $ac_status) && test -s "$ac_outfile"; then
8547
11597
# The compiler can only warn and ignore the option if not recognized
8548
11598
# So say no if there are warnings other than the usual output.
8549
@@ -14323,11 +14354,11 @@
8550
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
8551
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
8552
-e 's:$: $lt_compiler_flag:'`
8553
- (eval echo "\"\$as_me:14326: $lt_compile\"" >&5)
8554
+ (eval echo "\"\$as_me:14357: $lt_compile\"" >&5)
8555
(eval "$lt_compile" 2>out/conftest.err)
8556
ac_status=$?
8557
cat out/conftest.err >&5
8558
- echo "$as_me:14330: \$? = $ac_status" >&5
8559
+ echo "$as_me:14361: \$? = $ac_status" >&5
8560
if (exit $ac_status) && test -s out/conftest2.$ac_objext
8561
then
8562
# The compiler can only warn and ignore the option if not recognized
8563
@@ -14375,11 +14406,11 @@
8564
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
8565
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
8566
-e 's:$: $lt_compiler_flag:'`
8567
- (eval echo "\"\$as_me:14378: $lt_compile\"" >&5)
8568
+ (eval echo "\"\$as_me:14409: $lt_compile\"" >&5)
8569
(eval "$lt_compile" 2>out/conftest.err)
8570
ac_status=$?
8571
cat out/conftest.err >&5
8572
- echo "$as_me:14382: \$? = $ac_status" >&5
8573
+ echo "$as_me:14413: \$? = $ac_status" >&5
8574
if (exit $ac_status) && test -s out/conftest2.$ac_objext
8575
then
8576
# The compiler can only warn and ignore the option if not recognized
8577
@@ -14451,6 +14482,9 @@
11599
- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
11600
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
11601
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
11602
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
11603
lt_cv_prog_compiler_pic_works_CXX=yes
11604
@@ -13958,7 +14221,7 @@
11605
if test -s conftest.err; then
11606
# Append any errors to the config.log.
11607
cat conftest.err 1>&5
11608
- $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
11609
+ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
11610
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
11611
if diff conftest.exp conftest.er2 >/dev/null; then
11612
lt_cv_prog_compiler_static_works_CXX=yes
11613
@@ -14004,16 +14267,16 @@
11614
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
11615
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
11616
-e 's:$: $lt_compiler_flag:'`
11617
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
11618
+ (eval echo "\"\$as_me:14270: $lt_compile\"" >&5)
11619
(eval "$lt_compile" 2>out/conftest.err)
11620
ac_status=$?
11621
cat out/conftest.err >&5
11622
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
11623
+ echo "$as_me:14274: \$? = $ac_status" >&5
11624
if (exit $ac_status) && test -s out/conftest2.$ac_objext
11625
then
11626
# The compiler can only warn and ignore the option if not recognized
11627
# So say no if there are warnings
11628
- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
11629
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
11630
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
11631
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
11632
lt_cv_prog_compiler_c_o_CXX=yes
11633
@@ -14056,16 +14319,16 @@
11634
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
11635
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
11636
-e 's:$: $lt_compiler_flag:'`
11637
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
11638
+ (eval echo "\"\$as_me:14322: $lt_compile\"" >&5)
11639
(eval "$lt_compile" 2>out/conftest.err)
11640
ac_status=$?
11641
cat out/conftest.err >&5
11642
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
11643
+ echo "$as_me:14326: \$? = $ac_status" >&5
11644
if (exit $ac_status) && test -s out/conftest2.$ac_objext
11645
then
11646
# The compiler can only warn and ignore the option if not recognized
11647
# So say no if there are warnings
11648
- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
11649
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
11650
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
11651
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
11652
lt_cv_prog_compiler_c_o_CXX=yes
11653
@@ -14120,10 +14383,8 @@
11654
aix[4-9]*)
11655
# If we're using GNU nm, then we don't want the "-C" option.
11656
# -C means demangle to AIX nm, but means don't demangle with GNU nm
11657
- # Also, AIX nm treats weak defined symbols like other global defined
11658
- # symbols, whereas GNU nm marks them as "W".
11659
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
11660
- export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
11661
+ export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
11662
else
11663
export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
11664
fi
11665
@@ -14134,6 +14395,9 @@
8578
11666
cygwin* | mingw* | cegcc*)
8579
11667
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
8580
11668
;;
8584
11672
*)
8585
11673
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
8586
11674
;;
8587
@@ -14950,7 +14984,7 @@
8588
;;
8589
8590
# This must be Linux ELF.
8591
-linux* | k*bsd*-gnu)
8592
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
8593
version_type=linux
8594
need_lib_prefix=no
8595
need_version=no
8596
@@ -14990,13 +15024,10 @@
11675
@@ -14170,50 +14434,44 @@
11676
# to ld, don't add -lc before -lgcc.
11677
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
11678
$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
11679
-if test "${lt_cv_archive_cmds_need_lc_CXX+set}" = set; then :
11680
- $as_echo_n "(cached) " >&6
11681
-else
11682
- $RM conftest*
11683
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
11684
+ $RM conftest*
11685
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
11686
11687
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
11688
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
11689
(eval $ac_compile) 2>&5
11690
ac_status=$?
11691
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11692
test $ac_status = 0; } 2>conftest.err; then
11693
- soname=conftest
11694
- lib=conftest
11695
- libobjs=conftest.$ac_objext
11696
- deplibs=
11697
- wl=$lt_prog_compiler_wl_CXX
11698
- pic_flag=$lt_prog_compiler_pic_CXX
11699
- compiler_flags=-v
11700
- linker_flags=-v
11701
- verstring=
11702
- output_objdir=.
11703
- libname=conftest
11704
- lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
11705
- allow_undefined_flag_CXX=
11706
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
11707
+ soname=conftest
11708
+ lib=conftest
11709
+ libobjs=conftest.$ac_objext
11710
+ deplibs=
11711
+ wl=$lt_prog_compiler_wl_CXX
11712
+ pic_flag=$lt_prog_compiler_pic_CXX
11713
+ compiler_flags=-v
11714
+ linker_flags=-v
11715
+ verstring=
11716
+ output_objdir=.
11717
+ libname=conftest
11718
+ lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
11719
+ allow_undefined_flag_CXX=
11720
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
11721
(eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
11722
ac_status=$?
11723
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11724
test $ac_status = 0; }
11725
- then
11726
- lt_cv_archive_cmds_need_lc_CXX=no
11727
- else
11728
- lt_cv_archive_cmds_need_lc_CXX=yes
11729
- fi
11730
- allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
11731
- else
11732
- cat conftest.err 1>&5
11733
- fi
11734
- $RM conftest*
11735
-
11736
-fi
11737
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
11738
-$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; }
11739
- archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX
11740
+ then
11741
+ archive_cmds_need_lc_CXX=no
11742
+ else
11743
+ archive_cmds_need_lc_CXX=yes
11744
+ fi
11745
+ allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
11746
+ else
11747
+ cat conftest.err 1>&5
11748
+ fi
11749
+ $RM conftest*
11750
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5
11751
+$as_echo "$archive_cmds_need_lc_CXX" >&6; }
11752
;;
11753
esac
11754
fi
11755
@@ -14370,7 +14628,7 @@
11756
m68k)
11757
library_names_spec='$libname.ixlibrary $libname.a'
11758
# Create ${libname}_ixlibrary.a entries in /sys/libs.
11759
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
11760
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
11761
;;
11762
esac
11763
;;
11764
@@ -14423,11 +14681,23 @@
11765
cygwin*)
11766
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
11767
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
11768
-
11769
+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
11770
;;
11771
mingw* | cegcc*)
11772
# MinGW DLLs use traditional 'lib' prefix
11773
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
11774
+ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
11775
+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
11776
+ # It is most probably a Windows format PATH printed by
11777
+ # mingw gcc, but we are running on Cygwin. Gcc prints its search
11778
+ # path with ; separators, and with drive letters. We can handle the
11779
+ # drive letters (cygwin fileutils understands them), so leave them,
11780
+ # especially as we might pass files found there to a mingw objdump,
11781
+ # which wouldn't understand a cygwinified path. Ahh.
11782
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
11783
+ else
11784
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
11785
+ fi
11786
;;
11787
pw32*)
11788
# pw32 DLLs use 'pw' prefix rather than 'lib'
11789
@@ -14526,19 +14796,6 @@
11790
hardcode_into_libs=yes
11791
;;
11792
11793
-haiku*)
11794
- version_type=linux
11795
- need_lib_prefix=no
11796
- need_version=no
11797
- dynamic_linker="$host_os runtime_loader"
11798
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
11799
- soname_spec='${libname}${release}${shared_ext}$major'
11800
- shlibpath_var=LIBRARY_PATH
11801
- shlibpath_overrides_runpath=yes
11802
- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
11803
- hardcode_into_libs=yes
11804
- ;;
11805
-
11806
hpux9* | hpux10* | hpux11*)
11807
# Give a soname corresponding to the major version so that dld.sl refuses to
11808
# link against other versions.
11809
@@ -14581,10 +14838,8 @@
11810
soname_spec='${libname}${release}${shared_ext}$major'
11811
;;
11812
esac
11813
- # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
11814
+ # HP-UX runs *really* slowly unless shared libraries are mode 555.
11815
postinstall_cmds='chmod 555 $lib'
11816
- # or fails outright, so override atomically:
11817
- install_override_mode=555
11818
;;
11819
11820
interix[3-9]*)
11821
@@ -14651,17 +14906,12 @@
11822
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
11823
shlibpath_var=LD_LIBRARY_PATH
11824
shlibpath_overrides_runpath=no
11825
-
11826
# Some binutils ld are patched to set DT_RUNPATH
11827
- if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then :
11828
- $as_echo_n "(cached) " >&6
11829
-else
11830
- lt_cv_shlibpath_overrides_runpath=no
11831
- save_LDFLAGS=$LDFLAGS
11832
- save_libdir=$libdir
11833
- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
11834
- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
11835
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11836
+ save_LDFLAGS=$LDFLAGS
11837
+ save_libdir=$libdir
11838
+ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
11839
+ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
11840
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11841
/* end confdefs.h. */
11842
11843
int
11844
@@ -14674,31 +14924,23 @@
11845
_ACEOF
11846
if ac_fn_cxx_try_link "$LINENO"; then :
11847
if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
11848
- lt_cv_shlibpath_overrides_runpath=yes
11849
+ shlibpath_overrides_runpath=yes
11850
fi
11851
fi
11852
rm -f core conftest.err conftest.$ac_objext \
11853
conftest$ac_exeext conftest.$ac_ext
11854
- LDFLAGS=$save_LDFLAGS
11855
- libdir=$save_libdir
11856
-
11857
-fi
11858
-
11859
- shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
11860
+ LDFLAGS=$save_LDFLAGS
11861
+ libdir=$save_libdir
11862
11863
# This implies no fast_install, which is unacceptable.
11864
# Some rework will be needed to allow for fast_install
8597
11865
# before this can be enabled.
8598
11866
hardcode_into_libs=yes
8599
11867
8602
11870
-
8603
11871
# Append ld.so.conf contents to the search path
8604
11872
if test -f /etc/ld.so.conf; then
8605
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
11873
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
8606
11874
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
11875
-
11876
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
8607
11877
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
8608
11878
fi
8609
11879
8610
11880
# We used to test for /lib/ld.so.1 and disable shared libraries on
8611
@@ -15008,6 +15039,18 @@
11881
@@ -14710,6 +14952,18 @@
8612
11882
dynamic_linker='GNU/Linux ld.so'
8613
11883
;;
8614
11884
8627
11897
netbsd*)
8628
11898
version_type=sunos
8629
11899
need_lib_prefix=no
8630
@@ -17579,6 +17622,26 @@
11900
@@ -14949,8 +15203,6 @@
11901
11902
11903
11904
-
11905
-
11906
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
11907
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
11908
hardcode_action_CXX=
11909
@@ -15037,15 +15289,16 @@
11910
: ${CONFIG_LT=./config.lt}
11911
{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
11912
$as_echo "$as_me: creating $CONFIG_LT" >&6;}
11913
-as_write_fail=0
11914
-cat >"$CONFIG_LT" <<_ASEOF || as_write_fail=1
11915
+cat >"$CONFIG_LT" <<_LTEOF
11916
#! $SHELL
11917
# Generated by $as_me.
11918
# Run this file to recreate a libtool stub with the current configuration.
11919
+
11920
+lt_cl_silent=false
11921
SHELL=\${CONFIG_SHELL-$SHELL}
11922
-export SHELL
11923
-_ASEOF
11924
-cat >>"$CONFIG_LT" <<\_ASEOF || as_write_fail=1
11925
+_LTEOF
11926
+
11927
+cat >>"$CONFIG_LT" <<\_LTEOF
11928
## -------------------- ##
11929
## M4sh Initialization. ##
11930
## -------------------- ##
11931
@@ -15170,19 +15423,20 @@
11932
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
11933
11934
11935
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
11936
-# ----------------------------------------
11937
+
11938
+# as_fn_error ERROR [LINENO LOG_FD]
11939
+# ---------------------------------
11940
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
11941
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
11942
-# script with STATUS, using 1 if that was 0.
11943
+# script with status $?, using 1 if that was 0.
11944
as_fn_error ()
11945
{
11946
- as_status=$1; test $as_status -eq 0 && as_status=1
11947
- if test "$4"; then
11948
- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
11949
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
11950
+ as_status=$?; test $as_status -eq 0 && as_status=1
11951
+ if test "$3"; then
11952
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
11953
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
11954
fi
11955
- $as_echo "$as_me: error: $2" >&2
11956
+ $as_echo "$as_me: error: $1" >&2
11957
as_fn_exit $as_status
11958
} # as_fn_error
11959
11960
@@ -15378,7 +15632,7 @@
11961
test -d "$as_dir" && break
11962
done
11963
test -z "$as_dirs" || eval "mkdir $as_dirs"
11964
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
11965
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" "$LINENO" 5
11966
11967
11968
} # as_fn_mkdir_p
11969
@@ -15419,15 +15673,8 @@
11970
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
11971
11972
11973
-exec 6>&1
11974
-## --------------------------------- ##
11975
-## Main body of "$CONFIG_LT" script. ##
11976
-## --------------------------------- ##
11977
-_ASEOF
11978
-test $as_write_fail = 0 && chmod +x "$CONFIG_LT"
11979
11980
-cat >>"$CONFIG_LT" <<\_LTEOF
11981
-lt_cl_silent=false
11982
+exec 6>&1
11983
exec 5>>config.log
11984
{
11985
echo
11986
@@ -15452,9 +15699,9 @@
11987
11988
lt_cl_version="\
11989
gtk+ config.lt 2.21.5
11990
-configured by $0, generated by GNU Autoconf 2.66.
11991
+configured by $0, generated by GNU Autoconf 2.65.
11992
11993
-Copyright (C) 2010 Free Software Foundation, Inc.
11994
+Copyright (C) 2008 Free Software Foundation, Inc.
11995
This config.lt script is free software; the Free Software Foundation
11996
gives unlimited permision to copy, distribute and modify it."
11997
11998
@@ -15470,10 +15717,10 @@
11999
--quiet | --q* | --silent | --s* | -q )
12000
lt_cl_silent=: ;;
12001
12002
- -*) as_fn_error $? "unrecognized option: $1
12003
+ -*) as_fn_error "unrecognized option: $1
12004
Try \`$0 --help' for more information." "$LINENO" 5 ;;
12005
12006
- *) as_fn_error $? "unrecognized argument: $1
12007
+ *) as_fn_error "unrecognized argument: $1
12008
Try \`$0 --help' for more information." "$LINENO" 5 ;;
12009
esac
12010
shift
12011
@@ -15494,203 +15741,186 @@
12012
sed_quote_subst='$sed_quote_subst'
12013
double_quote_subst='$double_quote_subst'
12014
delay_variable_subst='$delay_variable_subst'
12015
-enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
12016
-AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
12017
-DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
12018
-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
12019
-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
12020
-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
12021
-enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
12022
-pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
12023
-enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
12024
-SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
12025
-ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
12026
-host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
12027
-host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
12028
-host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
12029
-build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
12030
-build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
12031
-build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
12032
-SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
12033
-Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
12034
-GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
12035
-EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
12036
-FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
12037
-LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
12038
-NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
12039
-LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
12040
-max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
12041
-ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
12042
-exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
12043
-lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
12044
-lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
12045
-lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
12046
-reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
12047
-reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
12048
-deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
12049
-file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
12050
-AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
12051
-AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
12052
-STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
12053
-RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
12054
-old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
12055
-old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
12056
-old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
12057
-lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
12058
-CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
12059
-CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
12060
-compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
12061
-GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
12062
-lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
12063
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
12064
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
12065
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
12066
-objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
12067
-MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
12068
-lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
12069
-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
12070
-lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
12071
-lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
12072
-lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
12073
-need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
12074
-DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
12075
-NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
12076
-LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
12077
-OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
12078
-OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
12079
-libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
12080
-shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
12081
-extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
12082
-archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
12083
-enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
12084
-export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
12085
-whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
12086
-compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
12087
-old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
12088
-old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
12089
-archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
12090
-archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
12091
-module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
12092
-module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
12093
-with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
12094
-allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
12095
-no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
12096
-hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
12097
-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
12098
-hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
12099
-hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
12100
-hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
12101
-hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
12102
-hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
12103
-hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
12104
-inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
12105
-link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
12106
-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
12107
-always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
12108
-export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
12109
-exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
12110
-include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
12111
-prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
12112
-file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
12113
-variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
12114
-need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
12115
-need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
12116
-version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
12117
-runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
12118
-shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
12119
-shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
12120
-libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
12121
-library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
12122
-soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
12123
-install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
12124
-postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
12125
-postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
12126
-finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
12127
-finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
12128
-hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
12129
-sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
12130
-sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
12131
-hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
12132
-enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
12133
-enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
12134
-enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
12135
-old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
12136
-striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
12137
-compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'
12138
-predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'
12139
-postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'
12140
-predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'
12141
-postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'
12142
-compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'
12143
-LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`'
12144
-reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`'
12145
-reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`'
12146
-old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
12147
-compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
12148
-GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
12149
-lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
12150
-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
12151
-lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
12152
-lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
12153
-lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
12154
-archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
12155
-enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`'
12156
-export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
12157
-whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
12158
-compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`'
12159
-old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`'
12160
-old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`'
12161
-archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
12162
-archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
12163
-module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`'
12164
-module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
12165
-with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
12166
-allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
12167
-no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
12168
-hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
12169
-hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`'
12170
-hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
12171
-hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
12172
-hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
12173
-hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`'
12174
-hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`'
12175
-hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
12176
-inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
12177
-link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
12178
-fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`'
12179
-always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
12180
-export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
12181
-exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
12182
-include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
12183
-prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
12184
-file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
12185
-hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
12186
-compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
12187
-predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`'
12188
-postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`'
12189
-predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'
12190
-postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'
12191
-compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'
12192
+enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
12193
+AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`'
12194
+DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`'
12195
+OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
12196
+macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
12197
+macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
12198
+enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
12199
+pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
12200
+enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
12201
+host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
12202
+host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
12203
+host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
12204
+build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
12205
+build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
12206
+build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
12207
+SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
12208
+Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
12209
+GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
12210
+EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
12211
+FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
12212
+LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
12213
+NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
12214
+LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
12215
+max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
12216
+ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
12217
+exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
12218
+lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
12219
+lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
12220
+lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
12221
+reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
12222
+reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
12223
+deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
12224
+file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
12225
+AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
12226
+AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
12227
+STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
12228
+RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
12229
+old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
12230
+old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
12231
+old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
12232
+CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
12233
+CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
12234
+compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
12235
+GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
12236
+lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
12237
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
12238
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
12239
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
12240
+objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
12241
+SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
12242
+ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
12243
+MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
12244
+lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
12245
+lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
12246
+lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
12247
+lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
12248
+lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
12249
+need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
12250
+DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
12251
+NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
12252
+LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
12253
+OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
12254
+OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
12255
+libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
12256
+shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
12257
+extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
12258
+archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
12259
+enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
12260
+export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
12261
+whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
12262
+compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
12263
+old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
12264
+old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
12265
+archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
12266
+archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
12267
+module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
12268
+module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
12269
+with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
12270
+allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
12271
+no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
12272
+hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
12273
+hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
12274
+hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
12275
+hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
12276
+hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
12277
+hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
12278
+hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
12279
+hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
12280
+inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
12281
+link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
12282
+fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
12283
+always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
12284
+export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
12285
+exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
12286
+include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
12287
+prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
12288
+file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
12289
+variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
12290
+need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
12291
+need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
12292
+version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
12293
+runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
12294
+shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
12295
+shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
12296
+libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
12297
+library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
12298
+soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
12299
+postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
12300
+postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
12301
+finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
12302
+finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
12303
+hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
12304
+sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
12305
+sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
12306
+hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
12307
+enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
12308
+enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
12309
+enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
12310
+old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
12311
+striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
12312
+compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`'
12313
+predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`'
12314
+postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`'
12315
+predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`'
12316
+postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`'
12317
+compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`'
12318
+LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12319
+old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12320
+compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12321
+GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12322
+lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12323
+lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12324
+lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12325
+lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12326
+lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12327
+archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12328
+enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12329
+export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12330
+whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12331
+compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12332
+old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12333
+old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12334
+archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12335
+archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12336
+module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12337
+module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12338
+with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12339
+allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12340
+no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12341
+hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12342
+hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12343
+hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12344
+hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12345
+hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12346
+hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12347
+hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12348
+hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12349
+inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12350
+link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12351
+fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12352
+always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12353
+export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12354
+exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12355
+include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12356
+prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12357
+file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12358
+hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12359
+compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12360
+predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12361
+postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12362
+predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12363
+postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12364
+compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
12365
12366
LTCC='$LTCC'
12367
LTCFLAGS='$LTCFLAGS'
12368
compiler='$compiler_DEFAULT'
12369
12370
-# A function that is used when there is no print builtin or printf.
12371
-func_fallback_echo ()
12372
-{
12373
- eval 'cat <<_LTECHO_EOF
12374
-\$1
12375
-_LTECHO_EOF'
12376
-}
12377
-
12378
# Quote evaled strings.
12379
-for var in AS \
12380
-DLLTOOL \
12381
-OBJDUMP \
12382
-SHELL \
12383
-ECHO \
12384
-SED \
12385
+for var in SED \
12386
GREP \
12387
EGREP \
12388
FGREP \
12389
@@ -15713,6 +15943,8 @@
12390
lt_cv_sys_global_symbol_to_cdecl \
12391
lt_cv_sys_global_symbol_to_c_name_address \
12392
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
12393
+SHELL \
12394
+ECHO \
12395
lt_prog_compiler_no_builtin_flag \
12396
lt_prog_compiler_wl \
12397
lt_prog_compiler_pic \
12398
@@ -15742,7 +15974,6 @@
12399
libname_spec \
12400
library_names_spec \
12401
soname_spec \
12402
-install_override_mode \
12403
finish_eval \
12404
old_striplib \
12405
striplib \
12406
@@ -15753,7 +15984,6 @@
12407
postdeps \
12408
compiler_lib_search_path \
12409
LD_CXX \
12410
-reload_flag_CXX \
12411
compiler_CXX \
12412
lt_prog_compiler_no_builtin_flag_CXX \
12413
lt_prog_compiler_wl_CXX \
12414
@@ -15779,9 +16009,9 @@
12415
predeps_CXX \
12416
postdeps_CXX \
12417
compiler_lib_search_path_CXX; do
12418
- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
12419
+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
12420
*[\\\\\\\`\\"\\\$]*)
12421
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
12422
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
12423
;;
12424
*)
12425
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
12426
@@ -15808,7 +16038,6 @@
12427
finish_cmds \
12428
sys_lib_search_path_spec \
12429
sys_lib_dlsearch_path_spec \
12430
-reload_cmds_CXX \
12431
old_archive_cmds_CXX \
12432
old_archive_from_new_cmds_CXX \
12433
old_archive_from_expsyms_cmds_CXX \
12434
@@ -15818,9 +16047,9 @@
12435
module_expsym_cmds_CXX \
12436
export_symbols_cmds_CXX \
12437
prelink_cmds_CXX; do
12438
- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
12439
+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
12440
*[\\\\\\\`\\"\\\$]*)
12441
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
12442
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
12443
;;
12444
*)
12445
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
12446
@@ -15828,6 +16057,12 @@
12447
esac
12448
done
12449
12450
+# Fix-up fallback echo if it was mangled by the above quoting rules.
12451
+case \$lt_ECHO in
12452
+*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
12453
+ ;;
12454
+esac
12455
+
12456
ac_aux_dir='$ac_aux_dir'
12457
xsi_shell='$xsi_shell'
12458
lt_shell_append='$lt_shell_append'
12459
@@ -15875,8 +16110,7 @@
12460
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
12461
#
12462
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
12463
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
12464
-# Inc.
12465
+# 2006, 2007, 2008 Free Software Foundation, Inc.
12466
# Written by Gordon Matzigkeit, 1996
12467
#
12468
# This file is part of GNU Libtool.
12469
@@ -15912,13 +16146,13 @@
12470
build_old_libs=$enable_static
12471
12472
# Assembler program.
12473
-AS=$lt_AS
12474
+AS=$AS
12475
12476
# DLL creation program.
12477
-DLLTOOL=$lt_DLLTOOL
12478
+DLLTOOL=$DLLTOOL
12479
12480
# Object dumper program.
12481
-OBJDUMP=$lt_OBJDUMP
12482
+OBJDUMP=$OBJDUMP
12483
12484
# Which release of libtool.m4 was used?
12485
macro_version=$macro_version
12486
@@ -15933,12 +16167,6 @@
12487
# Whether or not to optimize for fast installation.
12488
fast_install=$enable_fast_install
12489
12490
-# Shell to use when invoking shell scripts.
12491
-SHELL=$lt_SHELL
12492
-
12493
-# An echo program that protects backslashes.
12494
-ECHO=$lt_ECHO
12495
-
12496
# The host system.
12497
host_alias=$host_alias
12498
host=$host
12499
@@ -15988,6 +16216,10 @@
12500
# turn newlines into spaces.
12501
NL2SP=$lt_lt_NL2SP
12502
12503
+# How to create reloadable object files.
12504
+reload_flag=$lt_reload_flag
12505
+reload_cmds=$lt_reload_cmds
12506
+
12507
# Method to check whether dependent libraries are shared objects.
12508
deplibs_check_method=$lt_deplibs_check_method
12509
12510
@@ -16006,9 +16238,6 @@
12511
old_postinstall_cmds=$lt_old_postinstall_cmds
12512
old_postuninstall_cmds=$lt_old_postuninstall_cmds
12513
12514
-# Whether to use a lock for old archive extraction.
12515
-lock_old_archive_extraction=$lock_old_archive_extraction
12516
-
12517
# A C compiler.
12518
LTCC=$lt_CC
12519
12520
@@ -16030,6 +16259,12 @@
12521
# The name of the directory that contains temporary libtool files.
12522
objdir=$objdir
12523
12524
+# Shell to use when invoking shell scripts.
12525
+SHELL=$lt_SHELL
12526
+
12527
+# An echo program that does not interpret backslashes.
12528
+ECHO=$lt_ECHO
12529
+
12530
# Used to examine libraries when file_magic_cmd begins with "file".
12531
MAGIC_CMD=$MAGIC_CMD
12532
12533
@@ -16092,9 +16327,6 @@
12534
# The coded name of the library, if different from the real name.
12535
soname_spec=$lt_soname_spec
12536
12537
-# Permission mode override for installation of shared libraries.
12538
-install_override_mode=$lt_install_override_mode
12539
-
12540
# Command to use after installation of a shared archive.
12541
postinstall_cmds=$lt_postinstall_cmds
12542
12543
@@ -16134,10 +16366,6 @@
12544
# The linker used to build libraries.
12545
LD=$lt_LD
12546
12547
-# How to create reloadable object files.
12548
-reload_flag=$lt_reload_flag
12549
-reload_cmds=$lt_reload_cmds
12550
-
12551
# Commands used to build an old-style archive.
12552
old_archive_cmds=$lt_old_archive_cmds
12553
12554
@@ -16411,7 +16639,7 @@
12555
func_dirname ()
12556
{
12557
# Extract subdirectory from the argument.
12558
- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
12559
+ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
12560
if test "X$func_dirname_result" = "X${1}"; then
12561
func_dirname_result="${3}"
12562
else
12563
@@ -16422,7 +16650,7 @@
12564
# func_basename file
12565
func_basename ()
12566
{
12567
- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
12568
+ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
12569
}
12570
12571
12572
@@ -16435,8 +16663,10 @@
12573
func_stripname ()
12574
{
12575
case ${2} in
12576
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
12577
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
12578
+ .*) func_stripname_result=`$ECHO "X${3}" \
12579
+ | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
12580
+ *) func_stripname_result=`$ECHO "X${3}" \
12581
+ | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
12582
esac
12583
}
12584
12585
@@ -16447,20 +16677,20 @@
12586
# func_opt_split
12587
func_opt_split ()
12588
{
12589
- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
12590
- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
12591
+ func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
12592
+ func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
12593
}
12594
12595
# func_lo2o object
12596
func_lo2o ()
12597
{
12598
- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
12599
+ func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
12600
}
12601
12602
# func_xform libobj-or-source
12603
func_xform ()
12604
{
12605
- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
12606
+ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
12607
}
12608
12609
# func_arith arithmetic-term...
12610
@@ -16521,10 +16751,6 @@
12611
# The linker used to build libraries.
12612
LD=$lt_LD_CXX
12613
12614
-# How to create reloadable object files.
12615
-reload_flag=$lt_reload_flag_CXX
12616
-reload_cmds=$lt_reload_cmds_CXX
12617
-
12618
# Commands used to build an old-style archive.
12619
old_archive_cmds=$lt_old_archive_cmds_CXX
12620
12621
@@ -16679,13 +16905,15 @@
12622
# appending to config.log, which fails on DOS, as config.log is still kept
12623
# open by configure. Here we exec the FD to /dev/null, effectively closing
12624
# config.log, so it can be properly (re)opened and appended to by config.lt.
12625
-lt_cl_success=:
12626
-test "$silent" = yes &&
12627
- lt_config_lt_args="$lt_config_lt_args --quiet"
12628
-exec 5>/dev/null
12629
-$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
12630
-exec 5>>config.log
12631
-$lt_cl_success || as_fn_exit 1
12632
+if test "$no_create" != yes; then
12633
+ lt_cl_success=:
12634
+ test "$silent" = yes &&
12635
+ lt_config_lt_args="$lt_config_lt_args --quiet"
12636
+ exec 5>/dev/null
12637
+ $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
12638
+ exec 5>>config.log
12639
+ $lt_cl_success || as_fn_exit 1
12640
+fi
12641
12642
12643
12644
@@ -17227,7 +17455,7 @@
12645
fi
12646
12647
if test "$WINDRES" = no; then
12648
- as_fn_error $? "*** Could not find an implementation of windres in your PATH." "$LINENO" 5
12649
+ as_fn_error "*** Could not find an implementation of windres in your PATH." "$LINENO" 5
12650
fi
12651
# Extract the first word of "lib.exe", so it can be a program name with args.
12652
set dummy lib.exe; ac_word=$2
12653
@@ -17307,6 +17535,26 @@
8631
12654
enable_xinerama="yes"
8632
12655
fi
8633
12656
8654
12677
# Check whether --enable-rebuilds was given.
8655
12678
if test "${enable_rebuilds+set}" = set; then :
8656
12679
enableval=$enable_rebuilds;
8657
@@ -18661,10 +18724,6 @@
8658
## annoying to construct
8659
8660
8661
-
8662
-
8663
-
8664
-
8665
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
8666
if test -n "$ac_tool_prefix"; then
8667
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
8668
@@ -18777,16 +18836,18 @@
8669
$as_echo "no" >&6; }
8670
PKG_CONFIG=""
12680
@@ -17345,7 +17593,7 @@
12681
12682
case $gdktarget in
12683
x11|win32|quartz|directfb) ;;
12684
- *) as_fn_error $? "Invalid target for GDK: use x11, quartz, directfb or win32." "$LINENO" 5;;
12685
+ *) as_fn_error "Invalid target for GDK: use x11, quartz, directfb or win32." "$LINENO" 5;;
12686
esac
12687
12688
gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la
12689
@@ -17390,11 +17638,11 @@
12690
'
12691
case `pwd` in
12692
*[\\\"\#\$\&\'\`$am_lf]*)
12693
- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
12694
+ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
12695
esac
12696
case $srcdir in
12697
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
12698
- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
12699
+ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
12700
esac
12701
12702
# Do `set' in a subshell so we don't clobber the current shell's
12703
@@ -17416,7 +17664,7 @@
12704
# if, for instance, CONFIG_SHELL is bash and it inherits a
12705
# broken ls alias from the environment. This has actually
12706
# happened. Such a system could not be considered "sane".
12707
- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
12708
+ as_fn_error "ls -t appears to fail. Make sure there is not a broken
12709
alias in your environment" "$LINENO" 5
12710
fi
12711
12712
@@ -17426,7 +17674,7 @@
12713
# Ok.
12714
:
12715
else
12716
- as_fn_error $? "newly created file is older than distributed files!
12717
+ as_fn_error "newly created file is older than distributed files!
12718
Check your system clock" "$LINENO" 5
12719
fi
12720
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
12721
@@ -17789,8 +18037,8 @@
12722
12723
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
12724
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
12725
-as_fn_error $? "no acceptable C compiler found in \$PATH
12726
-See \`config.log' for more details" "$LINENO" 5; }
12727
+as_fn_error "no acceptable C compiler found in \$PATH
12728
+See \`config.log' for more details." "$LINENO" 5; }
12729
12730
# Provide some information about the compiler.
12731
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
12732
@@ -18168,7 +18416,7 @@
12733
fi
12734
set dummy $CC; ac_cc=`$as_echo "$2" |
12735
sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
12736
-if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then :
12737
+if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
12738
$as_echo_n "(cached) " >&6
12739
else
12740
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12741
@@ -18290,7 +18538,7 @@
12742
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
12743
set x ${MAKE-make}
12744
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
12745
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
12746
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
12747
$as_echo_n "(cached) " >&6
12748
else
12749
cat >conftest.make <<\_ACEOF
12750
@@ -18298,7 +18546,7 @@
12751
all:
12752
@echo '@@@%%%=$(MAKE)=@@@%%%'
12753
_ACEOF
12754
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
12755
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
12756
case `${MAKE-make} -f conftest.make 2>/dev/null` in
12757
*@@@%%%=?*=@@@%%%*)
12758
eval ac_cv_prog_make_${ac_make}_set=yes;;
12759
@@ -18507,10 +18755,6 @@
8671
12760
fi
8672
+
8673
12761
fi
8674
12762
12763
-
12764
-
12765
-
12766
-
8675
12767
pkg_failed=no
8676
12768
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BASE_DEPENDENCIES" >&5
8677
12769
$as_echo_n "checking for BASE_DEPENDENCIES... " >&6; }
8678
8679
-if test -n "$BASE_DEPENDENCIES_CFLAGS"; then
8680
- pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS"
8681
- elif test -n "$PKG_CONFIG"; then
8682
- if test -n "$PKG_CONFIG" && \
8683
+if test -n "$PKG_CONFIG"; then
8684
+ if test -n "$BASE_DEPENDENCIES_CFLAGS"; then
8685
+ pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS"
8686
+ else
8687
+ if test -n "$PKG_CONFIG" && \
8688
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.25.8 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6\""; } >&5
8689
($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.25.8 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6") 2>&5
8690
ac_status=$?
8691
@@ -18796,13 +18857,15 @@
8692
else
8693
pkg_failed=yes
8694
fi
8695
- else
8696
- pkg_failed=untried
8697
+ fi
8698
+else
8699
+ pkg_failed=untried
8700
fi
8701
-if test -n "$BASE_DEPENDENCIES_LIBS"; then
8702
- pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS"
8703
- elif test -n "$PKG_CONFIG"; then
8704
- if test -n "$PKG_CONFIG" && \
8705
+if test -n "$PKG_CONFIG"; then
8706
+ if test -n "$BASE_DEPENDENCIES_LIBS"; then
8707
+ pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS"
8708
+ else
8709
+ if test -n "$PKG_CONFIG" && \
8710
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.25.8 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6\""; } >&5
8711
($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.25.8 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6") 2>&5
8712
ac_status=$?
8713
@@ -18812,15 +18875,14 @@
8714
else
8715
pkg_failed=yes
8716
fi
8717
- else
8718
- pkg_failed=untried
8719
+ fi
8720
+else
8721
+ pkg_failed=untried
8722
fi
8723
8724
8725
12770
@@ -18518,8 +18762,7 @@
12771
if test -n "$BASE_DEPENDENCIES_CFLAGS"; then
12772
pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS"
12773
elif test -n "$PKG_CONFIG"; then
12774
-
12775
-if test -n "$PKG_CONFIG" && \
12776
+ if test -n "$PKG_CONFIG" && \
12777
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0\""; } >&5
12778
($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0") 2>&5
12779
ac_status=$?
12780
@@ -18528,17 +18771,14 @@
12781
pkg_cv_BASE_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0" 2>/dev/null`
12782
else
12783
pkg_failed=yes
12784
-
12785
fi
12786
else
12787
pkg_failed=untried
12788
fi
12789
-
12790
if test -n "$BASE_DEPENDENCIES_LIBS"; then
12791
pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS"
12792
elif test -n "$PKG_CONFIG"; then
12793
-
12794
-if test -n "$PKG_CONFIG" && \
12795
+ if test -n "$PKG_CONFIG" && \
12796
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0\""; } >&5
12797
($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0") 2>&5
12798
ac_status=$?
12799
@@ -18547,7 +18787,6 @@
12800
pkg_cv_BASE_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0" 2>/dev/null`
12801
else
12802
pkg_failed=yes
12803
-
12804
fi
12805
else
12806
pkg_failed=untried
12807
@@ -18555,7 +18794,6 @@
12808
12809
12810
12811
-
8726
12812
if test $pkg_failed = yes; then
8727
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8728
-$as_echo "no" >&6; }
8729
8730
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
8731
_pkg_short_errors_supported=yes
8732
@@ -18828,9 +18890,9 @@
12813
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12814
$as_echo "no" >&6; }
12815
@@ -18565,7 +18803,6 @@
12816
else
8733
12817
_pkg_short_errors_supported=no
8734
12818
fi
12819
-
8735
12820
if test $_pkg_short_errors_supported = yes; then
8736
- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.25.8 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6" 2>&1`
8737
+ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.25.8 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6"`
12821
BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0" 2>&1`
8738
12822
else
8739
- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.25.8 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6" 2>&1`
8740
+ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.25.8 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6"`
8741
fi
12823
@@ -18574,7 +18811,7 @@
8742
12824
# Put the nasty error message in config.log where it belongs
8743
12825
echo "$BASE_DEPENDENCIES_PKG_ERRORS" >&5
8744
@@ -18844,10 +18906,9 @@
8745
12826
12827
- as_fn_error $? "Package requirements (glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0) were not met:
12828
+ as_fn_error "Package requirements (glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0) were not met:
12829
12830
$BASE_DEPENDENCIES_PKG_ERRORS
12831
12832
@@ -18584,13 +18821,12 @@
8746
12833
Alternatively, you may set the environment variables BASE_DEPENDENCIES_CFLAGS
8747
12834
and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config.
8748
-See the pkg-config man page for more details." "$LINENO" 5
8749
+See the pkg-config man page for more details.
8750
+" "$LINENO" 5
12835
See the pkg-config man page for more details." "$LINENO" 5
12836
-
8751
12837
elif test $pkg_failed = untried; then
8752
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8753
-$as_echo "no" >&6; }
12838
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12839
$as_echo "no" >&6; }
8754
12840
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
8755
12841
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
8756
as_fn_error "The pkg-config script could not be found or is too old. Make sure it
8757
@@ -18865,7 +18926,7 @@
12842
-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
12843
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
12844
is in your PATH or set the PKG_CONFIG environment variable to the full
12845
path to pkg-config.
12846
12847
@@ -18599,8 +18835,7 @@
12848
See the pkg-config man page for more details.
12849
12850
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
12851
-See \`config.log' for more details" "$LINENO" 5; }
12852
-
12853
+See \`config.log' for more details." "$LINENO" 5; }
12854
else
12855
BASE_DEPENDENCIES_CFLAGS=$pkg_cv_BASE_DEPENDENCIES_CFLAGS
8758
12856
BASE_DEPENDENCIES_LIBS=$pkg_cv_BASE_DEPENDENCIES_LIBS
8759
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
8760
$as_echo "yes" >&6; }
12857
@@ -18609,7 +18844,6 @@
12858
12859
fi
12860
8761
12861
-
8762
+ :
8763
fi
8764
8765
12862
## In addition to checking that cairo is present, we also need to
8766
@@ -18883,10 +18944,11 @@
12863
## check that the correct cairo backend is there. E.g. if the GDK
12864
## target is win32 we need the cairo-win32 backend and so on.
12865
@@ -18621,9 +18855,6 @@
12866
cairo_backend=xlib
12867
fi
12868
12869
-
12870
-
12871
-
12872
pkg_failed=no
8767
12873
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO_BACKEND" >&5
8768
12874
$as_echo_n "checking for CAIRO_BACKEND... " >&6; }
8769
8770
-if test -n "$CAIRO_BACKEND_CFLAGS"; then
8771
- pkg_cv_CAIRO_BACKEND_CFLAGS="$CAIRO_BACKEND_CFLAGS"
8772
- elif test -n "$PKG_CONFIG"; then
8773
- if test -n "$PKG_CONFIG" && \
8774
+if test -n "$PKG_CONFIG"; then
8775
+ if test -n "$CAIRO_BACKEND_CFLAGS"; then
8776
+ pkg_cv_CAIRO_BACKEND_CFLAGS="$CAIRO_BACKEND_CFLAGS"
8777
+ else
8778
+ if test -n "$PKG_CONFIG" && \
8779
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-\$cairo_backend >= 1.6\""; } >&5
8780
($PKG_CONFIG --exists --print-errors "cairo-$cairo_backend >= 1.6") 2>&5
8781
ac_status=$?
8782
@@ -18896,13 +18958,15 @@
8783
else
8784
pkg_failed=yes
8785
fi
8786
- else
8787
- pkg_failed=untried
8788
+ fi
8789
+else
8790
+ pkg_failed=untried
8791
fi
8792
-if test -n "$CAIRO_BACKEND_LIBS"; then
8793
- pkg_cv_CAIRO_BACKEND_LIBS="$CAIRO_BACKEND_LIBS"
8794
- elif test -n "$PKG_CONFIG"; then
8795
- if test -n "$PKG_CONFIG" && \
8796
+if test -n "$PKG_CONFIG"; then
8797
+ if test -n "$CAIRO_BACKEND_LIBS"; then
8798
+ pkg_cv_CAIRO_BACKEND_LIBS="$CAIRO_BACKEND_LIBS"
8799
+ else
8800
+ if test -n "$PKG_CONFIG" && \
8801
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-\$cairo_backend >= 1.6\""; } >&5
8802
($PKG_CONFIG --exists --print-errors "cairo-$cairo_backend >= 1.6") 2>&5
8803
ac_status=$?
8804
@@ -18912,15 +18976,14 @@
8805
else
8806
pkg_failed=yes
8807
fi
8808
- else
8809
- pkg_failed=untried
8810
+ fi
8811
+else
8812
+ pkg_failed=untried
8813
fi
8814
8815
8816
12875
@@ -18631,8 +18862,7 @@
12876
if test -n "$CAIRO_BACKEND_CFLAGS"; then
12877
pkg_cv_CAIRO_BACKEND_CFLAGS="$CAIRO_BACKEND_CFLAGS"
12878
elif test -n "$PKG_CONFIG"; then
12879
-
12880
-if test -n "$PKG_CONFIG" && \
12881
+ if test -n "$PKG_CONFIG" && \
12882
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-\$cairo_backend >= 1.6\""; } >&5
12883
($PKG_CONFIG --exists --print-errors "cairo-$cairo_backend >= 1.6") 2>&5
12884
ac_status=$?
12885
@@ -18641,17 +18871,14 @@
12886
pkg_cv_CAIRO_BACKEND_CFLAGS=`$PKG_CONFIG --cflags "cairo-$cairo_backend >= 1.6" 2>/dev/null`
12887
else
12888
pkg_failed=yes
12889
-
12890
fi
12891
else
12892
pkg_failed=untried
12893
fi
12894
-
12895
if test -n "$CAIRO_BACKEND_LIBS"; then
12896
pkg_cv_CAIRO_BACKEND_LIBS="$CAIRO_BACKEND_LIBS"
12897
elif test -n "$PKG_CONFIG"; then
12898
-
12899
-if test -n "$PKG_CONFIG" && \
12900
+ if test -n "$PKG_CONFIG" && \
12901
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-\$cairo_backend >= 1.6\""; } >&5
12902
($PKG_CONFIG --exists --print-errors "cairo-$cairo_backend >= 1.6") 2>&5
12903
ac_status=$?
12904
@@ -18660,7 +18887,6 @@
12905
pkg_cv_CAIRO_BACKEND_LIBS=`$PKG_CONFIG --libs "cairo-$cairo_backend >= 1.6" 2>/dev/null`
12906
else
12907
pkg_failed=yes
12908
-
12909
fi
12910
else
12911
pkg_failed=untried
12912
@@ -18668,7 +18894,6 @@
12913
12914
12915
12916
-
8817
12917
if test $pkg_failed = yes; then
8818
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8819
-$as_echo "no" >&6; }
8820
8821
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
8822
_pkg_short_errors_supported=yes
8823
@@ -18928,9 +18991,9 @@
12918
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12919
$as_echo "no" >&6; }
12920
@@ -18678,7 +18903,6 @@
12921
else
8824
12922
_pkg_short_errors_supported=no
8825
12923
fi
12924
-
8826
12925
if test $_pkg_short_errors_supported = yes; then
8827
- CAIRO_BACKEND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "cairo-$cairo_backend >= 1.6" 2>&1`
8828
+ CAIRO_BACKEND_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "cairo-$cairo_backend >= 1.6"`
12926
CAIRO_BACKEND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "cairo-$cairo_backend >= 1.6" 2>&1`
8829
12927
else
8830
- CAIRO_BACKEND_PKG_ERRORS=`$PKG_CONFIG --print-errors "cairo-$cairo_backend >= 1.6" 2>&1`
8831
+ CAIRO_BACKEND_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo-$cairo_backend >= 1.6"`
8832
fi
12928
@@ -18687,7 +18911,7 @@
8833
12929
# Put the nasty error message in config.log where it belongs
8834
12930
echo "$CAIRO_BACKEND_PKG_ERRORS" >&5
8835
@@ -18944,10 +19007,9 @@
8836
12931
12932
- as_fn_error $? "Package requirements (cairo-$cairo_backend >= 1.6) were not met:
12933
+ as_fn_error "Package requirements (cairo-$cairo_backend >= 1.6) were not met:
12934
12935
$CAIRO_BACKEND_PKG_ERRORS
12936
12937
@@ -18697,13 +18921,12 @@
8837
12938
Alternatively, you may set the environment variables CAIRO_BACKEND_CFLAGS
8838
12939
and CAIRO_BACKEND_LIBS to avoid the need to call pkg-config.
8839
-See the pkg-config man page for more details." "$LINENO" 5
8840
+See the pkg-config man page for more details.
8841
+" "$LINENO" 5
12940
See the pkg-config man page for more details." "$LINENO" 5
12941
-
8842
12942
elif test $pkg_failed = untried; then
8843
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8844
-$as_echo "no" >&6; }
12943
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12944
$as_echo "no" >&6; }
8845
12945
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
8846
12946
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
8847
as_fn_error "The pkg-config script could not be found or is too old. Make sure it
8848
@@ -18965,7 +19027,7 @@
12947
-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
12948
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
12949
is in your PATH or set the PKG_CONFIG environment variable to the full
12950
path to pkg-config.
12951
12952
@@ -18712,8 +18935,7 @@
12953
See the pkg-config man page for more details.
12954
12955
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
12956
-See \`config.log' for more details" "$LINENO" 5; }
12957
-
12958
+See \`config.log' for more details." "$LINENO" 5; }
12959
else
12960
CAIRO_BACKEND_CFLAGS=$pkg_cv_CAIRO_BACKEND_CFLAGS
8849
12961
CAIRO_BACKEND_LIBS=$pkg_cv_CAIRO_BACKEND_LIBS
8850
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
8851
$as_echo "yes" >&6; }
12962
@@ -18722,7 +18944,6 @@
12963
12964
fi
12965
8852
12966
-
8853
+ :
8854
fi
8855
8856
12967
if test "$os_win32" != yes; then
8857
@@ -20207,10 +20269,6 @@
8858
8859
8860
8861
-
8862
-
8863
-
8864
-
8865
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
8866
if test -n "$ac_tool_prefix"; then
8867
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
8868
@@ -20323,6 +20381,7 @@
8869
$as_echo "no" >&6; }
8870
PKG_CONFIG=""
12968
# libtool option to control which symbols are exported
12969
# right now, symbols starting with _ are not exported
12970
@@ -18756,7 +18977,7 @@
12971
;;
12972
yes|no)
12973
;;
12974
- *) as_fn_error $? "Value given to --enable-explicit-deps must be one of yes, no or auto" "$LINENO" 5
12975
+ *) as_fn_error "Value given to --enable-explicit-deps must be one of yes, no or auto" "$LINENO" 5
12976
;;
12977
esac
12978
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_explicit_deps" >&5
12979
@@ -18871,7 +19092,8 @@
12980
do :
12981
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
12982
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
12983
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
12984
+eval as_val=\$$as_ac_var
12985
+ if test "x$as_val" = x""yes; then :
12986
cat >>confdefs.h <<_ACEOF
12987
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
12988
_ACEOF
12989
@@ -20079,7 +20301,6 @@
8871
12990
fi
8872
+
8873
12991
fi
8874
12992
12993
-
8875
12994
no_glib=""
8876
@@ -24038,7 +24097,8 @@
12995
12996
if test "x$PKG_CONFIG" = x ; then
12997
@@ -20273,7 +20494,7 @@
12998
GLIB_GENMARSHAL=""
12999
GOBJECT_QUERY=""
13000
GLIB_MKENUMS=""
13001
- as_fn_error $? "
13002
+ as_fn_error "
13003
*** GLIB 2.25.10 or better is required. The latest version of
13004
*** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." "$LINENO" 5
13005
fi
13006
@@ -20641,7 +20862,8 @@
13007
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
13008
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
13009
"
13010
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
13011
+eval as_val=\$$as_ac_Header
13012
+ if test "x$as_val" = x""yes; then :
13013
cat >>confdefs.h <<_ACEOF
13014
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
13015
_ACEOF
13016
@@ -21240,7 +21462,7 @@
13017
if echo "$all_immodules" | egrep "(^|,)$immodule(\$|,)" > /dev/null; then
13018
:
13019
else
13020
- as_fn_error $? "the specified input method $immodule does not exist" "$LINENO" 5
13021
+ as_fn_error "the specified input method $immodule does not exist" "$LINENO" 5
13022
fi
13023
13024
INCLUDED_IMMODULE_OBJ="$INCLUDED_IMMODULE_OBJ ../modules/input/libstatic-im-$immodule.la"
13025
@@ -21667,7 +21889,7 @@
13026
13027
if test ! -f $srcdir/gtk/gtkbuiltincache.h &&
13028
test "x$REBUILD_PNGS" = "x#" ; then
13029
- as_fn_error $? "
13030
+ as_fn_error "
13031
*** gtkbuiltincache.h is not in the tree, and cannot be built
13032
*** because you don't have libpng, or (when cross-compiling) you
13033
*** don't have a prebuilt gtk-update-icon-cache on the build system." "$LINENO" 5
13034
@@ -21692,7 +21914,7 @@
13035
# settings.
13036
#
13037
if $PKG_CONFIG --exists fontconfig; then : ; else
13038
- as_fn_error $? "
13039
+ as_fn_error "
13040
*** fontconfig (http://www.fontconfig.org) is required by the X11 backend." "$LINENO" 5
13041
fi
13042
13043
@@ -21733,7 +21955,7 @@
13044
have_x=disabled
13045
else
13046
case $x_includes,$x_libraries in #(
13047
- *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
13048
+ *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #(
13049
*,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
13050
$as_echo_n "(cached) " >&6
13051
else
13052
@@ -21751,7 +21973,7 @@
13053
@echo libdir='${LIBDIR}'
13054
_ACEOF
13055
if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
13056
- # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
13057
+ # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
13058
for ac_var in incroot usrlibdir libdir; do
13059
eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
13060
done
13061
@@ -22402,7 +22624,7 @@
13062
fi
13063
13064
if test x$no_x = xyes ; then
13065
- as_fn_error $? "X development libraries not found" "$LINENO" 5
13066
+ as_fn_error "X development libraries not found" "$LINENO" 5
13067
fi
13068
13069
x_cflags="$X_CFLAGS"
13070
@@ -22427,21 +22649,21 @@
13071
if test "x$ac_cv_func_XOpenDisplay" = x""yes; then :
13072
:
13073
else
13074
- as_fn_error $? "*** libX11 not found. Check 'config.log' for more details." "$LINENO" 5
13075
+ as_fn_error "*** libX11 not found. Check 'config.log' for more details." "$LINENO" 5
13076
fi
13077
13078
ac_fn_c_check_func "$LINENO" "XextFindDisplay" "ac_cv_func_XextFindDisplay"
13079
if test "x$ac_cv_func_XextFindDisplay" = x""yes; then :
13080
:
13081
else
13082
- as_fn_error $? "*** libXext not found. Check 'config.log' for more details." "$LINENO" 5
13083
+ as_fn_error "*** libXext not found. Check 'config.log' for more details." "$LINENO" 5
13084
fi
13085
13086
ac_fn_c_check_func "$LINENO" "XRenderQueryExtension" "ac_cv_func_XRenderQueryExtension"
13087
if test "x$ac_cv_func_XRenderQueryExtension" = x""yes; then :
13088
:
13089
else
13090
- as_fn_error $? "*** libXrender not found. Check 'config.log' for more details." "$LINENO" 5
13091
+ as_fn_error "*** libXrender not found. Check 'config.log' for more details." "$LINENO" 5
13092
fi
13093
13094
13095
@@ -22485,7 +22707,7 @@
13096
else
13097
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
13098
$as_echo "unknown" >&6; }
13099
- as_fn_error $? "xReply type unavailable. X11 is too old" "$LINENO" 5
13100
+ as_fn_error "xReply type unavailable. X11 is too old" "$LINENO" 5
13101
fi
13102
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
13103
fi
13104
@@ -22497,7 +22719,8 @@
13105
do :
13106
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
13107
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
13108
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
13109
+eval as_val=\$$as_ac_var
13110
+ if test "x$as_val" = x""yes; then :
13111
cat >>confdefs.h <<_ACEOF
13112
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
13113
_ACEOF
13114
@@ -22559,7 +22782,7 @@
13115
if test "x$ac_cv_func_XShapeCombineMask" = x""yes; then :
13116
:
13117
else
13118
- as_fn_error $? "Shape extension not found, check your development headers" "$LINENO" 5
13119
+ as_fn_error "Shape extension not found, check your development headers" "$LINENO" 5
13120
fi
13121
13122
13123
@@ -22863,7 +23086,8 @@
8877
13124
8878
13125
8879
13126
# Check for the RANDR extension
8883
13130
8884
13131
$as_echo "#define HAVE_RANDR 1" >>confdefs.h
8885
13132
8886
@@ -24058,7 +24118,8 @@
13133
@@ -22883,7 +23107,8 @@
8887
13134
8888
13135
# Checks for XFixes extension
8889
13136
8893
13140
8894
13141
$as_echo "#define HAVE_XFIXES 1" >>confdefs.h
8895
13142
8896
@@ -24069,7 +24130,8 @@
13143
@@ -22894,7 +23119,8 @@
8897
13144
8898
13145
# Checks for Xcomposite extension
8899
13146
8903
13150
8904
13151
$as_echo "#define HAVE_XCOMPOSITE 1" >>confdefs.h
8905
13152
8906
@@ -24080,7 +24142,7 @@
13153
@@ -22905,7 +23131,7 @@
8907
13154
8908
13155
# Checks for Xdamage extension
8909
13156
8912
13159
8913
13160
$as_echo "#define HAVE_XDAMAGE 1" >>confdefs.h
8914
13161
8915
@@ -24196,10 +24258,11 @@
13162
@@ -23008,9 +23234,6 @@
13163
$as_echo_n "checking for DirectFB... " >&6; }
13164
13165
13166
-
13167
-
13168
-
13169
pkg_failed=no
8916
13170
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DIRECTFB" >&5
8917
13171
$as_echo_n "checking for DIRECTFB... " >&6; }
8918
8919
-if test -n "$DIRECTFB_CFLAGS"; then
8920
- pkg_cv_DIRECTFB_CFLAGS="$DIRECTFB_CFLAGS"
8921
- elif test -n "$PKG_CONFIG"; then
8922
- if test -n "$PKG_CONFIG" && \
8923
+if test -n "$PKG_CONFIG"; then
8924
+ if test -n "$DIRECTFB_CFLAGS"; then
8925
+ pkg_cv_DIRECTFB_CFLAGS="$DIRECTFB_CFLAGS"
8926
+ else
8927
+ if test -n "$PKG_CONFIG" && \
8928
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"directfb >= \$DIRECTFB_REQUIRED_VERSION\""; } >&5
8929
($PKG_CONFIG --exists --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION") 2>&5
8930
ac_status=$?
8931
@@ -24209,13 +24272,15 @@
8932
else
8933
pkg_failed=yes
8934
fi
8935
- else
8936
- pkg_failed=untried
8937
+ fi
8938
+else
8939
+ pkg_failed=untried
8940
fi
8941
-if test -n "$DIRECTFB_LIBS"; then
8942
- pkg_cv_DIRECTFB_LIBS="$DIRECTFB_LIBS"
8943
- elif test -n "$PKG_CONFIG"; then
8944
- if test -n "$PKG_CONFIG" && \
8945
+if test -n "$PKG_CONFIG"; then
8946
+ if test -n "$DIRECTFB_LIBS"; then
8947
+ pkg_cv_DIRECTFB_LIBS="$DIRECTFB_LIBS"
8948
+ else
8949
+ if test -n "$PKG_CONFIG" && \
8950
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"directfb >= \$DIRECTFB_REQUIRED_VERSION\""; } >&5
8951
($PKG_CONFIG --exists --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION") 2>&5
8952
ac_status=$?
8953
@@ -24225,15 +24290,14 @@
8954
else
8955
pkg_failed=yes
8956
fi
8957
- else
8958
- pkg_failed=untried
8959
+ fi
8960
+else
8961
+ pkg_failed=untried
8962
fi
8963
8964
8965
13172
@@ -23018,8 +23241,7 @@
13173
if test -n "$DIRECTFB_CFLAGS"; then
13174
pkg_cv_DIRECTFB_CFLAGS="$DIRECTFB_CFLAGS"
13175
elif test -n "$PKG_CONFIG"; then
13176
-
13177
-if test -n "$PKG_CONFIG" && \
13178
+ if test -n "$PKG_CONFIG" && \
13179
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"directfb >= \$DIRECTFB_REQUIRED_VERSION\""; } >&5
13180
($PKG_CONFIG --exists --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION") 2>&5
13181
ac_status=$?
13182
@@ -23028,17 +23250,14 @@
13183
pkg_cv_DIRECTFB_CFLAGS=`$PKG_CONFIG --cflags "directfb >= $DIRECTFB_REQUIRED_VERSION" 2>/dev/null`
13184
else
13185
pkg_failed=yes
13186
-
13187
fi
13188
else
13189
pkg_failed=untried
13190
fi
13191
-
13192
if test -n "$DIRECTFB_LIBS"; then
13193
pkg_cv_DIRECTFB_LIBS="$DIRECTFB_LIBS"
13194
elif test -n "$PKG_CONFIG"; then
13195
-
13196
-if test -n "$PKG_CONFIG" && \
13197
+ if test -n "$PKG_CONFIG" && \
13198
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"directfb >= \$DIRECTFB_REQUIRED_VERSION\""; } >&5
13199
($PKG_CONFIG --exists --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION") 2>&5
13200
ac_status=$?
13201
@@ -23047,7 +23266,6 @@
13202
pkg_cv_DIRECTFB_LIBS=`$PKG_CONFIG --libs "directfb >= $DIRECTFB_REQUIRED_VERSION" 2>/dev/null`
13203
else
13204
pkg_failed=yes
13205
-
13206
fi
13207
else
13208
pkg_failed=untried
13209
@@ -23055,7 +23273,6 @@
13210
13211
13212
13213
-
8966
13214
if test $pkg_failed = yes; then
8967
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8968
-$as_echo "no" >&6; }
8969
8970
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
8971
_pkg_short_errors_supported=yes
8972
@@ -24241,9 +24305,9 @@
13215
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13216
$as_echo "no" >&6; }
13217
@@ -23065,7 +23282,6 @@
13218
else
8973
13219
_pkg_short_errors_supported=no
8974
13220
fi
13221
-
8975
13222
if test $_pkg_short_errors_supported = yes; then
8976
- DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION" 2>&1`
8977
+ DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION"`
13223
DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION" 2>&1`
8978
13224
else
8979
- DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION" 2>&1`
8980
+ DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION"`
8981
fi
13225
@@ -23074,7 +23290,7 @@
8982
13226
# Put the nasty error message in config.log where it belongs
8983
13227
echo "$DIRECTFB_PKG_ERRORS" >&5
8984
@@ -24257,10 +24321,9 @@
8985
13228
13229
- as_fn_error $? "Package requirements (directfb >= $DIRECTFB_REQUIRED_VERSION) were not met:
13230
+ as_fn_error "Package requirements (directfb >= $DIRECTFB_REQUIRED_VERSION) were not met:
13231
13232
$DIRECTFB_PKG_ERRORS
13233
13234
@@ -23084,13 +23300,12 @@
8986
13235
Alternatively, you may set the environment variables DIRECTFB_CFLAGS
8987
13236
and DIRECTFB_LIBS to avoid the need to call pkg-config.
8988
-See the pkg-config man page for more details." "$LINENO" 5
8989
+See the pkg-config man page for more details.
8990
+" "$LINENO" 5
13237
See the pkg-config man page for more details." "$LINENO" 5
13238
-
8991
13239
elif test $pkg_failed = untried; then
8992
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8993
-$as_echo "no" >&6; }
13240
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13241
$as_echo "no" >&6; }
8994
13242
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
8995
13243
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
8996
as_fn_error "The pkg-config script could not be found or is too old. Make sure it
8997
@@ -24278,7 +24341,7 @@
13244
-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
13245
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
13246
is in your PATH or set the PKG_CONFIG environment variable to the full
13247
path to pkg-config.
13248
13249
@@ -23099,8 +23314,7 @@
13250
See the pkg-config man page for more details.
13251
13252
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
13253
-See \`config.log' for more details" "$LINENO" 5; }
13254
-
13255
+See \`config.log' for more details." "$LINENO" 5; }
13256
else
13257
DIRECTFB_CFLAGS=$pkg_cv_DIRECTFB_CFLAGS
8998
13258
DIRECTFB_LIBS=$pkg_cv_DIRECTFB_LIBS
8999
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
13259
@@ -23108,7 +23322,6 @@
9000
13260
$as_echo "yes" >&6; }
13261
13262
fi
9001
13263
-
9002
+ :
9003
fi
9004
13264
if true; then
9005
13265
USE_DIRECTFB_TRUE=
9006
@@ -24365,20 +24428,23 @@
13266
USE_DIRECTFB_FALSE='#'
13267
@@ -23146,7 +23359,7 @@
13268
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PANGO_CFLAGS $PANGO_LIBS" >&5
13269
$as_echo "$PANGO_CFLAGS $PANGO_LIBS" >&6; }
13270
else
13271
- as_fn_error $? "
13272
+ as_fn_error "
13273
*** Pango not found. Pango built with Cairo support is required
13274
*** to build GTK+. See http://www.pango.org for Pango information.
13275
" "$LINENO" 5
13276
@@ -23180,7 +23393,7 @@
13277
if ac_fn_c_try_link "$LINENO"; then :
13278
:
13279
else
13280
- as_fn_error $? "
13281
+ as_fn_error "
13282
*** Can't link to Pango. Pango is required to build
13283
*** GTK+. For more information see http://www.pango.org" "$LINENO" 5
13284
fi
13285
@@ -23194,20 +23407,23 @@
9007
13286
9008
13287
# Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c
9009
13288
if test "x$gdktarget" = "xx11"; then
9010
- GDK_PACKAGES="$PANGO_PACKAGES gio-unix-2.0 $X_PACKAGES cairo-$cairo_backend"
9011
+ GDK_PACKAGES="$PANGO_PACKAGES"
13289
- GDK_PACKAGES="$PANGO_PACKAGES gio-unix-2.0 $X_PACKAGES gdk-pixbuf-2.0 cairo-$cairo_backend"
13290
+ GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0"
9012
13291
+ GDK_PRIVATE_PACKAGES="gio-unix-2.0 $X_PACKAGES cairo-$cairo_backend"
9013
13292
else
9014
- GDK_PACKAGES="$PANGO_PACKAGES $X_PACKAGES cairo-$cairo_backend"
9015
+ GDK_PACKAGES="$PANGO_PACKAGES"
9016
+ GDK_PRIVATE_PACKAGES="$X_PACKAGES cairo-$cairo_backend"
13293
- GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 gdk-pixbuf-2.0 cairo-$cairo_backend"
13294
+ GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0"
13295
+ GDK_PRIVATE_PACKAGES="gio-2.0 cairo-$cairo_backend"
9017
13296
fi
9018
13297
9019
-GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
9020
-GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
9021
+GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
9022
+GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
13298
-GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES`"
13299
-GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PACKAGES` $GDK_EXTRA_CFLAGS"
13300
+GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES $GDK_PRIVATE_PACKAGES`"
13301
+GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_EXTRA_CFLAGS"
9023
13302
#
9024
13303
# If we aren't writing explicit dependencies, then don't put the extra libraries we need
9025
13304
# into the pkg-config files
9026
13305
#
9027
13306
if test $enable_explicit_deps != yes ; then
9028
- GDK_PACKAGES="$PANGO_PACKAGES"
13307
- GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0"
9029
13308
GDK_EXTRA_LIBS=
9030
13309
+else
9031
13310
+ GDK_PACKAGES="$GDK_PACKAGES $GDK_PRIVATE_PACKAGES"
9032
13311
fi
9033
13312
9034
13313
9035
@@ -24388,6 +24454,7 @@
13314
@@ -23217,6 +23433,7 @@
9036
13315
9037
13316
9038
13317
9040
13319
########################################
9041
13320
# Check for Accessibility Toolkit flags
9042
13321
########################################
9043
@@ -24462,7 +24529,7 @@
9044
CAIRO_PREFIX="`pkg-config --variable=prefix cairo`"
9045
9046
if test $enable_explicit_deps != yes ; then
9047
- GDK_PIXBUF_EXTRA_LIBS=
9048
+ GDK_PIXBUF_EXTRA_LIBS="$MATH_LIB"
9049
fi
9050
9051
9052
@@ -25693,6 +25760,10 @@
9053
as_fn_error "conditional \"am__fastdepCC\" was never defined.
13322
@@ -23231,7 +23448,7 @@
13323
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ATK_CFLAGS $ATK_LIBS" >&5
13324
$as_echo "$ATK_CFLAGS $ATK_LIBS" >&6; }
13325
else
13326
- as_fn_error $? "
13327
+ as_fn_error "
13328
*** Accessibility Toolkit not found. Accessibility Toolkit is required
13329
*** to build GTK+.
13330
" "$LINENO" 5
13331
@@ -23263,7 +23480,7 @@
13332
if ac_fn_c_try_link "$LINENO"; then :
13333
:
13334
else
13335
- as_fn_error $? "
13336
+ as_fn_error "
13337
*** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required
13338
*** to build GTK+" "$LINENO" 5
13339
fi
13340
@@ -23582,7 +23799,7 @@
13341
fi
13342
13343
else
13344
- as_fn_error $? "
13345
+ as_fn_error "
13346
*** cups not found.
13347
" "$LINENO" 5
13348
fi
13349
@@ -23610,7 +23827,7 @@
13350
if test "x$ac_cv_header_cups_cups_h" = x""yes; then :
13351
13352
else
13353
- as_fn_error $? "*** Sorry, cups-config present but cups/cups.h missing." "$LINENO" 5
13354
+ as_fn_error "*** Sorry, cups-config present but cups/cups.h missing." "$LINENO" 5
13355
fi
13356
13357
13358
@@ -23743,7 +23960,7 @@
13359
fi
13360
13361
if test "x$enable_papi" = "xyes" -a "x$have_papi" = "xno"; then
13362
- as_fn_error $? "
13363
+ as_fn_error "
13364
*** papi not found.
13365
" "$LINENO" 5
13366
fi
13367
@@ -23765,7 +23982,7 @@
13368
if test "x$ac_cv_header_cairo_pdf_h" = x""yes; then :
13369
13370
else
13371
- as_fn_error $? "
13372
+ as_fn_error "
13373
*** Can't find cairo-pdf.h. You must build Cairo with the pdf
13374
*** backend enabled." "$LINENO" 5
13375
fi
13376
@@ -23777,7 +23994,7 @@
13377
if test "x$ac_cv_header_cairo_ps_h" = x""yes; then :
13378
13379
else
13380
- as_fn_error $? "
13381
+ as_fn_error "
13382
*** Can't find cairo-ps.h. You must build Cairo with the
13383
*** postscript backend enabled." "$LINENO" 5
13384
fi
13385
@@ -23788,7 +24005,7 @@
13386
if test "x$ac_cv_header_cairo_svg_h" = x""yes; then :
13387
13388
else
13389
- as_fn_error $? "
13390
+ as_fn_error "
13391
*** Can't find cairo-svg.h. You must build Cairo with the
13392
*** svg backend enabled." "$LINENO" 5
13393
fi
13394
@@ -23859,8 +24076,7 @@
13395
found_introspection="no (disabled, use --enable-introspection to enable)"
13396
;; #(
13397
yes) :
13398
-
13399
-if test -n "$PKG_CONFIG" && \
13400
+ if test -n "$PKG_CONFIG" && \
13401
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0\""; } >&5
13402
($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0") 2>&5
13403
ac_status=$?
13404
@@ -23868,11 +24084,9 @@
13405
test $ac_status = 0; }; then
13406
:
13407
else
13408
- as_fn_error $? "gobject-introspection-1.0 is not installed" "$LINENO" 5
13409
-
13410
+ as_fn_error "gobject-introspection-1.0 is not installed" "$LINENO" 5
13411
fi
13412
-
13413
-if test -n "$PKG_CONFIG" && \
13414
+ if test -n "$PKG_CONFIG" && \
13415
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.6.7\""; } >&5
13416
($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.6.7") 2>&5
13417
ac_status=$?
13418
@@ -23880,13 +24094,11 @@
13419
test $ac_status = 0; }; then
13420
found_introspection=yes
13421
else
13422
- as_fn_error $? "You need to have gobject-introspection >= 0.6.7 installed to build gtk+" "$LINENO" 5
13423
-
13424
+ as_fn_error "You need to have gobject-introspection >= 0.6.7 installed to build gtk+" "$LINENO" 5
13425
fi
13426
;; #(
13427
auto) :
13428
-
13429
-if test -n "$PKG_CONFIG" && \
13430
+ if test -n "$PKG_CONFIG" && \
13431
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.6.7\""; } >&5
13432
($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.6.7") 2>&5
13433
ac_status=$?
13434
@@ -23895,11 +24107,10 @@
13435
found_introspection=yes
13436
else
13437
found_introspection=no
13438
-
13439
fi
13440
;; #(
13441
*) :
13442
- as_fn_error $? "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5
13443
+ as_fn_error "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5
13444
;;
13445
esac
13446
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5
13447
@@ -24095,8 +24306,7 @@
13448
13449
13450
if test x$enable_gtk_doc = xyes; then
13451
-
13452
-if test -n "$PKG_CONFIG" && \
13453
+ if test -n "$PKG_CONFIG" && \
13454
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.11\""; } >&5
13455
($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.11") 2>&5
13456
ac_status=$?
13457
@@ -24104,8 +24314,7 @@
13458
test $ac_status = 0; }; then
13459
:
13460
else
13461
- as_fn_error $? "You need to have gtk-doc >= 1.11 installed to build $PACKAGE_NAME" "$LINENO" 5
13462
-
13463
+ as_fn_error "You need to have gtk-doc >= 1.11 installed to build $PACKAGE_NAME" "$LINENO" 5
13464
fi
13465
fi
13466
13467
@@ -24491,7 +24700,6 @@
13468
13469
ac_libobjs=
13470
ac_ltlibobjs=
13471
-U=
13472
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
13473
# 1. Remove the extension, and $U if already installed.
13474
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
13475
@@ -24515,235 +24723,243 @@
13476
fi
13477
13478
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
13479
- as_fn_error $? "conditional \"AMDEP\" was never defined.
13480
+ as_fn_error "conditional \"AMDEP\" was never defined.
9054
13481
Usually this means the macro was only invoked conditionally." "$LINENO" 5
9055
13482
fi
13483
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
13484
- as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
13485
+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
13486
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
13487
+fi
9056
13488
+if test -z "${ENABLE_STATIC_TRUE}" && test -z "${ENABLE_STATIC_FALSE}"; then
9057
13489
+ as_fn_error "conditional \"ENABLE_STATIC\" was never defined.
9058
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
9059
+fi
13490
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13491
fi
9060
13492
if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
9061
as_fn_error "conditional \"am__fastdepCXX\" was never defined.
9062
Usually this means the macro was only invoked conditionally." "$LINENO" 5
9063
diff -Nur gtk+2.0-2.21.2/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.21.2.ubuntu/contrib/gdk-pixbuf-xlib/Makefile.in
9064
--- gtk+2.0-2.21.2/contrib/gdk-pixbuf-xlib/Makefile.in 2010-06-10 19:18:21.000000000 +0200
9065
+++ gtk+2.0-2.21.2.ubuntu/contrib/gdk-pixbuf-xlib/Makefile.in 2010-06-11 12:15:20.000000000 +0200
9066
@@ -45,7 +45,10 @@
9067
subdir = contrib/gdk-pixbuf-xlib
9068
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9069
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
9070
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9071
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
9072
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
9073
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
9074
+ $(top_srcdir)/configure.in
9075
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9076
$(ACLOCAL_M4)
9077
mkinstalldirs = $(install_sh) -d
9078
@@ -198,6 +201,7 @@
9079
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
9080
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
9081
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
9082
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
9083
GDK_WLIBS = @GDK_WLIBS@
9084
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
9085
GLIB_CFLAGS = @GLIB_CFLAGS@
9086
@@ -290,8 +294,6 @@
9087
PATH_SEPARATOR = @PATH_SEPARATOR@
9088
PERL = @PERL@
9089
PKG_CONFIG = @PKG_CONFIG@
9090
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
9091
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
9092
POFILES = @POFILES@
9093
POSUB = @POSUB@
9094
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
9095
diff -Nur gtk+2.0-2.21.2/contrib/Makefile.in gtk+2.0-2.21.2.ubuntu/contrib/Makefile.in
9096
--- gtk+2.0-2.21.2/contrib/Makefile.in 2010-06-10 19:18:21.000000000 +0200
9097
+++ gtk+2.0-2.21.2.ubuntu/contrib/Makefile.in 2010-06-11 12:15:20.000000000 +0200
9098
@@ -41,7 +41,10 @@
9099
subdir = contrib
9100
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9101
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
9102
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9103
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
9104
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
9105
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
9106
+ $(top_srcdir)/configure.in
9107
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9108
$(ACLOCAL_M4)
9109
mkinstalldirs = $(install_sh) -d
9110
@@ -171,6 +174,7 @@
9111
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
9112
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
9113
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
9114
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
9115
GDK_WLIBS = @GDK_WLIBS@
9116
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
9117
GLIB_CFLAGS = @GLIB_CFLAGS@
9118
@@ -263,8 +267,6 @@
9119
PATH_SEPARATOR = @PATH_SEPARATOR@
9120
PERL = @PERL@
9121
PKG_CONFIG = @PKG_CONFIG@
9122
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
9123
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
9124
POFILES = @POFILES@
9125
POSUB = @POSUB@
9126
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
9127
diff -Nur gtk+2.0-2.21.2/demos/gtk-demo/Makefile.in gtk+2.0-2.21.2.ubuntu/demos/gtk-demo/Makefile.in
9128
--- gtk+2.0-2.21.2/demos/gtk-demo/Makefile.in 2010-06-10 19:18:21.000000000 +0200
9129
+++ gtk+2.0-2.21.2.ubuntu/demos/gtk-demo/Makefile.in 2010-06-11 12:15:20.000000000 +0200
9130
@@ -43,7 +43,10 @@
13493
- as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
13494
+ as_fn_error "conditional \"am__fastdepCXX\" was never defined.
13495
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13496
fi
13497
if test -z "${HAVE_CXX_TRUE}" && test -z "${HAVE_CXX_FALSE}"; then
13498
- as_fn_error $? "conditional \"HAVE_CXX\" was never defined.
13499
+ as_fn_error "conditional \"HAVE_CXX\" was never defined.
13500
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13501
fi
13502
if test -z "${HAVE_OBJC_TRUE}" && test -z "${HAVE_OBJC_FALSE}"; then
13503
- as_fn_error $? "conditional \"HAVE_OBJC\" was never defined.
13504
+ as_fn_error "conditional \"HAVE_OBJC\" was never defined.
13505
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
13506
+fi
13507
+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
13508
+ as_fn_error "conditional \"am__fastdepCXX\" was never defined.
13509
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13510
fi
13511
if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then
13512
- as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined.
13513
+ as_fn_error "conditional \"am__fastdepCCAS\" was never defined.
13514
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13515
fi
13516
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
13517
- as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
13518
+ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
13519
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13520
fi
13521
if test -z "${PLATFORM_WIN32_TRUE}" && test -z "${PLATFORM_WIN32_FALSE}"; then
13522
- as_fn_error $? "conditional \"PLATFORM_WIN32\" was never defined.
13523
+ as_fn_error "conditional \"PLATFORM_WIN32\" was never defined.
13524
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13525
fi
13526
if test -z "${OS_WIN32_TRUE}" && test -z "${OS_WIN32_FALSE}"; then
13527
- as_fn_error $? "conditional \"OS_WIN32\" was never defined.
13528
+ as_fn_error "conditional \"OS_WIN32\" was never defined.
13529
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13530
fi
13531
if test -z "${OS_UNIX_TRUE}" && test -z "${OS_UNIX_FALSE}"; then
13532
- as_fn_error $? "conditional \"OS_UNIX\" was never defined.
13533
+ as_fn_error "conditional \"OS_UNIX\" was never defined.
13534
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13535
fi
13536
if test -z "${OS_LINUX_TRUE}" && test -z "${OS_LINUX_FALSE}"; then
13537
- as_fn_error $? "conditional \"OS_LINUX\" was never defined.
13538
+ as_fn_error "conditional \"OS_LINUX\" was never defined.
13539
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13540
fi
13541
if test -z "${MS_LIB_AVAILABLE_TRUE}" && test -z "${MS_LIB_AVAILABLE_FALSE}"; then
13542
- as_fn_error $? "conditional \"MS_LIB_AVAILABLE\" was never defined.
13543
+ as_fn_error "conditional \"MS_LIB_AVAILABLE\" was never defined.
13544
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13545
fi
13546
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
13547
- as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
13548
+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
13549
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13550
fi
13551
if test -z "${DISABLE_EXPLICIT_DEPS_TRUE}" && test -z "${DISABLE_EXPLICIT_DEPS_FALSE}"; then
13552
- as_fn_error $? "conditional \"DISABLE_EXPLICIT_DEPS\" was never defined.
13553
+ as_fn_error "conditional \"DISABLE_EXPLICIT_DEPS\" was never defined.
13554
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13555
fi
13556
if test -z "${BUILD_DYNAMIC_MODULES_TRUE}" && test -z "${BUILD_DYNAMIC_MODULES_FALSE}"; then
13557
- as_fn_error $? "conditional \"BUILD_DYNAMIC_MODULES\" was never defined.
13558
+ as_fn_error "conditional \"BUILD_DYNAMIC_MODULES\" was never defined.
13559
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13560
fi
13561
if test -z "${HAVE_INCLUDED_IMMMODULES_TRUE}" && test -z "${HAVE_INCLUDED_IMMMODULES_FALSE}"; then
13562
- as_fn_error $? "conditional \"HAVE_INCLUDED_IMMMODULES\" was never defined.
13563
+ as_fn_error "conditional \"HAVE_INCLUDED_IMMMODULES\" was never defined.
13564
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13565
fi
13566
if test -z "${INCLUDE_IM_AM_ET_TRUE}" && test -z "${INCLUDE_IM_AM_ET_FALSE}"; then
13567
- as_fn_error $? "conditional \"INCLUDE_IM_AM_ET\" was never defined.
13568
+ as_fn_error "conditional \"INCLUDE_IM_AM_ET\" was never defined.
13569
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13570
fi
13571
if test -z "${INCLUDE_IM_CEDILLA_TRUE}" && test -z "${INCLUDE_IM_CEDILLA_FALSE}"; then
13572
- as_fn_error $? "conditional \"INCLUDE_IM_CEDILLA\" was never defined.
13573
+ as_fn_error "conditional \"INCLUDE_IM_CEDILLA\" was never defined.
13574
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13575
fi
13576
if test -z "${INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE}" && test -z "${INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE}"; then
13577
- as_fn_error $? "conditional \"INCLUDE_IM_CYRILLIC_TRANSLIT\" was never defined.
13578
+ as_fn_error "conditional \"INCLUDE_IM_CYRILLIC_TRANSLIT\" was never defined.
13579
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13580
fi
13581
if test -z "${INCLUDE_IM_IME_TRUE}" && test -z "${INCLUDE_IM_IME_FALSE}"; then
13582
- as_fn_error $? "conditional \"INCLUDE_IM_IME\" was never defined.
13583
+ as_fn_error "conditional \"INCLUDE_IM_IME\" was never defined.
13584
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13585
fi
13586
if test -z "${INCLUDE_IM_INUKTITUT_TRUE}" && test -z "${INCLUDE_IM_INUKTITUT_FALSE}"; then
13587
- as_fn_error $? "conditional \"INCLUDE_IM_INUKTITUT\" was never defined.
13588
+ as_fn_error "conditional \"INCLUDE_IM_INUKTITUT\" was never defined.
13589
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13590
fi
13591
if test -z "${INCLUDE_IM_IPA_TRUE}" && test -z "${INCLUDE_IM_IPA_FALSE}"; then
13592
- as_fn_error $? "conditional \"INCLUDE_IM_IPA\" was never defined.
13593
+ as_fn_error "conditional \"INCLUDE_IM_IPA\" was never defined.
13594
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13595
fi
13596
if test -z "${INCLUDE_IM_MULTIPRESS_TRUE}" && test -z "${INCLUDE_IM_MULTIPRESS_FALSE}"; then
13597
- as_fn_error $? "conditional \"INCLUDE_IM_MULTIPRESS\" was never defined.
13598
+ as_fn_error "conditional \"INCLUDE_IM_MULTIPRESS\" was never defined.
13599
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13600
fi
13601
if test -z "${INCLUDE_IM_THAI_TRUE}" && test -z "${INCLUDE_IM_THAI_FALSE}"; then
13602
- as_fn_error $? "conditional \"INCLUDE_IM_THAI\" was never defined.
13603
+ as_fn_error "conditional \"INCLUDE_IM_THAI\" was never defined.
13604
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13605
fi
13606
if test -z "${INCLUDE_IM_TI_ER_TRUE}" && test -z "${INCLUDE_IM_TI_ER_FALSE}"; then
13607
- as_fn_error $? "conditional \"INCLUDE_IM_TI_ER\" was never defined.
13608
+ as_fn_error "conditional \"INCLUDE_IM_TI_ER\" was never defined.
13609
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13610
fi
13611
if test -z "${INCLUDE_IM_TI_ET_TRUE}" && test -z "${INCLUDE_IM_TI_ET_FALSE}"; then
13612
- as_fn_error $? "conditional \"INCLUDE_IM_TI_ET\" was never defined.
13613
+ as_fn_error "conditional \"INCLUDE_IM_TI_ET\" was never defined.
13614
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13615
fi
13616
if test -z "${INCLUDE_IM_VIQR_TRUE}" && test -z "${INCLUDE_IM_VIQR_FALSE}"; then
13617
- as_fn_error $? "conditional \"INCLUDE_IM_VIQR\" was never defined.
13618
+ as_fn_error "conditional \"INCLUDE_IM_VIQR\" was never defined.
13619
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13620
fi
13621
if test -z "${INCLUDE_IM_XIM_TRUE}" && test -z "${INCLUDE_IM_XIM_FALSE}"; then
13622
- as_fn_error $? "conditional \"INCLUDE_IM_XIM\" was never defined.
13623
+ as_fn_error "conditional \"INCLUDE_IM_XIM\" was never defined.
13624
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13625
fi
13626
if test -z "${USE_MEDIALIB_TRUE}" && test -z "${USE_MEDIALIB_FALSE}"; then
13627
- as_fn_error $? "conditional \"USE_MEDIALIB\" was never defined.
13628
+ as_fn_error "conditional \"USE_MEDIALIB\" was never defined.
13629
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13630
fi
13631
if test -z "${USE_MEDIALIB25_TRUE}" && test -z "${USE_MEDIALIB25_FALSE}"; then
13632
- as_fn_error $? "conditional \"USE_MEDIALIB25\" was never defined.
13633
+ as_fn_error "conditional \"USE_MEDIALIB25\" was never defined.
13634
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13635
fi
13636
if test -z "${CROSS_COMPILING_TRUE}" && test -z "${CROSS_COMPILING_FALSE}"; then
13637
- as_fn_error $? "conditional \"CROSS_COMPILING\" was never defined.
13638
+ as_fn_error "conditional \"CROSS_COMPILING\" was never defined.
13639
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13640
fi
13641
if test -z "${HAVE_X11R6_TRUE}" && test -z "${HAVE_X11R6_FALSE}"; then
13642
- as_fn_error $? "conditional \"HAVE_X11R6\" was never defined.
13643
+ as_fn_error "conditional \"HAVE_X11R6\" was never defined.
13644
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13645
fi
13646
if test -z "${XINPUT_XFREE_TRUE}" && test -z "${XINPUT_XFREE_FALSE}"; then
13647
- as_fn_error $? "conditional \"XINPUT_XFREE\" was never defined.
13648
+ as_fn_error "conditional \"XINPUT_XFREE\" was never defined.
13649
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13650
fi
13651
if test -z "${USE_X11_TRUE}" && test -z "${USE_X11_FALSE}"; then
13652
- as_fn_error $? "conditional \"USE_X11\" was never defined.
13653
+ as_fn_error "conditional \"USE_X11\" was never defined.
13654
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13655
fi
13656
if test -z "${XINPUT_XFREE_TRUE}" && test -z "${XINPUT_XFREE_FALSE}"; then
13657
- as_fn_error $? "conditional \"XINPUT_XFREE\" was never defined.
13658
+ as_fn_error "conditional \"XINPUT_XFREE\" was never defined.
13659
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13660
fi
13661
if test -z "${USE_X11_TRUE}" && test -z "${USE_X11_FALSE}"; then
13662
- as_fn_error $? "conditional \"USE_X11\" was never defined.
13663
+ as_fn_error "conditional \"USE_X11\" was never defined.
13664
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13665
fi
13666
if test -z "${HAVE_X11R6_TRUE}" && test -z "${HAVE_X11R6_FALSE}"; then
13667
- as_fn_error $? "conditional \"HAVE_X11R6\" was never defined.
13668
+ as_fn_error "conditional \"HAVE_X11R6\" was never defined.
13669
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13670
fi
13671
if test -z "${USE_WIN32_TRUE}" && test -z "${USE_WIN32_FALSE}"; then
13672
- as_fn_error $? "conditional \"USE_WIN32\" was never defined.
13673
+ as_fn_error "conditional \"USE_WIN32\" was never defined.
13674
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13675
fi
13676
if test -z "${USE_WIN32_TRUE}" && test -z "${USE_WIN32_FALSE}"; then
13677
- as_fn_error $? "conditional \"USE_WIN32\" was never defined.
13678
+ as_fn_error "conditional \"USE_WIN32\" was never defined.
13679
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13680
fi
13681
if test -z "${USE_QUARTZ_TRUE}" && test -z "${USE_QUARTZ_FALSE}"; then
13682
- as_fn_error $? "conditional \"USE_QUARTZ\" was never defined.
13683
+ as_fn_error "conditional \"USE_QUARTZ\" was never defined.
13684
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13685
fi
13686
if test -z "${USE_QUARTZ_TRUE}" && test -z "${USE_QUARTZ_FALSE}"; then
13687
- as_fn_error $? "conditional \"USE_QUARTZ\" was never defined.
13688
+ as_fn_error "conditional \"USE_QUARTZ\" was never defined.
13689
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13690
fi
13691
if test -z "${USE_DIRECTFB_TRUE}" && test -z "${USE_DIRECTFB_FALSE}"; then
13692
- as_fn_error $? "conditional \"USE_DIRECTFB\" was never defined.
13693
+ as_fn_error "conditional \"USE_DIRECTFB\" was never defined.
13694
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13695
fi
13696
if test -z "${USE_DIRECTFB_TRUE}" && test -z "${USE_DIRECTFB_FALSE}"; then
13697
- as_fn_error $? "conditional \"USE_DIRECTFB\" was never defined.
13698
+ as_fn_error "conditional \"USE_DIRECTFB\" was never defined.
13699
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13700
fi
13701
if test -z "${HAVE_CUPS_TRUE}" && test -z "${HAVE_CUPS_FALSE}"; then
13702
- as_fn_error $? "conditional \"HAVE_CUPS\" was never defined.
13703
+ as_fn_error "conditional \"HAVE_CUPS\" was never defined.
13704
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13705
fi
13706
if test -z "${HAVE_CUPS_TRUE}" && test -z "${HAVE_CUPS_FALSE}"; then
13707
- as_fn_error $? "conditional \"HAVE_CUPS\" was never defined.
13708
+ as_fn_error "conditional \"HAVE_CUPS\" was never defined.
13709
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13710
fi
13711
if test -z "${HAVE_CUPS_TRUE}" && test -z "${HAVE_CUPS_FALSE}"; then
13712
- as_fn_error $? "conditional \"HAVE_CUPS\" was never defined.
13713
+ as_fn_error "conditional \"HAVE_CUPS\" was never defined.
13714
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13715
fi
13716
if test -z "${HAVE_PAPI_TRUE}" && test -z "${HAVE_PAPI_FALSE}"; then
13717
- as_fn_error $? "conditional \"HAVE_PAPI\" was never defined.
13718
+ as_fn_error "conditional \"HAVE_PAPI\" was never defined.
13719
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13720
fi
13721
if test -z "${HAVE_PAPI_TRUE}" && test -z "${HAVE_PAPI_FALSE}"; then
13722
- as_fn_error $? "conditional \"HAVE_PAPI\" was never defined.
13723
+ as_fn_error "conditional \"HAVE_PAPI\" was never defined.
13724
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13725
fi
13726
if test -z "${HAVE_PAPI_CUPS_TRUE}" && test -z "${HAVE_PAPI_CUPS_FALSE}"; then
13727
- as_fn_error $? "conditional \"HAVE_PAPI_CUPS\" was never defined.
13728
+ as_fn_error "conditional \"HAVE_PAPI_CUPS\" was never defined.
13729
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13730
fi
13731
if test -z "${TEST_PRINT_BACKEND_TRUE}" && test -z "${TEST_PRINT_BACKEND_FALSE}"; then
13732
- as_fn_error $? "conditional \"TEST_PRINT_BACKEND\" was never defined.
13733
+ as_fn_error "conditional \"TEST_PRINT_BACKEND\" was never defined.
13734
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13735
fi
13736
if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then
13737
- as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined.
13738
+ as_fn_error "conditional \"HAVE_INTROSPECTION\" was never defined.
13739
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13740
fi
13741
if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
13742
- as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined.
13743
+ as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
13744
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13745
fi
13746
if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then
13747
- as_fn_error $? "conditional \"GTK_DOC_BUILD_HTML\" was never defined.
13748
+ as_fn_error "conditional \"GTK_DOC_BUILD_HTML\" was never defined.
13749
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13750
fi
13751
if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then
13752
- as_fn_error $? "conditional \"GTK_DOC_BUILD_PDF\" was never defined.
13753
+ as_fn_error "conditional \"GTK_DOC_BUILD_PDF\" was never defined.
13754
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13755
fi
13756
if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
13757
- as_fn_error $? "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
13758
+ as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
13759
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13760
fi
13761
if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then
13762
- as_fn_error $? "conditional \"GTK_DOC_USE_REBASE\" was never defined.
13763
+ as_fn_error "conditional \"GTK_DOC_USE_REBASE\" was never defined.
13764
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13765
fi
13766
if test -z "${HAVE_DOCBOOK_TRUE}" && test -z "${HAVE_DOCBOOK_FALSE}"; then
13767
- as_fn_error $? "conditional \"HAVE_DOCBOOK\" was never defined.
13768
+ as_fn_error "conditional \"HAVE_DOCBOOK\" was never defined.
13769
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13770
fi
13771
if test -z "${ENABLE_MAN_TRUE}" && test -z "${ENABLE_MAN_FALSE}"; then
13772
- as_fn_error $? "conditional \"ENABLE_MAN\" was never defined.
13773
+ as_fn_error "conditional \"ENABLE_MAN\" was never defined.
13774
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13775
fi
13776
13777
@@ -24893,19 +25109,19 @@
13778
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
13779
13780
13781
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
13782
-# ----------------------------------------
13783
+# as_fn_error ERROR [LINENO LOG_FD]
13784
+# ---------------------------------
13785
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
13786
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
13787
-# script with STATUS, using 1 if that was 0.
13788
+# script with status $?, using 1 if that was 0.
13789
as_fn_error ()
13790
{
13791
- as_status=$1; test $as_status -eq 0 && as_status=1
13792
- if test "$4"; then
13793
- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
13794
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
13795
+ as_status=$?; test $as_status -eq 0 && as_status=1
13796
+ if test "$3"; then
13797
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
13798
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
13799
fi
13800
- $as_echo "$as_me: error: $2" >&2
13801
+ $as_echo "$as_me: error: $1" >&2
13802
as_fn_exit $as_status
13803
} # as_fn_error
13804
13805
@@ -25101,7 +25317,7 @@
13806
test -d "$as_dir" && break
13807
done
13808
test -z "$as_dirs" || eval "mkdir $as_dirs"
13809
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
13810
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
13811
13812
13813
} # as_fn_mkdir_p
13814
@@ -25155,7 +25371,7 @@
13815
# values after options handling.
13816
ac_log="
13817
This file was extended by gtk+ $as_me 2.21.5, which was
13818
-generated by GNU Autoconf 2.66. Invocation command line was
13819
+generated by GNU Autoconf 2.65. Invocation command line was
13820
13821
CONFIG_FILES = $CONFIG_FILES
13822
CONFIG_HEADERS = $CONFIG_HEADERS
13823
@@ -25221,10 +25437,10 @@
13824
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
13825
ac_cs_version="\\
13826
gtk+ config.status 2.21.5
13827
-configured by $0, generated by GNU Autoconf 2.66,
13828
+configured by $0, generated by GNU Autoconf 2.65,
13829
with options \\"\$ac_cs_config\\"
13830
13831
-Copyright (C) 2010 Free Software Foundation, Inc.
13832
+Copyright (C) 2009 Free Software Foundation, Inc.
13833
This config.status script is free software; the Free Software Foundation
13834
gives unlimited permission to copy, distribute and modify it."
13835
13836
@@ -25280,7 +25496,7 @@
13837
ac_need_defaults=false;;
13838
--he | --h)
13839
# Conflict between --help and --header
13840
- as_fn_error $? "ambiguous option: \`$1'
13841
+ as_fn_error "ambiguous option: \`$1'
13842
Try \`$0 --help' for more information.";;
13843
--help | --hel | -h )
13844
$as_echo "$ac_cs_usage"; exit ;;
13845
@@ -25289,7 +25505,7 @@
13846
ac_cs_silent=: ;;
13847
13848
# This is an error.
13849
- -*) as_fn_error $? "unrecognized option: \`$1'
13850
+ -*) as_fn_error "unrecognized option: \`$1'
13851
Try \`$0 --help' for more information." ;;
13852
13853
*) as_fn_append ac_config_targets " $1"
13854
@@ -25343,203 +25559,186 @@
13855
sed_quote_subst='$sed_quote_subst'
13856
double_quote_subst='$double_quote_subst'
13857
delay_variable_subst='$delay_variable_subst'
13858
-enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
13859
-AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
13860
-DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
13861
-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
13862
-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
13863
-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
13864
-enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
13865
-pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
13866
-enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
13867
-SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
13868
-ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
13869
-host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
13870
-host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
13871
-host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
13872
-build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
13873
-build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
13874
-build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
13875
-SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
13876
-Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
13877
-GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
13878
-EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
13879
-FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
13880
-LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
13881
-NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
13882
-LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
13883
-max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
13884
-ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
13885
-exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
13886
-lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
13887
-lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
13888
-lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
13889
-reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
13890
-reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
13891
-deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
13892
-file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
13893
-AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
13894
-AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
13895
-STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
13896
-RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
13897
-old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
13898
-old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
13899
-old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
13900
-lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
13901
-CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
13902
-CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
13903
-compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
13904
-GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
13905
-lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
13906
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
13907
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
13908
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
13909
-objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
13910
-MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
13911
-lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
13912
-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
13913
-lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
13914
-lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
13915
-lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
13916
-need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
13917
-DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
13918
-NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
13919
-LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
13920
-OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
13921
-OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
13922
-libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
13923
-shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
13924
-extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
13925
-archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
13926
-enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
13927
-export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
13928
-whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
13929
-compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
13930
-old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
13931
-old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
13932
-archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
13933
-archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
13934
-module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
13935
-module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
13936
-with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
13937
-allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
13938
-no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
13939
-hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
13940
-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
13941
-hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
13942
-hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
13943
-hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
13944
-hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
13945
-hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
13946
-hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
13947
-inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
13948
-link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
13949
-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
13950
-always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
13951
-export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
13952
-exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
13953
-include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
13954
-prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
13955
-file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
13956
-variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
13957
-need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
13958
-need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
13959
-version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
13960
-runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
13961
-shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
13962
-shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
13963
-libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
13964
-library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
13965
-soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
13966
-install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
13967
-postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
13968
-postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
13969
-finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
13970
-finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
13971
-hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
13972
-sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
13973
-sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
13974
-hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
13975
-enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
13976
-enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
13977
-enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
13978
-old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
13979
-striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
13980
-compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'
13981
-predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'
13982
-postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'
13983
-predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'
13984
-postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'
13985
-compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'
13986
-LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`'
13987
-reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`'
13988
-reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`'
13989
-old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
13990
-compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
13991
-GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
13992
-lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
13993
-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
13994
-lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
13995
-lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
13996
-lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
13997
-archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
13998
-enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`'
13999
-export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
14000
-whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
14001
-compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`'
14002
-old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`'
14003
-old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`'
14004
-archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
14005
-archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
14006
-module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`'
14007
-module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
14008
-with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
14009
-allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
14010
-no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
14011
-hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
14012
-hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`'
14013
-hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
14014
-hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
14015
-hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
14016
-hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`'
14017
-hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`'
14018
-hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
14019
-inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
14020
-link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
14021
-fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`'
14022
-always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
14023
-export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
14024
-exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
14025
-include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
14026
-prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
14027
-file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
14028
-hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
14029
-compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
14030
-predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`'
14031
-postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`'
14032
-predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'
14033
-postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'
14034
-compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'
14035
+enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
14036
+AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`'
14037
+DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`'
14038
+OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
14039
+macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
14040
+macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
14041
+enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
14042
+pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
14043
+enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
14044
+host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
14045
+host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
14046
+host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
14047
+build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
14048
+build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
14049
+build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
14050
+SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
14051
+Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
14052
+GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
14053
+EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
14054
+FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
14055
+LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
14056
+NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
14057
+LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
14058
+max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
14059
+ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
14060
+exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
14061
+lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
14062
+lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
14063
+lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
14064
+reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
14065
+reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
14066
+deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
14067
+file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
14068
+AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
14069
+AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
14070
+STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
14071
+RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
14072
+old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
14073
+old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
14074
+old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
14075
+CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
14076
+CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
14077
+compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
14078
+GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
14079
+lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
14080
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
14081
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
14082
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
14083
+objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
14084
+SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
14085
+ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
14086
+MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
14087
+lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
14088
+lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
14089
+lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
14090
+lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
14091
+lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
14092
+need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
14093
+DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
14094
+NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
14095
+LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
14096
+OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
14097
+OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
14098
+libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
14099
+shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
14100
+extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
14101
+archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
14102
+enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
14103
+export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
14104
+whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
14105
+compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
14106
+old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
14107
+old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
14108
+archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
14109
+archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
14110
+module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
14111
+module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
14112
+with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
14113
+allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
14114
+no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
14115
+hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
14116
+hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
14117
+hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
14118
+hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
14119
+hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
14120
+hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
14121
+hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
14122
+hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
14123
+inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
14124
+link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
14125
+fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
14126
+always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
14127
+export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
14128
+exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
14129
+include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
14130
+prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
14131
+file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
14132
+variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
14133
+need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
14134
+need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
14135
+version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
14136
+runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
14137
+shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
14138
+shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
14139
+libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
14140
+library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
14141
+soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
14142
+postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
14143
+postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
14144
+finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
14145
+finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
14146
+hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
14147
+sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
14148
+sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
14149
+hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
14150
+enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
14151
+enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
14152
+enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
14153
+old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
14154
+striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
14155
+compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`'
14156
+predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`'
14157
+postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`'
14158
+predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`'
14159
+postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`'
14160
+compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`'
14161
+LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14162
+old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14163
+compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14164
+GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14165
+lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14166
+lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14167
+lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14168
+lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14169
+lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14170
+archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14171
+enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14172
+export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14173
+whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14174
+compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14175
+old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14176
+old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14177
+archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14178
+archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14179
+module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14180
+module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14181
+with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14182
+allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14183
+no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14184
+hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14185
+hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14186
+hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14187
+hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14188
+hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14189
+hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14190
+hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14191
+hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14192
+inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14193
+link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14194
+fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14195
+always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14196
+export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14197
+exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14198
+include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14199
+prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14200
+file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14201
+hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14202
+compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14203
+predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14204
+postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14205
+predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14206
+postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14207
+compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
14208
14209
LTCC='$LTCC'
14210
LTCFLAGS='$LTCFLAGS'
14211
compiler='$compiler_DEFAULT'
14212
14213
-# A function that is used when there is no print builtin or printf.
14214
-func_fallback_echo ()
14215
-{
14216
- eval 'cat <<_LTECHO_EOF
14217
-\$1
14218
-_LTECHO_EOF'
14219
-}
14220
-
14221
# Quote evaled strings.
14222
-for var in AS \
14223
-DLLTOOL \
14224
-OBJDUMP \
14225
-SHELL \
14226
-ECHO \
14227
-SED \
14228
+for var in SED \
14229
GREP \
14230
EGREP \
14231
FGREP \
14232
@@ -25562,6 +25761,8 @@
14233
lt_cv_sys_global_symbol_to_cdecl \
14234
lt_cv_sys_global_symbol_to_c_name_address \
14235
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
14236
+SHELL \
14237
+ECHO \
14238
lt_prog_compiler_no_builtin_flag \
14239
lt_prog_compiler_wl \
14240
lt_prog_compiler_pic \
14241
@@ -25591,7 +25792,6 @@
14242
libname_spec \
14243
library_names_spec \
14244
soname_spec \
14245
-install_override_mode \
14246
finish_eval \
14247
old_striplib \
14248
striplib \
14249
@@ -25602,7 +25802,6 @@
14250
postdeps \
14251
compiler_lib_search_path \
14252
LD_CXX \
14253
-reload_flag_CXX \
14254
compiler_CXX \
14255
lt_prog_compiler_no_builtin_flag_CXX \
14256
lt_prog_compiler_wl_CXX \
14257
@@ -25628,9 +25827,9 @@
14258
predeps_CXX \
14259
postdeps_CXX \
14260
compiler_lib_search_path_CXX; do
14261
- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
14262
+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
14263
*[\\\\\\\`\\"\\\$]*)
14264
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
14265
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
14266
;;
14267
*)
14268
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
14269
@@ -25657,7 +25856,6 @@
14270
finish_cmds \
14271
sys_lib_search_path_spec \
14272
sys_lib_dlsearch_path_spec \
14273
-reload_cmds_CXX \
14274
old_archive_cmds_CXX \
14275
old_archive_from_new_cmds_CXX \
14276
old_archive_from_expsyms_cmds_CXX \
14277
@@ -25667,9 +25865,9 @@
14278
module_expsym_cmds_CXX \
14279
export_symbols_cmds_CXX \
14280
prelink_cmds_CXX; do
14281
- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
14282
+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
14283
*[\\\\\\\`\\"\\\$]*)
14284
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
14285
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
14286
;;
14287
*)
14288
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
14289
@@ -25677,6 +25875,12 @@
14290
esac
14291
done
14292
14293
+# Fix-up fallback echo if it was mangled by the above quoting rules.
14294
+case \$lt_ECHO in
14295
+*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
14296
+ ;;
14297
+esac
14298
+
14299
ac_aux_dir='$ac_aux_dir'
14300
xsi_shell='$xsi_shell'
14301
lt_shell_append='$lt_shell_append'
14302
@@ -25811,7 +26015,7 @@
14303
"modules/printbackends/test/Makefile") CONFIG_FILES="$CONFIG_FILES modules/printbackends/test/Makefile" ;;
14304
"perf/Makefile") CONFIG_FILES="$CONFIG_FILES perf/Makefile" ;;
14305
14306
- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
14307
+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
14308
esac
14309
done
14310
14311
@@ -25849,7 +26053,7 @@
14312
{
14313
tmp=./conf$$-$RANDOM
14314
(umask 077 && mkdir "$tmp")
14315
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
14316
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
14317
14318
# Set up the scripts for CONFIG_FILES section.
14319
# No need to generate them if there are no CONFIG_FILES.
14320
@@ -25866,7 +26070,7 @@
14321
fi
14322
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
14323
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
14324
- ac_cs_awk_cr='\\r'
14325
+ ac_cs_awk_cr='\r'
14326
else
14327
ac_cs_awk_cr=$ac_cr
14328
fi
14329
@@ -25880,18 +26084,18 @@
14330
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
14331
echo "_ACEOF"
14332
} >conf$$subs.sh ||
14333
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
14334
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
14335
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
14336
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
14337
ac_delim='%!_!# '
14338
for ac_last_try in false false false false false :; do
14339
. ./conf$$subs.sh ||
14340
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
14341
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
14342
14343
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
14344
if test $ac_delim_n = $ac_delim_num; then
14345
break
14346
elif $ac_last_try; then
14347
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
14348
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
14349
else
14350
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
14351
fi
14352
@@ -25980,28 +26184,20 @@
14353
else
14354
cat
14355
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
14356
- || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
14357
+ || as_fn_error "could not setup config files machinery" "$LINENO" 5
14358
_ACEOF
14359
14360
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
14361
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
14362
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
14363
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
14364
# trailing colons and then remove the whole line if VPATH becomes empty
14365
# (actually we leave an empty line to preserve line numbers).
14366
if test "x$srcdir" = x.; then
14367
- ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
14368
-h
14369
-s///
14370
-s/^/:/
14371
-s/[ ]*$/:/
14372
-s/:\$(srcdir):/:/g
14373
-s/:\${srcdir}:/:/g
14374
-s/:@srcdir@:/:/g
14375
-s/^:*//
14376
+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
14377
+s/:*\$(srcdir):*/:/
14378
+s/:*\${srcdir}:*/:/
14379
+s/:*@srcdir@:*/:/
14380
+s/^\([^=]*=[ ]*\):*/\1/
14381
s/:*$//
14382
-x
14383
-s/\(=[ ]*\).*/\1/
14384
-G
14385
-s/\n//
14386
s/^[^=]*=[ ]*$//
14387
}'
14388
fi
14389
@@ -26029,7 +26225,7 @@
14390
if test -z "$ac_t"; then
14391
break
14392
elif $ac_last_try; then
14393
- as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
14394
+ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
14395
else
14396
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
14397
fi
14398
@@ -26114,7 +26310,7 @@
14399
_ACAWK
14400
_ACEOF
14401
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
14402
- as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
14403
+ as_fn_error "could not setup config headers machinery" "$LINENO" 5
14404
fi # test -n "$CONFIG_HEADERS"
14405
14406
14407
@@ -26127,7 +26323,7 @@
14408
esac
14409
case $ac_mode$ac_tag in
14410
:[FHL]*:*);;
14411
- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
14412
+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
14413
:[FH]-) ac_tag=-:-;;
14414
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
14415
esac
14416
@@ -26155,7 +26351,7 @@
14417
[\\/$]*) false;;
14418
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
14419
esac ||
14420
- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
14421
+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
14422
esac
14423
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
14424
as_fn_append ac_file_inputs " '$ac_f'"
14425
@@ -26182,7 +26378,7 @@
14426
14427
case $ac_tag in
14428
*:-:* | *:-) cat >"$tmp/stdin" \
14429
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
14430
+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
14431
esac
14432
;;
14433
esac
14434
@@ -26319,22 +26515,22 @@
14435
$ac_datarootdir_hack
14436
"
14437
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
14438
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
14439
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
14440
14441
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
14442
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
14443
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
14444
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
14445
-which seems to be undefined. Please make sure it is defined" >&5
14446
+which seems to be undefined. Please make sure it is defined." >&5
14447
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
14448
-which seems to be undefined. Please make sure it is defined" >&2;}
14449
+which seems to be undefined. Please make sure it is defined." >&2;}
14450
14451
rm -f "$tmp/stdin"
14452
case $ac_file in
14453
-) cat "$tmp/out" && rm -f "$tmp/out";;
14454
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
14455
esac \
14456
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
14457
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
14458
;;
14459
:H)
14460
#
14461
@@ -26345,19 +26541,19 @@
14462
$as_echo "/* $configure_input */" \
14463
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
14464
} >"$tmp/config.h" \
14465
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
14466
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
14467
if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
14468
{ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
14469
$as_echo "$as_me: $ac_file is unchanged" >&6;}
14470
else
14471
rm -f "$ac_file"
14472
mv "$tmp/config.h" "$ac_file" \
14473
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
14474
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
14475
fi
14476
else
14477
$as_echo "/* $configure_input */" \
14478
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
14479
- || as_fn_error $? "could not create -" "$LINENO" 5
14480
+ || as_fn_error "could not create -" "$LINENO" 5
14481
fi
14482
# Compute "$ac_file"'s index in $config_headers.
14483
_am_arg="$ac_file"
14484
@@ -26518,8 +26714,7 @@
14485
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
14486
#
14487
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
14488
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
14489
-# Inc.
14490
+# 2006, 2007, 2008 Free Software Foundation, Inc.
14491
# Written by Gordon Matzigkeit, 1996
14492
#
14493
# This file is part of GNU Libtool.
14494
@@ -26555,13 +26750,13 @@
14495
build_old_libs=$enable_static
14496
14497
# Assembler program.
14498
-AS=$lt_AS
14499
+AS=$AS
14500
14501
# DLL creation program.
14502
-DLLTOOL=$lt_DLLTOOL
14503
+DLLTOOL=$DLLTOOL
14504
14505
# Object dumper program.
14506
-OBJDUMP=$lt_OBJDUMP
14507
+OBJDUMP=$OBJDUMP
14508
14509
# Which release of libtool.m4 was used?
14510
macro_version=$macro_version
14511
@@ -26576,12 +26771,6 @@
14512
# Whether or not to optimize for fast installation.
14513
fast_install=$enable_fast_install
14514
14515
-# Shell to use when invoking shell scripts.
14516
-SHELL=$lt_SHELL
14517
-
14518
-# An echo program that protects backslashes.
14519
-ECHO=$lt_ECHO
14520
-
14521
# The host system.
14522
host_alias=$host_alias
14523
host=$host
14524
@@ -26631,6 +26820,10 @@
14525
# turn newlines into spaces.
14526
NL2SP=$lt_lt_NL2SP
14527
14528
+# How to create reloadable object files.
14529
+reload_flag=$lt_reload_flag
14530
+reload_cmds=$lt_reload_cmds
14531
+
14532
# Method to check whether dependent libraries are shared objects.
14533
deplibs_check_method=$lt_deplibs_check_method
14534
14535
@@ -26649,9 +26842,6 @@
14536
old_postinstall_cmds=$lt_old_postinstall_cmds
14537
old_postuninstall_cmds=$lt_old_postuninstall_cmds
14538
14539
-# Whether to use a lock for old archive extraction.
14540
-lock_old_archive_extraction=$lock_old_archive_extraction
14541
-
14542
# A C compiler.
14543
LTCC=$lt_CC
14544
14545
@@ -26673,6 +26863,12 @@
14546
# The name of the directory that contains temporary libtool files.
14547
objdir=$objdir
14548
14549
+# Shell to use when invoking shell scripts.
14550
+SHELL=$lt_SHELL
14551
+
14552
+# An echo program that does not interpret backslashes.
14553
+ECHO=$lt_ECHO
14554
+
14555
# Used to examine libraries when file_magic_cmd begins with "file".
14556
MAGIC_CMD=$MAGIC_CMD
14557
14558
@@ -26735,9 +26931,6 @@
14559
# The coded name of the library, if different from the real name.
14560
soname_spec=$lt_soname_spec
14561
14562
-# Permission mode override for installation of shared libraries.
14563
-install_override_mode=$lt_install_override_mode
14564
-
14565
# Command to use after installation of a shared archive.
14566
postinstall_cmds=$lt_postinstall_cmds
14567
14568
@@ -26777,10 +26970,6 @@
14569
# The linker used to build libraries.
14570
LD=$lt_LD
14571
14572
-# How to create reloadable object files.
14573
-reload_flag=$lt_reload_flag
14574
-reload_cmds=$lt_reload_cmds
14575
-
14576
# Commands used to build an old-style archive.
14577
old_archive_cmds=$lt_old_archive_cmds
14578
14579
@@ -27054,7 +27243,7 @@
14580
func_dirname ()
14581
{
14582
# Extract subdirectory from the argument.
14583
- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
14584
+ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
14585
if test "X$func_dirname_result" = "X${1}"; then
14586
func_dirname_result="${3}"
14587
else
14588
@@ -27065,7 +27254,7 @@
14589
# func_basename file
14590
func_basename ()
14591
{
14592
- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
14593
+ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
14594
}
14595
14596
14597
@@ -27078,8 +27267,10 @@
14598
func_stripname ()
14599
{
14600
case ${2} in
14601
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
14602
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
14603
+ .*) func_stripname_result=`$ECHO "X${3}" \
14604
+ | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
14605
+ *) func_stripname_result=`$ECHO "X${3}" \
14606
+ | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
14607
esac
14608
}
14609
14610
@@ -27090,20 +27281,20 @@
14611
# func_opt_split
14612
func_opt_split ()
14613
{
14614
- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
14615
- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
14616
+ func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
14617
+ func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
14618
}
14619
14620
# func_lo2o object
14621
func_lo2o ()
14622
{
14623
- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
14624
+ func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
14625
}
14626
14627
# func_xform libobj-or-source
14628
func_xform ()
14629
{
14630
- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
14631
+ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
14632
}
14633
14634
# func_arith arithmetic-term...
14635
@@ -27164,10 +27355,6 @@
14636
# The linker used to build libraries.
14637
LD=$lt_LD_CXX
14638
14639
-# How to create reloadable object files.
14640
-reload_flag=$lt_reload_flag_CXX
14641
-reload_cmds=$lt_reload_cmds_CXX
14642
-
14643
# Commands used to build an old-style archive.
14644
old_archive_cmds=$lt_old_archive_cmds_CXX
14645
14646
@@ -27379,7 +27566,7 @@
14647
ac_clean_files=$ac_clean_files_save
14648
14649
test $ac_write_fail = 0 ||
14650
- as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
14651
+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
14652
14653
14654
# configure is writing to config.log, and then calls config.status.
14655
@@ -27400,7 +27587,7 @@
14656
exec 5>>config.log
14657
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
14658
# would make configure fail if this is the last instruction.
14659
- $ac_cs_success || as_fn_exit 1
14660
+ $ac_cs_success || as_fn_exit $?
14661
fi
14662
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
14663
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
14664
Index: gtk+-2.21.5/demos/gtk-demo/Makefile.in
14665
===================================================================
14666
--- gtk+-2.21.5.orig/demos/gtk-demo/Makefile.in 2010-07-22 21:44:03.480072001 +0200
14667
+++ gtk+-2.21.5/demos/gtk-demo/Makefile.in 2010-07-22 21:44:19.340072000 +0200
14668
@@ -42,11 +42,14 @@
14669
bin_PROGRAMS = gtk-demo$(EXEEXT)
9131
14670
subdir = demos/gtk-demo
9132
14671
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9133
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
9134
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9135
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
9136
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
9137
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
9138
+ $(top_srcdir)/configure.in
14672
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
14673
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
14674
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
14675
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
14676
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
14677
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9139
14678
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9140
14679
$(ACLOCAL_M4)
9141
mkinstalldirs = $(install_sh) -d
9142
@@ -207,6 +210,7 @@
9143
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
9144
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
9145
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
14680
-mkinstalldirs = $(install_sh) -d
14681
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
14682
CONFIG_HEADER = $(top_builddir)/config.h
14683
CONFIG_CLEAN_FILES = geninclude.pl
14684
CONFIG_CLEAN_VPATH_FILES =
14685
@@ -193,6 +196,7 @@
14686
GDK_PACKAGES = @GDK_PACKAGES@
14687
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
14688
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
9146
14689
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
9147
14690
GDK_WLIBS = @GDK_WLIBS@
9148
14691
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
9149
14692
GLIB_CFLAGS = @GLIB_CFLAGS@
9150
@@ -299,8 +303,6 @@
9151
PATH_SEPARATOR = @PATH_SEPARATOR@
9152
PERL = @PERL@
9153
PKG_CONFIG = @PKG_CONFIG@
9154
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
9155
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
9156
POFILES = @POFILES@
9157
POSUB = @POSUB@
9158
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
9159
diff -Nur gtk+2.0-2.21.2/demos/Makefile.in gtk+2.0-2.21.2.ubuntu/demos/Makefile.in
9160
--- gtk+2.0-2.21.2/demos/Makefile.in 2010-06-10 19:18:21.000000000 +0200
9161
+++ gtk+2.0-2.21.2.ubuntu/demos/Makefile.in 2010-06-11 12:15:20.000000000 +0200
9162
@@ -47,7 +47,10 @@
14693
@@ -343,6 +347,7 @@
14694
libexecdir = @libexecdir@
14695
localedir = @localedir@
14696
localstatedir = @localstatedir@
14697
+lt_ECHO = @lt_ECHO@
14698
mandir = @mandir@
14699
mkdir_p = @mkdir_p@
14700
ms_librarian = @ms_librarian@
14701
Index: gtk+-2.21.5/demos/Makefile.in
14702
===================================================================
14703
--- gtk+-2.21.5.orig/demos/Makefile.in 2010-07-22 21:44:03.470072001 +0200
14704
+++ gtk+-2.21.5/demos/Makefile.in 2010-07-22 21:44:19.250072000 +0200
14705
@@ -44,11 +44,14 @@
14706
testpixbuf$(EXEEXT)
9163
14707
subdir = demos
9164
14708
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9165
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
9166
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9167
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
9168
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
9169
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
9170
+ $(top_srcdir)/configure.in
14709
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
14710
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
14711
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
14712
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
14713
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
14714
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9171
14715
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9172
14716
$(ACLOCAL_M4)
9173
mkinstalldirs = $(install_sh) -d
9174
@@ -230,6 +233,7 @@
9175
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
9176
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
9177
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
14717
-mkinstalldirs = $(install_sh) -d
14718
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
14719
CONFIG_HEADER = $(top_builddir)/config.h
14720
CONFIG_CLEAN_FILES =
14721
CONFIG_CLEAN_VPATH_FILES =
14722
@@ -213,6 +216,7 @@
14723
GDK_PACKAGES = @GDK_PACKAGES@
14724
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
14725
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
9178
14726
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
9179
14727
GDK_WLIBS = @GDK_WLIBS@
9180
14728
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
9181
14729
GLIB_CFLAGS = @GLIB_CFLAGS@
9182
@@ -322,8 +326,6 @@
9183
PATH_SEPARATOR = @PATH_SEPARATOR@
9184
PERL = @PERL@
9185
PKG_CONFIG = @PKG_CONFIG@
9186
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
9187
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
9188
POFILES = @POFILES@
9189
POSUB = @POSUB@
9190
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
9191
diff -Nur gtk+2.0-2.21.2/docs/faq/Makefile.in gtk+2.0-2.21.2.ubuntu/docs/faq/Makefile.in
9192
--- gtk+2.0-2.21.2/docs/faq/Makefile.in 2010-06-10 19:18:21.000000000 +0200
9193
+++ gtk+2.0-2.21.2.ubuntu/docs/faq/Makefile.in 2010-06-11 12:15:20.000000000 +0200
9194
@@ -40,7 +40,10 @@
14730
@@ -363,6 +367,7 @@
14731
libexecdir = @libexecdir@
14732
localedir = @localedir@
14733
localstatedir = @localstatedir@
14734
+lt_ECHO = @lt_ECHO@
14735
mandir = @mandir@
14736
mkdir_p = @mkdir_p@
14737
ms_librarian = @ms_librarian@
14738
Index: gtk+-2.21.5/docs/faq/Makefile.in
14739
===================================================================
14740
--- gtk+-2.21.5.orig/docs/faq/Makefile.in 2010-07-22 21:44:03.350072001 +0200
14741
+++ gtk+-2.21.5/docs/faq/Makefile.in 2010-07-22 21:44:19.480072000 +0200
14742
@@ -39,11 +39,14 @@
14743
$(top_srcdir)/Makefile.decl
9195
14744
subdir = docs/faq
9196
14745
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9197
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
9198
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9199
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
9200
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
9201
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
9202
+ $(top_srcdir)/configure.in
14746
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
14747
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
14748
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
14749
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
14750
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
14751
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9203
14752
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9204
14753
$(ACLOCAL_M4)
9205
mkinstalldirs = $(install_sh) -d
9206
@@ -130,6 +133,7 @@
9207
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
9208
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
9209
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
14754
-mkinstalldirs = $(install_sh) -d
14755
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
14756
CONFIG_HEADER = $(top_builddir)/config.h
14757
CONFIG_CLEAN_FILES =
14758
CONFIG_CLEAN_VPATH_FILES =
14759
@@ -117,6 +120,7 @@
14760
GDK_PACKAGES = @GDK_PACKAGES@
14761
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
14762
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
9210
14763
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
9211
14764
GDK_WLIBS = @GDK_WLIBS@
9212
14765
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
9213
14766
GLIB_CFLAGS = @GLIB_CFLAGS@
9214
@@ -222,8 +226,6 @@
9215
PATH_SEPARATOR = @PATH_SEPARATOR@
9216
PERL = @PERL@
9217
PKG_CONFIG = @PKG_CONFIG@
9218
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
9219
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
9220
POFILES = @POFILES@
9221
POSUB = @POSUB@
9222
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
9223
diff -Nur gtk+2.0-2.21.2/docs/Makefile.in gtk+2.0-2.21.2.ubuntu/docs/Makefile.in
9224
--- gtk+2.0-2.21.2/docs/Makefile.in 2010-06-10 19:18:21.000000000 +0200
9225
+++ gtk+2.0-2.21.2.ubuntu/docs/Makefile.in 2010-06-11 12:15:20.000000000 +0200
9226
@@ -40,7 +40,10 @@
14767
@@ -267,6 +271,7 @@
14768
libexecdir = @libexecdir@
14769
localedir = @localedir@
14770
localstatedir = @localstatedir@
14771
+lt_ECHO = @lt_ECHO@
14772
mandir = @mandir@
14773
mkdir_p = @mkdir_p@
14774
ms_librarian = @ms_librarian@
14775
Index: gtk+-2.21.5/docs/Makefile.in
14776
===================================================================
14777
--- gtk+-2.21.5.orig/docs/Makefile.in 2010-07-22 21:44:03.360072001 +0200
14778
+++ gtk+-2.21.5/docs/Makefile.in 2010-07-22 21:44:19.410072000 +0200
14779
@@ -39,11 +39,14 @@
14780
$(top_srcdir)/Makefile.decl
9227
14781
subdir = docs
9228
14782
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9229
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
9230
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9231
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
9232
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
9233
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
9234
+ $(top_srcdir)/configure.in
14783
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
14784
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
14785
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
14786
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
14787
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
14788
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9235
14789
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9236
14790
$(ACLOCAL_M4)
9237
mkinstalldirs = $(install_sh) -d
9238
@@ -170,6 +173,7 @@
9239
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
9240
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
9241
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
14791
-mkinstalldirs = $(install_sh) -d
14792
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
14793
CONFIG_HEADER = $(top_builddir)/config.h
14794
CONFIG_CLEAN_FILES =
14795
CONFIG_CLEAN_VPATH_FILES =
14796
@@ -157,6 +160,7 @@
14797
GDK_PACKAGES = @GDK_PACKAGES@
14798
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
14799
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
9242
14800
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
9243
14801
GDK_WLIBS = @GDK_WLIBS@
9244
14802
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
9245
14803
GLIB_CFLAGS = @GLIB_CFLAGS@
9246
@@ -262,8 +266,6 @@
9247
PATH_SEPARATOR = @PATH_SEPARATOR@
9248
PERL = @PERL@
9249
PKG_CONFIG = @PKG_CONFIG@
9250
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
9251
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
9252
POFILES = @POFILES@
9253
POSUB = @POSUB@
9254
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
9255
diff -Nur gtk+2.0-2.21.2/docs/reference/gdk/Makefile.in gtk+2.0-2.21.2.ubuntu/docs/reference/gdk/Makefile.in
9256
--- gtk+2.0-2.21.2/docs/reference/gdk/Makefile.in 2010-06-10 19:18:22.000000000 +0200
9257
+++ gtk+2.0-2.21.2.ubuntu/docs/reference/gdk/Makefile.in 2010-06-11 12:15:21.000000000 +0200
9258
@@ -47,7 +47,10 @@
14804
@@ -307,6 +311,7 @@
14805
libexecdir = @libexecdir@
14806
localedir = @localedir@
14807
localstatedir = @localstatedir@
14808
+lt_ECHO = @lt_ECHO@
14809
mandir = @mandir@
14810
mkdir_p = @mkdir_p@
14811
ms_librarian = @ms_librarian@
14812
Index: gtk+-2.21.5/docs/reference/gdk/Makefile.in
14813
===================================================================
14814
--- gtk+-2.21.5.orig/docs/reference/gdk/Makefile.in 2010-07-22 21:44:03.370072001 +0200
14815
+++ gtk+-2.21.5/docs/reference/gdk/Makefile.in 2010-07-22 21:44:19.630072000 +0200
14816
@@ -46,11 +46,14 @@
14817
$(top_srcdir)/gtk-doc.make
9259
14818
subdir = docs/reference/gdk
9260
14819
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9261
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
9262
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9263
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
9264
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
9265
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
9266
+ $(top_srcdir)/configure.in
9267
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9268
$(ACLOCAL_M4)
9269
mkinstalldirs = $(install_sh) -d
9270
@@ -137,6 +140,7 @@
9271
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
9272
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
9273
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
9274
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
9275
GDK_WLIBS = @GDK_WLIBS@
9276
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
9277
GLIB_CFLAGS = @GLIB_CFLAGS@
9278
@@ -229,8 +233,6 @@
9279
PATH_SEPARATOR = @PATH_SEPARATOR@
9280
PERL = @PERL@
9281
PKG_CONFIG = @PKG_CONFIG@
9282
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
9283
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
9284
POFILES = @POFILES@
9285
POSUB = @POSUB@
9286
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
9287
diff -Nur gtk+2.0-2.21.2/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.21.2.ubuntu/docs/reference/gdk-pixbuf/Makefile.in
9288
--- gtk+2.0-2.21.2/docs/reference/gdk-pixbuf/Makefile.in 2010-06-10 19:18:22.000000000 +0200
9289
+++ gtk+2.0-2.21.2.ubuntu/docs/reference/gdk-pixbuf/Makefile.in 2010-06-11 12:15:21.000000000 +0200
9290
@@ -47,7 +47,10 @@
9291
subdir = docs/reference/gdk-pixbuf
9292
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9293
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
9294
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9295
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
9296
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
9297
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
9298
+ $(top_srcdir)/configure.in
9299
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9300
$(ACLOCAL_M4)
9301
mkinstalldirs = $(install_sh) -d
9302
@@ -162,6 +165,7 @@
9303
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
9304
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
9305
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
9306
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
9307
GDK_WLIBS = @GDK_WLIBS@
9308
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
9309
GLIB_CFLAGS = @GLIB_CFLAGS@
9310
@@ -254,8 +258,6 @@
9311
PATH_SEPARATOR = @PATH_SEPARATOR@
9312
PERL = @PERL@
9313
PKG_CONFIG = @PKG_CONFIG@
9314
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
9315
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
9316
POFILES = @POFILES@
9317
POSUB = @POSUB@
9318
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
9319
diff -Nur gtk+2.0-2.21.2/docs/reference/gtk/Makefile.in gtk+2.0-2.21.2.ubuntu/docs/reference/gtk/Makefile.in
9320
--- gtk+2.0-2.21.2/docs/reference/gtk/Makefile.in 2010-06-10 19:18:22.000000000 +0200
9321
+++ gtk+2.0-2.21.2.ubuntu/docs/reference/gtk/Makefile.in 2010-06-11 12:15:21.000000000 +0200
9322
@@ -47,7 +47,10 @@
14820
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
14821
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
14822
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
14823
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
14824
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
14825
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
14826
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
14827
$(ACLOCAL_M4)
14828
-mkinstalldirs = $(install_sh) -d
14829
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
14830
CONFIG_HEADER = $(top_builddir)/config.h
14831
CONFIG_CLEAN_FILES = version.xml
14832
CONFIG_CLEAN_VPATH_FILES =
14833
@@ -124,6 +127,7 @@
14834
GDK_PACKAGES = @GDK_PACKAGES@
14835
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
14836
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
14837
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
14838
GDK_WLIBS = @GDK_WLIBS@
14839
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
14840
GLIB_CFLAGS = @GLIB_CFLAGS@
14841
@@ -274,6 +278,7 @@
14842
libexecdir = @libexecdir@
14843
localedir = @localedir@
14844
localstatedir = @localstatedir@
14845
+lt_ECHO = @lt_ECHO@
14846
mandir = @mandir@
14847
mkdir_p = @mkdir_p@
14848
ms_librarian = @ms_librarian@
14849
Index: gtk+-2.21.5/docs/reference/gtk/Makefile.in
14850
===================================================================
14851
--- gtk+-2.21.5.orig/docs/reference/gtk/Makefile.in 2010-07-22 21:44:03.390072001 +0200
14852
+++ gtk+-2.21.5/docs/reference/gtk/Makefile.in 2010-07-22 21:44:19.730072000 +0200
14853
@@ -46,11 +46,14 @@
14854
$(top_srcdir)/gtk-doc.make
9323
14855
subdir = docs/reference/gtk
9324
14856
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9325
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
9326
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9327
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
9328
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
9329
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
9330
+ $(top_srcdir)/configure.in
14857
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
14858
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
14859
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
14860
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
14861
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
14862
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9331
14863
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9332
14864
$(ACLOCAL_M4)
9333
mkinstalldirs = $(install_sh) -d
9334
@@ -162,6 +165,7 @@
9335
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
9336
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
9337
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
14865
-mkinstalldirs = $(install_sh) -d
14866
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
14867
CONFIG_HEADER = $(top_builddir)/config.h
14868
CONFIG_CLEAN_FILES = version.xml
14869
CONFIG_CLEAN_VPATH_FILES =
14870
@@ -149,6 +152,7 @@
14871
GDK_PACKAGES = @GDK_PACKAGES@
14872
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
14873
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
9338
14874
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
9339
14875
GDK_WLIBS = @GDK_WLIBS@
9340
14876
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
9341
14877
GLIB_CFLAGS = @GLIB_CFLAGS@
9342
@@ -254,8 +258,6 @@
9343
PATH_SEPARATOR = @PATH_SEPARATOR@
9344
PERL = @PERL@
9345
PKG_CONFIG = @PKG_CONFIG@
9346
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
9347
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
9348
POFILES = @POFILES@
9349
POSUB = @POSUB@
9350
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
9351
diff -Nur gtk+2.0-2.21.2/docs/reference/libgail-util/Makefile.in gtk+2.0-2.21.2.ubuntu/docs/reference/libgail-util/Makefile.in
9352
--- gtk+2.0-2.21.2/docs/reference/libgail-util/Makefile.in 2010-06-10 19:18:22.000000000 +0200
9353
+++ gtk+2.0-2.21.2.ubuntu/docs/reference/libgail-util/Makefile.in 2010-06-11 12:15:21.000000000 +0200
9354
@@ -46,7 +46,10 @@
14878
@@ -299,6 +303,7 @@
14879
libexecdir = @libexecdir@
14880
localedir = @localedir@
14881
localstatedir = @localstatedir@
14882
+lt_ECHO = @lt_ECHO@
14883
mandir = @mandir@
14884
mkdir_p = @mkdir_p@
14885
ms_librarian = @ms_librarian@
14886
Index: gtk+-2.21.5/docs/reference/libgail-util/Makefile.in
14887
===================================================================
14888
--- gtk+-2.21.5.orig/docs/reference/libgail-util/Makefile.in 2010-07-22 21:44:03.380072001 +0200
14889
+++ gtk+-2.21.5/docs/reference/libgail-util/Makefile.in 2010-07-22 21:44:19.810072000 +0200
14890
@@ -45,11 +45,14 @@
14891
$(top_srcdir)/Makefile.decl $(top_srcdir)/gtk-doc.make
9355
14892
subdir = docs/reference/libgail-util
9356
14893
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9357
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
9358
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9359
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
9360
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
9361
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
9362
+ $(top_srcdir)/configure.in
14894
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
14895
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
14896
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
14897
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
14898
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
14899
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9363
14900
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9364
14901
$(ACLOCAL_M4)
9365
mkinstalldirs = $(install_sh) -d
9366
@@ -136,6 +139,7 @@
9367
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
9368
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
9369
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
14902
-mkinstalldirs = $(install_sh) -d
14903
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
14904
CONFIG_HEADER = $(top_builddir)/config.h
14905
CONFIG_CLEAN_FILES =
14906
CONFIG_CLEAN_VPATH_FILES =
14907
@@ -123,6 +126,7 @@
14908
GDK_PACKAGES = @GDK_PACKAGES@
14909
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
14910
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
9370
14911
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
9371
14912
GDK_WLIBS = @GDK_WLIBS@
9372
14913
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
9373
14914
GLIB_CFLAGS = @GLIB_CFLAGS@
9374
@@ -228,8 +232,6 @@
9375
PATH_SEPARATOR = @PATH_SEPARATOR@
9376
PERL = @PERL@
9377
PKG_CONFIG = @PKG_CONFIG@
9378
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
9379
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
9380
POFILES = @POFILES@
9381
POSUB = @POSUB@
9382
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
9383
diff -Nur gtk+2.0-2.21.2/docs/reference/Makefile.in gtk+2.0-2.21.2.ubuntu/docs/reference/Makefile.in
9384
--- gtk+2.0-2.21.2/docs/reference/Makefile.in 2010-06-10 19:18:22.000000000 +0200
9385
+++ gtk+2.0-2.21.2.ubuntu/docs/reference/Makefile.in 2010-06-11 12:15:21.000000000 +0200
9386
@@ -40,7 +40,10 @@
14915
@@ -273,6 +277,7 @@
14916
libexecdir = @libexecdir@
14917
localedir = @localedir@
14918
localstatedir = @localstatedir@
14919
+lt_ECHO = @lt_ECHO@
14920
mandir = @mandir@
14921
mkdir_p = @mkdir_p@
14922
ms_librarian = @ms_librarian@
14923
Index: gtk+-2.21.5/docs/reference/Makefile.in
14924
===================================================================
14925
--- gtk+-2.21.5.orig/docs/reference/Makefile.in 2010-07-22 21:44:03.380072001 +0200
14926
+++ gtk+-2.21.5/docs/reference/Makefile.in 2010-07-22 21:44:19.550072000 +0200
14927
@@ -39,11 +39,14 @@
14928
$(top_srcdir)/Makefile.decl AUTHORS COPYING ChangeLog
9387
14929
subdir = docs/reference
9388
14930
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9389
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
9390
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9391
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
9392
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
9393
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
9394
+ $(top_srcdir)/configure.in
14931
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
14932
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
14933
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
14934
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
14935
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
14936
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9395
14937
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9396
14938
$(ACLOCAL_M4)
9397
mkinstalldirs = $(install_sh) -d
9398
@@ -170,6 +173,7 @@
9399
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
9400
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
9401
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
14939
-mkinstalldirs = $(install_sh) -d
14940
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
14941
CONFIG_HEADER = $(top_builddir)/config.h
14942
CONFIG_CLEAN_FILES =
14943
CONFIG_CLEAN_VPATH_FILES =
14944
@@ -157,6 +160,7 @@
14945
GDK_PACKAGES = @GDK_PACKAGES@
14946
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
14947
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
9402
14948
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
9403
14949
GDK_WLIBS = @GDK_WLIBS@
9404
14950
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
9405
14951
GLIB_CFLAGS = @GLIB_CFLAGS@
9406
@@ -262,8 +266,6 @@
9407
PATH_SEPARATOR = @PATH_SEPARATOR@
9408
PERL = @PERL@
9409
PKG_CONFIG = @PKG_CONFIG@
9410
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
9411
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
9412
POFILES = @POFILES@
9413
POSUB = @POSUB@
9414
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
9415
diff -Nur gtk+2.0-2.21.2/docs/tools/Makefile.in gtk+2.0-2.21.2.ubuntu/docs/tools/Makefile.in
9416
--- gtk+2.0-2.21.2/docs/tools/Makefile.in 2010-06-10 19:18:22.000000000 +0200
9417
+++ gtk+2.0-2.21.2.ubuntu/docs/tools/Makefile.in 2010-06-11 12:15:21.000000000 +0200
9418
@@ -42,7 +42,10 @@
14952
@@ -307,6 +311,7 @@
14953
libexecdir = @libexecdir@
14954
localedir = @localedir@
14955
localstatedir = @localstatedir@
14956
+lt_ECHO = @lt_ECHO@
14957
mandir = @mandir@
14958
mkdir_p = @mkdir_p@
14959
ms_librarian = @ms_librarian@
14960
Index: gtk+-2.21.5/docs/tools/Makefile.in
14961
===================================================================
14962
--- gtk+-2.21.5.orig/docs/tools/Makefile.in 2010-07-22 21:44:03.340072001 +0200
14963
+++ gtk+-2.21.5/docs/tools/Makefile.in 2010-07-22 21:44:19.890072000 +0200
14964
@@ -41,11 +41,14 @@
14965
@USE_X11_TRUE@noinst_PROGRAMS = doc-shooter$(EXEEXT)
9419
14966
subdir = docs/tools
9420
14967
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9421
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
9422
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9423
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
9424
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
9425
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
9426
+ $(top_srcdir)/configure.in
14968
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
14969
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
14970
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
14971
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
14972
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
14973
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9427
14974
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9428
14975
$(ACLOCAL_M4)
9429
mkinstalldirs = $(install_sh) -d
9430
@@ -166,6 +169,7 @@
9431
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
9432
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
9433
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
14976
-mkinstalldirs = $(install_sh) -d
14977
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
14978
CONFIG_HEADER = $(top_builddir)/config.h
14979
CONFIG_CLEAN_FILES =
14980
CONFIG_CLEAN_VPATH_FILES =
14981
@@ -152,6 +155,7 @@
14982
GDK_PACKAGES = @GDK_PACKAGES@
14983
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
14984
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
9434
14985
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
9435
14986
GDK_WLIBS = @GDK_WLIBS@
9436
14987
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
9437
14988
GLIB_CFLAGS = @GLIB_CFLAGS@
9438
@@ -258,8 +262,6 @@
9439
PATH_SEPARATOR = @PATH_SEPARATOR@
9440
PERL = @PERL@
9441
PKG_CONFIG = @PKG_CONFIG@
9442
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
9443
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
9444
POFILES = @POFILES@
9445
POSUB = @POSUB@
9446
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
9447
diff -Nur gtk+2.0-2.21.2/docs/tutorial/Makefile.in gtk+2.0-2.21.2.ubuntu/docs/tutorial/Makefile.in
9448
--- gtk+2.0-2.21.2/docs/tutorial/Makefile.in 2010-06-10 19:18:22.000000000 +0200
9449
+++ gtk+2.0-2.21.2.ubuntu/docs/tutorial/Makefile.in 2010-06-11 12:15:21.000000000 +0200
9450
@@ -40,7 +40,10 @@
14989
@@ -302,6 +306,7 @@
14990
libexecdir = @libexecdir@
14991
localedir = @localedir@
14992
localstatedir = @localstatedir@
14993
+lt_ECHO = @lt_ECHO@
14994
mandir = @mandir@
14995
mkdir_p = @mkdir_p@
14996
ms_librarian = @ms_librarian@
14997
Index: gtk+-2.21.5/docs/tutorial/Makefile.in
14998
===================================================================
14999
--- gtk+-2.21.5.orig/docs/tutorial/Makefile.in 2010-07-22 21:44:03.340072001 +0200
15000
+++ gtk+-2.21.5/docs/tutorial/Makefile.in 2010-07-22 21:44:19.970072000 +0200
15001
@@ -39,11 +39,14 @@
15002
$(top_srcdir)/Makefile.decl
9451
15003
subdir = docs/tutorial
9452
15004
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9453
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
9454
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9455
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
9456
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
9457
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
9458
+ $(top_srcdir)/configure.in
15005
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
15006
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
15007
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
15008
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
15009
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
15010
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9459
15011
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9460
15012
$(ACLOCAL_M4)
9461
mkinstalldirs = $(install_sh) -d
9462
@@ -130,6 +133,7 @@
9463
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
9464
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
9465
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
15013
-mkinstalldirs = $(install_sh) -d
15014
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
15015
CONFIG_HEADER = $(top_builddir)/config.h
15016
CONFIG_CLEAN_FILES =
15017
CONFIG_CLEAN_VPATH_FILES =
15018
@@ -117,6 +120,7 @@
15019
GDK_PACKAGES = @GDK_PACKAGES@
15020
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
15021
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
9466
15022
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
9467
15023
GDK_WLIBS = @GDK_WLIBS@
9468
15024
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
9469
15025
GLIB_CFLAGS = @GLIB_CFLAGS@
9470
@@ -222,8 +226,6 @@
9471
PATH_SEPARATOR = @PATH_SEPARATOR@
9472
PERL = @PERL@
9473
PKG_CONFIG = @PKG_CONFIG@
9474
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
9475
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
9476
POFILES = @POFILES@
9477
POSUB = @POSUB@
9478
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
9479
diff -Nur gtk+2.0-2.21.2/gdk/directfb/Makefile.in gtk+2.0-2.21.2.ubuntu/gdk/directfb/Makefile.in
9480
--- gtk+2.0-2.21.2/gdk/directfb/Makefile.in 2010-06-10 19:18:23.000000000 +0200
9481
+++ gtk+2.0-2.21.2.ubuntu/gdk/directfb/Makefile.in 2010-06-11 12:15:22.000000000 +0200
9482
@@ -42,7 +42,10 @@
15026
@@ -267,6 +271,7 @@
15027
libexecdir = @libexecdir@
15028
localedir = @localedir@
15029
localstatedir = @localstatedir@
15030
+lt_ECHO = @lt_ECHO@
15031
mandir = @mandir@
15032
mkdir_p = @mkdir_p@
15033
ms_librarian = @ms_librarian@
15034
Index: gtk+-2.21.5/gdk/directfb/Makefile.in
15035
===================================================================
15036
--- gtk+-2.21.5.orig/gdk/directfb/Makefile.in 2010-07-22 21:44:03.100072001 +0200
15037
+++ gtk+-2.21.5/gdk/directfb/Makefile.in 2010-07-22 21:44:20.200072000 +0200
15038
@@ -41,11 +41,14 @@
15039
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl AUTHORS TODO
9483
15040
subdir = gdk/directfb
9484
15041
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9485
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
9486
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9487
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
9488
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
9489
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
9490
+ $(top_srcdir)/configure.in
15042
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
15043
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
15044
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
15045
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
15046
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
15047
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9491
15048
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9492
15049
$(ACLOCAL_M4)
9493
mkinstalldirs = $(install_sh) -d
9494
@@ -194,6 +197,7 @@
9495
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
9496
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
9497
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
15050
-mkinstalldirs = $(install_sh) -d
15051
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
15052
CONFIG_HEADER = $(top_builddir)/config.h
15053
CONFIG_CLEAN_FILES =
15054
CONFIG_CLEAN_VPATH_FILES =
15055
@@ -181,6 +184,7 @@
15056
GDK_PACKAGES = @GDK_PACKAGES@
15057
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
15058
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
9498
15059
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
9499
15060
GDK_WLIBS = @GDK_WLIBS@
9500
15061
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
9501
15062
GLIB_CFLAGS = @GLIB_CFLAGS@
9502
@@ -286,8 +290,6 @@
9503
PATH_SEPARATOR = @PATH_SEPARATOR@
9504
PERL = @PERL@
9505
PKG_CONFIG = @PKG_CONFIG@
9506
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
9507
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
9508
POFILES = @POFILES@
9509
POSUB = @POSUB@
9510
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
9511
diff -Nur gtk+2.0-2.21.2/gdk/Makefile.in gtk+2.0-2.21.2.ubuntu/gdk/Makefile.in
9512
--- gtk+2.0-2.21.2/gdk/Makefile.in 2010-06-10 19:18:23.000000000 +0200
9513
+++ gtk+2.0-2.21.2.ubuntu/gdk/Makefile.in 2010-06-11 12:15:22.000000000 +0200
9514
@@ -46,7 +46,10 @@
15063
@@ -331,6 +335,7 @@
15064
libexecdir = @libexecdir@
15065
localedir = @localedir@
15066
localstatedir = @localstatedir@
15067
+lt_ECHO = @lt_ECHO@
15068
mandir = @mandir@
15069
mkdir_p = @mkdir_p@
15070
ms_librarian = @ms_librarian@
15071
Index: gtk+-2.21.5/gdk/Makefile.in
15072
===================================================================
15073
--- gtk+-2.21.5.orig/gdk/Makefile.in 2010-07-22 21:44:03.120072001 +0200
15074
+++ gtk+-2.21.5/gdk/Makefile.in 2010-07-22 21:44:20.120072000 +0200
15075
@@ -44,11 +44,14 @@
15076
@HAVE_INTROSPECTION_TRUE@am__append_2 = $(gir_DATA) $(typelibs_DATA)
9515
15077
subdir = gdk
9516
15078
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9517
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
9518
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9519
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
9520
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
9521
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
9522
+ $(top_srcdir)/configure.in
15079
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
15080
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
15081
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
15082
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
15083
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
15084
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9523
15085
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9524
15086
$(ACLOCAL_M4)
9525
mkinstalldirs = $(install_sh) -d
9526
@@ -321,6 +324,7 @@
9527
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
9528
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
9529
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
15087
-mkinstalldirs = $(install_sh) -d
15088
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
15089
CONFIG_HEADER = $(top_builddir)/config.h
15090
CONFIG_CLEAN_FILES =
15091
CONFIG_CLEAN_VPATH_FILES =
15092
@@ -303,6 +306,7 @@
15093
GDK_PACKAGES = @GDK_PACKAGES@
15094
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
15095
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
9530
15096
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
9531
15097
GDK_WLIBS = @GDK_WLIBS@
9532
15098
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
9533
15099
GLIB_CFLAGS = @GLIB_CFLAGS@
9534
@@ -413,8 +417,6 @@
9535
PATH_SEPARATOR = @PATH_SEPARATOR@
9536
PERL = @PERL@
9537
PKG_CONFIG = @PKG_CONFIG@
9538
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
9539
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
9540
POFILES = @POFILES@
9541
POSUB = @POSUB@
9542
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
9543
diff -Nur gtk+2.0-2.21.2/gdk/quartz/Makefile.in gtk+2.0-2.21.2.ubuntu/gdk/quartz/Makefile.in
9544
--- gtk+2.0-2.21.2/gdk/quartz/Makefile.in 2010-06-10 19:18:23.000000000 +0200
9545
+++ gtk+2.0-2.21.2.ubuntu/gdk/quartz/Makefile.in 2010-06-11 12:15:22.000000000 +0200
9546
@@ -42,7 +42,10 @@
15100
@@ -453,6 +457,7 @@
15101
libexecdir = @libexecdir@
15102
localedir = @localedir@
15103
localstatedir = @localstatedir@
15104
+lt_ECHO = @lt_ECHO@
15105
mandir = @mandir@
15106
mkdir_p = @mkdir_p@
15107
ms_librarian = @ms_librarian@
15108
Index: gtk+-2.21.5/gdk/quartz/Makefile.in
15109
===================================================================
15110
--- gtk+-2.21.5.orig/gdk/quartz/Makefile.in 2010-07-22 21:44:03.090072001 +0200
15111
+++ gtk+-2.21.5/gdk/quartz/Makefile.in 2010-07-22 21:44:20.290072000 +0200
15112
@@ -41,11 +41,14 @@
15113
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
9547
15114
subdir = gdk/quartz
9548
15115
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9549
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
9550
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9551
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
9552
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
9553
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
9554
+ $(top_srcdir)/configure.in
15116
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
15117
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
15118
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
15119
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
15120
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
15121
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9555
15122
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9556
15123
$(ACLOCAL_M4)
9557
mkinstalldirs = $(install_sh) -d
9558
@@ -193,6 +196,7 @@
9559
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
9560
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
9561
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
15124
-mkinstalldirs = $(install_sh) -d
15125
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
15126
CONFIG_HEADER = $(top_builddir)/config.h
15127
CONFIG_CLEAN_FILES =
15128
CONFIG_CLEAN_VPATH_FILES =
15129
@@ -180,6 +183,7 @@
15130
GDK_PACKAGES = @GDK_PACKAGES@
15131
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
15132
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
9562
15133
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
9563
15134
GDK_WLIBS = @GDK_WLIBS@
9564
15135
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
9565
15136
GLIB_CFLAGS = @GLIB_CFLAGS@
9566
@@ -285,8 +289,6 @@
9567
PATH_SEPARATOR = @PATH_SEPARATOR@
9568
PERL = @PERL@
9569
PKG_CONFIG = @PKG_CONFIG@
9570
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
9571
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
9572
POFILES = @POFILES@
9573
POSUB = @POSUB@
9574
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
9575
diff -Nur gtk+2.0-2.21.2/gdk/tests/Makefile.in gtk+2.0-2.21.2.ubuntu/gdk/tests/Makefile.in
9576
--- gtk+2.0-2.21.2/gdk/tests/Makefile.in 2010-06-10 19:18:23.000000000 +0200
9577
+++ gtk+2.0-2.21.2.ubuntu/gdk/tests/Makefile.in 2010-06-11 12:15:22.000000000 +0200
9578
@@ -42,7 +42,10 @@
15137
@@ -330,6 +334,7 @@
15138
libexecdir = @libexecdir@
15139
localedir = @localedir@
15140
localstatedir = @localstatedir@
15141
+lt_ECHO = @lt_ECHO@
15142
mandir = @mandir@
15143
mkdir_p = @mkdir_p@
15144
ms_librarian = @ms_librarian@
15145
Index: gtk+-2.21.5/gdk/tests/Makefile.in
15146
===================================================================
15147
--- gtk+-2.21.5.orig/gdk/tests/Makefile.in 2010-07-22 21:44:03.120072001 +0200
15148
+++ gtk+-2.21.5/gdk/tests/Makefile.in 2010-07-22 21:44:20.360072000 +0200
15149
@@ -41,11 +41,14 @@
15150
TESTS = $(am__EXEEXT_1)
9579
15151
subdir = gdk/tests
9580
15152
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9581
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
9582
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9583
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
9584
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
9585
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
9586
+ $(top_srcdir)/configure.in
15153
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
15154
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
15155
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
15156
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
15157
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
15158
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9587
15159
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9588
15160
$(ACLOCAL_M4)
9589
mkinstalldirs = $(install_sh) -d
9590
@@ -135,6 +138,7 @@
9591
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
9592
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
9593
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
15161
-mkinstalldirs = $(install_sh) -d
15162
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
15163
CONFIG_HEADER = $(top_builddir)/config.h
15164
CONFIG_CLEAN_FILES =
15165
CONFIG_CLEAN_VPATH_FILES =
15166
@@ -122,6 +125,7 @@
15167
GDK_PACKAGES = @GDK_PACKAGES@
15168
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
15169
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
9594
15170
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
9595
15171
GDK_WLIBS = @GDK_WLIBS@
9596
15172
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
9597
15173
GLIB_CFLAGS = @GLIB_CFLAGS@
9598
@@ -227,8 +231,6 @@
9599
PATH_SEPARATOR = @PATH_SEPARATOR@
9600
PERL = @PERL@
9601
PKG_CONFIG = @PKG_CONFIG@
9602
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
9603
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
9604
POFILES = @POFILES@
9605
POSUB = @POSUB@
9606
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
9607
diff -Nur gtk+2.0-2.21.2/gdk/win32/Makefile.in gtk+2.0-2.21.2.ubuntu/gdk/win32/Makefile.in
9608
--- gtk+2.0-2.21.2/gdk/win32/Makefile.in 2010-06-10 19:18:23.000000000 +0200
9609
+++ gtk+2.0-2.21.2.ubuntu/gdk/win32/Makefile.in 2010-06-11 12:15:22.000000000 +0200
9610
@@ -42,7 +42,10 @@
15174
@@ -272,6 +276,7 @@
15175
libexecdir = @libexecdir@
15176
localedir = @localedir@
15177
localstatedir = @localstatedir@
15178
+lt_ECHO = @lt_ECHO@
15179
mandir = @mandir@
15180
mkdir_p = @mkdir_p@
15181
ms_librarian = @ms_librarian@
15182
Index: gtk+-2.21.5/gdk/win32/Makefile.in
15183
===================================================================
15184
--- gtk+-2.21.5.orig/gdk/win32/Makefile.in 2010-07-22 21:44:03.110072001 +0200
15185
+++ gtk+-2.21.5/gdk/win32/Makefile.in 2010-07-22 21:44:20.460072000 +0200
15186
@@ -41,11 +41,14 @@
15187
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
9611
15188
subdir = gdk/win32
9612
15189
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9613
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
9614
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9615
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
9616
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
9617
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
9618
+ $(top_srcdir)/configure.in
15190
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
15191
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
15192
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
15193
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
15194
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
15195
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9619
15196
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9620
15197
$(ACLOCAL_M4)
9621
mkinstalldirs = $(install_sh) -d
9622
@@ -231,6 +234,7 @@
9623
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
9624
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
9625
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
15198
-mkinstalldirs = $(install_sh) -d
15199
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
15200
CONFIG_HEADER = $(top_builddir)/config.h
15201
CONFIG_CLEAN_FILES =
15202
CONFIG_CLEAN_VPATH_FILES =
15203
@@ -218,6 +221,7 @@
15204
GDK_PACKAGES = @GDK_PACKAGES@
15205
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
15206
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
9626
15207
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
9627
15208
GDK_WLIBS = @GDK_WLIBS@
9628
15209
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
9629
15210
GLIB_CFLAGS = @GLIB_CFLAGS@
9630
@@ -323,8 +327,6 @@
9631
PATH_SEPARATOR = @PATH_SEPARATOR@
9632
PERL = @PERL@
9633
PKG_CONFIG = @PKG_CONFIG@
9634
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
9635
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
9636
POFILES = @POFILES@
9637
POSUB = @POSUB@
9638
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
9639
diff -Nur gtk+2.0-2.21.2/gdk/win32/rc/Makefile.in gtk+2.0-2.21.2.ubuntu/gdk/win32/rc/Makefile.in
9640
--- gtk+2.0-2.21.2/gdk/win32/rc/Makefile.in 2010-06-10 19:18:23.000000000 +0200
9641
+++ gtk+2.0-2.21.2.ubuntu/gdk/win32/rc/Makefile.in 2010-06-11 12:15:22.000000000 +0200
9642
@@ -41,7 +41,10 @@
15211
@@ -368,6 +372,7 @@
15212
libexecdir = @libexecdir@
15213
localedir = @localedir@
15214
localstatedir = @localstatedir@
15215
+lt_ECHO = @lt_ECHO@
15216
mandir = @mandir@
15217
mkdir_p = @mkdir_p@
15218
ms_librarian = @ms_librarian@
15219
Index: gtk+-2.21.5/gdk/win32/rc/Makefile.in
15220
===================================================================
15221
--- gtk+-2.21.5.orig/gdk/win32/rc/Makefile.in 2010-07-22 21:44:03.100072001 +0200
15222
+++ gtk+-2.21.5/gdk/win32/rc/Makefile.in 2010-07-22 21:44:20.530072000 +0200
15223
@@ -40,11 +40,14 @@
15224
$(srcdir)/gdk.rc.in $(top_srcdir)/Makefile.decl
9643
15225
subdir = gdk/win32/rc
9644
15226
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9645
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
9646
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9647
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
9648
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
9649
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
9650
+ $(top_srcdir)/configure.in
15227
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
15228
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
15229
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
15230
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
15231
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
15232
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9651
15233
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9652
15234
$(ACLOCAL_M4)
9653
mkinstalldirs = $(install_sh) -d
9654
@@ -132,6 +135,7 @@
9655
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
9656
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
9657
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
15235
-mkinstalldirs = $(install_sh) -d
15236
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
15237
CONFIG_HEADER = $(top_builddir)/config.h
15238
CONFIG_CLEAN_FILES = gdk.rc
15239
CONFIG_CLEAN_VPATH_FILES =
15240
@@ -119,6 +122,7 @@
15241
GDK_PACKAGES = @GDK_PACKAGES@
15242
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
15243
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
9658
15244
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
9659
15245
GDK_WLIBS = @GDK_WLIBS@
9660
15246
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
9661
15247
GLIB_CFLAGS = @GLIB_CFLAGS@
9662
@@ -224,8 +228,6 @@
9663
PATH_SEPARATOR = @PATH_SEPARATOR@
9664
PERL = @PERL@
9665
PKG_CONFIG = @PKG_CONFIG@
9666
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
9667
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
9668
POFILES = @POFILES@
9669
POSUB = @POSUB@
9670
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
9671
diff -Nur gtk+2.0-2.21.2/gdk/x11/Makefile.in gtk+2.0-2.21.2.ubuntu/gdk/x11/Makefile.in
9672
--- gtk+2.0-2.21.2/gdk/x11/Makefile.in 2010-06-10 19:18:24.000000000 +0200
9673
+++ gtk+2.0-2.21.2.ubuntu/gdk/x11/Makefile.in 2010-06-11 12:15:22.000000000 +0200
9674
@@ -47,7 +47,10 @@
15248
@@ -269,6 +273,7 @@
15249
libexecdir = @libexecdir@
15250
localedir = @localedir@
15251
localstatedir = @localstatedir@
15252
+lt_ECHO = @lt_ECHO@
15253
mandir = @mandir@
15254
mkdir_p = @mkdir_p@
15255
ms_librarian = @ms_librarian@
15256
Index: gtk+-2.21.5/gdk/x11/Makefile.in
15257
===================================================================
15258
--- gtk+-2.21.5.orig/gdk/x11/Makefile.in 2010-07-22 21:44:03.130072001 +0200
15259
+++ gtk+-2.21.5/gdk/x11/Makefile.in 2010-07-22 21:44:20.630072000 +0200
15260
@@ -46,11 +46,14 @@
15261
TESTS = checksettings$(EXEEXT)
9675
15262
subdir = gdk/x11
9676
15263
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9677
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
9678
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9679
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
9680
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
9681
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
9682
+ $(top_srcdir)/configure.in
9683
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9684
$(ACLOCAL_M4)
9685
mkinstalldirs = $(install_sh) -d
9686
@@ -223,6 +226,7 @@
9687
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
9688
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
9689
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
9690
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
9691
GDK_WLIBS = @GDK_WLIBS@
9692
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
9693
GLIB_CFLAGS = @GLIB_CFLAGS@
9694
@@ -315,8 +319,6 @@
9695
PATH_SEPARATOR = @PATH_SEPARATOR@
9696
PERL = @PERL@
9697
PKG_CONFIG = @PKG_CONFIG@
9698
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
9699
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
9700
POFILES = @POFILES@
9701
POSUB = @POSUB@
9702
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
9703
diff -Nur gtk+2.0-2.21.2/gdk-pixbuf/Makefile.in gtk+2.0-2.21.2.ubuntu/gdk-pixbuf/Makefile.in
9704
--- gtk+2.0-2.21.2/gdk-pixbuf/Makefile.in 2010-06-10 19:18:23.000000000 +0200
9705
+++ gtk+2.0-2.21.2.ubuntu/gdk-pixbuf/Makefile.in 2010-06-11 12:15:21.000000000 +0200
9706
@@ -52,7 +52,10 @@
9707
subdir = gdk-pixbuf
9708
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9709
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
9710
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9711
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
9712
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
9713
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
9714
+ $(top_srcdir)/configure.in
9715
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9716
$(ACLOCAL_M4)
9717
mkinstalldirs = $(install_sh) -d
9718
@@ -779,6 +782,7 @@
9719
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
9720
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
9721
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
9722
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
9723
GDK_WLIBS = @GDK_WLIBS@
9724
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
9725
GLIB_CFLAGS = @GLIB_CFLAGS@
9726
@@ -871,8 +875,6 @@
9727
PATH_SEPARATOR = @PATH_SEPARATOR@
9728
PERL = @PERL@
9729
PKG_CONFIG = @PKG_CONFIG@
9730
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
9731
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
9732
POFILES = @POFILES@
9733
POSUB = @POSUB@
9734
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
9735
@@ -1001,6 +1003,7 @@
9736
libgdk_pixbuf-2.0.la
9737
9738
loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders
9739
+loaderfilesdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loader-files.d
9740
module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
9741
9742
#
9743
@@ -1358,7 +1361,7 @@
9744
$(GDK_PIXBUF_DEP_CFLAGS) \
9745
-DGDK_PIXBUF_ENABLE_BACKEND
9746
9747
-AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
9748
+AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DPIXBUF_FILES_LIBDIR=\"$(loaderfilesdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
9749
LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
9750
test_gdk_pixbuf_LDADD = $(LDADDS)
9751
gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
9752
diff -Nur gtk+2.0-2.21.2/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.21.2.ubuntu/gdk-pixbuf/pixops/Makefile.in
9753
--- gtk+2.0-2.21.2/gdk-pixbuf/pixops/Makefile.in 2010-06-10 19:18:23.000000000 +0200
9754
+++ gtk+2.0-2.21.2.ubuntu/gdk-pixbuf/pixops/Makefile.in 2010-06-11 12:15:21.000000000 +0200
9755
@@ -43,7 +43,10 @@
9756
subdir = gdk-pixbuf/pixops
9757
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9758
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
9759
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9760
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
9761
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
9762
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
9763
+ $(top_srcdir)/configure.in
9764
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9765
$(ACLOCAL_M4)
9766
mkinstalldirs = $(install_sh) -d
9767
@@ -183,6 +186,7 @@
9768
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
9769
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
9770
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
9771
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
9772
GDK_WLIBS = @GDK_WLIBS@
9773
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
9774
GLIB_CFLAGS = @GLIB_CFLAGS@
9775
@@ -275,8 +279,6 @@
9776
PATH_SEPARATOR = @PATH_SEPARATOR@
9777
PERL = @PERL@
9778
PKG_CONFIG = @PKG_CONFIG@
9779
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
9780
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
9781
POFILES = @POFILES@
9782
POSUB = @POSUB@
9783
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
9784
diff -Nur gtk+2.0-2.21.2/gtk/Makefile.in gtk+2.0-2.21.2.ubuntu/gtk/Makefile.in
9785
--- gtk+2.0-2.21.2/gtk/Makefile.in 2010-06-10 19:18:24.000000000 +0200
9786
+++ gtk+2.0-2.21.2.ubuntu/gtk/Makefile.in 2010-06-11 12:15:22.000000000 +0200
9787
@@ -78,7 +78,10 @@
15264
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
15265
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
15266
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
15267
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
15268
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
15269
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
15270
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
15271
$(ACLOCAL_M4)
15272
-mkinstalldirs = $(install_sh) -d
15273
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
15274
CONFIG_HEADER = $(top_builddir)/config.h
15275
CONFIG_CLEAN_FILES =
15276
CONFIG_CLEAN_VPATH_FILES =
15277
@@ -209,6 +212,7 @@
15278
GDK_PACKAGES = @GDK_PACKAGES@
15279
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
15280
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
15281
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
15282
GDK_WLIBS = @GDK_WLIBS@
15283
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
15284
GLIB_CFLAGS = @GLIB_CFLAGS@
15285
@@ -359,6 +363,7 @@
15286
libexecdir = @libexecdir@
15287
localedir = @localedir@
15288
localstatedir = @localstatedir@
15289
+lt_ECHO = @lt_ECHO@
15290
mandir = @mandir@
15291
mkdir_p = @mkdir_p@
15292
ms_librarian = @ms_librarian@
15293
Index: gtk+-2.21.5/gtk/Makefile.in
15294
===================================================================
15295
--- gtk+-2.21.5.orig/gtk/Makefile.in 2010-07-22 21:44:03.420072001 +0200
15296
+++ gtk+-2.21.5/gtk/Makefile.in 2010-07-22 21:44:20.960072000 +0200
15297
@@ -77,11 +77,14 @@
15298
9788
15299
subdir = gtk
9789
15300
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9790
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
9791
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9792
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
9793
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
9794
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
9795
+ $(top_srcdir)/configure.in
15301
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
15302
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
15303
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
15304
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
15305
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
15306
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
9796
15307
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9797
15308
$(ACLOCAL_M4)
9798
mkinstalldirs = $(install_sh) -d
9799
@@ -148,16 +151,17 @@
15309
-mkinstalldirs = $(install_sh) -d
15310
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
15311
CONFIG_HEADER = $(top_builddir)/config.h
15312
CONFIG_CLEAN_FILES = makefile.msc gtkversion.h gtk-win32.rc
15313
CONFIG_CLEAN_VPATH_FILES =
15314
@@ -147,16 +150,17 @@
9800
15315
gtkinfobar.c gtkinputdialog.c gtkinvisible.c gtkitem.c \
9801
15316
gtkkeyhash.c gtklabel.c gtklayout.c gtklinkbutton.c \
9802
15317
gtkliststore.c gtkmain.c gtkmarshal.c gtkmarshalers.c \
9824
15339
gtkrecentchooserdialog.c gtkrecentchoosermenu.c \
9825
15340
gtkrecentchooserwidget.c gtkrecentchooserutils.c \
9826
15341
gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \
9827
@@ -181,13 +185,13 @@
9828
gtktypeutils.c gtkuimanager.c gtkvbbox.c gtkvbox.c \
9829
gtkvolumebutton.c gtkviewport.c gtkvpaned.c gtkvruler.c \
9830
gtkvscale.c gtkvscrollbar.c gtkvseparator.c gtkwidget.c \
9831
- gtkwindow-decorate.c gtkwindow.c gtkclipboard.c gtkdnd.c \
9832
- gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c gtktext.c \
9833
- gtktree.c gtktreeitem.c gtkclist.c gtkcombo.c gtkctree.c \
9834
- gtkcurve.c gtkfilesel.c gtkgamma.c gtkitemfactory.c gtklist.c \
9835
- gtklistitem.c gtkoldeditable.c gtkoptionmenu.c gtkpixmap.c \
9836
- gtkpreview.c gtkprogress.c gtksignal.c gtktipsquery.c \
9837
- gtktooltips.c gtkcustompaperunixdialog.c \
9838
+ gtkwindow.c gtkclipboard.c gtkdnd.c gtkclipboard-quartz.c \
9839
+ gtkdnd-quartz.c gtkquartz.c gtktext.c gtktree.c gtktreeitem.c \
9840
+ gtkclist.c gtkcombo.c gtkctree.c gtkcurve.c gtkfilesel.c \
9841
+ gtkgamma.c gtkitemfactory.c gtklist.c gtklistitem.c \
9842
+ gtkoldeditable.c gtkoptionmenu.c gtkpixmap.c gtkpreview.c \
9843
+ gtkprogress.c gtksignal.c gtktipsquery.c gtktooltips.c \
9844
+ gtkwindow-decorate.c gtkcustompaperunixdialog.c \
9845
gtkpagesetupunixdialog.c gtkprinter.c gtkprinteroption.c \
9846
gtkprinteroptionset.c gtkprinteroptionwidget.c gtkprintjob.c \
9847
gtkprintoperation-unix.c gtkprintunixdialog.c \
9848
@@ -234,26 +238,27 @@
15342
@@ -233,26 +237,27 @@
9849
15343
gtkinfobar.lo gtkinputdialog.lo gtkinvisible.lo gtkitem.lo \
9850
15344
gtkkeyhash.lo gtklabel.lo gtklayout.lo gtklinkbutton.lo \
9851
15345
gtkliststore.lo gtkmain.lo gtkmarshal.lo gtkmarshalers.lo \
9893
15387
gtktextbtree.lo gtktextbuffer.lo gtktextbufferrichtext.lo \
9894
15388
gtktextbufferserialize.lo gtktextchild.lo gtktextdisplay.lo \
9895
15389
gtktextiter.lo gtktextlayout.lo gtktextmark.lo \
9896
@@ -268,13 +273,13 @@
9897
gtktreeviewcolumn.lo gtktypebuiltins.lo gtktypeutils.lo \
9898
gtkuimanager.lo gtkvbbox.lo gtkvbox.lo gtkvolumebutton.lo \
9899
gtkviewport.lo gtkvpaned.lo gtkvruler.lo gtkvscale.lo \
9900
- gtkvscrollbar.lo gtkvseparator.lo gtkwidget.lo \
9901
- gtkwindow-decorate.lo gtkwindow.lo $(am__objects_1) gtktext.lo \
9902
- gtktree.lo gtktreeitem.lo gtkclist.lo gtkcombo.lo gtkctree.lo \
9903
- gtkcurve.lo gtkfilesel.lo gtkgamma.lo gtkitemfactory.lo \
9904
- gtklist.lo gtklistitem.lo gtkoldeditable.lo gtkoptionmenu.lo \
9905
- gtkpixmap.lo gtkpreview.lo gtkprogress.lo gtksignal.lo \
9906
- gtktipsquery.lo gtktooltips.lo
9907
+ gtkvscrollbar.lo gtkvseparator.lo gtkwidget.lo gtkwindow.lo \
9908
+ $(am__objects_1) gtktext.lo gtktree.lo gtktreeitem.lo \
9909
+ gtkclist.lo gtkcombo.lo gtkctree.lo gtkcurve.lo gtkfilesel.lo \
9910
+ gtkgamma.lo gtkitemfactory.lo gtklist.lo gtklistitem.lo \
9911
+ gtkoldeditable.lo gtkoptionmenu.lo gtkpixmap.lo gtkpreview.lo \
9912
+ gtkprogress.lo gtksignal.lo gtktipsquery.lo gtktooltips.lo \
9913
+ gtkwindow-decorate.lo
9914
am__objects_3 = gtkcustompaperunixdialog.lo gtkpagesetupunixdialog.lo \
9915
gtkprinter.lo gtkprinteroption.lo gtkprinteroptionset.lo \
9916
gtkprinteroptionwidget.lo gtkprintjob.lo \
9917
@@ -339,16 +344,17 @@
9918
gtkinfobar.c gtkinputdialog.c gtkinvisible.c gtkitem.c \
9919
gtkkeyhash.c gtklabel.c gtklayout.c gtklinkbutton.c \
9920
gtkliststore.c gtkmain.c gtkmarshal.c gtkmarshalers.c \
9921
- gtkmenu.c gtkmenubar.c gtkmenuitem.c gtkmenushell.c \
9922
- gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \
9923
- gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \
9924
- gtknotebook.c gtkobject.c gtkoffscreenwindow.c gtkorientable.c \
9925
- gtkpagesetup.c gtkpaned.c gtkpapersize.c gtkpathbar.c \
9926
- gtkplug.c gtkprintcontext.c gtkprintoperation.c \
9927
- gtkprintoperationpreview.c gtkprintsettings.c gtkprintutils.c \
9928
- gtkprogressbar.c gtkradioaction.c gtkradiobutton.c \
9929
- gtkradiomenuitem.c gtkradiotoolbutton.c gtkrange.c gtkrbtree.c \
9930
- gtkrc.c gtkrecentaction.c gtkrecentchooserdefault.c \
9931
+ gtkmenu.c gtkmenubar.c gtkmenuitem.c ubuntumenuproxy.c \
9932
+ ubuntumenuproxymodule.c gtkmenushell.c gtkmenutoolbutton.c \
9933
+ gtkmessagedialog.c gtkmisc.c gtkmnemonichash.c gtkmodules.c \
9934
+ gtkmountoperation.c gtknotebook.c gtkobject.c \
9935
+ gtkoffscreenwindow.c gtkorientable.c gtkpagesetup.c gtkpaned.c \
9936
+ gtkpapersize.c gtkpathbar.c gtkplug.c gtkprintcontext.c \
9937
+ gtkprintoperation.c gtkprintoperationpreview.c \
9938
+ gtkprintsettings.c gtkprintutils.c gtkprogressbar.c \
9939
+ gtkradioaction.c gtkradiobutton.c gtkradiomenuitem.c \
9940
+ gtkradiotoolbutton.c gtkrange.c gtkrbtree.c gtkrc.c \
9941
+ gtkrecentaction.c gtkrecentchooserdefault.c \
9942
gtkrecentchooserdialog.c gtkrecentchoosermenu.c \
9943
gtkrecentchooserwidget.c gtkrecentchooserutils.c \
9944
gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \
9945
@@ -372,13 +378,13 @@
9946
gtktypeutils.c gtkuimanager.c gtkvbbox.c gtkvbox.c \
9947
gtkvolumebutton.c gtkviewport.c gtkvpaned.c gtkvruler.c \
9948
gtkvscale.c gtkvscrollbar.c gtkvseparator.c gtkwidget.c \
9949
- gtkwindow-decorate.c gtkwindow.c gtkclipboard.c gtkdnd.c \
9950
- gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c gtktext.c \
9951
- gtktree.c gtktreeitem.c gtkclist.c gtkcombo.c gtkctree.c \
9952
- gtkcurve.c gtkfilesel.c gtkgamma.c gtkitemfactory.c gtklist.c \
9953
- gtklistitem.c gtkoldeditable.c gtkoptionmenu.c gtkpixmap.c \
9954
- gtkpreview.c gtkprogress.c gtksignal.c gtktipsquery.c \
9955
- gtktooltips.c gtkcustompaperunixdialog.c \
9956
+ gtkwindow.c gtkclipboard.c gtkdnd.c gtkclipboard-quartz.c \
9957
+ gtkdnd-quartz.c gtkquartz.c gtktext.c gtktree.c gtktreeitem.c \
9958
+ gtkclist.c gtkcombo.c gtkctree.c gtkcurve.c gtkfilesel.c \
9959
+ gtkgamma.c gtkitemfactory.c gtklist.c gtklistitem.c \
9960
+ gtkoldeditable.c gtkoptionmenu.c gtkpixmap.c gtkpreview.c \
9961
+ gtkprogress.c gtksignal.c gtktipsquery.c gtktooltips.c \
9962
+ gtkwindow-decorate.c gtkcustompaperunixdialog.c \
9963
gtkpagesetupunixdialog.c gtkprinter.c gtkprinteroption.c \
9964
gtkprinteroptionset.c gtkprinteroptionwidget.c gtkprintjob.c \
9965
gtkprintoperation-unix.c gtkprintunixdialog.c \
9966
@@ -426,16 +432,17 @@
9967
gtkinfobar.c gtkinputdialog.c gtkinvisible.c gtkitem.c \
9968
gtkkeyhash.c gtklabel.c gtklayout.c gtklinkbutton.c \
9969
gtkliststore.c gtkmain.c gtkmarshal.c gtkmarshalers.c \
9970
- gtkmenu.c gtkmenubar.c gtkmenuitem.c gtkmenushell.c \
9971
- gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \
9972
- gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \
9973
- gtknotebook.c gtkobject.c gtkoffscreenwindow.c gtkorientable.c \
9974
- gtkpagesetup.c gtkpaned.c gtkpapersize.c gtkpathbar.c \
9975
- gtkplug.c gtkprintcontext.c gtkprintoperation.c \
9976
- gtkprintoperationpreview.c gtkprintsettings.c gtkprintutils.c \
9977
- gtkprogressbar.c gtkradioaction.c gtkradiobutton.c \
9978
- gtkradiomenuitem.c gtkradiotoolbutton.c gtkrange.c gtkrbtree.c \
9979
- gtkrc.c gtkrecentaction.c gtkrecentchooserdefault.c \
9980
+ gtkmenu.c gtkmenubar.c gtkmenuitem.c ubuntumenuproxy.c \
9981
+ ubuntumenuproxymodule.c gtkmenushell.c gtkmenutoolbutton.c \
9982
+ gtkmessagedialog.c gtkmisc.c gtkmnemonichash.c gtkmodules.c \
9983
+ gtkmountoperation.c gtknotebook.c gtkobject.c \
9984
+ gtkoffscreenwindow.c gtkorientable.c gtkpagesetup.c gtkpaned.c \
9985
+ gtkpapersize.c gtkpathbar.c gtkplug.c gtkprintcontext.c \
9986
+ gtkprintoperation.c gtkprintoperationpreview.c \
9987
+ gtkprintsettings.c gtkprintutils.c gtkprogressbar.c \
9988
+ gtkradioaction.c gtkradiobutton.c gtkradiomenuitem.c \
9989
+ gtkradiotoolbutton.c gtkrange.c gtkrbtree.c gtkrc.c \
9990
+ gtkrecentaction.c gtkrecentchooserdefault.c \
9991
gtkrecentchooserdialog.c gtkrecentchoosermenu.c \
9992
gtkrecentchooserwidget.c gtkrecentchooserutils.c \
9993
gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \
9994
@@ -459,13 +466,13 @@
9995
gtktypeutils.c gtkuimanager.c gtkvbbox.c gtkvbox.c \
9996
gtkvolumebutton.c gtkviewport.c gtkvpaned.c gtkvruler.c \
9997
gtkvscale.c gtkvscrollbar.c gtkvseparator.c gtkwidget.c \
9998
- gtkwindow-decorate.c gtkwindow.c gtkclipboard.c gtkdnd.c \
9999
- gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c gtktext.c \
10000
- gtktree.c gtktreeitem.c gtkclist.c gtkcombo.c gtkctree.c \
10001
- gtkcurve.c gtkfilesel.c gtkgamma.c gtkitemfactory.c gtklist.c \
10002
- gtklistitem.c gtkoldeditable.c gtkoptionmenu.c gtkpixmap.c \
10003
- gtkpreview.c gtkprogress.c gtksignal.c gtktipsquery.c \
10004
- gtktooltips.c gtkcustompaperunixdialog.c \
10005
+ gtkwindow.c gtkclipboard.c gtkdnd.c gtkclipboard-quartz.c \
10006
+ gtkdnd-quartz.c gtkquartz.c gtktext.c gtktree.c gtktreeitem.c \
10007
+ gtkclist.c gtkcombo.c gtkctree.c gtkcurve.c gtkfilesel.c \
10008
+ gtkgamma.c gtkitemfactory.c gtklist.c gtklistitem.c \
10009
+ gtkoldeditable.c gtkoptionmenu.c gtkpixmap.c gtkpreview.c \
10010
+ gtkprogress.c gtksignal.c gtktipsquery.c gtktooltips.c \
10011
+ gtkwindow-decorate.c gtkcustompaperunixdialog.c \
10012
gtkpagesetupunixdialog.c gtkprinter.c gtkprinteroption.c \
10013
gtkprinteroptionset.c gtkprinteroptionwidget.c gtkprintjob.c \
10014
gtkprintoperation-unix.c gtkprintunixdialog.c \
10015
@@ -513,16 +520,17 @@
10016
gtkinfobar.c gtkinputdialog.c gtkinvisible.c gtkitem.c \
10017
gtkkeyhash.c gtklabel.c gtklayout.c gtklinkbutton.c \
10018
gtkliststore.c gtkmain.c gtkmarshal.c gtkmarshalers.c \
10019
- gtkmenu.c gtkmenubar.c gtkmenuitem.c gtkmenushell.c \
10020
- gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \
10021
- gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \
10022
- gtknotebook.c gtkobject.c gtkoffscreenwindow.c gtkorientable.c \
10023
- gtkpagesetup.c gtkpaned.c gtkpapersize.c gtkpathbar.c \
10024
- gtkplug.c gtkprintcontext.c gtkprintoperation.c \
10025
- gtkprintoperationpreview.c gtkprintsettings.c gtkprintutils.c \
10026
- gtkprogressbar.c gtkradioaction.c gtkradiobutton.c \
10027
- gtkradiomenuitem.c gtkradiotoolbutton.c gtkrange.c gtkrbtree.c \
10028
- gtkrc.c gtkrecentaction.c gtkrecentchooserdefault.c \
10029
+ gtkmenu.c gtkmenubar.c gtkmenuitem.c ubuntumenuproxy.c \
10030
+ ubuntumenuproxymodule.c gtkmenushell.c gtkmenutoolbutton.c \
10031
+ gtkmessagedialog.c gtkmisc.c gtkmnemonichash.c gtkmodules.c \
10032
+ gtkmountoperation.c gtknotebook.c gtkobject.c \
10033
+ gtkoffscreenwindow.c gtkorientable.c gtkpagesetup.c gtkpaned.c \
10034
+ gtkpapersize.c gtkpathbar.c gtkplug.c gtkprintcontext.c \
10035
+ gtkprintoperation.c gtkprintoperationpreview.c \
10036
+ gtkprintsettings.c gtkprintutils.c gtkprogressbar.c \
10037
+ gtkradioaction.c gtkradiobutton.c gtkradiomenuitem.c \
10038
+ gtkradiotoolbutton.c gtkrange.c gtkrbtree.c gtkrc.c \
10039
+ gtkrecentaction.c gtkrecentchooserdefault.c \
10040
gtkrecentchooserdialog.c gtkrecentchoosermenu.c \
10041
gtkrecentchooserwidget.c gtkrecentchooserutils.c \
10042
gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \
10043
@@ -546,13 +554,13 @@
10044
gtktypeutils.c gtkuimanager.c gtkvbbox.c gtkvbox.c \
10045
gtkvolumebutton.c gtkviewport.c gtkvpaned.c gtkvruler.c \
10046
gtkvscale.c gtkvscrollbar.c gtkvseparator.c gtkwidget.c \
10047
- gtkwindow-decorate.c gtkwindow.c gtkclipboard.c gtkdnd.c \
10048
- gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c gtktext.c \
10049
- gtktree.c gtktreeitem.c gtkclist.c gtkcombo.c gtkctree.c \
10050
- gtkcurve.c gtkfilesel.c gtkgamma.c gtkitemfactory.c gtklist.c \
10051
- gtklistitem.c gtkoldeditable.c gtkoptionmenu.c gtkpixmap.c \
10052
- gtkpreview.c gtkprogress.c gtksignal.c gtktipsquery.c \
10053
- gtktooltips.c gtkcustompaperunixdialog.c \
10054
+ gtkwindow.c gtkclipboard.c gtkdnd.c gtkclipboard-quartz.c \
10055
+ gtkdnd-quartz.c gtkquartz.c gtktext.c gtktree.c gtktreeitem.c \
10056
+ gtkclist.c gtkcombo.c gtkctree.c gtkcurve.c gtkfilesel.c \
10057
+ gtkgamma.c gtkitemfactory.c gtklist.c gtklistitem.c \
10058
+ gtkoldeditable.c gtkoptionmenu.c gtkpixmap.c gtkpreview.c \
10059
+ gtkprogress.c gtksignal.c gtktipsquery.c gtktooltips.c \
10060
+ gtkwindow-decorate.c gtkcustompaperunixdialog.c \
10061
gtkpagesetupunixdialog.c gtkprinter.c gtkprinteroption.c \
10062
gtkprinteroptionset.c gtkprinteroptionwidget.c gtkprintjob.c \
10063
gtkprintoperation-unix.c gtkprintunixdialog.c \
10064
@@ -739,6 +747,7 @@
10065
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
10066
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
10067
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
15390
@@ -338,16 +343,17 @@
15391
gtkinfobar.c gtkinputdialog.c gtkinvisible.c gtkitem.c \
15392
gtkkeyhash.c gtklabel.c gtklayout.c gtklinkbutton.c \
15393
gtkliststore.c gtkmain.c gtkmarshal.c gtkmarshalers.c \
15394
- gtkmenu.c gtkmenubar.c gtkmenuitem.c gtkmenushell.c \
15395
- gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \
15396
- gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \
15397
- gtknotebook.c gtkobject.c gtkoffscreenwindow.c gtkorientable.c \
15398
- gtkpagesetup.c gtkpaned.c gtkpapersize.c gtkpathbar.c \
15399
- gtkplug.c gtkprintcontext.c gtkprintoperation.c \
15400
- gtkprintoperationpreview.c gtkprintsettings.c gtkprintutils.c \
15401
- gtkprogressbar.c gtkradioaction.c gtkradiobutton.c \
15402
- gtkradiomenuitem.c gtkradiotoolbutton.c gtkrange.c gtkrbtree.c \
15403
- gtkrc.c gtkrecentaction.c gtkrecentchooserdefault.c \
15404
+ gtkmenu.c gtkmenubar.c gtkmenuitem.c ubuntumenuproxy.c \
15405
+ ubuntumenuproxymodule.c gtkmenushell.c gtkmenutoolbutton.c \
15406
+ gtkmessagedialog.c gtkmisc.c gtkmnemonichash.c gtkmodules.c \
15407
+ gtkmountoperation.c gtknotebook.c gtkobject.c \
15408
+ gtkoffscreenwindow.c gtkorientable.c gtkpagesetup.c gtkpaned.c \
15409
+ gtkpapersize.c gtkpathbar.c gtkplug.c gtkprintcontext.c \
15410
+ gtkprintoperation.c gtkprintoperationpreview.c \
15411
+ gtkprintsettings.c gtkprintutils.c gtkprogressbar.c \
15412
+ gtkradioaction.c gtkradiobutton.c gtkradiomenuitem.c \
15413
+ gtkradiotoolbutton.c gtkrange.c gtkrbtree.c gtkrc.c \
15414
+ gtkrecentaction.c gtkrecentchooserdefault.c \
15415
gtkrecentchooserdialog.c gtkrecentchoosermenu.c \
15416
gtkrecentchooserwidget.c gtkrecentchooserutils.c \
15417
gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \
15418
@@ -425,16 +431,17 @@
15419
gtkinfobar.c gtkinputdialog.c gtkinvisible.c gtkitem.c \
15420
gtkkeyhash.c gtklabel.c gtklayout.c gtklinkbutton.c \
15421
gtkliststore.c gtkmain.c gtkmarshal.c gtkmarshalers.c \
15422
- gtkmenu.c gtkmenubar.c gtkmenuitem.c gtkmenushell.c \
15423
- gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \
15424
- gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \
15425
- gtknotebook.c gtkobject.c gtkoffscreenwindow.c gtkorientable.c \
15426
- gtkpagesetup.c gtkpaned.c gtkpapersize.c gtkpathbar.c \
15427
- gtkplug.c gtkprintcontext.c gtkprintoperation.c \
15428
- gtkprintoperationpreview.c gtkprintsettings.c gtkprintutils.c \
15429
- gtkprogressbar.c gtkradioaction.c gtkradiobutton.c \
15430
- gtkradiomenuitem.c gtkradiotoolbutton.c gtkrange.c gtkrbtree.c \
15431
- gtkrc.c gtkrecentaction.c gtkrecentchooserdefault.c \
15432
+ gtkmenu.c gtkmenubar.c gtkmenuitem.c ubuntumenuproxy.c \
15433
+ ubuntumenuproxymodule.c gtkmenushell.c gtkmenutoolbutton.c \
15434
+ gtkmessagedialog.c gtkmisc.c gtkmnemonichash.c gtkmodules.c \
15435
+ gtkmountoperation.c gtknotebook.c gtkobject.c \
15436
+ gtkoffscreenwindow.c gtkorientable.c gtkpagesetup.c gtkpaned.c \
15437
+ gtkpapersize.c gtkpathbar.c gtkplug.c gtkprintcontext.c \
15438
+ gtkprintoperation.c gtkprintoperationpreview.c \
15439
+ gtkprintsettings.c gtkprintutils.c gtkprogressbar.c \
15440
+ gtkradioaction.c gtkradiobutton.c gtkradiomenuitem.c \
15441
+ gtkradiotoolbutton.c gtkrange.c gtkrbtree.c gtkrc.c \
15442
+ gtkrecentaction.c gtkrecentchooserdefault.c \
15443
gtkrecentchooserdialog.c gtkrecentchoosermenu.c \
15444
gtkrecentchooserwidget.c gtkrecentchooserutils.c \
15445
gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \
15446
@@ -512,16 +519,17 @@
15447
gtkinfobar.c gtkinputdialog.c gtkinvisible.c gtkitem.c \
15448
gtkkeyhash.c gtklabel.c gtklayout.c gtklinkbutton.c \
15449
gtkliststore.c gtkmain.c gtkmarshal.c gtkmarshalers.c \
15450
- gtkmenu.c gtkmenubar.c gtkmenuitem.c gtkmenushell.c \
15451
- gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \
15452
- gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \
15453
- gtknotebook.c gtkobject.c gtkoffscreenwindow.c gtkorientable.c \
15454
- gtkpagesetup.c gtkpaned.c gtkpapersize.c gtkpathbar.c \
15455
- gtkplug.c gtkprintcontext.c gtkprintoperation.c \
15456
- gtkprintoperationpreview.c gtkprintsettings.c gtkprintutils.c \
15457
- gtkprogressbar.c gtkradioaction.c gtkradiobutton.c \
15458
- gtkradiomenuitem.c gtkradiotoolbutton.c gtkrange.c gtkrbtree.c \
15459
- gtkrc.c gtkrecentaction.c gtkrecentchooserdefault.c \
15460
+ gtkmenu.c gtkmenubar.c gtkmenuitem.c ubuntumenuproxy.c \
15461
+ ubuntumenuproxymodule.c gtkmenushell.c gtkmenutoolbutton.c \
15462
+ gtkmessagedialog.c gtkmisc.c gtkmnemonichash.c gtkmodules.c \
15463
+ gtkmountoperation.c gtknotebook.c gtkobject.c \
15464
+ gtkoffscreenwindow.c gtkorientable.c gtkpagesetup.c gtkpaned.c \
15465
+ gtkpapersize.c gtkpathbar.c gtkplug.c gtkprintcontext.c \
15466
+ gtkprintoperation.c gtkprintoperationpreview.c \
15467
+ gtkprintsettings.c gtkprintutils.c gtkprogressbar.c \
15468
+ gtkradioaction.c gtkradiobutton.c gtkradiomenuitem.c \
15469
+ gtkradiotoolbutton.c gtkrange.c gtkrbtree.c gtkrc.c \
15470
+ gtkrecentaction.c gtkrecentchooserdefault.c \
15471
gtkrecentchooserdialog.c gtkrecentchoosermenu.c \
15472
gtkrecentchooserwidget.c gtkrecentchooserutils.c \
15473
gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \
15474
@@ -722,6 +730,7 @@
15475
GDK_PACKAGES = @GDK_PACKAGES@
15476
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
15477
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
10068
15478
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
10069
15479
GDK_WLIBS = @GDK_WLIBS@
10070
15480
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
10071
15481
GLIB_CFLAGS = @GLIB_CFLAGS@
10072
@@ -831,8 +840,6 @@
10073
PATH_SEPARATOR = @PATH_SEPARATOR@
10074
PERL = @PERL@
10075
PKG_CONFIG = @PKG_CONFIG@
10076
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
10077
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
10078
POFILES = @POFILES@
10079
POSUB = @POSUB@
10080
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
10081
@@ -990,6 +997,8 @@
15482
@@ -872,6 +881,7 @@
15483
libexecdir = @libexecdir@
15484
localedir = @localedir@
15485
localstatedir = @localstatedir@
15486
+lt_ECHO = @lt_ECHO@
15487
mandir = @mandir@
15488
mkdir_p = @mkdir_p@
15489
ms_librarian = @ms_librarian@
15490
@@ -962,6 +972,8 @@
15491
-I$(top_srcdir) -I../gdk \
10082
15492
-I$(top_srcdir)/gdk \
10083
-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \
10084
15493
-DGDK_DISABLE_DEPRECATED \
10085
15494
+ -DMAEMO_CHANGES \
10086
15495
+ -DGTK_FILE_CHOOSER_ENABLE_UNSUPPORTED \
10087
15496
-DGTK_DISABLE_DEPRECATED \
10088
15497
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
10089
15498
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
10090
@@ -1058,11 +1067,11 @@
15499
@@ -1029,11 +1041,11 @@
10091
15500
gtkimmodule.h gtkimmulticontext.h gtkinfobar.h gtkinvisible.h \
10092
15501
gtkitem.h gtklabel.h gtklayout.h gtklinkbutton.h \
10093
15502
gtkliststore.h gtkmain.h gtkmenu.h gtkmenubar.h gtkmenuitem.h \
10104
15513
gtkprintoperationpreview.h gtkprintsettings.h gtkprivate.h \
10105
15514
gtkprogressbar.h gtkradioaction.h gtkradiobutton.h \
10106
15515
gtkradiomenuitem.h gtkradiotoolbutton.h gtkrange.h gtkrc.h \
10107
@@ -1091,7 +1100,7 @@
10108
gtkgamma.h gtkinputdialog.h gtkitemfactory.h gtklist.h \
10109
gtklistitem.h gtkoldeditable.h gtkoptionmenu.h gtkpixmap.h \
10110
gtkpreview.h gtkprogress.h gtksignal.h gtktipsquery.h \
10111
- gtktooltips.h
10112
+ gtktooltips.h gtkwindow-decorate.h
10113
@OS_UNIX_TRUE@gtk_unix_print_public_h_sources = \
10114
@OS_UNIX_TRUE@ gtkpagesetupunixdialog.h \
10115
@OS_UNIX_TRUE@ gtkprintunixdialog.h \
10116
@@ -1103,17 +1112,21 @@
15516
@@ -1074,17 +1086,21 @@
10117
15517
# Installed header files without compatibility guarantees
10118
15518
# that are not included in gtk/gtk.h
10119
15519
gtk_semi_private_h_sources = \
10143
15543
gtkmnemonichash.h gtkmountoperationprivate.h gtkpathbar.h \
10144
15544
gtkplugprivate.h gtkprintoperation-private.h gtkprintutils.h \
10145
15545
gtkrbtree.h gtkrecentchooserdefault.h \
10146
@@ -1123,7 +1136,7 @@
10147
gtktextmarkprivate.h gtktextsegment.h gtktexttagprivate.h \
10148
gtktexttypes.h gtktextutil.h gtkthemes.h \
10149
gtktoggleactionprivate.h gtktoolpaletteprivate.h \
10150
- gtktreedatalist.h gtktreeprivate.h gtkwindow-decorate.h \
10151
+ gtktreedatalist.h gtktreeprivate.h \
10152
$(gtk_clipboard_dnd_h_sources) $(am__append_4) $(am__append_6) \
10153
$(am__append_8) $(am__append_10) $(am__append_12)
10154
10155
@@ -1159,16 +1172,17 @@
15546
@@ -1130,16 +1146,17 @@
10156
15547
gtkinfobar.c gtkinputdialog.c gtkinvisible.c gtkitem.c \
10157
15548
gtkkeyhash.c gtklabel.c gtklayout.c gtklinkbutton.c \
10158
15549
gtkliststore.c gtkmain.c gtkmarshal.c gtkmarshalers.c \
10180
15571
gtkrecentchooserdialog.c gtkrecentchoosermenu.c \
10181
15572
gtkrecentchooserwidget.c gtkrecentchooserutils.c \
10182
15573
gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \
10183
@@ -1192,13 +1206,12 @@
10184
gtktypeutils.c gtkuimanager.c gtkvbbox.c gtkvbox.c \
10185
gtkvolumebutton.c gtkviewport.c gtkvpaned.c gtkvruler.c \
10186
gtkvscale.c gtkvscrollbar.c gtkvseparator.c gtkwidget.c \
10187
- gtkwindow-decorate.c gtkwindow.c \
10188
- $(gtk_clipboard_dnd_c_sources) gtktext.c gtktree.c \
10189
+ gtkwindow.c $(gtk_clipboard_dnd_c_sources) gtktext.c gtktree.c \
10190
gtktreeitem.c gtkclist.c gtkcombo.c gtkctree.c gtkcurve.c \
10191
gtkfilesel.c gtkgamma.c gtkitemfactory.c gtklist.c \
10192
gtklistitem.c gtkoldeditable.c gtkoptionmenu.c gtkpixmap.c \
10193
gtkpreview.c gtkprogress.c gtksignal.c gtktipsquery.c \
10194
- gtktooltips.c
10195
+ gtktooltips.c gtkwindow-decorate.c
10196
gtk_c_sources = $(gtk_base_c_sources) $(am__append_5) $(am__append_7) \
10197
$(am__append_9) $(am__append_11) $(am__append_13) \
10198
$(am__append_14)
10199
@@ -2078,6 +2091,8 @@
15574
@@ -2042,6 +2059,8 @@
10200
15575
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkwindow.Plo@am__quote@
10201
15576
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkxembed.Plo@am__quote@
10202
15577
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/queryimmodules.Po@am__quote@
10205
15580
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/updateiconcache.Po@am__quote@
10206
15581
10207
15582
.c.o:
10208
diff -Nur gtk+2.0-2.21.2/gtk/tests/Makefile.in gtk+2.0-2.21.2.ubuntu/gtk/tests/Makefile.in
10209
--- gtk+2.0-2.21.2/gtk/tests/Makefile.in 2010-06-10 19:18:24.000000000 +0200
10210
+++ gtk+2.0-2.21.2.ubuntu/gtk/tests/Makefile.in 2010-06-11 12:15:23.000000000 +0200
10211
@@ -43,7 +43,10 @@
15583
Index: gtk+-2.21.5/gtk/tests/Makefile.in
15584
===================================================================
15585
--- gtk+-2.21.5.orig/gtk/tests/Makefile.in 2010-07-22 21:44:03.430072001 +0200
15586
+++ gtk+-2.21.5/gtk/tests/Makefile.in 2010-07-22 21:44:21.080072000 +0200
15587
@@ -42,20 +42,24 @@
15588
@OS_UNIX_TRUE@am__append_1 = defaultvalue
10212
15589
subdir = gtk/tests
10213
15590
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
10214
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
10215
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
10216
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
10217
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
10218
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
10219
+ $(top_srcdir)/configure.in
15591
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
15592
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
15593
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
15594
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
15595
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
15596
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
10220
15597
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
10221
15598
$(ACLOCAL_M4)
10222
mkinstalldirs = $(install_sh) -d
10223
@@ -53,9 +56,10 @@
15599
-mkinstalldirs = $(install_sh) -d
15600
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
15601
CONFIG_HEADER = $(top_builddir)/config.h
15602
CONFIG_CLEAN_FILES =
15603
CONFIG_CLEAN_VPATH_FILES =
10224
15604
@OS_UNIX_TRUE@am__EXEEXT_1 = defaultvalue$(EXEEXT)
10225
15605
am__EXEEXT_2 = testing$(EXEEXT) liststore$(EXEEXT) treestore$(EXEEXT) \
10226
15606
treeview$(EXEEXT) treeview-scrolling$(EXEEXT) \
10234
15614
PROGRAMS = $(noinst_PROGRAMS)
10235
15615
am_action_OBJECTS = action.$(OBJEXT)
10236
15616
action_OBJECTS = $(am_action_OBJECTS)
10237
@@ -88,6 +92,9 @@
15617
@@ -87,6 +91,9 @@
10238
15618
am_liststore_OBJECTS = liststore.$(OBJEXT)
10239
15619
liststore_OBJECTS = $(am_liststore_OBJECTS)
10240
15620
liststore_DEPENDENCIES = $(am__DEPENDENCIES_2)
10244
15624
am_object_OBJECTS = object.$(OBJEXT) pixbuf-init.$(OBJEXT)
10245
15625
object_OBJECTS = $(am_object_OBJECTS)
10246
15626
object_DEPENDENCIES = $(am__DEPENDENCIES_2)
10247
@@ -137,14 +144,14 @@
15627
@@ -136,14 +143,14 @@
10248
15628
am__v_GEN_0 = @echo " GEN " $@;
10249
15629
SOURCES = $(action_SOURCES) $(builder_SOURCES) $(defaultvalue_SOURCES) \
10250
15630
$(expander_SOURCES) $(filtermodel_SOURCES) $(floating_SOURCES) \
10261
15641
$(recentmanager_SOURCES) $(testing_SOURCES) \
10262
15642
$(textbuffer_SOURCES) $(treestore_SOURCES) $(treeview_SOURCES) \
10263
15643
$(treeview_scrolling_SOURCES)
10264
@@ -225,6 +232,7 @@
10265
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
10266
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
10267
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
15644
@@ -211,6 +218,7 @@
15645
GDK_PACKAGES = @GDK_PACKAGES@
15646
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
15647
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
10268
15648
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
10269
15649
GDK_WLIBS = @GDK_WLIBS@
10270
15650
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
10271
15651
GLIB_CFLAGS = @GLIB_CFLAGS@
10272
@@ -317,8 +325,6 @@
10273
PATH_SEPARATOR = @PATH_SEPARATOR@
10274
PERL = @PERL@
10275
PKG_CONFIG = @PKG_CONFIG@
10276
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
10277
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
10278
POFILES = @POFILES@
10279
POSUB = @POSUB@
10280
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
10281
@@ -405,8 +411,8 @@
15652
@@ -361,6 +369,7 @@
15653
libexecdir = @libexecdir@
15654
localedir = @localedir@
15655
localstatedir = @localstatedir@
15656
+lt_ECHO = @lt_ECHO@
15657
mandir = @mandir@
15658
mkdir_p = @mkdir_p@
15659
ms_librarian = @ms_librarian@
15660
@@ -383,8 +392,8 @@
10282
15661
# initialize variables for unconditional += appending
10283
15662
EXTRA_DIST =
10284
15663
TEST_PROGS = testing liststore treestore treeview treeview-scrolling \
10289
15668
10290
15669
### testing rules
10291
15670
10292
@@ -463,6 +469,8 @@
15671
@@ -439,6 +448,8 @@
10293
15672
treeview_scrolling_LDADD = $(progs_ldadd)
10294
15673
recentmanager_SOURCES = recentmanager.c
10295
15674
recentmanager_LDADD = $(progs_ldadd)
10298
15677
floating_SOURCES = floating.c
10299
15678
floating_LDADD = $(progs_ldadd)
10300
15679
object_SOURCES = object.c pixbuf-init.c
10301
@@ -557,6 +565,9 @@
15680
@@ -533,6 +544,9 @@
10302
15681
liststore$(EXEEXT): $(liststore_OBJECTS) $(liststore_DEPENDENCIES)
10303
15682
@rm -f liststore$(EXEEXT)
10304
15683
$(AM_V_CCLD)$(LINK) $(liststore_OBJECTS) $(liststore_LDADD) $(LIBS)
10308
15687
object$(EXEEXT): $(object_OBJECTS) $(object_DEPENDENCIES)
10309
15688
@rm -f object$(EXEEXT)
10310
15689
$(AM_V_CCLD)$(LINK) $(object_OBJECTS) $(object_LDADD) $(LIBS)
10311
@@ -592,6 +603,7 @@
15690
@@ -568,6 +582,7 @@
10312
15691
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filtermodel.Po@am__quote@
10313
15692
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/floating.Po@am__quote@
10314
15693
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liststore.Po@am__quote@
10316
15695
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/object.Po@am__quote@
10317
15696
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixbuf-init.Po@am__quote@
10318
15697
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recentmanager.Po@am__quote@
10319
diff -Nur gtk+2.0-2.21.2/gtk/theme-bits/Makefile.in gtk+2.0-2.21.2.ubuntu/gtk/theme-bits/Makefile.in
10320
--- gtk+2.0-2.21.2/gtk/theme-bits/Makefile.in 2010-06-10 19:18:24.000000000 +0200
10321
+++ gtk+2.0-2.21.2.ubuntu/gtk/theme-bits/Makefile.in 2010-06-11 12:15:23.000000000 +0200
10322
@@ -42,7 +42,10 @@
15698
Index: gtk+-2.21.5/gtk/theme-bits/Makefile.in
15699
===================================================================
15700
--- gtk+-2.21.5.orig/gtk/theme-bits/Makefile.in 2010-07-22 21:44:03.410072001 +0200
15701
+++ gtk+-2.21.5/gtk/theme-bits/Makefile.in 2010-07-22 21:44:21.160072000 +0200
15702
@@ -41,11 +41,14 @@
15703
noinst_PROGRAMS = decompose-bits$(EXEEXT)
10323
15704
subdir = gtk/theme-bits
10324
15705
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
10325
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
10326
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
10327
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
10328
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
10329
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
10330
+ $(top_srcdir)/configure.in
15706
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
15707
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
15708
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
15709
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
15710
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
15711
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
10331
15712
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
10332
15713
$(ACLOCAL_M4)
10333
mkinstalldirs = $(install_sh) -d
10334
@@ -163,6 +166,7 @@
10335
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
10336
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
10337
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
15714
-mkinstalldirs = $(install_sh) -d
15715
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
15716
CONFIG_HEADER = $(top_builddir)/config.h
15717
CONFIG_CLEAN_FILES =
15718
CONFIG_CLEAN_VPATH_FILES =
15719
@@ -149,6 +152,7 @@
15720
GDK_PACKAGES = @GDK_PACKAGES@
15721
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
15722
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
10338
15723
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
10339
15724
GDK_WLIBS = @GDK_WLIBS@
10340
15725
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
10341
15726
GLIB_CFLAGS = @GLIB_CFLAGS@
10342
@@ -255,8 +259,6 @@
10343
PATH_SEPARATOR = @PATH_SEPARATOR@
10344
PERL = @PERL@
10345
PKG_CONFIG = @PKG_CONFIG@
10346
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
10347
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
10348
POFILES = @POFILES@
10349
POSUB = @POSUB@
10350
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
10351
diff -Nur gtk+2.0-2.21.2/m4/libtool.m4 gtk+2.0-2.21.2.ubuntu/m4/libtool.m4
10352
--- gtk+2.0-2.21.2/m4/libtool.m4 1970-01-01 01:00:00.000000000 +0100
10353
+++ gtk+2.0-2.21.2.ubuntu/m4/libtool.m4 2010-06-11 12:15:14.000000000 +0200
15727
@@ -299,6 +303,7 @@
15728
libexecdir = @libexecdir@
15729
localedir = @localedir@
15730
localstatedir = @localstatedir@
15731
+lt_ECHO = @lt_ECHO@
15732
mandir = @mandir@
15733
mkdir_p = @mkdir_p@
15734
ms_librarian = @ms_librarian@
15735
Index: gtk+-2.21.5/ltmain.sh
15736
===================================================================
15737
--- gtk+-2.21.5.orig/ltmain.sh 2010-07-22 21:44:03.160072001 +0200
15738
+++ gtk+-2.21.5/ltmain.sh 2010-07-22 21:44:13.230072000 +0200
15739
@@ -1,10 +1,9 @@
15740
# Generated from ltmain.m4sh.
15741
15742
-# libtool (GNU libtool) 2.2.10
15743
+# ltmain.sh (GNU libtool) 2.2.6b
15744
# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
15745
15746
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
15747
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
15748
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
15749
# This is free software; see the source for copying conditions. There is NO
15750
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
15751
15752
@@ -33,54 +32,50 @@
15753
#
15754
# Provide generalized library-building support services.
15755
#
15756
-# --config show all configuration variables
15757
-# --debug enable verbose shell tracing
15758
-# -n, --dry-run display commands without modifying any files
15759
-# --features display basic configuration information and exit
15760
-# --mode=MODE use operation mode MODE
15761
-# --preserve-dup-deps don't remove duplicate dependency libraries
15762
-# --quiet, --silent don't print informational messages
15763
-# --no-quiet, --no-silent
15764
-# print informational messages (default)
15765
-# --tag=TAG use configuration variables from tag TAG
15766
-# -v, --verbose print more informational messages than default
15767
-# --no-verbose don't print the extra informational messages
15768
-# --version print version information
15769
-# -h, --help, --help-all print short, long, or detailed help message
15770
+# --config show all configuration variables
15771
+# --debug enable verbose shell tracing
15772
+# -n, --dry-run display commands without modifying any files
15773
+# --features display basic configuration information and exit
15774
+# --mode=MODE use operation mode MODE
15775
+# --preserve-dup-deps don't remove duplicate dependency libraries
15776
+# --quiet, --silent don't print informational messages
15777
+# --tag=TAG use configuration variables from tag TAG
15778
+# -v, --verbose print informational messages (default)
15779
+# --version print version information
15780
+# -h, --help print short or long help message
15781
#
15782
# MODE must be one of the following:
15783
#
15784
-# clean remove files from the build directory
15785
-# compile compile a source file into a libtool object
15786
-# execute automatically set library path, then run a program
15787
-# finish complete the installation of libtool libraries
15788
-# install install libraries or executables
15789
-# link create a library or an executable
15790
-# uninstall remove libraries from an installed directory
15791
+# clean remove files from the build directory
15792
+# compile compile a source file into a libtool object
15793
+# execute automatically set library path, then run a program
15794
+# finish complete the installation of libtool libraries
15795
+# install install libraries or executables
15796
+# link create a library or an executable
15797
+# uninstall remove libraries from an installed directory
15798
#
15799
-# MODE-ARGS vary depending on the MODE. When passed as first option,
15800
-# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
15801
+# MODE-ARGS vary depending on the MODE.
15802
# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
15803
#
15804
# When reporting a bug, please describe a test case to reproduce it and
15805
# include the following information:
15806
#
15807
-# host-triplet: $host
15808
-# shell: $SHELL
15809
-# compiler: $LTCC
15810
-# compiler flags: $LTCFLAGS
15811
-# linker: $LD (gnu? $with_gnu_ld)
15812
-# $progname: (GNU libtool) 2.2.10
15813
-# automake: $automake_version
15814
-# autoconf: $autoconf_version
15815
+# host-triplet: $host
15816
+# shell: $SHELL
15817
+# compiler: $LTCC
15818
+# compiler flags: $LTCFLAGS
15819
+# linker: $LD (gnu? $with_gnu_ld)
15820
+# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
15821
+# automake: $automake_version
15822
+# autoconf: $autoconf_version
15823
#
15824
# Report bugs to <bug-libtool@gnu.org>.
15825
15826
-PROGRAM=libtool
15827
+PROGRAM=ltmain.sh
15828
PACKAGE=libtool
15829
-VERSION=2.2.10
15830
+VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
15831
TIMESTAMP=""
15832
-package_revision=1.3175
15833
+package_revision=1.3017
15834
15835
# Be Bourne compatible
15836
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
15837
@@ -96,15 +91,10 @@
15838
BIN_SH=xpg4; export BIN_SH # for Tru64
15839
DUALCASE=1; export DUALCASE # for MKS sh
15840
15841
-# A function that is used when there is no print builtin or printf.
15842
-func_fallback_echo ()
15843
-{
15844
- eval 'cat <<_LTECHO_EOF
15845
-$1
15846
-_LTECHO_EOF'
15847
-}
15848
-
15849
# NLS nuisances: We save the old values to restore during execute mode.
15850
+# Only set LANG and LC_ALL to C if already set.
15851
+# These must not be set unconditionally because not all systems understand
15852
+# e.g. LANG=C (notably SCO).
15853
lt_user_locale=
15854
lt_safe_locale=
15855
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
15856
@@ -117,24 +107,15 @@
15857
lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
15858
fi"
15859
done
15860
-LC_ALL=C
15861
-LANGUAGE=C
15862
-export LANGUAGE LC_ALL
15863
15864
$lt_unset CDPATH
15865
15866
15867
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
15868
-# is ksh but when the shell is invoked as "sh" and the current value of
15869
-# the _XPG environment variable is not equal to 1 (one), the special
15870
-# positional parameter $0, within a function call, is the name of the
15871
-# function.
15872
-progpath="$0"
15873
15874
15875
15876
: ${CP="cp -f"}
15877
-test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
15878
+: ${ECHO="echo"}
15879
: ${EGREP="/bin/grep -E"}
15880
: ${FGREP="/bin/grep -F"}
15881
: ${GREP="/bin/grep"}
15882
@@ -178,168 +159,32 @@
15883
func_dirname_and_basename ()
15884
{
15885
# Extract subdirectory from the argument.
15886
- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
15887
+ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
15888
if test "X$func_dirname_result" = "X${1}"; then
15889
func_dirname_result="${3}"
15890
else
15891
func_dirname_result="$func_dirname_result${2}"
15892
fi
15893
- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
15894
+ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
15895
}
15896
15897
# Generated shell functions inserted here.
15898
15899
-# These SED scripts presuppose an absolute path with a trailing slash.
15900
-pathcar='s,^/\([^/]*\).*$,\1,'
15901
-pathcdr='s,^/[^/]*,,'
15902
-removedotparts=':dotsl
15903
- s@/\./@/@g
15904
- t dotsl
15905
- s,/\.$,/,'
15906
-collapseslashes='s@/\{1,\}@/@g'
15907
-finalslash='s,/*$,/,'
15908
-
15909
-# func_normal_abspath PATH
15910
-# Remove doubled-up and trailing slashes, "." path components,
15911
-# and cancel out any ".." path components in PATH after making
15912
-# it an absolute path.
15913
-# value returned in "$func_normal_abspath_result"
15914
-func_normal_abspath ()
15915
-{
15916
- # Start from root dir and reassemble the path.
15917
- func_normal_abspath_result=
15918
- func_normal_abspath_tpath=$1
15919
- func_normal_abspath_altnamespace=
15920
- case $func_normal_abspath_tpath in
15921
- "")
15922
- # Empty path, that just means $cwd.
15923
- func_stripname '' '/' "`pwd`"
15924
- func_normal_abspath_result=$func_stripname_result
15925
- return
15926
- ;;
15927
- # The next three entries are used to spot a run of precisely
15928
- # two leading slashes without using negated character classes;
15929
- # we take advantage of case's first-match behaviour.
15930
- ///*)
15931
- # Unusual form of absolute path, do nothing.
15932
- ;;
15933
- //*)
15934
- # Not necessarily an ordinary path; POSIX reserves leading '//'
15935
- # and for example Cygwin uses it to access remote file shares
15936
- # over CIFS/SMB, so we conserve a leading double slash if found.
15937
- func_normal_abspath_altnamespace=/
15938
- ;;
15939
- /*)
15940
- # Absolute path, do nothing.
15941
- ;;
15942
- *)
15943
- # Relative path, prepend $cwd.
15944
- func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
15945
- ;;
15946
- esac
15947
- # Cancel out all the simple stuff to save iterations. We also want
15948
- # the path to end with a slash for ease of parsing, so make sure
15949
- # there is one (and only one) here.
15950
- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
15951
- -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
15952
- while :; do
15953
- # Processed it all yet?
15954
- if test "$func_normal_abspath_tpath" = / ; then
15955
- # If we ascended to the root using ".." the result may be empty now.
15956
- if test -z "$func_normal_abspath_result" ; then
15957
- func_normal_abspath_result=/
15958
- fi
15959
- break
15960
- fi
15961
- func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
15962
- -e "$pathcar"`
15963
- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
15964
- -e "$pathcdr"`
15965
- # Figure out what to do with it
15966
- case $func_normal_abspath_tcomponent in
15967
- "")
15968
- # Trailing empty path component, ignore it.
15969
- ;;
15970
- ..)
15971
- # Parent dir; strip last assembled component from result.
15972
- func_dirname "$func_normal_abspath_result"
15973
- func_normal_abspath_result=$func_dirname_result
15974
- ;;
15975
- *)
15976
- # Actual path component, append it.
15977
- func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
15978
- ;;
15979
- esac
15980
- done
15981
- # Restore leading double-slash if one was found on entry.
15982
- func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
15983
-}
15984
-
15985
-# func_relative_path SRCDIR DSTDIR
15986
-# generates a relative path from SRCDIR to DSTDIR, with a trailing
15987
-# slash if non-empty, suitable for immediately appending a filename
15988
-# without needing to append a separator.
15989
-# value returned in "$func_relative_path_result"
15990
-func_relative_path ()
15991
-{
15992
- func_relative_path_result=
15993
- func_normal_abspath "$1"
15994
- func_relative_path_tlibdir=$func_normal_abspath_result
15995
- func_normal_abspath "$2"
15996
- func_relative_path_tbindir=$func_normal_abspath_result
15997
-
15998
- # Ascend the tree starting from libdir
15999
- while :; do
16000
- # check if we have found a prefix of bindir
16001
- case $func_relative_path_tbindir in
16002
- $func_relative_path_tlibdir)
16003
- # found an exact match
16004
- func_relative_path_tcancelled=
16005
- break
16006
- ;;
16007
- $func_relative_path_tlibdir*)
16008
- # found a matching prefix
16009
- func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
16010
- func_relative_path_tcancelled=$func_stripname_result
16011
- if test -z "$func_relative_path_result"; then
16012
- func_relative_path_result=.
16013
- fi
16014
- break
16015
- ;;
16016
- *)
16017
- func_dirname $func_relative_path_tlibdir
16018
- func_relative_path_tlibdir=${func_dirname_result}
16019
- if test "x$func_relative_path_tlibdir" = x ; then
16020
- # Have to descend all the way to the root!
16021
- func_relative_path_result=../$func_relative_path_result
16022
- func_relative_path_tcancelled=$func_relative_path_tbindir
16023
- break
16024
- fi
16025
- func_relative_path_result=../$func_relative_path_result
16026
- ;;
16027
- esac
16028
- done
16029
-
16030
- # Now calculate path; take care to avoid doubling-up slashes.
16031
- func_stripname '' '/' "$func_relative_path_result"
16032
- func_relative_path_result=$func_stripname_result
16033
- func_stripname '/' '/' "$func_relative_path_tcancelled"
16034
- if test "x$func_stripname_result" != x ; then
16035
- func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
16036
- fi
16037
-
16038
- # Normalisation. If bindir is libdir, return empty string,
16039
- # else relative path ending with a slash; either way, target
16040
- # file name can be directly appended.
16041
- if test ! -z "$func_relative_path_result"; then
16042
- func_stripname './' '' "$func_relative_path_result/"
16043
- func_relative_path_result=$func_stripname_result
16044
- fi
16045
-}
16046
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
16047
+# is ksh but when the shell is invoked as "sh" and the current value of
16048
+# the _XPG environment variable is not equal to 1 (one), the special
16049
+# positional parameter $0, within a function call, is the name of the
16050
+# function.
16051
+progpath="$0"
16052
16053
# The name of this program:
16054
+# In the unlikely event $progname began with a '-', it would play havoc with
16055
+# func_echo (imagine progname=-n), so we prepend ./ in that case:
16056
func_dirname_and_basename "$progpath"
16057
progname=$func_basename_result
16058
+case $progname in
16059
+ -*) progname=./$progname ;;
16060
+esac
16061
16062
# Make sure we have an absolute path for reexecution:
16063
case $progpath in
16064
@@ -413,13 +258,6 @@
16065
:
16066
}
16067
16068
-# func_echo_all arg...
16069
-# Invoke $ECHO with all args, space-separated.
16070
-func_echo_all ()
16071
-{
16072
- $ECHO "$*"
16073
-}
16074
-
16075
# func_error arg...
16076
# Echo program name prefixed message to standard error.
16077
func_error ()
16078
@@ -488,9 +326,9 @@
16079
case $my_directory_path in */*) ;; *) break ;; esac
16080
16081
# ...otherwise throw away the child directory and loop
16082
- my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
16083
+ my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
16084
done
16085
- my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
16086
+ my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
16087
16088
save_mkdir_p_IFS="$IFS"; IFS=':'
16089
for my_dir in $my_dir_list; do
16090
@@ -540,7 +378,7 @@
16091
func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
16092
fi
16093
16094
- $ECHO "$my_tmpdir"
16095
+ $ECHO "X$my_tmpdir" | $Xsed
16096
}
16097
16098
16099
@@ -554,7 +392,7 @@
16100
{
16101
case $1 in
16102
*[\\\`\"\$]*)
16103
- func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
16104
+ func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
16105
*)
16106
func_quote_for_eval_unquoted_result="$1" ;;
16107
esac
16108
@@ -581,7 +419,7 @@
16109
{
16110
case $1 in
16111
*[\\\`\"]*)
16112
- my_arg=`$ECHO "$1" | $SED \
16113
+ my_arg=`$ECHO "X$1" | $Xsed \
16114
-e "$double_quote_subst" -e "$sed_double_backslash"` ;;
16115
*)
16116
my_arg="$1" ;;
16117
@@ -651,19 +489,14 @@
16118
}
16119
16120
16121
+
16122
+
16123
+
16124
# func_version
16125
# Echo version message to standard output and exit.
16126
func_version ()
16127
{
16128
- $SED -n '/(C)/!b go
16129
- :more
16130
- /\./!{
16131
- N
16132
- s/\n# / /
16133
- b more
16134
- }
16135
- :go
16136
- /^# '$PROGRAM' (GNU /,/# warranty; / {
16137
+ $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
16138
s/^# //
16139
s/^# *$//
16140
s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
16141
@@ -676,20 +509,19 @@
16142
# Echo short help message to standard output and exit.
16143
func_usage ()
16144
{
16145
- $SED -n '/^# Usage:/,/^# *.*--help/ {
16146
+ $SED -n '/^# Usage:/,/# -h/ {
16147
s/^# //
16148
s/^# *$//
16149
s/\$progname/'$progname'/
16150
p
16151
}' < "$progpath"
16152
- echo
16153
+ $ECHO
16154
$ECHO "run \`$progname --help | more' for full usage"
16155
exit $?
16156
}
16157
16158
-# func_help [NOEXIT]
16159
-# Echo long help message to standard output and exit,
16160
-# unless 'noexit' is passed as argument.
16161
+# func_help
16162
+# Echo long help message to standard output and exit.
16163
func_help ()
16164
{
16165
$SED -n '/^# Usage:/,/# Report bugs to/ {
16166
@@ -706,10 +538,7 @@
16167
s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
16168
p
16169
}' < "$progpath"
16170
- ret=$?
16171
- if test -z "$1"; then
16172
- exit $ret
16173
- fi
16174
+ exit $?
16175
}
16176
16177
# func_missing_arg argname
16178
@@ -717,7 +546,7 @@
16179
# exit_cmd.
16180
func_missing_arg ()
16181
{
16182
- func_error "missing argument for $1."
16183
+ func_error "missing argument for $1"
16184
exit_cmd=exit
16185
}
16186
16187
@@ -727,6 +556,29 @@
16188
16189
16190
16191
+# Check that we have a working $ECHO.
16192
+if test "X$1" = X--no-reexec; then
16193
+ # Discard the --no-reexec flag, and continue.
16194
+ shift
16195
+elif test "X$1" = X--fallback-echo; then
16196
+ # Avoid inline document here, it may be left over
16197
+ :
16198
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
16199
+ # Yippee, $ECHO works!
16200
+ :
16201
+else
16202
+ # Restart under the correct shell, and then maybe $ECHO will work.
16203
+ exec $SHELL "$progpath" --no-reexec ${1+"$@"}
16204
+fi
16205
+
16206
+if test "X$1" = X--fallback-echo; then
16207
+ # used as fallback echo
16208
+ shift
16209
+ cat <<EOF
16210
+$*
16211
+EOF
16212
+ exit $EXIT_SUCCESS
16213
+fi
16214
16215
magic="%%%MAGIC variable%%%"
16216
magic_exe="%%%MAGIC EXE variable%%%"
16217
@@ -784,16 +636,16 @@
16218
# Display the features supported by this script.
16219
func_features ()
16220
{
16221
- echo "host: $host"
16222
+ $ECHO "host: $host"
16223
if test "$build_libtool_libs" = yes; then
16224
- echo "enable shared libraries"
16225
+ $ECHO "enable shared libraries"
16226
else
16227
- echo "disable shared libraries"
16228
+ $ECHO "disable shared libraries"
16229
fi
16230
if test "$build_old_libs" = yes; then
16231
- echo "enable static libraries"
16232
+ $ECHO "enable static libraries"
16233
else
16234
- echo "disable static libraries"
16235
+ $ECHO "disable static libraries"
16236
fi
16237
16238
exit $?
16239
@@ -920,21 +772,10 @@
16240
16241
--quiet|--silent) preserve_args="$preserve_args $opt"
16242
opt_silent=:
16243
- opt_verbose=false
16244
- ;;
16245
-
16246
- --no-quiet|--no-silent)
16247
- preserve_args="$preserve_args $opt"
16248
- opt_silent=false
16249
;;
16250
16251
--verbose| -v) preserve_args="$preserve_args $opt"
16252
opt_silent=false
16253
- opt_verbose=:
16254
- ;;
16255
-
16256
- --no-verbose) preserve_args="$preserve_args $opt"
16257
- opt_verbose=false
16258
;;
16259
16260
--tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
16261
@@ -952,7 +793,6 @@
16262
16263
-\?|-h) func_usage ;;
16264
--help) opt_help=: ;;
16265
- --help-all) opt_help=': help-all' ;;
16266
--version) func_version ;;
16267
16268
-*) func_fatal_help "unrecognized option \`$opt'" ;;
16269
@@ -1176,13 +1016,10 @@
16270
func_quote_for_eval "$arg"
16271
CC_quoted="$CC_quoted $func_quote_for_eval_result"
16272
done
16273
- CC_expanded=`func_echo_all $CC`
16274
- CC_quoted_expanded=`func_echo_all $CC_quoted`
16275
case $@ in
16276
# Blanks in the command may have been stripped by the calling shell,
16277
# but not from the CC environment variable when configure was run.
16278
- " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
16279
- " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
16280
+ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
16281
# Blanks at the start of $base_compile will cause this to fail
16282
# if we don't check for them as well.
16283
*)
16284
@@ -1196,11 +1033,8 @@
16285
func_quote_for_eval "$arg"
16286
CC_quoted="$CC_quoted $func_quote_for_eval_result"
16287
done
16288
- CC_expanded=`func_echo_all $CC`
16289
- CC_quoted_expanded=`func_echo_all $CC_quoted`
16290
case "$@ " in
16291
- " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
16292
- " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
16293
+ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
16294
# The compiler in the base compile command matches
16295
# the one in the tagged configuration.
16296
# Assume this is the tagged configuration we want.
16297
@@ -1379,7 +1213,7 @@
16298
*.[cCFSifmso] | \
16299
*.ada | *.adb | *.ads | *.asm | \
16300
*.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
16301
- *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
16302
+ *.[fF][09]? | *.for | *.java | *.obj | *.sx)
16303
func_xform "$libobj"
16304
libobj=$func_xform_result
16305
;;
16306
@@ -1454,7 +1288,7 @@
16307
# Calculate the filename of the output object if compiler does
16308
# not support -o with -c
16309
if test "$compiler_c_o" = no; then
16310
- output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
16311
+ output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
16312
lockfile="$output_obj.lock"
16313
else
16314
output_obj=
16315
@@ -1611,7 +1445,7 @@
16316
}
16317
16318
$opt_help || {
16319
- test "$mode" = compile && func_mode_compile ${1+"$@"}
16320
+test "$mode" = compile && func_mode_compile ${1+"$@"}
16321
}
16322
16323
func_mode_help ()
16324
@@ -1648,11 +1482,10 @@
16325
16326
-o OUTPUT-FILE set the output file name to OUTPUT-FILE
16327
-no-suppress do not suppress compiler output for multiple passes
16328
- -prefer-pic try to build PIC objects only
16329
- -prefer-non-pic try to build non-PIC objects only
16330
+ -prefer-pic try to building PIC objects only
16331
+ -prefer-non-pic try to building non-PIC objects only
16332
-shared do not build a \`.o' file suitable for static linking
16333
-static only build a \`.o' file suitable for static linking
16334
- -Wc,FLAG pass FLAG directly to the compiler
16335
16336
COMPILE-COMMAND is a command to be used in creating a \`standard' object file
16337
from the given SOURCEFILE.
16338
@@ -1705,7 +1538,7 @@
16339
16340
The following components of INSTALL-COMMAND are treated specially:
16341
16342
- -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation
16343
+ -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation
16344
16345
The rest of the components are interpreted as arguments to that command (only
16346
BSD-compatible install options are recognized)."
16347
@@ -1725,8 +1558,6 @@
16348
16349
-all-static do not do any dynamic linking at all
16350
-avoid-version do not add a version suffix if possible
16351
- -bindir BINDIR specify path to binaries directory (for systems where
16352
- libraries must be found in the PATH setting at runtime)
16353
-dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
16354
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
16355
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
16356
@@ -1755,11 +1586,6 @@
16357
-version-info CURRENT[:REVISION[:AGE]]
16358
specify library version info [each variable defaults to 0]
16359
-weak LIBNAME declare that the target provides the LIBNAME interface
16360
- -Wc,FLAG
16361
- -Xcompiler FLAG pass linker-specific FLAG directly to the compiler
16362
- -Wl,FLAG
16363
- -Xlinker FLAG pass linker-specific FLAG directly to the linker
16364
- -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC)
16365
16366
All other options (arguments beginning with \`-') are ignored.
16367
16368
@@ -1797,40 +1623,14 @@
16369
;;
16370
esac
16371
16372
- echo
16373
+ $ECHO
16374
$ECHO "Try \`$progname --help' for more information about other modes."
16375
+
16376
+ exit $?
16377
}
16378
16379
-# Now that we've collected a possible --mode arg, show help if necessary
16380
-if $opt_help; then
16381
- if test "$opt_help" = :; then
16382
- func_mode_help
16383
- else
16384
- {
16385
- func_help noexit
16386
- for mode in compile link execute install finish uninstall clean; do
16387
- func_mode_help
16388
- done
16389
- } | sed -n '1p; 2,$s/^Usage:/ or: /p'
16390
- {
16391
- func_help noexit
16392
- for mode in compile link execute install finish uninstall clean; do
16393
- echo
16394
- func_mode_help
16395
- done
16396
- } |
16397
- sed '1d
16398
- /^When reporting/,/^Report/{
16399
- H
16400
- d
16401
- }
16402
- $x
16403
- /information about other modes/d
16404
- /more detailed .*MODE/d
16405
- s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
16406
- fi
16407
- exit $?
16408
-fi
16409
+ # Now that we've collected a possible --mode arg, show help if necessary
16410
+ $opt_help && func_mode_help
16411
16412
16413
# func_mode_execute arg...
16414
@@ -1912,7 +1712,7 @@
16415
for file
16416
do
16417
case $file in
16418
- -* | *.la | *.lo ) ;;
16419
+ -*) ;;
16420
*)
16421
# Do a test to see if this is really a libtool program.
16422
if func_ltwrapper_script_p "$file"; then
16423
@@ -1954,7 +1754,7 @@
16424
# Display what would be done.
16425
if test -n "$shlibpath_var"; then
16426
eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
16427
- echo "export $shlibpath_var"
16428
+ $ECHO "export $shlibpath_var"
16429
fi
16430
$ECHO "$cmd$args"
16431
exit $EXIT_SUCCESS
16432
@@ -1995,23 +1795,23 @@
16433
# Exit here if they wanted silent mode.
16434
$opt_silent && exit $EXIT_SUCCESS
16435
16436
- echo "----------------------------------------------------------------------"
16437
- echo "Libraries have been installed in:"
16438
+ $ECHO "X----------------------------------------------------------------------" | $Xsed
16439
+ $ECHO "Libraries have been installed in:"
16440
for libdir in $libdirs; do
16441
$ECHO " $libdir"
16442
done
16443
- echo
16444
- echo "If you ever happen to want to link against installed libraries"
16445
- echo "in a given directory, LIBDIR, you must either use libtool, and"
16446
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
16447
- echo "flag during linking and do at least one of the following:"
16448
+ $ECHO
16449
+ $ECHO "If you ever happen to want to link against installed libraries"
16450
+ $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
16451
+ $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
16452
+ $ECHO "flag during linking and do at least one of the following:"
16453
if test -n "$shlibpath_var"; then
16454
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
16455
- echo " during execution"
16456
+ $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable"
16457
+ $ECHO " during execution"
16458
fi
16459
if test -n "$runpath_var"; then
16460
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
16461
- echo " during linking"
16462
+ $ECHO " - add LIBDIR to the \`$runpath_var' environment variable"
16463
+ $ECHO " during linking"
16464
fi
16465
if test -n "$hardcode_libdir_flag_spec"; then
16466
libdir=LIBDIR
16467
@@ -2023,21 +1823,21 @@
16468
$ECHO " - have your system administrator run these commands:$admincmds"
16469
fi
16470
if test -f /etc/ld.so.conf; then
16471
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
16472
+ $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
16473
fi
16474
- echo
16475
+ $ECHO
16476
16477
- echo "See any operating system documentation about shared libraries for"
16478
+ $ECHO "See any operating system documentation about shared libraries for"
16479
case $host in
16480
solaris2.[6789]|solaris2.1[0-9])
16481
- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
16482
- echo "pages."
16483
+ $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
16484
+ $ECHO "pages."
16485
;;
16486
*)
16487
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
16488
+ $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
16489
;;
16490
esac
16491
- echo "----------------------------------------------------------------------"
16492
+ $ECHO "X----------------------------------------------------------------------" | $Xsed
16493
exit $EXIT_SUCCESS
16494
}
16495
16496
@@ -2052,7 +1852,7 @@
16497
# install_prog (especially on Windows NT).
16498
if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
16499
# Allow the use of GNU shtool's install command.
16500
- case $nonopt in *shtool*) :;; *) false;; esac; then
16501
+ $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
16502
# Aesthetically quote it.
16503
func_quote_for_eval "$nonopt"
16504
install_prog="$func_quote_for_eval_result "
16505
@@ -2067,11 +1867,6 @@
16506
# Aesthetically quote it.
16507
func_quote_for_eval "$arg"
16508
install_prog="$install_prog$func_quote_for_eval_result"
16509
- install_shared_prog=$install_prog
16510
- case " $install_prog " in
16511
- *[\\\ /]cp\ *) install_cp=: ;;
16512
- *) install_cp=false ;;
16513
- esac
16514
16515
# We need to accept at least all the BSD install flags.
16516
dest=
16517
@@ -2081,10 +1876,8 @@
16518
install_type=
16519
isdir=no
16520
stripme=
16521
- no_mode=:
16522
for arg
16523
do
16524
- arg2=
16525
if test -n "$dest"; then
16526
files="$files $dest"
16527
dest=$arg
16528
@@ -2094,9 +1887,10 @@
16529
case $arg in
16530
-d) isdir=yes ;;
16531
-f)
16532
- if $install_cp; then :; else
16533
- prev=$arg
16534
- fi
16535
+ case " $install_prog " in
16536
+ *[\\\ /]cp\ *) ;;
16537
+ *) prev=$arg ;;
16538
+ esac
16539
;;
16540
-g | -m | -o)
16541
prev=$arg
16542
@@ -2110,10 +1904,6 @@
16543
*)
16544
# If the previous option needed an argument, then skip it.
16545
if test -n "$prev"; then
16546
- if test "x$prev" = x-m && test -n "$install_override_mode"; then
16547
- arg2=$install_override_mode
16548
- no_mode=false
16549
- fi
16550
prev=
16551
else
16552
dest=$arg
16553
@@ -2125,10 +1915,6 @@
16554
# Aesthetically quote the argument.
16555
func_quote_for_eval "$arg"
16556
install_prog="$install_prog $func_quote_for_eval_result"
16557
- if test -n "$arg2"; then
16558
- func_quote_for_eval "$arg2"
16559
- fi
16560
- install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
16561
done
16562
16563
test -z "$install_prog" && \
16564
@@ -2137,13 +1923,6 @@
16565
test -n "$prev" && \
16566
func_fatal_help "the \`$prev' option requires an argument"
16567
16568
- if test -n "$install_override_mode" && $no_mode; then
16569
- if $install_cp; then :; else
16570
- func_quote_for_eval "$install_override_mode"
16571
- install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
16572
- fi
16573
- fi
16574
-
16575
if test -z "$files"; then
16576
if test -z "$dest"; then
16577
func_fatal_help "no file or destination specified"
16578
@@ -2231,7 +2010,7 @@
16579
16580
if test -n "$relink_command"; then
16581
# Determine the prefix the user has applied to our future dir.
16582
- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
16583
+ inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
16584
16585
# Don't allow the user to place us outside of our expected
16586
# location b/c this prevents finding dependent libraries that
16587
@@ -2244,9 +2023,9 @@
16588
16589
if test -n "$inst_prefix_dir"; then
16590
# Stick the inst_prefix_dir data into the link command.
16591
- relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
16592
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
16593
else
16594
- relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
16595
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
16596
fi
16597
16598
func_warning "relinking \`$file'"
16599
@@ -2264,7 +2043,7 @@
16600
test -n "$relink_command" && srcname="$realname"T
16601
16602
# Install the shared library and build the symlinks.
16603
- func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
16604
+ func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
16605
'exit $?'
16606
tstripme="$stripme"
16607
case $host_os in
16608
@@ -2404,7 +2183,7 @@
16609
if test -f "$lib"; then
16610
func_source "$lib"
16611
fi
16612
- libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
16613
+ libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
16614
if test -n "$libdir" && test ! -f "$libfile"; then
16615
func_warning "\`$lib' has not been installed in \`$libdir'"
16616
finalize=no
16617
@@ -2423,7 +2202,7 @@
16618
file="$func_basename_result"
16619
outputname="$tmpdir/$file"
16620
# Replace the output file specification.
16621
- relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
16622
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
16623
16624
$opt_silent || {
16625
func_quote_for_expand "$relink_command"
16626
@@ -2442,7 +2221,7 @@
16627
}
16628
else
16629
# Install the binary that we compiled earlier.
16630
- file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
16631
+ file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
16632
fi
16633
fi
16634
16635
@@ -2544,10 +2323,6 @@
16636
extern \"C\" {
16637
#endif
16638
16639
-#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
16640
-#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
16641
-#endif
16642
-
16643
/* External symbol declarations for the compiler. */\
16644
"
16645
16646
@@ -2557,7 +2332,7 @@
16647
$opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
16648
16649
# Add our own program objects to the symbol list.
16650
- progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
16651
+ progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
16652
for progfile in $progfiles; do
16653
func_verbose "extracting global C symbols from \`$progfile'"
16654
$opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
16655
@@ -2596,7 +2371,7 @@
16656
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
16657
eval '$MV "$nlist"T "$nlist"'
16658
case $host in
16659
- *cygwin* | *mingw* | *cegcc* )
16660
+ *cygwin | *mingw* | *cegcc* )
16661
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
16662
eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
16663
;;
16664
@@ -2640,10 +2415,10 @@
16665
if test -f "$nlist"S; then
16666
eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
16667
else
16668
- echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
16669
+ $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
16670
fi
16671
16672
- echo >> "$output_objdir/$my_dlsyms" "\
16673
+ $ECHO >> "$output_objdir/$my_dlsyms" "\
16674
16675
/* The mapping between symbol names and symbols. */
16676
typedef struct {
16677
@@ -2653,7 +2428,7 @@
16678
"
16679
case $host in
16680
*cygwin* | *mingw* | *cegcc* )
16681
- echo >> "$output_objdir/$my_dlsyms" "\
16682
+ $ECHO >> "$output_objdir/$my_dlsyms" "\
16683
/* DATA imports from DLLs on WIN32 con't be const, because
16684
runtime relocations are performed -- see ld's documentation
16685
on pseudo-relocs. */"
16686
@@ -2666,7 +2441,7 @@
16687
lt_dlsym_const=const ;;
16688
esac
16689
16690
- echo >> "$output_objdir/$my_dlsyms" "\
16691
+ $ECHO >> "$output_objdir/$my_dlsyms" "\
16692
extern $lt_dlsym_const lt_dlsymlist
16693
lt_${my_prefix}_LTX_preloaded_symbols[];
16694
$lt_dlsym_const lt_dlsymlist
16695
@@ -2682,7 +2457,7 @@
16696
eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
16697
;;
16698
esac
16699
- echo >> "$output_objdir/$my_dlsyms" "\
16700
+ $ECHO >> "$output_objdir/$my_dlsyms" "\
16701
{0, (void *) 0}
16702
};
16703
16704
@@ -2740,16 +2515,16 @@
16705
case $host in
16706
*cygwin* | *mingw* | *cegcc* )
16707
if test -f "$output_objdir/$my_outputname.def"; then
16708
- compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
16709
- finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
16710
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
16711
+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
16712
else
16713
- compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
16714
- finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
16715
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
16716
+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
16717
fi
16718
;;
16719
*)
16720
- compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
16721
- finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
16722
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
16723
+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
16724
;;
16725
esac
16726
;;
16727
@@ -2763,8 +2538,8 @@
16728
# really was required.
16729
16730
# Nullify the symbol file.
16731
- compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
16732
- finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
16733
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
16734
+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
16735
fi
16736
}
16737
16738
@@ -2774,7 +2549,6 @@
16739
# Need a lot of goo to handle *both* DLLs and import libs
16740
# Has to be a shell function in order to 'eat' the argument
16741
# that is supplied when $file_magic_command is called.
16742
-# Despite the name, also deal with 64 bit binaries.
16743
func_win32_libid ()
16744
{
16745
$opt_debug
16746
@@ -2785,9 +2559,8 @@
16747
win32_libid_type="x86 archive import"
16748
;;
16749
*ar\ archive*) # could be an import, or static
16750
- # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
16751
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
16752
- $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
16753
+ $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
16754
win32_nmres=`eval $NM -f posix -A $1 |
16755
$SED -n -e '
16756
1,100{
16757
@@ -2825,18 +2598,7 @@
16758
$opt_debug
16759
f_ex_an_ar_dir="$1"; shift
16760
f_ex_an_ar_oldlib="$1"
16761
- if test "$lock_old_archive_extraction" = yes; then
16762
- lockfile=$f_ex_an_ar_oldlib.lock
16763
- until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
16764
- func_echo "Waiting for $lockfile to be removed"
16765
- sleep 2
16766
- done
16767
- fi
16768
- func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
16769
- 'stat=$?; rm -f "$lockfile"; exit $stat'
16770
- if test "$lock_old_archive_extraction" = yes; then
16771
- $opt_dry_run || rm -f "$lockfile"
16772
- fi
16773
+ func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
16774
if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
16775
:
16776
else
16777
@@ -2907,7 +2669,7 @@
16778
darwin_file=
16779
darwin_files=
16780
for darwin_file in $darwin_filelist; do
16781
- darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
16782
+ darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
16783
$LIPO -create -output "$darwin_file" $darwin_files
16784
done # $darwin_filelist
16785
$RM -rf unfat-$$
16786
@@ -2922,30 +2684,25 @@
16787
func_extract_an_archive "$my_xdir" "$my_xabs"
16788
;;
16789
esac
16790
- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
16791
+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
16792
done
16793
16794
func_extract_archives_result="$my_oldobjs"
16795
}
16796
16797
16798
-# func_emit_wrapper [arg=no]
16799
-#
16800
-# Emit a libtool wrapper script on stdout.
16801
-# Don't directly open a file because we may want to
16802
-# incorporate the script contents within a cygwin/mingw
16803
-# wrapper executable. Must ONLY be called from within
16804
-# func_mode_link because it depends on a number of variables
16805
-# set therein.
16806
+
16807
+# func_emit_wrapper_part1 [arg=no]
16808
#
16809
-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
16810
-# variable will take. If 'yes', then the emitted script
16811
-# will assume that the directory in which it is stored is
16812
-# the $objdir directory. This is a cygwin/mingw-specific
16813
-# behavior.
16814
-func_emit_wrapper ()
16815
-{
16816
- func_emit_wrapper_arg1=${1-no}
16817
+# Emit the first part of a libtool wrapper script on stdout.
16818
+# For more information, see the description associated with
16819
+# func_emit_wrapper(), below.
16820
+func_emit_wrapper_part1 ()
16821
+{
16822
+ func_emit_wrapper_part1_arg1=no
16823
+ if test -n "$1" ; then
16824
+ func_emit_wrapper_part1_arg1=$1
16825
+ fi
16826
16827
$ECHO "\
16828
#! $SHELL
16829
@@ -2961,6 +2718,7 @@
16830
16831
# Sed substitution that helps us do robust quoting. It backslashifies
16832
# metacharacters that are still active within double-quoted strings.
16833
+Xsed='${SED} -e 1s/^X//'
16834
sed_quote_subst='$sed_quote_subst'
16835
16836
# Be Bourne compatible
16837
@@ -2991,132 +2749,31 @@
16838
else
16839
# When we are sourced in execute mode, \$file and \$ECHO are already set.
16840
if test \"\$libtool_execute_magic\" != \"$magic\"; then
16841
- file=\"\$0\""
16842
-
16843
- qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
16844
- $ECHO "\
16845
-
16846
-# A function that is used when there is no print builtin or printf.
16847
-func_fallback_echo ()
16848
-{
16849
- eval 'cat <<_LTECHO_EOF
16850
-\$1
16851
-_LTECHO_EOF'
16852
-}
16853
- ECHO=\"$qECHO\"
16854
- fi
16855
-
16856
-# Very basic option parsing. These options are (a) specific to
16857
-# the libtool wrapper, (b) are identical between the wrapper
16858
-# /script/ and the wrapper /executable/ which is used only on
16859
-# windows platforms, and (c) all begin with the string "--lt-"
16860
-# (application programs are unlikely to have options which match
16861
-# this pattern).
16862
-#
16863
-# There are only two supported options: --lt-debug and
16864
-# --lt-dump-script. There is, deliberately, no --lt-help.
16865
-#
16866
-# The first argument to this parsing function should be the
16867
-# script's $0 value, followed by "$@".
16868
-lt_option_debug=
16869
-func_parse_lt_options ()
16870
-{
16871
- lt_script_arg0=\$0
16872
- shift
16873
- for lt_opt
16874
- do
16875
- case \"\$lt_opt\" in
16876
- --lt-debug) lt_option_debug=1 ;;
16877
- --lt-dump-script)
16878
- lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
16879
- test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
16880
- lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
16881
- cat \"\$lt_dump_D/\$lt_dump_F\"
16882
- exit 0
16883
- ;;
16884
- --lt-*)
16885
- \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
16886
- exit 1
16887
- ;;
16888
- esac
16889
- done
16890
-
16891
- # Print the debug banner immediately:
16892
- if test -n \"\$lt_option_debug\"; then
16893
- echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
16894
- fi
16895
-}
16896
-
16897
-# Used when --lt-debug. Prints its arguments to stdout
16898
-# (redirection is the responsibility of the caller)
16899
-func_lt_dump_args ()
16900
-{
16901
- lt_dump_args_N=1;
16902
- for lt_arg
16903
- do
16904
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
16905
- lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
16906
- done
16907
-}
16908
-
16909
-# Core function for launching the target application
16910
-func_exec_program_core ()
16911
-{
16912
-"
16913
- case $host in
16914
- # Backslashes separate directories on plain windows
16915
- *-*-mingw | *-*-os2* | *-cegcc*)
16916
- $ECHO "\
16917
- if test -n \"\$lt_option_debug\"; then
16918
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
16919
- func_lt_dump_args \${1+\"\$@\"} 1>&2
16920
- fi
16921
- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
16922
-"
16923
- ;;
16924
-
16925
- *)
16926
- $ECHO "\
16927
- if test -n \"\$lt_option_debug\"; then
16928
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
16929
- func_lt_dump_args \${1+\"\$@\"} 1>&2
16930
- fi
16931
- exec \"\$progdir/\$program\" \${1+\"\$@\"}
16932
+ ECHO=\"$qecho\"
16933
+ file=\"\$0\"
16934
+ # Make sure echo works.
16935
+ if test \"X\$1\" = X--no-reexec; then
16936
+ # Discard the --no-reexec flag, and continue.
16937
+ shift
16938
+ elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
16939
+ # Yippee, \$ECHO works!
16940
+ :
16941
+ else
16942
+ # Restart under the correct shell, and then maybe \$ECHO will work.
16943
+ exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
16944
+ fi
16945
+ fi\
16946
"
16947
- ;;
16948
- esac
16949
- $ECHO "\
16950
- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
16951
- exit 1
16952
-}
16953
-
16954
-# A function to encapsulate launching the target application
16955
-# Strips options in the --lt-* namespace from \$@ and
16956
-# launches target application with the remaining arguments.
16957
-func_exec_program ()
16958
-{
16959
- for lt_wr_arg
16960
- do
16961
- case \$lt_wr_arg in
16962
- --lt-*) ;;
16963
- *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
16964
- esac
16965
- shift
16966
- done
16967
- func_exec_program_core \${1+\"\$@\"}
16968
-}
16969
-
16970
- # Parse options
16971
- func_parse_lt_options \"\$0\" \${1+\"\$@\"}
16972
+ $ECHO "\
16973
16974
# Find the directory that this script lives in.
16975
- thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
16976
+ thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
16977
test \"x\$thisdir\" = \"x\$file\" && thisdir=.
16978
16979
# Follow symbolic links until we get to the real thisdir.
16980
- file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
16981
+ file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
16982
while test -n \"\$file\"; do
16983
- destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
16984
+ destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
16985
16986
# If there was a directory component, then change thisdir.
16987
if test \"x\$destdir\" != \"x\$file\"; then
16988
@@ -3126,13 +2783,30 @@
16989
esac
16990
fi
16991
16992
- file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
16993
- file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
16994
+ file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
16995
+ file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
16996
done
16997
+"
16998
+}
16999
+# end: func_emit_wrapper_part1
17000
+
17001
+# func_emit_wrapper_part2 [arg=no]
17002
+#
17003
+# Emit the second part of a libtool wrapper script on stdout.
17004
+# For more information, see the description associated with
17005
+# func_emit_wrapper(), below.
17006
+func_emit_wrapper_part2 ()
17007
+{
17008
+ func_emit_wrapper_part2_arg1=no
17009
+ if test -n "$1" ; then
17010
+ func_emit_wrapper_part2_arg1=$1
17011
+ fi
17012
+
17013
+ $ECHO "\
17014
17015
# Usually 'no', except on cygwin/mingw when embedded into
17016
# the cwrapper.
17017
- WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
17018
+ WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
17019
if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
17020
# special case for '.'
17021
if test \"\$thisdir\" = \".\"; then
17022
@@ -3140,7 +2814,7 @@
17023
fi
17024
# remove .libs from thisdir
17025
case \"\$thisdir\" in
17026
- *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
17027
+ *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
17028
$objdir ) thisdir=. ;;
17029
esac
17030
fi
17031
@@ -3203,7 +2877,7 @@
17032
17033
# Some systems cannot cope with colon-terminated $shlibpath_var
17034
# The second colon is a workaround for a bug in BeOS R4 sed
17035
- $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
17036
+ $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
17037
17038
export $shlibpath_var
17039
"
17040
@@ -3220,18 +2894,64 @@
17041
$ECHO "\
17042
if test \"\$libtool_execute_magic\" != \"$magic\"; then
17043
# Run the actual program with our arguments.
17044
- func_exec_program \${1+\"\$@\"}
17045
+"
17046
+ case $host in
17047
+ # Backslashes separate directories on plain windows
17048
+ *-*-mingw | *-*-os2* | *-cegcc*)
17049
+ $ECHO "\
17050
+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
17051
+"
17052
+ ;;
17053
+
17054
+ *)
17055
+ $ECHO "\
17056
+ exec \"\$progdir/\$program\" \${1+\"\$@\"}
17057
+"
17058
+ ;;
17059
+ esac
17060
+ $ECHO "\
17061
+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
17062
+ exit 1
17063
fi
17064
else
17065
# The program doesn't exist.
17066
\$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
17067
\$ECHO \"This script is just a wrapper for \$program.\" 1>&2
17068
- \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
17069
+ $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
17070
exit 1
17071
fi
17072
fi\
17073
"
17074
}
17075
+# end: func_emit_wrapper_part2
17076
+
17077
+
17078
+# func_emit_wrapper [arg=no]
17079
+#
17080
+# Emit a libtool wrapper script on stdout.
17081
+# Don't directly open a file because we may want to
17082
+# incorporate the script contents within a cygwin/mingw
17083
+# wrapper executable. Must ONLY be called from within
17084
+# func_mode_link because it depends on a number of variables
17085
+# set therein.
17086
+#
17087
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
17088
+# variable will take. If 'yes', then the emitted script
17089
+# will assume that the directory in which it is stored is
17090
+# the $objdir directory. This is a cygwin/mingw-specific
17091
+# behavior.
17092
+func_emit_wrapper ()
17093
+{
17094
+ func_emit_wrapper_arg1=no
17095
+ if test -n "$1" ; then
17096
+ func_emit_wrapper_arg1=$1
17097
+ fi
17098
+
17099
+ # split this up so that func_emit_cwrapperexe_src
17100
+ # can call each part independently.
17101
+ func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
17102
+ func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
17103
+}
17104
17105
17106
# func_to_host_path arg
17107
@@ -3258,19 +2978,23 @@
17108
func_to_host_path ()
17109
{
17110
func_to_host_path_result="$1"
17111
- if test -n "$1"; then
17112
+ if test -n "$1" ; then
17113
case $host in
17114
*mingw* )
17115
lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
17116
case $build in
17117
*mingw* ) # actually, msys
17118
# awkward: cmd appends spaces to result
17119
- func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
17120
- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
17121
+ lt_sed_strip_trailing_spaces="s/[ ]*\$//"
17122
+ func_to_host_path_tmp1=`( cmd //c echo "$1" |\
17123
+ $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
17124
+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
17125
+ $SED -e "$lt_sed_naive_backslashify"`
17126
;;
17127
*cygwin* )
17128
- func_to_host_path_result=`cygpath -w "$1" |
17129
- $SED -e "$lt_sed_naive_backslashify"`
17130
+ func_to_host_path_tmp1=`cygpath -w "$1"`
17131
+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
17132
+ $SED -e "$lt_sed_naive_backslashify"`
17133
;;
17134
* )
17135
# Unfortunately, winepath does not exit with a non-zero
17136
@@ -3282,17 +3006,17 @@
17137
# the odd construction:
17138
func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
17139
if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
17140
- func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" |
17141
+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
17142
$SED -e "$lt_sed_naive_backslashify"`
17143
else
17144
# Allow warning below.
17145
- func_to_host_path_result=
17146
+ func_to_host_path_result=""
17147
fi
17148
;;
17149
esac
17150
if test -z "$func_to_host_path_result" ; then
17151
func_error "Could not determine host path corresponding to"
17152
- func_error " \`$1'"
17153
+ func_error " '$1'"
17154
func_error "Continuing, but uninstalled executables may not work."
17155
# Fallback:
17156
func_to_host_path_result="$1"
17157
@@ -3325,24 +3049,30 @@
17158
func_to_host_pathlist ()
17159
{
17160
func_to_host_pathlist_result="$1"
17161
- if test -n "$1"; then
17162
+ if test -n "$1" ; then
17163
case $host in
17164
*mingw* )
17165
lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
17166
# Remove leading and trailing path separator characters from
17167
# ARG. msys behavior is inconsistent here, cygpath turns them
17168
# into '.;' and ';.', and winepath ignores them completely.
17169
- func_stripname : : "$1"
17170
- func_to_host_pathlist_tmp1=$func_stripname_result
17171
+ func_to_host_pathlist_tmp2="$1"
17172
+ # Once set for this call, this variable should not be
17173
+ # reassigned. It is used in tha fallback case.
17174
+ func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
17175
+ $SED -e 's|^:*||' -e 's|:*$||'`
17176
case $build in
17177
*mingw* ) # Actually, msys.
17178
# Awkward: cmd appends spaces to result.
17179
- func_to_host_pathlist_result=`
17180
- ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
17181
- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
17182
+ lt_sed_strip_trailing_spaces="s/[ ]*\$//"
17183
+ func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
17184
+ $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
17185
+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
17186
+ $SED -e "$lt_sed_naive_backslashify"`
17187
;;
17188
*cygwin* )
17189
- func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
17190
+ func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
17191
+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
17192
$SED -e "$lt_sed_naive_backslashify"`
17193
;;
17194
* )
17195
@@ -3358,17 +3088,18 @@
17196
if test -z "$func_to_host_pathlist_result" ; then
17197
func_to_host_pathlist_result="$func_to_host_path_result"
17198
else
17199
- func_append func_to_host_pathlist_result ";$func_to_host_path_result"
17200
+ func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
17201
fi
17202
fi
17203
fi
17204
+ IFS=:
17205
done
17206
IFS=$func_to_host_pathlist_oldIFS
17207
;;
17208
esac
17209
- if test -z "$func_to_host_pathlist_result"; then
17210
+ if test -z "$func_to_host_pathlist_result" ; then
17211
func_error "Could not determine the host path(s) corresponding to"
17212
- func_error " \`$1'"
17213
+ func_error " '$1'"
17214
func_error "Continuing, but uninstalled executables may not work."
17215
# Fallback. This may break if $1 contains DOS-style drive
17216
# specifications. The fix is not to complicate the expression
17217
@@ -3385,7 +3116,7 @@
17218
;;
17219
esac
17220
case "$1" in
17221
- *: ) func_append func_to_host_pathlist_result ";"
17222
+ *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
17223
;;
17224
esac
17225
;;
17226
@@ -3410,23 +3141,31 @@
17227
17228
This wrapper executable should never be moved out of the build directory.
17229
If it is, it will not operate correctly.
17230
+
17231
+ Currently, it simply execs the wrapper *script* "$SHELL $output",
17232
+ but could eventually absorb all of the scripts functionality and
17233
+ exec $objdir/$outputname directly.
17234
*/
17235
EOF
17236
cat <<"EOF"
17237
-#ifdef _MSC_VER
17238
-# define _CRT_SECURE_NO_DEPRECATE 1
17239
-#endif
17240
#include <stdio.h>
17241
#include <stdlib.h>
17242
#ifdef _MSC_VER
17243
# include <direct.h>
17244
# include <process.h>
17245
# include <io.h>
17246
+# define setmode _setmode
17247
#else
17248
# include <unistd.h>
17249
# include <stdint.h>
17250
# ifdef __CYGWIN__
17251
# include <io.h>
17252
+# define HAVE_SETENV
17253
+# ifdef __STRICT_ANSI__
17254
+char *realpath (const char *, char *);
17255
+int putenv (char *);
17256
+int setenv (const char *, const char *, int);
17257
+# endif
17258
# endif
17259
#endif
17260
#include <malloc.h>
17261
@@ -3438,44 +3177,6 @@
17262
#include <fcntl.h>
17263
#include <sys/stat.h>
17264
17265
-/* declarations of non-ANSI functions */
17266
-#if defined(__MINGW32__)
17267
-# ifdef __STRICT_ANSI__
17268
-int _putenv (const char *);
17269
-# endif
17270
-#elif defined(__CYGWIN__)
17271
-# ifdef __STRICT_ANSI__
17272
-char *realpath (const char *, char *);
17273
-int putenv (char *);
17274
-int setenv (const char *, const char *, int);
17275
-# endif
17276
-/* #elif defined (other platforms) ... */
17277
-#endif
17278
-
17279
-/* portability defines, excluding path handling macros */
17280
-#if defined(_MSC_VER)
17281
-# define setmode _setmode
17282
-# define stat _stat
17283
-# define chmod _chmod
17284
-# define getcwd _getcwd
17285
-# define putenv _putenv
17286
-# define S_IXUSR _S_IEXEC
17287
-# ifndef _INTPTR_T_DEFINED
17288
-# define _INTPTR_T_DEFINED
17289
-# define intptr_t int
17290
-# endif
17291
-#elif defined(__MINGW32__)
17292
-# define setmode _setmode
17293
-# define stat _stat
17294
-# define chmod _chmod
17295
-# define getcwd _getcwd
17296
-# define putenv _putenv
17297
-#elif defined(__CYGWIN__)
17298
-# define HAVE_SETENV
17299
-# define FOPEN_WB "wb"
17300
-/* #elif defined (other platforms) ... */
17301
-#endif
17302
-
17303
#if defined(PATH_MAX)
17304
# define LT_PATHMAX PATH_MAX
17305
#elif defined(MAXPATHLEN)
17306
@@ -3491,7 +3192,14 @@
17307
# define S_IXGRP 0
17308
#endif
17309
17310
-/* path handling portability macros */
17311
+#ifdef _MSC_VER
17312
+# define S_IXUSR _S_IEXEC
17313
+# define stat _stat
17314
+# ifndef _INTPTR_T_DEFINED
17315
+# define intptr_t int
17316
+# endif
17317
+#endif
17318
+
17319
#ifndef DIR_SEPARATOR
17320
# define DIR_SEPARATOR '/'
17321
# define PATH_SEPARATOR ':'
17322
@@ -3522,6 +3230,10 @@
17323
# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
17324
#endif /* PATH_SEPARATOR_2 */
17325
17326
+#ifdef __CYGWIN__
17327
+# define FOPEN_WB "wb"
17328
+#endif
17329
+
17330
#ifndef FOPEN_WB
17331
# define FOPEN_WB "w"
17332
#endif
17333
@@ -3534,13 +3246,22 @@
17334
if (stale) { free ((void *) stale); stale = 0; } \
17335
} while (0)
17336
17337
-#if defined(LT_DEBUGWRAPPER)
17338
-static int lt_debug = 1;
17339
+#undef LTWRAPPER_DEBUGPRINTF
17340
+#if defined DEBUGWRAPPER
17341
+# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
17342
+static void
17343
+ltwrapper_debugprintf (const char *fmt, ...)
17344
+{
17345
+ va_list args;
17346
+ va_start (args, fmt);
17347
+ (void) vfprintf (stderr, fmt, args);
17348
+ va_end (args);
17349
+}
17350
#else
17351
-static int lt_debug = 0;
17352
+# define LTWRAPPER_DEBUGPRINTF(args)
17353
#endif
17354
17355
-const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
17356
+const char *program_name = NULL;
17357
17358
void *xmalloc (size_t num);
17359
char *xstrdup (const char *string);
17360
@@ -3550,17 +3271,31 @@
17361
int make_executable (const char *path);
17362
int check_executable (const char *path);
17363
char *strendzap (char *str, const char *pat);
17364
-void lt_debugprintf (const char *file, int line, const char *fmt, ...);
17365
-void lt_fatal (const char *file, int line, const char *message, ...);
17366
-static const char *nonnull (const char *s);
17367
-static const char *nonempty (const char *s);
17368
+void lt_fatal (const char *message, ...);
17369
void lt_setenv (const char *name, const char *value);
17370
char *lt_extend_str (const char *orig_value, const char *add, int to_end);
17371
+void lt_opt_process_env_set (const char *arg);
17372
+void lt_opt_process_env_prepend (const char *arg);
17373
+void lt_opt_process_env_append (const char *arg);
17374
+int lt_split_name_value (const char *arg, char** name, char** value);
17375
void lt_update_exe_path (const char *name, const char *value);
17376
void lt_update_lib_path (const char *name, const char *value);
17377
-char **prepare_spawn (char **argv);
17378
-void lt_dump_script (FILE *f);
17379
+
17380
+static const char *script_text_part1 =
17381
+EOF
17382
+
17383
+ func_emit_wrapper_part1 yes |
17384
+ $SED -e 's/\([\\"]\)/\\\1/g' \
17385
+ -e 's/^/ "/' -e 's/$/\\n"/'
17386
+ echo ";"
17387
+ cat <<EOF
17388
+
17389
+static const char *script_text_part2 =
17390
EOF
17391
+ func_emit_wrapper_part2 yes |
17392
+ $SED -e 's/\([\\"]\)/\\\1/g' \
17393
+ -e 's/^/ "/' -e 's/$/\\n"/'
17394
+ echo ";"
17395
17396
cat <<EOF
17397
const char * MAGIC_EXE = "$magic_exe";
17398
@@ -3605,10 +3340,24 @@
17399
cat <<"EOF"
17400
17401
#define LTWRAPPER_OPTION_PREFIX "--lt-"
17402
+#define LTWRAPPER_OPTION_PREFIX_LENGTH 5
17403
17404
+static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;
17405
static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
17406
+
17407
static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
17408
-static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";
17409
+
17410
+static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
17411
+static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set";
17412
+ /* argument is putenv-style "foo=bar", value of foo is set to bar */
17413
+
17414
+static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
17415
+static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend";
17416
+ /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
17417
+
17418
+static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
17419
+static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append";
17420
+ /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
17421
17422
int
17423
main (int argc, char *argv[])
17424
@@ -3625,13 +3374,10 @@
17425
int i;
17426
17427
program_name = (char *) xstrdup (base_name (argv[0]));
17428
- newargz = XMALLOC (char *, argc + 1);
17429
+ LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
17430
+ LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
17431
17432
- /* very simple arg parsing; don't want to rely on getopt
17433
- * also, copy all non cwrapper options to newargz, except
17434
- * argz[0], which is handled differently
17435
- */
17436
- newargc=0;
17437
+ /* very simple arg parsing; don't want to rely on getopt */
17438
for (i = 1; i < argc; i++)
17439
{
17440
if (strcmp (argv[i], dumpscript_opt) == 0)
17441
@@ -3645,57 +3391,25 @@
17442
esac
17443
17444
cat <<"EOF"
17445
- lt_dump_script (stdout);
17446
+ printf ("%s", script_text_part1);
17447
+ printf ("%s", script_text_part2);
17448
return 0;
17449
}
17450
- if (strcmp (argv[i], debug_opt) == 0)
17451
- {
17452
- lt_debug = 1;
17453
- continue;
17454
- }
17455
- if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
17456
- {
17457
- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
17458
- namespace, but it is not one of the ones we know about and
17459
- have already dealt with, above (inluding dump-script), then
17460
- report an error. Otherwise, targets might begin to believe
17461
- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
17462
- namespace. The first time any user complains about this, we'll
17463
- need to make LTWRAPPER_OPTION_PREFIX a configure-time option
17464
- or a configure.ac-settable value.
17465
- */
17466
- lt_fatal (__FILE__, __LINE__,
17467
- "unrecognized %s option: '%s'",
17468
- ltwrapper_option_prefix, argv[i]);
17469
- }
17470
- /* otherwise ... */
17471
- newargz[++newargc] = xstrdup (argv[i]);
17472
}
17473
- newargz[++newargc] = NULL;
17474
-
17475
-EOF
17476
- cat <<EOF
17477
- /* The GNU banner must be the first non-error debug message */
17478
- lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
17479
-EOF
17480
- cat <<"EOF"
17481
- lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
17482
- lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
17483
17484
+ newargz = XMALLOC (char *, argc + 1);
17485
tmp_pathspec = find_executable (argv[0]);
17486
if (tmp_pathspec == NULL)
17487
- lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
17488
- lt_debugprintf (__FILE__, __LINE__,
17489
- "(main) found exe (before symlink chase) at: %s\n",
17490
- tmp_pathspec);
17491
+ lt_fatal ("Couldn't find %s", argv[0]);
17492
+ LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
17493
+ tmp_pathspec));
17494
17495
actual_cwrapper_path = chase_symlinks (tmp_pathspec);
17496
- lt_debugprintf (__FILE__, __LINE__,
17497
- "(main) found exe (after symlink chase) at: %s\n",
17498
- actual_cwrapper_path);
17499
+ LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
17500
+ actual_cwrapper_path));
17501
XFREE (tmp_pathspec);
17502
17503
- actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
17504
+ actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
17505
strendzap (actual_cwrapper_path, actual_cwrapper_name);
17506
17507
/* wrapper name transforms */
17508
@@ -3713,9 +3427,8 @@
17509
target_name = tmp_pathspec;
17510
tmp_pathspec = 0;
17511
17512
- lt_debugprintf (__FILE__, __LINE__,
17513
- "(main) libtool target name: %s\n",
17514
- target_name);
17515
+ LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
17516
+ target_name));
17517
EOF
17518
17519
cat <<EOF
17520
@@ -3768,12 +3481,77 @@
17521
lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
17522
lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
17523
17524
- lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
17525
- nonnull (lt_argv_zero));
17526
+ newargc=0;
17527
+ for (i = 1; i < argc; i++)
17528
+ {
17529
+ if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
17530
+ {
17531
+ if (argv[i][env_set_opt_len] == '=')
17532
+ {
17533
+ const char *p = argv[i] + env_set_opt_len + 1;
17534
+ lt_opt_process_env_set (p);
17535
+ }
17536
+ else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
17537
+ {
17538
+ lt_opt_process_env_set (argv[++i]); /* don't copy */
17539
+ }
17540
+ else
17541
+ lt_fatal ("%s missing required argument", env_set_opt);
17542
+ continue;
17543
+ }
17544
+ if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
17545
+ {
17546
+ if (argv[i][env_prepend_opt_len] == '=')
17547
+ {
17548
+ const char *p = argv[i] + env_prepend_opt_len + 1;
17549
+ lt_opt_process_env_prepend (p);
17550
+ }
17551
+ else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
17552
+ {
17553
+ lt_opt_process_env_prepend (argv[++i]); /* don't copy */
17554
+ }
17555
+ else
17556
+ lt_fatal ("%s missing required argument", env_prepend_opt);
17557
+ continue;
17558
+ }
17559
+ if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
17560
+ {
17561
+ if (argv[i][env_append_opt_len] == '=')
17562
+ {
17563
+ const char *p = argv[i] + env_append_opt_len + 1;
17564
+ lt_opt_process_env_append (p);
17565
+ }
17566
+ else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
17567
+ {
17568
+ lt_opt_process_env_append (argv[++i]); /* don't copy */
17569
+ }
17570
+ else
17571
+ lt_fatal ("%s missing required argument", env_append_opt);
17572
+ continue;
17573
+ }
17574
+ if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
17575
+ {
17576
+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
17577
+ namespace, but it is not one of the ones we know about and
17578
+ have already dealt with, above (inluding dump-script), then
17579
+ report an error. Otherwise, targets might begin to believe
17580
+ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
17581
+ namespace. The first time any user complains about this, we'll
17582
+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option
17583
+ or a configure.ac-settable value.
17584
+ */
17585
+ lt_fatal ("Unrecognized option in %s namespace: '%s'",
17586
+ ltwrapper_option_prefix, argv[i]);
17587
+ }
17588
+ /* otherwise ... */
17589
+ newargz[++newargc] = xstrdup (argv[i]);
17590
+ }
17591
+ newargz[++newargc] = NULL;
17592
+
17593
+ LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
17594
for (i = 0; i < newargc; i++)
17595
{
17596
- lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
17597
- i, nonnull (newargz[i]));
17598
+ LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
17599
}
17600
17601
EOF
17602
@@ -3782,14 +3560,11 @@
17603
mingw*)
17604
cat <<"EOF"
17605
/* execv doesn't actually work on mingw as expected on unix */
17606
- newargz = prepare_spawn (newargz);
17607
rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
17608
if (rval == -1)
17609
{
17610
/* failed to start process */
17611
- lt_debugprintf (__FILE__, __LINE__,
17612
- "(main) failed to launch target \"%s\": %s\n",
17613
- lt_argv_zero, nonnull (strerror (errno)));
17614
+ LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
17615
return 127;
17616
}
17617
return rval;
17618
@@ -3811,7 +3586,7 @@
17619
{
17620
void *p = (void *) malloc (num);
17621
if (!p)
17622
- lt_fatal (__FILE__, __LINE__, "memory exhausted");
17623
+ lt_fatal ("Memory exhausted");
17624
17625
return p;
17626
}
17627
@@ -3845,8 +3620,8 @@
17628
{
17629
struct stat st;
17630
17631
- lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
17632
- nonempty (path));
17633
+ LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
17634
+ path ? (*path ? path : "EMPTY!") : "NULL!"));
17635
if ((!path) || (!*path))
17636
return 0;
17637
17638
@@ -3863,8 +3638,8 @@
17639
int rval = 0;
17640
struct stat st;
17641
17642
- lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
17643
- nonempty (path));
17644
+ LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
17645
+ path ? (*path ? path : "EMPTY!") : "NULL!"));
17646
if ((!path) || (!*path))
17647
return 0;
17648
17649
@@ -3890,8 +3665,8 @@
17650
int tmp_len;
17651
char *concat_name;
17652
17653
- lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
17654
- nonempty (wrapper));
17655
+ LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
17656
+ wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
17657
17658
if ((wrapper == NULL) || (*wrapper == '\0'))
17659
return NULL;
17660
@@ -3944,8 +3719,7 @@
17661
{
17662
/* empty path: current directory */
17663
if (getcwd (tmp, LT_PATHMAX) == NULL)
17664
- lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
17665
- nonnull (strerror (errno)));
17666
+ lt_fatal ("getcwd failed");
17667
tmp_len = strlen (tmp);
17668
concat_name =
17669
XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
17670
@@ -3970,8 +3744,7 @@
17671
}
17672
/* Relative path | not found in path: prepend cwd */
17673
if (getcwd (tmp, LT_PATHMAX) == NULL)
17674
- lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
17675
- nonnull (strerror (errno)));
17676
+ lt_fatal ("getcwd failed");
17677
tmp_len = strlen (tmp);
17678
concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
17679
memcpy (concat_name, tmp, tmp_len);
17680
@@ -3997,9 +3770,8 @@
17681
int has_symlinks = 0;
17682
while (strlen (tmp_pathspec) && !has_symlinks)
17683
{
17684
- lt_debugprintf (__FILE__, __LINE__,
17685
- "checking path component for symlinks: %s\n",
17686
- tmp_pathspec);
17687
+ LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
17688
+ tmp_pathspec));
17689
if (lstat (tmp_pathspec, &s) == 0)
17690
{
17691
if (S_ISLNK (s.st_mode) != 0)
17692
@@ -4021,9 +3793,8 @@
17693
}
17694
else
17695
{
17696
- lt_fatal (__FILE__, __LINE__,
17697
- "error accessing file \"%s\": %s",
17698
- tmp_pathspec, nonnull (strerror (errno)));
17699
+ char *errstr = strerror (errno);
17700
+ lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
17701
}
17702
}
17703
XFREE (tmp_pathspec);
17704
@@ -4036,8 +3807,7 @@
17705
tmp_pathspec = realpath (pathspec, buf);
17706
if (tmp_pathspec == 0)
17707
{
17708
- lt_fatal (__FILE__, __LINE__,
17709
- "could not follow symlinks for %s", pathspec);
17710
+ lt_fatal ("Could not follow symlinks for %s", pathspec);
17711
}
17712
return xstrdup (tmp_pathspec);
17713
#endif
17714
@@ -4063,25 +3833,11 @@
17715
return str;
17716
}
17717
17718
-void
17719
-lt_debugprintf (const char *file, int line, const char *fmt, ...)
17720
-{
17721
- va_list args;
17722
- if (lt_debug)
17723
- {
17724
- (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
17725
- va_start (args, fmt);
17726
- (void) vfprintf (stderr, fmt, args);
17727
- va_end (args);
17728
- }
17729
-}
17730
-
17731
static void
17732
-lt_error_core (int exit_status, const char *file,
17733
- int line, const char *mode,
17734
+lt_error_core (int exit_status, const char *mode,
17735
const char *message, va_list ap)
17736
{
17737
- fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
17738
+ fprintf (stderr, "%s: %s: ", program_name, mode);
17739
vfprintf (stderr, message, ap);
17740
fprintf (stderr, ".\n");
17741
17742
@@ -4090,32 +3846,20 @@
17743
}
17744
17745
void
17746
-lt_fatal (const char *file, int line, const char *message, ...)
17747
+lt_fatal (const char *message, ...)
17748
{
17749
va_list ap;
17750
va_start (ap, message);
17751
- lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
17752
+ lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
17753
va_end (ap);
17754
}
17755
17756
-static const char *
17757
-nonnull (const char *s)
17758
-{
17759
- return s ? s : "(null)";
17760
-}
17761
-
17762
-static const char *
17763
-nonempty (const char *s)
17764
-{
17765
- return (s && !*s) ? "(empty)" : nonnull (s);
17766
-}
17767
-
17768
void
17769
lt_setenv (const char *name, const char *value)
17770
{
17771
- lt_debugprintf (__FILE__, __LINE__,
17772
- "(lt_setenv) setting '%s' to '%s'\n",
17773
- nonnull (name), nonnull (value));
17774
+ LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
17775
+ (name ? name : "<NULL>"),
17776
+ (value ? value : "<NULL>")));
17777
{
17778
#ifdef HAVE_SETENV
17779
/* always make a copy, for consistency with !HAVE_SETENV */
17780
@@ -4160,12 +3904,95 @@
17781
return new_value;
17782
}
17783
17784
+int
17785
+lt_split_name_value (const char *arg, char** name, char** value)
17786
+{
17787
+ const char *p;
17788
+ int len;
17789
+ if (!arg || !*arg)
17790
+ return 1;
17791
+
17792
+ p = strchr (arg, (int)'=');
17793
+
17794
+ if (!p)
17795
+ return 1;
17796
+
17797
+ *value = xstrdup (++p);
17798
+
17799
+ len = strlen (arg) - strlen (*value);
17800
+ *name = XMALLOC (char, len);
17801
+ strncpy (*name, arg, len-1);
17802
+ (*name)[len - 1] = '\0';
17803
+
17804
+ return 0;
17805
+}
17806
+
17807
+void
17808
+lt_opt_process_env_set (const char *arg)
17809
+{
17810
+ char *name = NULL;
17811
+ char *value = NULL;
17812
+
17813
+ if (lt_split_name_value (arg, &name, &value) != 0)
17814
+ {
17815
+ XFREE (name);
17816
+ XFREE (value);
17817
+ lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
17818
+ }
17819
+
17820
+ lt_setenv (name, value);
17821
+ XFREE (name);
17822
+ XFREE (value);
17823
+}
17824
+
17825
+void
17826
+lt_opt_process_env_prepend (const char *arg)
17827
+{
17828
+ char *name = NULL;
17829
+ char *value = NULL;
17830
+ char *new_value = NULL;
17831
+
17832
+ if (lt_split_name_value (arg, &name, &value) != 0)
17833
+ {
17834
+ XFREE (name);
17835
+ XFREE (value);
17836
+ lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
17837
+ }
17838
+
17839
+ new_value = lt_extend_str (getenv (name), value, 0);
17840
+ lt_setenv (name, new_value);
17841
+ XFREE (new_value);
17842
+ XFREE (name);
17843
+ XFREE (value);
17844
+}
17845
+
17846
+void
17847
+lt_opt_process_env_append (const char *arg)
17848
+{
17849
+ char *name = NULL;
17850
+ char *value = NULL;
17851
+ char *new_value = NULL;
17852
+
17853
+ if (lt_split_name_value (arg, &name, &value) != 0)
17854
+ {
17855
+ XFREE (name);
17856
+ XFREE (value);
17857
+ lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
17858
+ }
17859
+
17860
+ new_value = lt_extend_str (getenv (name), value, 1);
17861
+ lt_setenv (name, new_value);
17862
+ XFREE (new_value);
17863
+ XFREE (name);
17864
+ XFREE (value);
17865
+}
17866
+
17867
void
17868
lt_update_exe_path (const char *name, const char *value)
17869
{
17870
- lt_debugprintf (__FILE__, __LINE__,
17871
- "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
17872
- nonnull (name), nonnull (value));
17873
+ LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
17874
+ (name ? name : "<NULL>"),
17875
+ (value ? value : "<NULL>")));
17876
17877
if (name && *name && value && *value)
17878
{
17879
@@ -4184,9 +4011,9 @@
17880
void
17881
lt_update_lib_path (const char *name, const char *value)
17882
{
17883
- lt_debugprintf (__FILE__, __LINE__,
17884
- "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
17885
- nonnull (name), nonnull (value));
17886
+ LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
17887
+ (name ? name : "<NULL>"),
17888
+ (value ? value : "<NULL>")));
17889
17890
if (name && *name && value && *value)
17891
{
17892
@@ -4196,152 +4023,11 @@
17893
}
17894
}
17895
17896
-EOF
17897
- case $host_os in
17898
- mingw*)
17899
- cat <<"EOF"
17900
-
17901
-/* Prepares an argument vector before calling spawn().
17902
- Note that spawn() does not by itself call the command interpreter
17903
- (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
17904
- ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
17905
- GetVersionEx(&v);
17906
- v.dwPlatformId == VER_PLATFORM_WIN32_NT;
17907
- }) ? "cmd.exe" : "command.com").
17908
- Instead it simply concatenates the arguments, separated by ' ', and calls
17909
- CreateProcess(). We must quote the arguments since Win32 CreateProcess()
17910
- interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
17911
- special way:
17912
- - Space and tab are interpreted as delimiters. They are not treated as
17913
- delimiters if they are surrounded by double quotes: "...".
17914
- - Unescaped double quotes are removed from the input. Their only effect is
17915
- that within double quotes, space and tab are treated like normal
17916
- characters.
17917
- - Backslashes not followed by double quotes are not special.
17918
- - But 2*n+1 backslashes followed by a double quote become
17919
- n backslashes followed by a double quote (n >= 0):
17920
- \" -> "
17921
- \\\" -> \"
17922
- \\\\\" -> \\"
17923
- */
17924
-#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
17925
-#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
17926
-char **
17927
-prepare_spawn (char **argv)
17928
-{
17929
- size_t argc;
17930
- char **new_argv;
17931
- size_t i;
17932
-
17933
- /* Count number of arguments. */
17934
- for (argc = 0; argv[argc] != NULL; argc++)
17935
- ;
17936
-
17937
- /* Allocate new argument vector. */
17938
- new_argv = XMALLOC (char *, argc + 1);
17939
-
17940
- /* Put quoted arguments into the new argument vector. */
17941
- for (i = 0; i < argc; i++)
17942
- {
17943
- const char *string = argv[i];
17944
-
17945
- if (string[0] == '\0')
17946
- new_argv[i] = xstrdup ("\"\"");
17947
- else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
17948
- {
17949
- int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
17950
- size_t length;
17951
- unsigned int backslashes;
17952
- const char *s;
17953
- char *quoted_string;
17954
- char *p;
17955
-
17956
- length = 0;
17957
- backslashes = 0;
17958
- if (quote_around)
17959
- length++;
17960
- for (s = string; *s != '\0'; s++)
17961
- {
17962
- char c = *s;
17963
- if (c == '"')
17964
- length += backslashes + 1;
17965
- length++;
17966
- if (c == '\\')
17967
- backslashes++;
17968
- else
17969
- backslashes = 0;
17970
- }
17971
- if (quote_around)
17972
- length += backslashes + 1;
17973
-
17974
- quoted_string = XMALLOC (char, length + 1);
17975
-
17976
- p = quoted_string;
17977
- backslashes = 0;
17978
- if (quote_around)
17979
- *p++ = '"';
17980
- for (s = string; *s != '\0'; s++)
17981
- {
17982
- char c = *s;
17983
- if (c == '"')
17984
- {
17985
- unsigned int j;
17986
- for (j = backslashes + 1; j > 0; j--)
17987
- *p++ = '\\';
17988
- }
17989
- *p++ = c;
17990
- if (c == '\\')
17991
- backslashes++;
17992
- else
17993
- backslashes = 0;
17994
- }
17995
- if (quote_around)
17996
- {
17997
- unsigned int j;
17998
- for (j = backslashes; j > 0; j--)
17999
- *p++ = '\\';
18000
- *p++ = '"';
18001
- }
18002
- *p = '\0';
18003
-
18004
- new_argv[i] = quoted_string;
18005
- }
18006
- else
18007
- new_argv[i] = (char *) string;
18008
- }
18009
- new_argv[argc] = NULL;
18010
-
18011
- return new_argv;
18012
-}
18013
-EOF
18014
- ;;
18015
- esac
18016
-
18017
- cat <<"EOF"
18018
-void lt_dump_script (FILE* f)
18019
-{
18020
-EOF
18021
- func_emit_wrapper yes |
18022
- $SED -e 's/\([\\"]\)/\\\1/g' \
18023
- -e 's/^/ fputs ("/' -e 's/$/\\n", f);/'
18024
18025
- cat <<"EOF"
18026
-}
18027
EOF
18028
}
18029
# end: func_emit_cwrapperexe_src
18030
18031
-# func_win32_import_lib_p ARG
18032
-# True if ARG is an import lib, as indicated by $file_magic_cmd
18033
-func_win32_import_lib_p ()
18034
-{
18035
- $opt_debug
18036
- case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
18037
- *import*) : ;;
18038
- *) false ;;
18039
- esac
18040
-}
18041
-
18042
# func_mode_link arg...
18043
func_mode_link ()
18044
{
18045
@@ -4386,7 +4072,6 @@
18046
new_inherited_linker_flags=
18047
18048
avoid_version=no
18049
- bindir=
18050
dlfiles=
18051
dlprefiles=
18052
dlself=no
18053
@@ -4479,11 +4164,6 @@
18054
esac
18055
18056
case $prev in
18057
- bindir)
18058
- bindir="$arg"
18059
- prev=
18060
- continue
18061
- ;;
18062
dlfiles|dlprefiles)
18063
if test "$preload" = no; then
18064
# Add the symbol object into the linking commands.
18065
@@ -4745,11 +4425,6 @@
18066
continue
18067
;;
18068
18069
- -bindir)
18070
- prev=bindir
18071
- continue
18072
- ;;
18073
-
18074
-dlopen)
18075
prev=dlfiles
18076
continue
18077
@@ -4828,7 +4503,7 @@
18078
esac
18079
case $host in
18080
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
18081
- testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
18082
+ testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
18083
case :$dllsearchpath: in
18084
*":$dir:"*) ;;
18085
::) dllsearchpath=$dir;;
18086
@@ -4847,7 +4522,7 @@
18087
-l*)
18088
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
18089
case $host in
18090
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
18091
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
18092
# These systems don't actually have a C or math library (as such)
18093
continue
18094
;;
18095
@@ -5033,7 +4708,7 @@
18096
for flag in $args; do
18097
IFS="$save_ifs"
18098
func_quote_for_eval "$flag"
18099
- arg="$arg $func_quote_for_eval_result"
18100
+ arg="$arg $wl$func_quote_for_eval_result"
18101
compiler_flags="$compiler_flags $func_quote_for_eval_result"
18102
done
18103
IFS="$save_ifs"
18104
@@ -5079,19 +4754,18 @@
18105
arg="$func_quote_for_eval_result"
18106
;;
18107
18108
- # Flags to be passed through unchanged, with rationale:
18109
- # -64, -mips[0-9] enable 64-bit mode for the SGI compiler
18110
- # -r[0-9][0-9]* specify processor for the SGI compiler
18111
- # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
18112
- # +DA*, +DD* enable 64-bit mode for the HP compiler
18113
- # -q* compiler args for the IBM compiler
18114
- # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
18115
- # -F/path path to uninstalled frameworks, gcc on darwin
18116
- # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
18117
- # @file GCC response files
18118
- # -tp=* Portland pgcc target processor selection
18119
+ # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
18120
+ # -r[0-9][0-9]* specifies the processor on the SGI compiler
18121
+ # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
18122
+ # +DA*, +DD* enable 64-bit mode on the HP compiler
18123
+ # -q* pass through compiler args for the IBM compiler
18124
+ # -m*, -t[45]*, -txscale* pass through architecture-specific
18125
+ # compiler args for GCC
18126
+ # -F/path gives path to uninstalled frameworks, gcc on darwin
18127
+ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
18128
+ # @file GCC response files
18129
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
18130
- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
18131
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
18132
func_quote_for_eval "$arg"
18133
arg="$func_quote_for_eval_result"
18134
func_append compile_command " $arg"
18135
@@ -5251,7 +4925,7 @@
18136
18137
if test -n "$shlibpath_var"; then
18138
# get the directories listed in $shlibpath_var
18139
- eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
18140
+ eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
18141
else
18142
shlib_search_path=
18143
fi
18144
@@ -5359,7 +5033,10 @@
18145
case $pass in
18146
dlopen) libs="$dlfiles" ;;
18147
dlpreopen) libs="$dlprefiles" ;;
18148
- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
18149
+ link)
18150
+ libs="$deplibs %DEPLIBS%"
18151
+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
18152
+ ;;
18153
esac
18154
fi
18155
if test "$linkmode,$pass" = "lib,dlpreopen"; then
18156
@@ -5374,8 +5051,7 @@
18157
# Collect preopened libtool deplibs, except any this library
18158
# has declared as weak libs
18159
for deplib in $dependency_libs; do
18160
- func_basename "$deplib"
18161
- deplib_base=$func_basename_result
18162
+ deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
18163
case " $weak_libs " in
18164
*" $deplib_base "*) ;;
18165
*) deplibs="$deplibs $deplib" ;;
18166
@@ -5554,7 +5230,7 @@
18167
match_pattern*)
18168
set dummy $deplibs_check_method; shift
18169
match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
18170
- if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
18171
+ if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
18172
| $EGREP "$match_pattern_regex" > /dev/null; then
18173
valid_a_lib=yes
18174
fi
18175
@@ -5564,15 +5240,15 @@
18176
;;
18177
esac
18178
if test "$valid_a_lib" != yes; then
18179
- echo
18180
+ $ECHO
18181
$ECHO "*** Warning: Trying to link with static lib archive $deplib."
18182
- echo "*** I have the capability to make that library automatically link in when"
18183
- echo "*** you link to this library. But I can only do this if you have a"
18184
- echo "*** shared version of the library, which you do not appear to have"
18185
- echo "*** because the file extensions .$libext of this argument makes me believe"
18186
- echo "*** that it is just a static archive that I should not use here."
18187
+ $ECHO "*** I have the capability to make that library automatically link in when"
18188
+ $ECHO "*** you link to this library. But I can only do this if you have a"
18189
+ $ECHO "*** shared version of the library, which you do not appear to have"
18190
+ $ECHO "*** because the file extensions .$libext of this argument makes me believe"
18191
+ $ECHO "*** that it is just a static archive that I should not use here."
18192
else
18193
- echo
18194
+ $ECHO
18195
$ECHO "*** Warning: Linking the shared library $output against the"
18196
$ECHO "*** static library $deplib is not portable!"
18197
deplibs="$deplib $deplibs"
18198
@@ -5645,7 +5321,7 @@
18199
18200
# Convert "-framework foo" to "foo.ltframework"
18201
if test -n "$inherited_linker_flags"; then
18202
- tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
18203
+ tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
18204
for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
18205
case " $new_inherited_linker_flags " in
18206
*" $tmp_inherited_linker_flag "*) ;;
18207
@@ -5653,7 +5329,7 @@
18208
esac
18209
done
18210
fi
18211
- dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
18212
+ dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
18213
if test "$linkmode,$pass" = "lib,link" ||
18214
test "$linkmode,$pass" = "prog,scan" ||
18215
{ test "$linkmode" != prog && test "$linkmode" != lib; }; then
18216
@@ -5671,19 +5347,19 @@
18217
# It is a libtool convenience library, so add in its objects.
18218
convenience="$convenience $ladir/$objdir/$old_library"
18219
old_convenience="$old_convenience $ladir/$objdir/$old_library"
18220
+ tmp_libs=
18221
+ for deplib in $dependency_libs; do
18222
+ deplibs="$deplib $deplibs"
18223
+ if $opt_duplicate_deps ; then
18224
+ case "$tmp_libs " in
18225
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
18226
+ esac
18227
+ fi
18228
+ tmp_libs="$tmp_libs $deplib"
18229
+ done
18230
elif test "$linkmode" != prog && test "$linkmode" != lib; then
18231
func_fatal_error "\`$lib' is not a convenience library"
18232
fi
18233
- tmp_libs=
18234
- for deplib in $dependency_libs; do
18235
- deplibs="$deplib $deplibs"
18236
- if $opt_duplicate_deps ; then
18237
- case "$tmp_libs " in
18238
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
18239
- esac
18240
- fi
18241
- tmp_libs="$tmp_libs $deplib"
18242
- done
18243
continue
18244
fi # $pass = conv
18245
18246
@@ -5907,7 +5583,7 @@
18247
fi
18248
done
18249
if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
18250
- echo
18251
+ $ECHO
18252
if test "$linkmode" = prog; then
18253
$ECHO "*** Warning: Linking the executable $output against the loadable module"
18254
else
18255
@@ -6010,9 +5686,9 @@
18256
if test "X$dlopenmodule" != "X$lib"; then
18257
$ECHO "*** Warning: lib $linklib is a module, not a shared library"
18258
if test -z "$old_library" ; then
18259
- echo
18260
- echo "*** And there doesn't seem to be a static archive available"
18261
- echo "*** The link will probably fail, sorry"
18262
+ $ECHO
18263
+ $ECHO "*** And there doesn't seem to be a static archive available"
18264
+ $ECHO "*** The link will probably fail, sorry"
18265
else
18266
add="$dir/$old_library"
18267
fi
18268
@@ -6152,21 +5828,21 @@
18269
18270
# Just print a warning and add the library to dependency_libs so
18271
# that the program can be linked against the static library.
18272
- echo
18273
+ $ECHO
18274
$ECHO "*** Warning: This system can not link to static lib archive $lib."
18275
- echo "*** I have the capability to make that library automatically link in when"
18276
- echo "*** you link to this library. But I can only do this if you have a"
18277
- echo "*** shared version of the library, which you do not appear to have."
18278
+ $ECHO "*** I have the capability to make that library automatically link in when"
18279
+ $ECHO "*** you link to this library. But I can only do this if you have a"
18280
+ $ECHO "*** shared version of the library, which you do not appear to have."
18281
if test "$module" = yes; then
18282
- echo "*** But as you try to build a module library, libtool will still create "
18283
- echo "*** a static module, that should work as long as the dlopening application"
18284
- echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
18285
+ $ECHO "*** But as you try to build a module library, libtool will still create "
18286
+ $ECHO "*** a static module, that should work as long as the dlopening application"
18287
+ $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
18288
if test -z "$global_symbol_pipe"; then
18289
- echo
18290
- echo "*** However, this would only work if libtool was able to extract symbol"
18291
- echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
18292
- echo "*** not find such a program. So, this module is probably useless."
18293
- echo "*** \`nm' from GNU binutils and a full rebuild may help."
18294
+ $ECHO
18295
+ $ECHO "*** However, this would only work if libtool was able to extract symbol"
18296
+ $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
18297
+ $ECHO "*** not find such a program. So, this module is probably useless."
18298
+ $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
18299
fi
18300
if test "$build_old_libs" = no; then
18301
build_libtool_libs=module
18302
@@ -6286,7 +5962,7 @@
18303
compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
18304
finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
18305
else
18306
- compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
18307
+ compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
18308
fi
18309
fi
18310
dependency_libs="$newdependency_libs"
18311
@@ -6454,7 +6130,7 @@
18312
if test "$deplibs_check_method" != pass_all; then
18313
func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
18314
else
18315
- echo
18316
+ $ECHO
18317
$ECHO "*** Warning: Linking the shared library $output against the non-libtool"
18318
$ECHO "*** objects $objs is not portable!"
18319
libobjs="$libobjs $objs"
18320
@@ -6522,7 +6198,7 @@
18321
age="$number_minor"
18322
revision="$number_revision"
18323
;;
18324
- freebsd-aout|freebsd-elf|qnx|sunos)
18325
+ freebsd-aout|freebsd-elf|sunos)
18326
current="$number_major"
18327
revision="$number_minor"
18328
age="0"
18329
@@ -6534,6 +6210,9 @@
18330
revision="$number_minor"
18331
lt_irix_increment=no
18332
;;
18333
+ *)
18334
+ func_fatal_configuration "$modename: unknown library version type \`$version_type'"
18335
+ ;;
18336
esac
18337
;;
18338
no)
18339
@@ -6756,14 +6435,14 @@
18340
oldlibs="$oldlibs $output_objdir/$libname.$libext"
18341
18342
# Transform .lo files to .o files.
18343
- oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
18344
+ oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
18345
fi
18346
18347
# Eliminate all temporary directories.
18348
#for path in $notinst_path; do
18349
- # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
18350
- # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
18351
- # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
18352
+ # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
18353
+ # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
18354
+ # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
18355
#done
18356
18357
if test -n "$xrpath"; then
18358
@@ -6804,7 +6483,7 @@
18359
if test "$build_libtool_libs" = yes; then
18360
if test -n "$rpath"; then
18361
case $host in
18362
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
18363
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
18364
# these systems don't actually have a c library (as such)!
18365
;;
18366
*-*-rhapsody* | *-*-darwin1.[012])
18367
@@ -6889,13 +6568,13 @@
18368
newdeplibs="$newdeplibs $i"
18369
else
18370
droppeddeps=yes
18371
- echo
18372
+ $ECHO
18373
$ECHO "*** Warning: dynamic linker does not accept needed library $i."
18374
- echo "*** I have the capability to make that library automatically link in when"
18375
- echo "*** you link to this library. But I can only do this if you have a"
18376
- echo "*** shared version of the library, which I believe you do not have"
18377
- echo "*** because a test_compile did reveal that the linker did not use it for"
18378
- echo "*** its dynamic dependency list that programs get resolved with at runtime."
18379
+ $ECHO "*** I have the capability to make that library automatically link in when"
18380
+ $ECHO "*** you link to this library. But I can only do this if you have a"
18381
+ $ECHO "*** shared version of the library, which I believe you do not have"
18382
+ $ECHO "*** because a test_compile did reveal that the linker did not use it for"
18383
+ $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
18384
fi
18385
fi
18386
;;
18387
@@ -6932,22 +6611,22 @@
18388
newdeplibs="$newdeplibs $i"
18389
else
18390
droppeddeps=yes
18391
- echo
18392
+ $ECHO
18393
$ECHO "*** Warning: dynamic linker does not accept needed library $i."
18394
- echo "*** I have the capability to make that library automatically link in when"
18395
- echo "*** you link to this library. But I can only do this if you have a"
18396
- echo "*** shared version of the library, which you do not appear to have"
18397
- echo "*** because a test_compile did reveal that the linker did not use this one"
18398
- echo "*** as a dynamic dependency that programs can get resolved with at runtime."
18399
+ $ECHO "*** I have the capability to make that library automatically link in when"
18400
+ $ECHO "*** you link to this library. But I can only do this if you have a"
18401
+ $ECHO "*** shared version of the library, which you do not appear to have"
18402
+ $ECHO "*** because a test_compile did reveal that the linker did not use this one"
18403
+ $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
18404
fi
18405
fi
18406
else
18407
droppeddeps=yes
18408
- echo
18409
+ $ECHO
18410
$ECHO "*** Warning! Library $i is needed by this library but I was not able to"
18411
- echo "*** make it link in! You will probably need to install it or some"
18412
- echo "*** library that it depends on before this library will be fully"
18413
- echo "*** functional. Installing it before continuing would be even better."
18414
+ $ECHO "*** make it link in! You will probably need to install it or some"
18415
+ $ECHO "*** library that it depends on before this library will be fully"
18416
+ $ECHO "*** functional. Installing it before continuing would be even better."
18417
fi
18418
;;
18419
*)
18420
@@ -6993,7 +6672,7 @@
18421
potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
18422
case $potliblink in
18423
[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
18424
- *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
18425
+ *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
18426
esac
18427
done
18428
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
18429
@@ -7008,12 +6687,12 @@
18430
fi
18431
if test -n "$a_deplib" ; then
18432
droppeddeps=yes
18433
- echo
18434
+ $ECHO
18435
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
18436
- echo "*** I have the capability to make that library automatically link in when"
18437
- echo "*** you link to this library. But I can only do this if you have a"
18438
- echo "*** shared version of the library, which you do not appear to have"
18439
- echo "*** because I did check the linker path looking for a file starting"
18440
+ $ECHO "*** I have the capability to make that library automatically link in when"
18441
+ $ECHO "*** you link to this library. But I can only do this if you have a"
18442
+ $ECHO "*** shared version of the library, which you do not appear to have"
18443
+ $ECHO "*** because I did check the linker path looking for a file starting"
18444
if test -z "$potlib" ; then
18445
$ECHO "*** with $libname but no candidates were found. (...for file magic test)"
18446
else
18447
@@ -7051,7 +6730,7 @@
18448
potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
18449
for potent_lib in $potential_libs; do
18450
potlib="$potent_lib" # see symlink-check above in file_magic test
18451
- if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
18452
+ if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
18453
$EGREP "$match_pattern_regex" > /dev/null; then
18454
newdeplibs="$newdeplibs $a_deplib"
18455
a_deplib=""
18456
@@ -7062,12 +6741,12 @@
18457
fi
18458
if test -n "$a_deplib" ; then
18459
droppeddeps=yes
18460
- echo
18461
+ $ECHO
18462
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
18463
- echo "*** I have the capability to make that library automatically link in when"
18464
- echo "*** you link to this library. But I can only do this if you have a"
18465
- echo "*** shared version of the library, which you do not appear to have"
18466
- echo "*** because I did check the linker path looking for a file starting"
18467
+ $ECHO "*** I have the capability to make that library automatically link in when"
18468
+ $ECHO "*** you link to this library. But I can only do this if you have a"
18469
+ $ECHO "*** shared version of the library, which you do not appear to have"
18470
+ $ECHO "*** because I did check the linker path looking for a file starting"
18471
if test -z "$potlib" ; then
18472
$ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
18473
else
18474
@@ -7085,25 +6764,25 @@
18475
;;
18476
none | unknown | *)
18477
newdeplibs=""
18478
- tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
18479
+ tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
18480
+ -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
18481
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
18482
for i in $predeps $postdeps ; do
18483
# can't use Xsed below, because $i might contain '/'
18484
- tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
18485
+ tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
18486
done
18487
fi
18488
- case $tmp_deplibs in
18489
- *[!\ \ ]*)
18490
- echo
18491
+ if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' |
18492
+ $GREP . >/dev/null; then
18493
+ $ECHO
18494
if test "X$deplibs_check_method" = "Xnone"; then
18495
- echo "*** Warning: inter-library dependencies are not supported in this platform."
18496
+ $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
18497
else
18498
- echo "*** Warning: inter-library dependencies are not known to be supported."
18499
+ $ECHO "*** Warning: inter-library dependencies are not known to be supported."
18500
fi
18501
- echo "*** All declared inter-library dependencies are being dropped."
18502
+ $ECHO "*** All declared inter-library dependencies are being dropped."
18503
droppeddeps=yes
18504
- ;;
18505
- esac
18506
+ fi
18507
;;
18508
esac
18509
versuffix=$versuffix_save
18510
@@ -7115,23 +6794,23 @@
18511
case $host in
18512
*-*-rhapsody* | *-*-darwin1.[012])
18513
# On Rhapsody replace the C library with the System framework
18514
- newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
18515
+ newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
18516
;;
18517
esac
18518
18519
if test "$droppeddeps" = yes; then
18520
if test "$module" = yes; then
18521
- echo
18522
- echo "*** Warning: libtool could not satisfy all declared inter-library"
18523
+ $ECHO
18524
+ $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
18525
$ECHO "*** dependencies of module $libname. Therefore, libtool will create"
18526
- echo "*** a static module, that should work as long as the dlopening"
18527
- echo "*** application is linked with the -dlopen flag."
18528
+ $ECHO "*** a static module, that should work as long as the dlopening"
18529
+ $ECHO "*** application is linked with the -dlopen flag."
18530
if test -z "$global_symbol_pipe"; then
18531
- echo
18532
- echo "*** However, this would only work if libtool was able to extract symbol"
18533
- echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
18534
- echo "*** not find such a program. So, this module is probably useless."
18535
- echo "*** \`nm' from GNU binutils and a full rebuild may help."
18536
+ $ECHO
18537
+ $ECHO "*** However, this would only work if libtool was able to extract symbol"
18538
+ $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
18539
+ $ECHO "*** not find such a program. So, this module is probably useless."
18540
+ $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
18541
fi
18542
if test "$build_old_libs" = no; then
18543
oldlibs="$output_objdir/$libname.$libext"
18544
@@ -7141,16 +6820,16 @@
18545
build_libtool_libs=no
18546
fi
18547
else
18548
- echo "*** The inter-library dependencies that have been dropped here will be"
18549
- echo "*** automatically added whenever a program is linked with this library"
18550
- echo "*** or is declared to -dlopen it."
18551
+ $ECHO "*** The inter-library dependencies that have been dropped here will be"
18552
+ $ECHO "*** automatically added whenever a program is linked with this library"
18553
+ $ECHO "*** or is declared to -dlopen it."
18554
18555
if test "$allow_undefined" = no; then
18556
- echo
18557
- echo "*** Since this library must not contain undefined symbols,"
18558
- echo "*** because either the platform does not support them or"
18559
- echo "*** it was explicitly requested with -no-undefined,"
18560
- echo "*** libtool will only create a static version of it."
18561
+ $ECHO
18562
+ $ECHO "*** Since this library must not contain undefined symbols,"
18563
+ $ECHO "*** because either the platform does not support them or"
18564
+ $ECHO "*** it was explicitly requested with -no-undefined,"
18565
+ $ECHO "*** libtool will only create a static version of it."
18566
if test "$build_old_libs" = no; then
18567
oldlibs="$output_objdir/$libname.$libext"
18568
build_libtool_libs=module
18569
@@ -7167,9 +6846,9 @@
18570
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
18571
case $host in
18572
*-*-darwin*)
18573
- newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
18574
- new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
18575
- deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
18576
+ newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
18577
+ new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
18578
+ deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
18579
;;
18580
esac
18581
18582
@@ -7291,7 +6970,7 @@
18583
done
18584
18585
# Use standard objects if they are pic
18586
- test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
18587
+ test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
18588
test "X$libobjs" = "X " && libobjs=
18589
18590
delfiles=
18591
@@ -7357,7 +7036,7 @@
18592
if test -n "$export_symbols" && test -n "$include_expsyms"; then
18593
tmp_export_symbols="$export_symbols"
18594
test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
18595
- $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
18596
+ $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
18597
fi
18598
18599
if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
18600
@@ -7458,8 +7137,7 @@
18601
save_libobjs=$libobjs
18602
fi
18603
save_output=$output
18604
- func_basename "$output"
18605
- output_la=$func_basename_result
18606
+ output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
18607
18608
# Clear the reloadable object creation command queue and
18609
# initialize k to one.
18610
@@ -7472,12 +7150,12 @@
18611
if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
18612
output=${output_objdir}/${output_la}.lnkscript
18613
func_verbose "creating GNU ld script: $output"
18614
- echo 'INPUT (' > $output
18615
+ $ECHO 'INPUT (' > $output
18616
for obj in $save_libobjs
18617
do
18618
$ECHO "$obj" >> $output
18619
done
18620
- echo ')' >> $output
18621
+ $ECHO ')' >> $output
18622
delfiles="$delfiles $output"
18623
elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
18624
output=${output_objdir}/${output_la}.lnk
18625
@@ -7519,19 +7197,17 @@
18626
# command to the queue.
18627
if test "$k" -eq 1 ; then
18628
# The first file doesn't have a previous command to add.
18629
- reload_objs=$objlist
18630
- eval concat_cmds=\"$reload_cmds\"
18631
+ eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
18632
else
18633
# All subsequent reloadable object files will link in
18634
# the last one created.
18635
- reload_objs="$objlist $last_robj"
18636
- eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
18637
+ eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
18638
fi
18639
last_robj=$output_objdir/$output_la-${k}.$objext
18640
func_arith $k + 1
18641
k=$func_arith_result
18642
output=$output_objdir/$output_la-${k}.$objext
18643
- objlist=" $obj"
18644
+ objlist=$obj
18645
func_len " $last_robj"
18646
func_arith $len0 + $func_len_result
18647
len=$func_arith_result
18648
@@ -7541,8 +7217,7 @@
18649
# reloadable object file. All subsequent reloadable object
18650
# files will link in the last one created.
18651
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
18652
- reload_objs="$objlist $last_robj"
18653
- eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
18654
+ eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
18655
if test -n "$last_robj"; then
18656
eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
18657
fi
18658
@@ -7601,7 +7276,7 @@
18659
if test -n "$export_symbols" && test -n "$include_expsyms"; then
18660
tmp_export_symbols="$export_symbols"
18661
test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
18662
- $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
18663
+ $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
18664
fi
18665
18666
if test -n "$orig_export_symbols"; then
18667
@@ -7766,7 +7441,7 @@
18668
if test -n "$convenience"; then
18669
if test -n "$whole_archive_flag_spec"; then
18670
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
18671
- reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
18672
+ reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
18673
else
18674
gentop="$output_objdir/${obj}x"
18675
generated="$generated $gentop"
18676
@@ -7777,7 +7452,7 @@
18677
fi
18678
18679
# Create the old-style object.
18680
- reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
18681
+ reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
18682
18683
output="$obj"
18684
func_execute_cmds "$reload_cmds" 'exit $?'
18685
@@ -7837,8 +7512,8 @@
18686
case $host in
18687
*-*-rhapsody* | *-*-darwin1.[012])
18688
# On Rhapsody replace the C library is the System framework
18689
- compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
18690
- finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
18691
+ compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
18692
+ finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
18693
;;
18694
esac
18695
18696
@@ -7855,8 +7530,8 @@
18697
esac
18698
fi
18699
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
18700
- compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
18701
- finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
18702
+ compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
18703
+ finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
18704
;;
18705
esac
18706
18707
@@ -7993,8 +7668,8 @@
18708
18709
if test -n "$libobjs" && test "$build_old_libs" = yes; then
18710
# Transform all the library objects into standard objects.
18711
- compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
18712
- finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
18713
+ compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
18714
+ finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
18715
fi
18716
18717
func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
18718
@@ -8006,15 +7681,15 @@
18719
18720
wrappers_required=yes
18721
case $host in
18722
- *cegcc* | *mingw32ce*)
18723
- # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
18724
- wrappers_required=no
18725
- ;;
18726
*cygwin* | *mingw* )
18727
if test "$build_libtool_libs" != yes; then
18728
wrappers_required=no
18729
fi
18730
;;
18731
+ *cegcc)
18732
+ # Disable wrappers for cegcc, we are cross compiling anyway.
18733
+ wrappers_required=no
18734
+ ;;
18735
*)
18736
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
18737
wrappers_required=no
18738
@@ -8023,7 +7698,7 @@
18739
esac
18740
if test "$wrappers_required" = no; then
18741
# Replace the output file specification.
18742
- compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
18743
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
18744
link_command="$compile_command$compile_rpath"
18745
18746
# We have no uninstalled library dependencies, so finalize right now.
18747
@@ -8070,7 +7745,7 @@
18748
# We don't need to create a wrapper script.
18749
link_command="$compile_var$compile_command$compile_rpath"
18750
# Replace the output file specification.
18751
- link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
18752
+ link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
18753
# Delete the old output file.
18754
$opt_dry_run || $RM $output
18755
# Link the executable and exit
18756
@@ -8089,7 +7764,7 @@
18757
if test "$fast_install" != no; then
18758
link_command="$finalize_var$compile_command$finalize_rpath"
18759
if test "$fast_install" = yes; then
18760
- relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
18761
+ relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
18762
else
18763
# fast_install is set to needless
18764
relink_command=
18765
@@ -8101,7 +7776,7 @@
18766
fi
18767
18768
# Replace the output file specification.
18769
- link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
18770
+ link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
18771
18772
# Delete the old output files.
18773
$opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
18774
@@ -8125,7 +7800,18 @@
18775
fi
18776
done
18777
relink_command="(cd `pwd`; $relink_command)"
18778
- relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
18779
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
18780
+ fi
18781
+
18782
+ # Quote $ECHO for shipping.
18783
+ if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
18784
+ case $progpath in
18785
+ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
18786
+ *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
18787
+ esac
18788
+ qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
18789
+ else
18790
+ qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
18791
fi
18792
18793
# Only actually do things if not in dry run mode.
18794
@@ -8246,7 +7932,7 @@
18795
done | sort | sort -uc >/dev/null 2>&1); then
18796
:
18797
else
18798
- echo "copying selected object files to avoid basename conflicts..."
18799
+ $ECHO "copying selected object files to avoid basename conflicts..."
18800
gentop="$output_objdir/${outputname}x"
18801
generated="$generated $gentop"
18802
func_mkdir_p "$gentop"
18803
@@ -8357,7 +8043,7 @@
18804
done
18805
# Quote the link command for shipping.
18806
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
18807
- relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
18808
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
18809
if test "$hardcode_automatic" = yes ; then
18810
relink_command=
18811
fi
18812
@@ -8442,27 +8128,9 @@
18813
fi
18814
$RM $output
18815
# place dlname in correct position for cygwin
18816
- # In fact, it would be nice if we could use this code for all target
18817
- # systems that can't hard-code library paths into their executables
18818
- # and that have no shared library path variable independent of PATH,
18819
- # but it turns out we can't easily determine that from inspecting
18820
- # libtool variables, so we have to hard-code the OSs to which it
18821
- # applies here; at the moment, that means platforms that use the PE
18822
- # object format with DLL files. See the long comment at the top of
18823
- # tests/bindir.at for full details.
18824
tdlname=$dlname
18825
case $host,$output,$installed,$module,$dlname in
18826
- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
18827
- # If a -bindir argument was supplied, place the dll there.
18828
- if test "x$bindir" != x ;
18829
- then
18830
- func_relative_path "$install_libdir" "$bindir"
18831
- tdlname=$func_relative_path_result$dlname
18832
- else
18833
- # Otherwise fall back on heuristic.
18834
- tdlname=../bin/$dlname
18835
- fi
18836
- ;;
18837
+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
18838
esac
18839
$ECHO > $output "\
18840
# $outputname - a libtool library file
18841
Index: gtk+-2.21.5/m4/gtk-doc.m4
18842
===================================================================
18843
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
18844
+++ gtk+-2.21.5/m4/gtk-doc.m4 2010-07-22 21:44:05.580072001 +0200
18845
@@ -0,0 +1,61 @@
18846
+dnl -*- mode: autoconf -*-
18847
+
18848
+# serial 1
18849
+
18850
+dnl Usage:
18851
+dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
18852
+AC_DEFUN([GTK_DOC_CHECK],
18853
+[
18854
+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
18855
+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
18856
+
18857
+ dnl check for tools we added during development
18858
+ AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
18859
+ AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
18860
+ AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
18861
+
18862
+ dnl for overriding the documentation installation directory
18863
+ AC_ARG_WITH([html-dir],
18864
+ AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
18865
+ [with_html_dir='${datadir}/gtk-doc/html'])
18866
+ HTML_DIR="$with_html_dir"
18867
+ AC_SUBST([HTML_DIR])
18868
+
18869
+ dnl enable/disable documentation building
18870
+ AC_ARG_ENABLE([gtk-doc],
18871
+ AS_HELP_STRING([--enable-gtk-doc],
18872
+ [use gtk-doc to build documentation [[default=no]]]),,
18873
+ [enable_gtk_doc=no])
18874
+
18875
+ if test x$enable_gtk_doc = xyes; then
18876
+ ifelse([$1],[],
18877
+ [PKG_CHECK_EXISTS([gtk-doc],,
18878
+ AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
18879
+ [PKG_CHECK_EXISTS([gtk-doc >= $1],,
18880
+ AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
18881
+ fi
18882
+
18883
+ AC_MSG_CHECKING([whether to build gtk-doc documentation])
18884
+ AC_MSG_RESULT($enable_gtk_doc)
18885
+
18886
+ dnl enable/disable output formats
18887
+ AC_ARG_ENABLE([gtk-doc-html],
18888
+ AS_HELP_STRING([--enable-gtk-doc-html],
18889
+ [build documentation in html format [[default=yes]]]),,
18890
+ [enable_gtk_doc_html=yes])
18891
+ AC_ARG_ENABLE([gtk-doc-pdf],
18892
+ AS_HELP_STRING([--enable-gtk-doc-pdf],
18893
+ [build documentation in pdf format [[default=no]]]),,
18894
+ [enable_gtk_doc_pdf=no])
18895
+
18896
+ if test -z "$GTKDOC_MKPDF"; then
18897
+ enable_gtk_doc_pdf=no
18898
+ fi
18899
+
18900
+
18901
+ AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
18902
+ AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
18903
+ AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
18904
+ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
18905
+ AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
18906
+])
18907
Index: gtk+-2.21.5/m4/libtool.m4
18908
===================================================================
18909
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
18910
+++ gtk+-2.21.5/m4/libtool.m4 2010-07-22 21:44:13.260072000 +0200
10354
18911
@@ -0,0 +1,7377 @@
10355
18912
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
10356
18913
+#
17729
26286
+ ;;
17730
26287
+ esac
17731
26288
+])
17732
diff -Nur gtk+2.0-2.21.2/m4/lt~obsolete.m4 gtk+2.0-2.21.2.ubuntu/m4/lt~obsolete.m4
17733
--- gtk+2.0-2.21.2/m4/lt~obsolete.m4 1970-01-01 01:00:00.000000000 +0100
17734
+++ gtk+2.0-2.21.2.ubuntu/m4/lt~obsolete.m4 2010-06-11 12:15:14.000000000 +0200
26289
Index: gtk+-2.21.5/m4/lt~obsolete.m4
26290
===================================================================
26291
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
26292
+++ gtk+-2.21.5/m4/lt~obsolete.m4 2010-07-22 21:44:13.360072000 +0200
17735
26293
@@ -0,0 +1,92 @@
17736
26294
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
17737
26295
+#
17825
26383
+m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
17826
26384
+m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
17827
26385
+m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
17828
diff -Nur gtk+2.0-2.21.2/m4/ltoptions.m4 gtk+2.0-2.21.2.ubuntu/m4/ltoptions.m4
17829
--- gtk+2.0-2.21.2/m4/ltoptions.m4 1970-01-01 01:00:00.000000000 +0100
17830
+++ gtk+2.0-2.21.2.ubuntu/m4/ltoptions.m4 2010-06-11 12:15:14.000000000 +0200
26386
Index: gtk+-2.21.5/m4/ltoptions.m4
26387
===================================================================
26388
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
26389
+++ gtk+-2.21.5/m4/ltoptions.m4 2010-07-22 21:44:13.280072000 +0200
17831
26390
@@ -0,0 +1,368 @@
17832
26391
+# Helper functions for option handling. -*- Autoconf -*-
17833
26392
+#
18197
26756
+ [m4_define([_LTDL_TYPE], [installable])])
18198
26757
+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
18199
26758
+ [m4_define([_LTDL_TYPE], [convenience])])
18200
diff -Nur gtk+2.0-2.21.2/m4/ltsugar.m4 gtk+2.0-2.21.2.ubuntu/m4/ltsugar.m4
18201
--- gtk+2.0-2.21.2/m4/ltsugar.m4 1970-01-01 01:00:00.000000000 +0100
18202
+++ gtk+2.0-2.21.2.ubuntu/m4/ltsugar.m4 2010-06-11 12:15:14.000000000 +0200
26759
Index: gtk+-2.21.5/m4/ltsugar.m4
26760
===================================================================
26761
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
26762
+++ gtk+-2.21.5/m4/ltsugar.m4 2010-07-22 21:44:13.310072000 +0200
18203
26763
@@ -0,0 +1,123 @@
18204
26764
+# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
18205
26765
+#
18324
26884
+ lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
18325
26885
+ [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
18326
26886
+])
18327
diff -Nur gtk+2.0-2.21.2/m4/ltversion.m4 gtk+2.0-2.21.2.ubuntu/m4/ltversion.m4
18328
--- gtk+2.0-2.21.2/m4/ltversion.m4 1970-01-01 01:00:00.000000000 +0100
18329
+++ gtk+2.0-2.21.2.ubuntu/m4/ltversion.m4 2010-06-11 12:15:14.000000000 +0200
26887
Index: gtk+-2.21.5/m4/ltversion.m4
26888
===================================================================
26889
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
26890
+++ gtk+-2.21.5/m4/ltversion.m4 2010-07-22 21:44:13.330072000 +0200
18330
26891
@@ -0,0 +1,23 @@
18331
26892
+# ltversion.m4 -- version numbers -*- Autoconf -*-
18332
26893
+#
18351
26912
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
18352
26913
+_LT_DECL(, macro_revision, 0)
18353
26914
+])
18354
diff -Nur gtk+2.0-2.21.2/m4macros/Makefile.in gtk+2.0-2.21.2.ubuntu/m4macros/Makefile.in
18355
--- gtk+2.0-2.21.2/m4macros/Makefile.in 2010-06-10 19:18:24.000000000 +0200
18356
+++ gtk+2.0-2.21.2.ubuntu/m4macros/Makefile.in 2010-06-11 12:15:23.000000000 +0200
18357
@@ -41,7 +41,10 @@
26915
Index: gtk+-2.21.5/m4macros/Makefile.in
26916
===================================================================
26917
--- gtk+-2.21.5.orig/m4macros/Makefile.in 2010-07-22 21:44:03.400072001 +0200
26918
+++ gtk+-2.21.5/m4macros/Makefile.in 2010-07-22 21:44:21.230072000 +0200
26919
@@ -40,11 +40,14 @@
26920
$(top_srcdir)/Makefile.decl
18358
26921
subdir = m4macros
18359
26922
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
18360
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
18361
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18362
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
18363
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
18364
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
18365
+ $(top_srcdir)/configure.in
26923
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
26924
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
26925
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
26926
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
26927
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
26928
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18366
26929
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
18367
26930
$(ACLOCAL_M4)
18368
mkinstalldirs = $(install_sh) -d
18369
@@ -154,6 +157,7 @@
18370
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
18371
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
18372
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
26931
-mkinstalldirs = $(install_sh) -d
26932
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
26933
CONFIG_HEADER = $(top_builddir)/config.h
26934
CONFIG_CLEAN_FILES =
26935
CONFIG_CLEAN_VPATH_FILES =
26936
@@ -141,6 +144,7 @@
26937
GDK_PACKAGES = @GDK_PACKAGES@
26938
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
26939
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
18373
26940
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
18374
26941
GDK_WLIBS = @GDK_WLIBS@
18375
26942
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
18376
26943
GLIB_CFLAGS = @GLIB_CFLAGS@
18377
@@ -246,8 +250,6 @@
18378
PATH_SEPARATOR = @PATH_SEPARATOR@
18379
PERL = @PERL@
18380
PKG_CONFIG = @PKG_CONFIG@
18381
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
18382
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
18383
POFILES = @POFILES@
18384
POSUB = @POSUB@
18385
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
18386
diff -Nur gtk+2.0-2.21.2/Makefile.in gtk+2.0-2.21.2.ubuntu/Makefile.in
18387
--- gtk+2.0-2.21.2/Makefile.in 2010-06-10 19:18:27.000000000 +0200
18388
+++ gtk+2.0-2.21.2.ubuntu/Makefile.in 2010-06-11 12:15:25.000000000 +0200
18389
@@ -52,7 +52,10 @@
26944
@@ -291,6 +295,7 @@
26945
libexecdir = @libexecdir@
26946
localedir = @localedir@
26947
localstatedir = @localstatedir@
26948
+lt_ECHO = @lt_ECHO@
26949
mandir = @mandir@
26950
mkdir_p = @mkdir_p@
26951
ms_librarian = @ms_librarian@
26952
Index: gtk+-2.21.5/Makefile.in
26953
===================================================================
26954
--- gtk+-2.21.5.orig/Makefile.in 2010-07-22 21:44:03.190072001 +0200
26955
+++ gtk+-2.21.5/Makefile.in 2010-07-22 21:44:25.860072002 +0200
26956
@@ -45,17 +45,20 @@
26957
$(srcdir)/gtk-zip.sh.in $(top_srcdir)/Makefile.decl \
26958
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
26959
compile config.guess config.sub depcomp install-sh ltmain.sh \
26960
- missing
26961
+ missing mkinstalldirs
26962
@OS_UNIX_TRUE@am__append_1 = gtk+-unix-print-2.0.pc
18390
26963
subdir = .
18391
26964
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
18392
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
18393
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18394
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
18395
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
18396
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
18397
+ $(top_srcdir)/configure.in
26965
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
26966
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
26967
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
26968
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
26969
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
26970
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18398
26971
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
18399
26972
$(ACLOCAL_M4)
18400
26973
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
18401
@@ -109,7 +112,8 @@
26974
configure.lineno config.status.lineno
26975
-mkinstalldirs = $(install_sh) -d
26976
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
26977
CONFIG_HEADER = config.h
26978
CONFIG_CLEAN_FILES = config.h.win32 gtk-zip.sh gdk-2.0.pc gtk+-2.0.pc \
26979
gtk+-unix-print-2.0.pc gail.pc gdk-2.0-uninstalled.pc \
26980
@@ -106,7 +109,8 @@
18402
26981
distdir dist dist-all distcheck
18403
26982
ETAGS = etags
18404
26983
CTAGS = ctags
18405
26984
-DIST_SUBDIRS = $(SUBDIRS)
18406
+DIST_SUBDIRS = po po-properties gdk-pixbuf gdk gtk modules demos tests \
18407
+ perf contrib docs m4macros build
26985
+DIST_SUBDIRS = po po-properties gdk gtk modules demos tests perf docs \
26986
+ m4macros build
18408
26987
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
18409
26988
distdir = $(PACKAGE)-$(VERSION)
18410
26989
top_distdir = $(distdir)
18411
@@ -220,6 +224,7 @@
18412
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
18413
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
18414
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
26990
@@ -204,6 +208,7 @@
26991
GDK_PACKAGES = @GDK_PACKAGES@
26992
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
26993
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
18415
26994
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
18416
26995
GDK_WLIBS = @GDK_WLIBS@
18417
26996
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
18418
26997
GLIB_CFLAGS = @GLIB_CFLAGS@
18419
@@ -312,8 +317,6 @@
18420
PATH_SEPARATOR = @PATH_SEPARATOR@
18421
PERL = @PERL@
18422
PKG_CONFIG = @PKG_CONFIG@
18423
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
18424
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
18425
POFILES = @POFILES@
18426
POSUB = @POSUB@
18427
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
18428
@@ -479,7 +482,10 @@
26998
@@ -354,6 +359,7 @@
26999
libexecdir = @libexecdir@
27000
localedir = @localedir@
27001
localstatedir = @localstatedir@
27002
+lt_ECHO = @lt_ECHO@
27003
mandir = @mandir@
27004
mkdir_p = @mkdir_p@
27005
ms_librarian = @ms_librarian@
27006
@@ -455,7 +461,10 @@
18429
27007
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
18430
27008
&& DISPLAY=:$$XID && export DISPLAY
18431
27009
18432
-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
27010
-SRC_SUBDIRS = gdk gtk modules demos tests perf
18433
27011
+
18434
27012
+# don't build perf measurement tools in static builds
18435
27013
+@ENABLE_STATIC_FALSE@MAYBE_PERF = perf
18436
+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests $(MAYBE_PERF) contrib
27014
+SRC_SUBDIRS = gdk gtk modules demos tests $(MAYBE_PERF)
18437
27015
SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
18438
27016
18439
27017
# require automake 1.4
18440
diff -Nur gtk+2.0-2.21.2/modules/engines/Makefile.in gtk+2.0-2.21.2.ubuntu/modules/engines/Makefile.in
18441
--- gtk+2.0-2.21.2/modules/engines/Makefile.in 2010-06-10 19:18:25.000000000 +0200
18442
+++ gtk+2.0-2.21.2.ubuntu/modules/engines/Makefile.in 2010-06-11 12:15:23.000000000 +0200
18443
@@ -40,7 +40,10 @@
27018
Index: gtk+-2.21.5/mkinstalldirs
27019
===================================================================
27020
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
27021
+++ gtk+-2.21.5/mkinstalldirs 2010-07-22 21:44:25.810072002 +0200
27022
@@ -0,0 +1,162 @@
27023
+#! /bin/sh
27024
+# mkinstalldirs --- make directory hierarchy
27025
+
27026
+scriptversion=2009-04-28.21; # UTC
27027
+
27028
+# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
27029
+# Created: 1993-05-16
27030
+# Public domain.
27031
+#
27032
+# This file is maintained in Automake, please report
27033
+# bugs to <bug-automake@gnu.org> or send patches to
27034
+# <automake-patches@gnu.org>.
27035
+
27036
+nl='
27037
+'
27038
+IFS=" "" $nl"
27039
+errstatus=0
27040
+dirmode=
27041
+
27042
+usage="\
27043
+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
27044
+
27045
+Create each directory DIR (with mode MODE, if specified), including all
27046
+leading file name components.
27047
+
27048
+Report bugs to <bug-automake@gnu.org>."
27049
+
27050
+# process command line arguments
27051
+while test $# -gt 0 ; do
27052
+ case $1 in
27053
+ -h | --help | --h*) # -h for help
27054
+ echo "$usage"
27055
+ exit $?
27056
+ ;;
27057
+ -m) # -m PERM arg
27058
+ shift
27059
+ test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
27060
+ dirmode=$1
27061
+ shift
27062
+ ;;
27063
+ --version)
27064
+ echo "$0 $scriptversion"
27065
+ exit $?
27066
+ ;;
27067
+ --) # stop option processing
27068
+ shift
27069
+ break
27070
+ ;;
27071
+ -*) # unknown option
27072
+ echo "$usage" 1>&2
27073
+ exit 1
27074
+ ;;
27075
+ *) # first non-opt arg
27076
+ break
27077
+ ;;
27078
+ esac
27079
+done
27080
+
27081
+for file
27082
+do
27083
+ if test -d "$file"; then
27084
+ shift
27085
+ else
27086
+ break
27087
+ fi
27088
+done
27089
+
27090
+case $# in
27091
+ 0) exit 0 ;;
27092
+esac
27093
+
27094
+# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
27095
+# mkdir -p a/c at the same time, both will detect that a is missing,
27096
+# one will create a, then the other will try to create a and die with
27097
+# a "File exists" error. This is a problem when calling mkinstalldirs
27098
+# from a parallel make. We use --version in the probe to restrict
27099
+# ourselves to GNU mkdir, which is thread-safe.
27100
+case $dirmode in
27101
+ '')
27102
+ if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
27103
+ echo "mkdir -p -- $*"
27104
+ exec mkdir -p -- "$@"
27105
+ else
27106
+ # On NextStep and OpenStep, the `mkdir' command does not
27107
+ # recognize any option. It will interpret all options as
27108
+ # directories to create, and then abort because `.' already
27109
+ # exists.
27110
+ test -d ./-p && rmdir ./-p
27111
+ test -d ./--version && rmdir ./--version
27112
+ fi
27113
+ ;;
27114
+ *)
27115
+ if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
27116
+ test ! -d ./--version; then
27117
+ echo "mkdir -m $dirmode -p -- $*"
27118
+ exec mkdir -m "$dirmode" -p -- "$@"
27119
+ else
27120
+ # Clean up after NextStep and OpenStep mkdir.
27121
+ for d in ./-m ./-p ./--version "./$dirmode";
27122
+ do
27123
+ test -d $d && rmdir $d
27124
+ done
27125
+ fi
27126
+ ;;
27127
+esac
27128
+
27129
+for file
27130
+do
27131
+ case $file in
27132
+ /*) pathcomp=/ ;;
27133
+ *) pathcomp= ;;
27134
+ esac
27135
+ oIFS=$IFS
27136
+ IFS=/
27137
+ set fnord $file
27138
+ shift
27139
+ IFS=$oIFS
27140
+
27141
+ for d
27142
+ do
27143
+ test "x$d" = x && continue
27144
+
27145
+ pathcomp=$pathcomp$d
27146
+ case $pathcomp in
27147
+ -*) pathcomp=./$pathcomp ;;
27148
+ esac
27149
+
27150
+ if test ! -d "$pathcomp"; then
27151
+ echo "mkdir $pathcomp"
27152
+
27153
+ mkdir "$pathcomp" || lasterr=$?
27154
+
27155
+ if test ! -d "$pathcomp"; then
27156
+ errstatus=$lasterr
27157
+ else
27158
+ if test ! -z "$dirmode"; then
27159
+ echo "chmod $dirmode $pathcomp"
27160
+ lasterr=
27161
+ chmod "$dirmode" "$pathcomp" || lasterr=$?
27162
+
27163
+ if test ! -z "$lasterr"; then
27164
+ errstatus=$lasterr
27165
+ fi
27166
+ fi
27167
+ fi
27168
+ fi
27169
+
27170
+ pathcomp=$pathcomp/
27171
+ done
27172
+done
27173
+
27174
+exit $errstatus
27175
+
27176
+# Local Variables:
27177
+# mode: shell-script
27178
+# sh-indentation: 2
27179
+# eval: (add-hook 'write-file-hooks 'time-stamp)
27180
+# time-stamp-start: "scriptversion="
27181
+# time-stamp-format: "%:y-%02m-%02d.%02H"
27182
+# time-stamp-time-zone: "UTC"
27183
+# time-stamp-end: "; # UTC"
27184
+# End:
27185
Index: gtk+-2.21.5/modules/engines/Makefile.in
27186
===================================================================
27187
--- gtk+-2.21.5.orig/modules/engines/Makefile.in 2010-07-22 21:44:03.240072001 +0200
27188
+++ gtk+-2.21.5/modules/engines/Makefile.in 2010-07-22 21:44:21.370072000 +0200
27189
@@ -39,11 +39,14 @@
27190
$(top_srcdir)/Makefile.decl
18444
27191
subdir = modules/engines
18445
27192
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
18446
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
18447
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18448
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
18449
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
18450
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
18451
+ $(top_srcdir)/configure.in
27193
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
27194
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
27195
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
27196
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
27197
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
27198
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18452
27199
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
18453
27200
$(ACLOCAL_M4)
18454
mkinstalldirs = $(install_sh) -d
18455
@@ -170,6 +173,7 @@
18456
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
18457
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
18458
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
27201
-mkinstalldirs = $(install_sh) -d
27202
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
27203
CONFIG_HEADER = $(top_builddir)/config.h
27204
CONFIG_CLEAN_FILES =
27205
CONFIG_CLEAN_VPATH_FILES =
27206
@@ -157,6 +160,7 @@
27207
GDK_PACKAGES = @GDK_PACKAGES@
27208
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
27209
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
18459
27210
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
18460
27211
GDK_WLIBS = @GDK_WLIBS@
18461
27212
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
18462
27213
GLIB_CFLAGS = @GLIB_CFLAGS@
18463
@@ -262,8 +266,6 @@
18464
PATH_SEPARATOR = @PATH_SEPARATOR@
18465
PERL = @PERL@
18466
PKG_CONFIG = @PKG_CONFIG@
18467
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
18468
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
18469
POFILES = @POFILES@
18470
POSUB = @POSUB@
18471
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
18472
diff -Nur gtk+2.0-2.21.2/modules/engines/ms-windows/Makefile.in gtk+2.0-2.21.2.ubuntu/modules/engines/ms-windows/Makefile.in
18473
--- gtk+2.0-2.21.2/modules/engines/ms-windows/Makefile.in 2010-06-10 19:18:25.000000000 +0200
18474
+++ gtk+2.0-2.21.2.ubuntu/modules/engines/ms-windows/Makefile.in 2010-06-11 12:15:23.000000000 +0200
18475
@@ -41,7 +41,10 @@
27214
@@ -307,6 +311,7 @@
27215
libexecdir = @libexecdir@
27216
localedir = @localedir@
27217
localstatedir = @localstatedir@
27218
+lt_ECHO = @lt_ECHO@
27219
mandir = @mandir@
27220
mkdir_p = @mkdir_p@
27221
ms_librarian = @ms_librarian@
27222
Index: gtk+-2.21.5/modules/engines/ms-windows/Makefile.in
27223
===================================================================
27224
--- gtk+-2.21.5.orig/modules/engines/ms-windows/Makefile.in 2010-07-22 21:44:03.260072001 +0200
27225
+++ gtk+-2.21.5/modules/engines/ms-windows/Makefile.in 2010-07-22 21:44:21.460072000 +0200
27226
@@ -40,11 +40,14 @@
27227
$(top_srcdir)/Makefile.decl
18476
27228
subdir = modules/engines/ms-windows
18477
27229
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
18478
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
18479
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18480
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
18481
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
18482
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
18483
+ $(top_srcdir)/configure.in
27230
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
27231
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
27232
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
27233
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
27234
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
27235
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18484
27236
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
18485
27237
$(ACLOCAL_M4)
18486
mkinstalldirs = $(install_sh) -d
18487
@@ -228,6 +231,7 @@
18488
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
18489
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
18490
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
27238
-mkinstalldirs = $(install_sh) -d
27239
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
27240
CONFIG_HEADER = $(top_builddir)/config.h
27241
CONFIG_CLEAN_FILES =
27242
CONFIG_CLEAN_VPATH_FILES =
27243
@@ -214,6 +217,7 @@
27244
GDK_PACKAGES = @GDK_PACKAGES@
27245
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
27246
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
18491
27247
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
18492
27248
GDK_WLIBS = @GDK_WLIBS@
18493
27249
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
18494
27250
GLIB_CFLAGS = @GLIB_CFLAGS@
18495
@@ -320,8 +324,6 @@
18496
PATH_SEPARATOR = @PATH_SEPARATOR@
18497
PERL = @PERL@
18498
PKG_CONFIG = @PKG_CONFIG@
18499
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
18500
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
18501
POFILES = @POFILES@
18502
POSUB = @POSUB@
18503
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
18504
diff -Nur gtk+2.0-2.21.2/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.21.2.ubuntu/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
18505
--- gtk+2.0-2.21.2/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2010-06-10 19:18:25.000000000 +0200
18506
+++ gtk+2.0-2.21.2.ubuntu/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2010-06-11 12:15:23.000000000 +0200
18507
@@ -41,7 +41,10 @@
27251
@@ -364,6 +368,7 @@
27252
libexecdir = @libexecdir@
27253
localedir = @localedir@
27254
localstatedir = @localstatedir@
27255
+lt_ECHO = @lt_ECHO@
27256
mandir = @mandir@
27257
mkdir_p = @mkdir_p@
27258
ms_librarian = @ms_librarian@
27259
Index: gtk+-2.21.5/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
27260
===================================================================
27261
--- gtk+-2.21.5.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2010-07-22 21:44:03.250072001 +0200
27262
+++ gtk+-2.21.5/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2010-07-22 21:44:21.600072000 +0200
27263
@@ -40,11 +40,14 @@
27264
$(top_srcdir)/Makefile.decl
18508
27265
subdir = modules/engines/ms-windows/Theme/gtk-2.0
18509
27266
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
18510
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
18511
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18512
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
18513
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
18514
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
18515
+ $(top_srcdir)/configure.in
27267
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
27268
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
27269
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
27270
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
27271
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
27272
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18516
27273
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
18517
27274
$(ACLOCAL_M4)
18518
mkinstalldirs = $(install_sh) -d
18519
@@ -154,6 +157,7 @@
18520
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
18521
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
18522
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
27275
-mkinstalldirs = $(install_sh) -d
27276
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
27277
CONFIG_HEADER = $(top_builddir)/config.h
27278
CONFIG_CLEAN_FILES =
27279
CONFIG_CLEAN_VPATH_FILES =
27280
@@ -141,6 +144,7 @@
27281
GDK_PACKAGES = @GDK_PACKAGES@
27282
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
27283
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
18523
27284
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
18524
27285
GDK_WLIBS = @GDK_WLIBS@
18525
27286
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
18526
27287
GLIB_CFLAGS = @GLIB_CFLAGS@
18527
@@ -246,8 +250,6 @@
18528
PATH_SEPARATOR = @PATH_SEPARATOR@
18529
PERL = @PERL@
18530
PKG_CONFIG = @PKG_CONFIG@
18531
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
18532
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
18533
POFILES = @POFILES@
18534
POSUB = @POSUB@
18535
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
18536
diff -Nur gtk+2.0-2.21.2/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.21.2.ubuntu/modules/engines/ms-windows/Theme/Makefile.in
18537
--- gtk+2.0-2.21.2/modules/engines/ms-windows/Theme/Makefile.in 2010-06-10 19:18:25.000000000 +0200
18538
+++ gtk+2.0-2.21.2.ubuntu/modules/engines/ms-windows/Theme/Makefile.in 2010-06-11 12:15:23.000000000 +0200
18539
@@ -40,7 +40,10 @@
27288
@@ -291,6 +295,7 @@
27289
libexecdir = @libexecdir@
27290
localedir = @localedir@
27291
localstatedir = @localstatedir@
27292
+lt_ECHO = @lt_ECHO@
27293
mandir = @mandir@
27294
mkdir_p = @mkdir_p@
27295
ms_librarian = @ms_librarian@
27296
Index: gtk+-2.21.5/modules/engines/ms-windows/Theme/Makefile.in
27297
===================================================================
27298
--- gtk+-2.21.5.orig/modules/engines/ms-windows/Theme/Makefile.in 2010-07-22 21:44:03.240072001 +0200
27299
+++ gtk+-2.21.5/modules/engines/ms-windows/Theme/Makefile.in 2010-07-22 21:44:21.530072000 +0200
27300
@@ -39,11 +39,14 @@
27301
$(top_srcdir)/Makefile.decl
18540
27302
subdir = modules/engines/ms-windows/Theme
18541
27303
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
18542
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
18543
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18544
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
18545
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
18546
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
18547
+ $(top_srcdir)/configure.in
27304
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
27305
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
27306
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
27307
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
27308
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
27309
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18548
27310
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
18549
27311
$(ACLOCAL_M4)
18550
mkinstalldirs = $(install_sh) -d
18551
@@ -170,6 +173,7 @@
18552
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
18553
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
18554
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
27312
-mkinstalldirs = $(install_sh) -d
27313
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
27314
CONFIG_HEADER = $(top_builddir)/config.h
27315
CONFIG_CLEAN_FILES =
27316
CONFIG_CLEAN_VPATH_FILES =
27317
@@ -157,6 +160,7 @@
27318
GDK_PACKAGES = @GDK_PACKAGES@
27319
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
27320
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
18555
27321
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
18556
27322
GDK_WLIBS = @GDK_WLIBS@
18557
27323
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
18558
27324
GLIB_CFLAGS = @GLIB_CFLAGS@
18559
@@ -262,8 +266,6 @@
18560
PATH_SEPARATOR = @PATH_SEPARATOR@
18561
PERL = @PERL@
18562
PKG_CONFIG = @PKG_CONFIG@
18563
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
18564
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
18565
POFILES = @POFILES@
18566
POSUB = @POSUB@
18567
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
18568
diff -Nur gtk+2.0-2.21.2/modules/engines/pixbuf/Makefile.in gtk+2.0-2.21.2.ubuntu/modules/engines/pixbuf/Makefile.in
18569
--- gtk+2.0-2.21.2/modules/engines/pixbuf/Makefile.in 2010-06-10 19:18:25.000000000 +0200
18570
+++ gtk+2.0-2.21.2.ubuntu/modules/engines/pixbuf/Makefile.in 2010-06-11 12:15:23.000000000 +0200
18571
@@ -41,7 +41,10 @@
27325
@@ -307,6 +311,7 @@
27326
libexecdir = @libexecdir@
27327
localedir = @localedir@
27328
localstatedir = @localstatedir@
27329
+lt_ECHO = @lt_ECHO@
27330
mandir = @mandir@
27331
mkdir_p = @mkdir_p@
27332
ms_librarian = @ms_librarian@
27333
Index: gtk+-2.21.5/modules/engines/pixbuf/Makefile.in
27334
===================================================================
27335
--- gtk+-2.21.5.orig/modules/engines/pixbuf/Makefile.in 2010-07-22 21:44:03.230072001 +0200
27336
+++ gtk+-2.21.5/modules/engines/pixbuf/Makefile.in 2010-07-22 21:44:21.690072000 +0200
27337
@@ -40,11 +40,14 @@
27338
$(top_srcdir)/Makefile.decl ChangeLog
18572
27339
subdir = modules/engines/pixbuf
18573
27340
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
18574
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
18575
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18576
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
18577
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
18578
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
18579
+ $(top_srcdir)/configure.in
27341
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
27342
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
27343
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
27344
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
27345
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
27346
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18580
27347
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
18581
27348
$(ACLOCAL_M4)
18582
mkinstalldirs = $(install_sh) -d
18583
@@ -191,6 +194,7 @@
18584
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
18585
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
18586
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
27349
-mkinstalldirs = $(install_sh) -d
27350
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
27351
CONFIG_HEADER = $(top_builddir)/config.h
27352
CONFIG_CLEAN_FILES =
27353
CONFIG_CLEAN_VPATH_FILES =
27354
@@ -177,6 +180,7 @@
27355
GDK_PACKAGES = @GDK_PACKAGES@
27356
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
27357
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
18587
27358
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
18588
27359
GDK_WLIBS = @GDK_WLIBS@
18589
27360
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
18590
27361
GLIB_CFLAGS = @GLIB_CFLAGS@
18591
@@ -283,8 +287,6 @@
18592
PATH_SEPARATOR = @PATH_SEPARATOR@
18593
PERL = @PERL@
18594
PKG_CONFIG = @PKG_CONFIG@
18595
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
18596
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
18597
POFILES = @POFILES@
18598
POSUB = @POSUB@
18599
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
18600
diff -Nur gtk+2.0-2.21.2/modules/input/Makefile.in gtk+2.0-2.21.2.ubuntu/modules/input/Makefile.in
18601
--- gtk+2.0-2.21.2/modules/input/Makefile.in 2010-06-10 19:18:25.000000000 +0200
18602
+++ gtk+2.0-2.21.2.ubuntu/modules/input/Makefile.in 2010-06-11 12:15:23.000000000 +0200
18603
@@ -42,7 +42,10 @@
27362
@@ -327,6 +331,7 @@
27363
libexecdir = @libexecdir@
27364
localedir = @localedir@
27365
localstatedir = @localstatedir@
27366
+lt_ECHO = @lt_ECHO@
27367
mandir = @mandir@
27368
mkdir_p = @mkdir_p@
27369
ms_librarian = @ms_librarian@
27370
Index: gtk+-2.21.5/modules/input/Makefile.in
27371
===================================================================
27372
--- gtk+-2.21.5.orig/modules/input/Makefile.in 2010-07-22 21:44:03.270072001 +0200
27373
+++ gtk+-2.21.5/modules/input/Makefile.in 2010-07-22 21:44:21.870072000 +0200
27374
@@ -41,11 +41,14 @@
27375
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
18604
27376
subdir = modules/input
18605
27377
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
18606
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
18607
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18608
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
18609
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
18610
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
18611
+ $(top_srcdir)/configure.in
27378
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
27379
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
27380
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
27381
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
27382
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
27383
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18612
27384
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
18613
27385
$(ACLOCAL_M4)
18614
mkinstalldirs = $(install_sh) -d
18615
@@ -392,6 +395,7 @@
18616
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
18617
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
18618
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
27386
-mkinstalldirs = $(install_sh) -d
27387
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
27388
CONFIG_HEADER = $(top_builddir)/config.h
27389
CONFIG_CLEAN_FILES =
27390
CONFIG_CLEAN_VPATH_FILES =
27391
@@ -378,6 +381,7 @@
27392
GDK_PACKAGES = @GDK_PACKAGES@
27393
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
27394
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
18619
27395
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
18620
27396
GDK_WLIBS = @GDK_WLIBS@
18621
27397
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
18622
27398
GLIB_CFLAGS = @GLIB_CFLAGS@
18623
@@ -484,8 +488,6 @@
18624
PATH_SEPARATOR = @PATH_SEPARATOR@
18625
PERL = @PERL@
18626
PKG_CONFIG = @PKG_CONFIG@
18627
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
18628
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
18629
POFILES = @POFILES@
18630
POSUB = @POSUB@
18631
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
18632
@@ -717,7 +719,8 @@
27399
@@ -528,6 +532,7 @@
27400
libexecdir = @libexecdir@
27401
localedir = @localedir@
27402
localstatedir = @localstatedir@
27403
+lt_ECHO = @lt_ECHO@
27404
mandir = @mandir@
27405
mkdir_p = @mkdir_p@
27406
ms_librarian = @ms_librarian@
27407
@@ -693,7 +698,8 @@
18633
27408
@INCLUDE_IM_MULTIPRESS_FALSE@MULTIPRESS_MODULE = im-multipress.la
18634
27409
imconffiledir = $(sysconfdir)/gtk-2.0
18635
27410
dist_imconffile_DATA = im-multipress.conf
18639
27414
@CROSS_COMPILING_TRUE@RUN_QUERY_IMMODULES_TEST = false
18640
27415
@BUILD_DYNAMIC_MODULES_TRUE@module_LTLIBRARIES = \
18641
27416
@BUILD_DYNAMIC_MODULES_TRUE@ $(AM_ET_MODULE) \
18642
@@ -1269,7 +1272,18 @@
27417
@@ -1245,7 +1251,18 @@
18643
27418
included-modules: $(noinst_LTLIBRARIES)
18644
27419
18645
27420
gtk.immodules: Makefile.am $(module_LTLIBRARIES)
18659
27434
18660
27435
@CROSS_COMPILING_FALSE@all-local: gtk.immodules
18661
27436
18662
diff -Nur gtk+2.0-2.21.2/modules/Makefile.in gtk+2.0-2.21.2.ubuntu/modules/Makefile.in
18663
--- gtk+2.0-2.21.2/modules/Makefile.in 2010-06-10 19:18:24.000000000 +0200
18664
+++ gtk+2.0-2.21.2.ubuntu/modules/Makefile.in 2010-06-11 12:15:23.000000000 +0200
18665
@@ -41,7 +41,10 @@
27437
Index: gtk+-2.21.5/modules/Makefile.in
27438
===================================================================
27439
--- gtk+-2.21.5.orig/modules/Makefile.in 2010-07-22 21:44:03.270072001 +0200
27440
+++ gtk+-2.21.5/modules/Makefile.in 2010-07-22 21:44:21.300072000 +0200
27441
@@ -40,11 +40,14 @@
27442
@OS_UNIX_TRUE@am__append_1 = printbackends
18666
27443
subdir = modules
18667
27444
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
18668
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
18669
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18670
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
18671
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
18672
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
18673
+ $(top_srcdir)/configure.in
27445
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
27446
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
27447
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
27448
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
27449
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
27450
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18674
27451
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
18675
27452
$(ACLOCAL_M4)
18676
mkinstalldirs = $(install_sh) -d
18677
@@ -171,6 +174,7 @@
18678
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
18679
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
18680
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
27453
-mkinstalldirs = $(install_sh) -d
27454
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
27455
CONFIG_HEADER = $(top_builddir)/config.h
27456
CONFIG_CLEAN_FILES =
27457
CONFIG_CLEAN_VPATH_FILES =
27458
@@ -158,6 +161,7 @@
27459
GDK_PACKAGES = @GDK_PACKAGES@
27460
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
27461
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
18681
27462
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
18682
27463
GDK_WLIBS = @GDK_WLIBS@
18683
27464
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
18684
27465
GLIB_CFLAGS = @GLIB_CFLAGS@
18685
@@ -263,8 +267,6 @@
18686
PATH_SEPARATOR = @PATH_SEPARATOR@
18687
PERL = @PERL@
18688
PKG_CONFIG = @PKG_CONFIG@
18689
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
18690
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
18691
POFILES = @POFILES@
18692
POSUB = @POSUB@
18693
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
18694
diff -Nur gtk+2.0-2.21.2/modules/other/gail/libgail-util/Makefile.in gtk+2.0-2.21.2.ubuntu/modules/other/gail/libgail-util/Makefile.in
18695
--- gtk+2.0-2.21.2/modules/other/gail/libgail-util/Makefile.in 2010-06-10 19:18:26.000000000 +0200
18696
+++ gtk+2.0-2.21.2.ubuntu/modules/other/gail/libgail-util/Makefile.in 2010-06-11 12:15:24.000000000 +0200
18697
@@ -43,7 +43,10 @@
27466
@@ -308,6 +312,7 @@
27467
libexecdir = @libexecdir@
27468
localedir = @localedir@
27469
localstatedir = @localstatedir@
27470
+lt_ECHO = @lt_ECHO@
27471
mandir = @mandir@
27472
mkdir_p = @mkdir_p@
27473
ms_librarian = @ms_librarian@
27474
Index: gtk+-2.21.5/modules/other/gail/libgail-util/Makefile.in
27475
===================================================================
27476
--- gtk+-2.21.5.orig/modules/other/gail/libgail-util/Makefile.in 2010-07-22 21:44:03.200072001 +0200
27477
+++ gtk+-2.21.5/modules/other/gail/libgail-util/Makefile.in 2010-07-22 21:44:22.340072000 +0200
27478
@@ -42,11 +42,14 @@
27479
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
18698
27480
subdir = modules/other/gail/libgail-util
18699
27481
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
18700
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
18701
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18702
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
18703
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
18704
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
18705
+ $(top_srcdir)/configure.in
27482
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
27483
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
27484
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
27485
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
27486
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
27487
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18706
27488
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
18707
27489
$(ACLOCAL_M4)
18708
mkinstalldirs = $(install_sh) -d
18709
@@ -195,6 +198,7 @@
18710
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
18711
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
18712
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
27490
-mkinstalldirs = $(install_sh) -d
27491
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
27492
CONFIG_HEADER = $(top_builddir)/config.h
27493
CONFIG_CLEAN_FILES =
27494
CONFIG_CLEAN_VPATH_FILES =
27495
@@ -182,6 +185,7 @@
27496
GDK_PACKAGES = @GDK_PACKAGES@
27497
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
27498
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
18713
27499
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
18714
27500
GDK_WLIBS = @GDK_WLIBS@
18715
27501
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
18716
27502
GLIB_CFLAGS = @GLIB_CFLAGS@
18717
@@ -287,8 +291,6 @@
18718
PATH_SEPARATOR = @PATH_SEPARATOR@
18719
PERL = @PERL@
18720
PKG_CONFIG = @PKG_CONFIG@
18721
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
18722
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
18723
POFILES = @POFILES@
18724
POSUB = @POSUB@
18725
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
18726
diff -Nur gtk+2.0-2.21.2/modules/other/gail/Makefile.in gtk+2.0-2.21.2.ubuntu/modules/other/gail/Makefile.in
18727
--- gtk+2.0-2.21.2/modules/other/gail/Makefile.in 2010-06-10 19:18:26.000000000 +0200
18728
+++ gtk+2.0-2.21.2.ubuntu/modules/other/gail/Makefile.in 2010-06-11 12:15:24.000000000 +0200
18729
@@ -42,7 +42,10 @@
27503
@@ -332,6 +336,7 @@
27504
libexecdir = @libexecdir@
27505
localedir = @localedir@
27506
localstatedir = @localstatedir@
27507
+lt_ECHO = @lt_ECHO@
27508
mandir = @mandir@
27509
mkdir_p = @mkdir_p@
27510
ms_librarian = @ms_librarian@
27511
Index: gtk+-2.21.5/modules/other/gail/Makefile.in
27512
===================================================================
27513
--- gtk+-2.21.5.orig/modules/other/gail/Makefile.in 2010-07-22 21:44:03.210072001 +0200
27514
+++ gtk+-2.21.5/modules/other/gail/Makefile.in 2010-07-22 21:44:22.240072000 +0200
27515
@@ -41,11 +41,14 @@
27516
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl ChangeLog
18730
27517
subdir = modules/other/gail
18731
27518
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
18732
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
18733
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18734
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
18735
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
18736
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
18737
+ $(top_srcdir)/configure.in
27519
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
27520
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
27521
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
27522
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
27523
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
27524
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18738
27525
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
18739
27526
$(ACLOCAL_M4)
18740
mkinstalldirs = $(install_sh) -d
18741
@@ -262,6 +265,7 @@
18742
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
18743
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
18744
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
27527
-mkinstalldirs = $(install_sh) -d
27528
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
27529
CONFIG_HEADER = $(top_builddir)/config.h
27530
CONFIG_CLEAN_FILES =
27531
CONFIG_CLEAN_VPATH_FILES =
27532
@@ -248,6 +251,7 @@
27533
GDK_PACKAGES = @GDK_PACKAGES@
27534
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
27535
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
18745
27536
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
18746
27537
GDK_WLIBS = @GDK_WLIBS@
18747
27538
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
18748
27539
GLIB_CFLAGS = @GLIB_CFLAGS@
18749
@@ -354,8 +358,6 @@
18750
PATH_SEPARATOR = @PATH_SEPARATOR@
18751
PERL = @PERL@
18752
PKG_CONFIG = @PKG_CONFIG@
18753
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
18754
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
18755
POFILES = @POFILES@
18756
POSUB = @POSUB@
18757
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
18758
diff -Nur gtk+2.0-2.21.2/modules/other/gail/tests/Makefile.in gtk+2.0-2.21.2.ubuntu/modules/other/gail/tests/Makefile.in
18759
--- gtk+2.0-2.21.2/modules/other/gail/tests/Makefile.in 2010-06-10 19:18:26.000000000 +0200
18760
+++ gtk+2.0-2.21.2.ubuntu/modules/other/gail/tests/Makefile.in 2010-06-11 12:15:24.000000000 +0200
18761
@@ -41,7 +41,10 @@
27540
@@ -398,6 +402,7 @@
27541
libexecdir = @libexecdir@
27542
localedir = @localedir@
27543
localstatedir = @localstatedir@
27544
+lt_ECHO = @lt_ECHO@
27545
mandir = @mandir@
27546
mkdir_p = @mkdir_p@
27547
ms_librarian = @ms_librarian@
27548
Index: gtk+-2.21.5/modules/other/gail/tests/Makefile.in
27549
===================================================================
27550
--- gtk+-2.21.5.orig/modules/other/gail/tests/Makefile.in 2010-07-22 21:44:03.220072001 +0200
27551
+++ gtk+-2.21.5/modules/other/gail/tests/Makefile.in 2010-07-22 21:44:22.480072000 +0200
27552
@@ -40,11 +40,14 @@
27553
$(top_srcdir)/Makefile.decl
18762
27554
subdir = modules/other/gail/tests
18763
27555
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
18764
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
18765
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18766
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
18767
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
18768
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
18769
+ $(top_srcdir)/configure.in
27556
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
27557
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
27558
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
27559
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
27560
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
27561
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18770
27562
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
18771
27563
$(ACLOCAL_M4)
18772
mkinstalldirs = $(install_sh) -d
18773
@@ -334,6 +337,7 @@
18774
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
18775
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
18776
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
27564
-mkinstalldirs = $(install_sh) -d
27565
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
27566
CONFIG_HEADER = $(top_builddir)/config.h
27567
CONFIG_CLEAN_FILES =
27568
CONFIG_CLEAN_VPATH_FILES =
27569
@@ -321,6 +324,7 @@
27570
GDK_PACKAGES = @GDK_PACKAGES@
27571
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
27572
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
18777
27573
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
18778
27574
GDK_WLIBS = @GDK_WLIBS@
18779
27575
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
18780
27576
GLIB_CFLAGS = @GLIB_CFLAGS@
18781
@@ -426,8 +430,6 @@
18782
PATH_SEPARATOR = @PATH_SEPARATOR@
18783
PERL = @PERL@
18784
PKG_CONFIG = @PKG_CONFIG@
18785
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
18786
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
18787
POFILES = @POFILES@
18788
POSUB = @POSUB@
18789
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
18790
diff -Nur gtk+2.0-2.21.2/modules/other/Makefile.in gtk+2.0-2.21.2.ubuntu/modules/other/Makefile.in
18791
--- gtk+2.0-2.21.2/modules/other/Makefile.in 2010-06-10 19:18:25.000000000 +0200
18792
+++ gtk+2.0-2.21.2.ubuntu/modules/other/Makefile.in 2010-06-11 12:15:23.000000000 +0200
18793
@@ -40,7 +40,10 @@
27577
@@ -471,6 +475,7 @@
27578
libexecdir = @libexecdir@
27579
localedir = @localedir@
27580
localstatedir = @localstatedir@
27581
+lt_ECHO = @lt_ECHO@
27582
mandir = @mandir@
27583
mkdir_p = @mkdir_p@
27584
ms_librarian = @ms_librarian@
27585
Index: gtk+-2.21.5/modules/other/Makefile.in
27586
===================================================================
27587
--- gtk+-2.21.5.orig/modules/other/Makefile.in 2010-07-22 21:44:03.220072001 +0200
27588
+++ gtk+-2.21.5/modules/other/Makefile.in 2010-07-22 21:44:21.950072000 +0200
27589
@@ -39,11 +39,14 @@
27590
$(top_srcdir)/Makefile.decl
18794
27591
subdir = modules/other
18795
27592
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
18796
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
18797
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18798
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
18799
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
18800
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
18801
+ $(top_srcdir)/configure.in
27593
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
27594
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
27595
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
27596
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
27597
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
27598
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18802
27599
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
18803
27600
$(ACLOCAL_M4)
18804
mkinstalldirs = $(install_sh) -d
18805
@@ -170,6 +173,7 @@
18806
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
18807
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
18808
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
27601
-mkinstalldirs = $(install_sh) -d
27602
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
27603
CONFIG_HEADER = $(top_builddir)/config.h
27604
CONFIG_CLEAN_FILES =
27605
CONFIG_CLEAN_VPATH_FILES =
27606
@@ -157,6 +160,7 @@
27607
GDK_PACKAGES = @GDK_PACKAGES@
27608
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
27609
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
18809
27610
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
18810
27611
GDK_WLIBS = @GDK_WLIBS@
18811
27612
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
18812
27613
GLIB_CFLAGS = @GLIB_CFLAGS@
18813
@@ -262,8 +266,6 @@
18814
PATH_SEPARATOR = @PATH_SEPARATOR@
18815
PERL = @PERL@
18816
PKG_CONFIG = @PKG_CONFIG@
18817
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
18818
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
18819
POFILES = @POFILES@
18820
POSUB = @POSUB@
18821
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
18822
diff -Nur gtk+2.0-2.21.2/modules/printbackends/cups/Makefile.in gtk+2.0-2.21.2.ubuntu/modules/printbackends/cups/Makefile.in
18823
--- gtk+2.0-2.21.2/modules/printbackends/cups/Makefile.in 2010-06-10 19:18:26.000000000 +0200
18824
+++ gtk+2.0-2.21.2.ubuntu/modules/printbackends/cups/Makefile.in 2010-06-11 12:15:24.000000000 +0200
18825
@@ -42,7 +42,10 @@
27614
@@ -307,6 +311,7 @@
27615
libexecdir = @libexecdir@
27616
localedir = @localedir@
27617
localstatedir = @localstatedir@
27618
+lt_ECHO = @lt_ECHO@
27619
mandir = @mandir@
27620
mkdir_p = @mkdir_p@
27621
ms_librarian = @ms_librarian@
27622
Index: gtk+-2.21.5/modules/printbackends/cups/Makefile.in
27623
===================================================================
27624
--- gtk+-2.21.5.orig/modules/printbackends/cups/Makefile.in 2010-07-22 21:44:03.310072001 +0200
27625
+++ gtk+-2.21.5/modules/printbackends/cups/Makefile.in 2010-07-22 21:44:22.740072000 +0200
27626
@@ -41,11 +41,14 @@
27627
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
18826
27628
subdir = modules/printbackends/cups
18827
27629
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
18828
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
18829
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18830
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
18831
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
18832
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
18833
+ $(top_srcdir)/configure.in
27630
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
27631
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
27632
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
27633
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
27634
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
27635
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18834
27636
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
18835
27637
$(ACLOCAL_M4)
18836
mkinstalldirs = $(install_sh) -d
18837
@@ -194,6 +197,7 @@
18838
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
18839
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
18840
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
27638
-mkinstalldirs = $(install_sh) -d
27639
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
27640
CONFIG_HEADER = $(top_builddir)/config.h
27641
CONFIG_CLEAN_FILES =
27642
CONFIG_CLEAN_VPATH_FILES =
27643
@@ -181,6 +184,7 @@
27644
GDK_PACKAGES = @GDK_PACKAGES@
27645
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
27646
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
18841
27647
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
18842
27648
GDK_WLIBS = @GDK_WLIBS@
18843
27649
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
18844
27650
GLIB_CFLAGS = @GLIB_CFLAGS@
18845
@@ -286,8 +290,6 @@
18846
PATH_SEPARATOR = @PATH_SEPARATOR@
18847
PERL = @PERL@
18848
PKG_CONFIG = @PKG_CONFIG@
18849
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
18850
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
18851
POFILES = @POFILES@
18852
POSUB = @POSUB@
18853
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
18854
diff -Nur gtk+2.0-2.21.2/modules/printbackends/file/Makefile.in gtk+2.0-2.21.2.ubuntu/modules/printbackends/file/Makefile.in
18855
--- gtk+2.0-2.21.2/modules/printbackends/file/Makefile.in 2010-06-10 19:18:26.000000000 +0200
18856
+++ gtk+2.0-2.21.2.ubuntu/modules/printbackends/file/Makefile.in 2010-06-11 12:15:24.000000000 +0200
18857
@@ -42,7 +42,10 @@
27651
@@ -331,6 +335,7 @@
27652
libexecdir = @libexecdir@
27653
localedir = @localedir@
27654
localstatedir = @localstatedir@
27655
+lt_ECHO = @lt_ECHO@
27656
mandir = @mandir@
27657
mkdir_p = @mkdir_p@
27658
ms_librarian = @ms_librarian@
27659
Index: gtk+-2.21.5/modules/printbackends/file/Makefile.in
27660
===================================================================
27661
--- gtk+-2.21.5.orig/modules/printbackends/file/Makefile.in 2010-07-22 21:44:03.300072001 +0200
27662
+++ gtk+-2.21.5/modules/printbackends/file/Makefile.in 2010-07-22 21:44:22.830072000 +0200
27663
@@ -41,11 +41,14 @@
27664
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
18858
27665
subdir = modules/printbackends/file
18859
27666
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
18860
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
18861
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18862
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
18863
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
18864
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
18865
+ $(top_srcdir)/configure.in
27667
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
27668
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
27669
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
27670
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
27671
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
27672
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18866
27673
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
18867
27674
$(ACLOCAL_M4)
18868
mkinstalldirs = $(install_sh) -d
18869
@@ -193,6 +196,7 @@
18870
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
18871
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
18872
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
27675
-mkinstalldirs = $(install_sh) -d
27676
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
27677
CONFIG_HEADER = $(top_builddir)/config.h
27678
CONFIG_CLEAN_FILES =
27679
CONFIG_CLEAN_VPATH_FILES =
27680
@@ -180,6 +183,7 @@
27681
GDK_PACKAGES = @GDK_PACKAGES@
27682
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
27683
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
18873
27684
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
18874
27685
GDK_WLIBS = @GDK_WLIBS@
18875
27686
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
18876
27687
GLIB_CFLAGS = @GLIB_CFLAGS@
18877
@@ -285,8 +289,6 @@
18878
PATH_SEPARATOR = @PATH_SEPARATOR@
18879
PERL = @PERL@
18880
PKG_CONFIG = @PKG_CONFIG@
18881
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
18882
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
18883
POFILES = @POFILES@
18884
POSUB = @POSUB@
18885
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
18886
diff -Nur gtk+2.0-2.21.2/modules/printbackends/lpr/Makefile.in gtk+2.0-2.21.2.ubuntu/modules/printbackends/lpr/Makefile.in
18887
--- gtk+2.0-2.21.2/modules/printbackends/lpr/Makefile.in 2010-06-10 19:18:26.000000000 +0200
18888
+++ gtk+2.0-2.21.2.ubuntu/modules/printbackends/lpr/Makefile.in 2010-06-11 12:15:24.000000000 +0200
18889
@@ -42,7 +42,10 @@
27688
@@ -330,6 +334,7 @@
27689
libexecdir = @libexecdir@
27690
localedir = @localedir@
27691
localstatedir = @localstatedir@
27692
+lt_ECHO = @lt_ECHO@
27693
mandir = @mandir@
27694
mkdir_p = @mkdir_p@
27695
ms_librarian = @ms_librarian@
27696
Index: gtk+-2.21.5/modules/printbackends/lpr/Makefile.in
27697
===================================================================
27698
--- gtk+-2.21.5.orig/modules/printbackends/lpr/Makefile.in 2010-07-22 21:44:03.280072001 +0200
27699
+++ gtk+-2.21.5/modules/printbackends/lpr/Makefile.in 2010-07-22 21:44:22.920072000 +0200
27700
@@ -41,11 +41,14 @@
27701
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
18890
27702
subdir = modules/printbackends/lpr
18891
27703
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
18892
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
18893
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18894
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
18895
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
18896
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
18897
+ $(top_srcdir)/configure.in
27704
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
27705
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
27706
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
27707
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
27708
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
27709
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18898
27710
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
18899
27711
$(ACLOCAL_M4)
18900
mkinstalldirs = $(install_sh) -d
18901
@@ -191,6 +194,7 @@
18902
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
18903
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
18904
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
27712
-mkinstalldirs = $(install_sh) -d
27713
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
27714
CONFIG_HEADER = $(top_builddir)/config.h
27715
CONFIG_CLEAN_FILES =
27716
CONFIG_CLEAN_VPATH_FILES =
27717
@@ -178,6 +181,7 @@
27718
GDK_PACKAGES = @GDK_PACKAGES@
27719
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
27720
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
18905
27721
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
18906
27722
GDK_WLIBS = @GDK_WLIBS@
18907
27723
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
18908
27724
GLIB_CFLAGS = @GLIB_CFLAGS@
18909
@@ -283,8 +287,6 @@
18910
PATH_SEPARATOR = @PATH_SEPARATOR@
18911
PERL = @PERL@
18912
PKG_CONFIG = @PKG_CONFIG@
18913
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
18914
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
18915
POFILES = @POFILES@
18916
POSUB = @POSUB@
18917
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
18918
diff -Nur gtk+2.0-2.21.2/modules/printbackends/Makefile.in gtk+2.0-2.21.2.ubuntu/modules/printbackends/Makefile.in
18919
--- gtk+2.0-2.21.2/modules/printbackends/Makefile.in 2010-06-10 19:18:26.000000000 +0200
18920
+++ gtk+2.0-2.21.2.ubuntu/modules/printbackends/Makefile.in 2010-06-11 12:15:24.000000000 +0200
18921
@@ -43,7 +43,10 @@
27725
@@ -328,6 +332,7 @@
27726
libexecdir = @libexecdir@
27727
localedir = @localedir@
27728
localstatedir = @localstatedir@
27729
+lt_ECHO = @lt_ECHO@
27730
mandir = @mandir@
27731
mkdir_p = @mkdir_p@
27732
ms_librarian = @ms_librarian@
27733
Index: gtk+-2.21.5/modules/printbackends/Makefile.in
27734
===================================================================
27735
--- gtk+-2.21.5.orig/modules/printbackends/Makefile.in 2010-07-22 21:44:03.300072001 +0200
27736
+++ gtk+-2.21.5/modules/printbackends/Makefile.in 2010-07-22 21:44:22.650072000 +0200
27737
@@ -42,11 +42,14 @@
27738
@HAVE_PAPI_TRUE@am__append_3 = papi
18922
27739
subdir = modules/printbackends
18923
27740
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
18924
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
18925
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18926
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
18927
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
18928
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
18929
+ $(top_srcdir)/configure.in
27741
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
27742
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
27743
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
27744
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
27745
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
27746
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18930
27747
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
18931
27748
$(ACLOCAL_M4)
18932
mkinstalldirs = $(install_sh) -d
18933
@@ -172,6 +175,7 @@
18934
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
18935
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
18936
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
27749
-mkinstalldirs = $(install_sh) -d
27750
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
27751
CONFIG_HEADER = $(top_builddir)/config.h
27752
CONFIG_CLEAN_FILES =
27753
CONFIG_CLEAN_VPATH_FILES =
27754
@@ -159,6 +162,7 @@
27755
GDK_PACKAGES = @GDK_PACKAGES@
27756
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
27757
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
18937
27758
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
18938
27759
GDK_WLIBS = @GDK_WLIBS@
18939
27760
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
18940
27761
GLIB_CFLAGS = @GLIB_CFLAGS@
18941
@@ -264,8 +268,6 @@
18942
PATH_SEPARATOR = @PATH_SEPARATOR@
18943
PERL = @PERL@
18944
PKG_CONFIG = @PKG_CONFIG@
18945
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
18946
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
18947
POFILES = @POFILES@
18948
POSUB = @POSUB@
18949
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
18950
diff -Nur gtk+2.0-2.21.2/modules/printbackends/papi/Makefile.in gtk+2.0-2.21.2.ubuntu/modules/printbackends/papi/Makefile.in
18951
--- gtk+2.0-2.21.2/modules/printbackends/papi/Makefile.in 2010-06-10 19:18:26.000000000 +0200
18952
+++ gtk+2.0-2.21.2.ubuntu/modules/printbackends/papi/Makefile.in 2010-06-11 12:15:24.000000000 +0200
18953
@@ -40,7 +40,10 @@
27762
@@ -309,6 +313,7 @@
27763
libexecdir = @libexecdir@
27764
localedir = @localedir@
27765
localstatedir = @localstatedir@
27766
+lt_ECHO = @lt_ECHO@
27767
mandir = @mandir@
27768
mkdir_p = @mkdir_p@
27769
ms_librarian = @ms_librarian@
27770
Index: gtk+-2.21.5/modules/printbackends/papi/Makefile.in
27771
===================================================================
27772
--- gtk+-2.21.5.orig/modules/printbackends/papi/Makefile.in 2010-07-22 21:44:03.290072001 +0200
27773
+++ gtk+-2.21.5/modules/printbackends/papi/Makefile.in 2010-07-22 21:44:23.010072000 +0200
27774
@@ -39,11 +39,14 @@
27775
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
18954
27776
$(srcdir)/Makefile.in
18955
27777
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
18956
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
18957
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18958
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
18959
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
18960
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
18961
+ $(top_srcdir)/configure.in
27778
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
27779
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
27780
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
27781
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
27782
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
27783
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18962
27784
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
18963
27785
$(ACLOCAL_M4)
18964
mkinstalldirs = $(install_sh) -d
18965
@@ -191,6 +194,7 @@
18966
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
18967
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
18968
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
27786
-mkinstalldirs = $(install_sh) -d
27787
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
27788
CONFIG_HEADER = $(top_builddir)/config.h
27789
CONFIG_CLEAN_FILES =
27790
CONFIG_CLEAN_VPATH_FILES =
27791
@@ -178,6 +181,7 @@
27792
GDK_PACKAGES = @GDK_PACKAGES@
27793
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
27794
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
18969
27795
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
18970
27796
GDK_WLIBS = @GDK_WLIBS@
18971
27797
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
18972
27798
GLIB_CFLAGS = @GLIB_CFLAGS@
18973
@@ -283,8 +287,6 @@
18974
PATH_SEPARATOR = @PATH_SEPARATOR@
18975
PERL = @PERL@
18976
PKG_CONFIG = @PKG_CONFIG@
18977
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
18978
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
18979
POFILES = @POFILES@
18980
POSUB = @POSUB@
18981
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
18982
diff -Nur gtk+2.0-2.21.2/modules/printbackends/test/Makefile.in gtk+2.0-2.21.2.ubuntu/modules/printbackends/test/Makefile.in
18983
--- gtk+2.0-2.21.2/modules/printbackends/test/Makefile.in 2010-06-10 19:18:27.000000000 +0200
18984
+++ gtk+2.0-2.21.2.ubuntu/modules/printbackends/test/Makefile.in 2010-06-11 12:15:24.000000000 +0200
18985
@@ -42,7 +42,10 @@
27799
@@ -328,6 +332,7 @@
27800
libexecdir = @libexecdir@
27801
localedir = @localedir@
27802
localstatedir = @localstatedir@
27803
+lt_ECHO = @lt_ECHO@
27804
mandir = @mandir@
27805
mkdir_p = @mkdir_p@
27806
ms_librarian = @ms_librarian@
27807
Index: gtk+-2.21.5/modules/printbackends/test/Makefile.in
27808
===================================================================
27809
--- gtk+-2.21.5.orig/modules/printbackends/test/Makefile.in 2010-07-22 21:44:03.320072001 +0200
27810
+++ gtk+-2.21.5/modules/printbackends/test/Makefile.in 2010-07-22 21:44:23.160072000 +0200
27811
@@ -41,11 +41,14 @@
27812
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
18986
27813
subdir = modules/printbackends/test
18987
27814
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
18988
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
18989
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18990
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
18991
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
18992
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
18993
+ $(top_srcdir)/configure.in
27815
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
27816
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
27817
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
27818
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
27819
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
27820
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
18994
27821
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
18995
27822
$(ACLOCAL_M4)
18996
mkinstalldirs = $(install_sh) -d
18997
@@ -192,6 +195,7 @@
18998
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
18999
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
19000
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
27823
-mkinstalldirs = $(install_sh) -d
27824
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
27825
CONFIG_HEADER = $(top_builddir)/config.h
27826
CONFIG_CLEAN_FILES =
27827
CONFIG_CLEAN_VPATH_FILES =
27828
@@ -179,6 +182,7 @@
27829
GDK_PACKAGES = @GDK_PACKAGES@
27830
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
27831
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
19001
27832
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
19002
27833
GDK_WLIBS = @GDK_WLIBS@
19003
27834
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
19004
27835
GLIB_CFLAGS = @GLIB_CFLAGS@
19005
@@ -284,8 +288,6 @@
19006
PATH_SEPARATOR = @PATH_SEPARATOR@
19007
PERL = @PERL@
19008
PKG_CONFIG = @PKG_CONFIG@
19009
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
19010
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
19011
POFILES = @POFILES@
19012
POSUB = @POSUB@
19013
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
19014
diff -Nur gtk+2.0-2.21.2/perf/Makefile.in gtk+2.0-2.21.2.ubuntu/perf/Makefile.in
19015
--- gtk+2.0-2.21.2/perf/Makefile.in 2010-06-10 19:18:27.000000000 +0200
19016
+++ gtk+2.0-2.21.2.ubuntu/perf/Makefile.in 2010-06-11 12:15:24.000000000 +0200
19017
@@ -42,7 +42,10 @@
27836
@@ -329,6 +333,7 @@
27837
libexecdir = @libexecdir@
27838
localedir = @localedir@
27839
localstatedir = @localstatedir@
27840
+lt_ECHO = @lt_ECHO@
27841
mandir = @mandir@
27842
mkdir_p = @mkdir_p@
27843
ms_librarian = @ms_librarian@
27844
Index: gtk+-2.21.5/perf/Makefile.in
27845
===================================================================
27846
--- gtk+-2.21.5.orig/perf/Makefile.in 2010-07-22 21:44:03.460072001 +0200
27847
+++ gtk+-2.21.5/perf/Makefile.in 2010-07-22 21:44:23.250072000 +0200
27848
@@ -41,11 +41,14 @@
27849
noinst_PROGRAMS = testperf$(EXEEXT)
19018
27850
subdir = perf
19019
27851
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
19020
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
19021
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
19022
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
19023
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
19024
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
19025
+ $(top_srcdir)/configure.in
27852
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
27853
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
27854
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
27855
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
27856
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
27857
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
19026
27858
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
19027
27859
$(ACLOCAL_M4)
19028
mkinstalldirs = $(install_sh) -d
19029
@@ -166,6 +169,7 @@
19030
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
19031
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
19032
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
27860
-mkinstalldirs = $(install_sh) -d
27861
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
27862
CONFIG_HEADER = $(top_builddir)/config.h
27863
CONFIG_CLEAN_FILES =
27864
CONFIG_CLEAN_VPATH_FILES =
27865
@@ -152,6 +155,7 @@
27866
GDK_PACKAGES = @GDK_PACKAGES@
27867
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
27868
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
19033
27869
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
19034
27870
GDK_WLIBS = @GDK_WLIBS@
19035
27871
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
19036
27872
GLIB_CFLAGS = @GLIB_CFLAGS@
19037
@@ -258,8 +262,6 @@
19038
PATH_SEPARATOR = @PATH_SEPARATOR@
19039
PERL = @PERL@
19040
PKG_CONFIG = @PKG_CONFIG@
19041
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
19042
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
27873
@@ -302,6 +306,7 @@
27874
libexecdir = @libexecdir@
27875
localedir = @localedir@
27876
localstatedir = @localstatedir@
27877
+lt_ECHO = @lt_ECHO@
27878
mandir = @mandir@
27879
mkdir_p = @mkdir_p@
27880
ms_librarian = @ms_librarian@
27881
Index: gtk+-2.21.5/po/Makefile.in.in
27882
===================================================================
27883
--- gtk+-2.21.5.orig/po/Makefile.in.in 2010-07-22 21:44:03.150072001 +0200
27884
+++ gtk+-2.21.5/po/Makefile.in.in 2010-07-22 21:44:05.590072001 +0200
27885
@@ -25,23 +25,23 @@
27886
27887
prefix = @prefix@
27888
exec_prefix = @exec_prefix@
27889
-datadir = @datadir@
27890
datarootdir = @datarootdir@
27891
+datadir = @datadir@
27892
libdir = @libdir@
27893
localedir = $(libdir)/locale
27894
gnulocaledir = $(datadir)/locale
27895
gettextsrcdir = $(datadir)/glib-2.0/gettext/po
27896
subdir = po
27897
-install_sh = @install_sh@
27898
-mkdir_p = $(install_sh) -d
27899
27900
INSTALL = @INSTALL@
27901
INSTALL_DATA = @INSTALL_DATA@
27902
+MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
27903
27904
CC = @CC@
27905
GENCAT = @GENCAT@
27906
GMSGFMT = @GMSGFMT@
27907
MSGFMT = @MSGFMT@
27908
+MSGFMT_OPTS = @MSGFMT_OPTS@
27909
XGETTEXT = @XGETTEXT@
27910
MSGMERGE = msgmerge
27911
27912
@@ -56,7 +56,7 @@
27913
SOURCES =
19043
27914
POFILES = @POFILES@
19044
POSUB = @POSUB@
19045
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
19046
diff -Nur gtk+2.0-2.21.2/tests/Makefile.in gtk+2.0-2.21.2.ubuntu/tests/Makefile.in
19047
--- gtk+2.0-2.21.2/tests/Makefile.in 2010-06-10 19:18:27.000000000 +0200
19048
+++ gtk+2.0-2.21.2.ubuntu/tests/Makefile.in 2010-06-11 12:15:25.000000000 +0200
19049
@@ -77,7 +77,10 @@
27915
GMOFILES = @GMOFILES@
27916
-DISTFILES = LINGUAS ChangeLog Makefile.in.in POTFILES.in POTFILES.skip $(GETTEXT_PACKAGE).pot \
27917
+DISTFILES = LINGUAS ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \
27918
$(POFILES) $(GMOFILES) $(SOURCES)
27919
27920
POTFILES = \
27921
@@ -80,7 +80,7 @@
27922
27923
.po.gmo:
27924
file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
27925
- && rm -f $$file && $(GMSGFMT) -c -o $$file $<
27926
+ && rm -f $$file && $(GMSGFMT) $(MSGFMT_OPTS) -o $$file $<
27927
27928
.po.cat:
27929
sed -f ../intl/po2msg.sed < $< > $*.msg \
27930
@@ -94,8 +94,15 @@
27931
27932
$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
27933
$(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \
27934
- --add-comments --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 \
27935
+ --add-comments --keyword=_ --keyword=N_ \
27936
+ --keyword=C_:1c,2 \
27937
+ --keyword=NC_:1c,2 \
27938
+ --keyword=g_dcgettext:2 \
27939
--keyword=g_dngettext:2,3 \
27940
+ --keyword=g_dpgettext2:2c,3 \
27941
+ --flag=N_:1:pass-c-format \
27942
+ --flag=C_:2:pass-c-format \
27943
+ --flag=NC_:2:pass-c-format \
27944
--flag=g_dngettext:2:pass-c-format \
27945
--flag=g_strdup_printf:1:c-format \
27946
--flag=g_string_printf:2:c-format \
27947
@@ -112,10 +119,6 @@
27948
--flag=g_snprintf:3:c-format \
27949
--flag=g_scanner_error:2:c-format \
27950
--flag=g_scanner_warn:2:c-format \
27951
- --flag=gtk_message_dialog_format_secondary_markup:2:c-format \
27952
- --flag=gtk_message_dialog_format_secondary_text:2:c-format \
27953
- --flag=gtk_message_dialog_new:5:c-format \
27954
- --flag=gtk_message_dialog_new_with_markup:5:c-format \
27955
--files-from=$(srcdir)/POTFILES.in \
27956
&& test ! -f $(GETTEXT_PACKAGE).po \
27957
|| ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \
27958
@@ -126,8 +129,12 @@
27959
install-data: install-data-@USE_NLS@
27960
install-data-no: all
27961
install-data-yes: all
27962
- $(mkdir_p) $(DESTDIR)$(datadir); \
27963
- catalogs='$(CATALOGS)'; \
27964
+ if test -r "$(MKINSTALLDIRS)"; then \
27965
+ $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
27966
+ else \
27967
+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
27968
+ fi
27969
+ @catalogs='$(CATALOGS)'; \
27970
for cat in $$catalogs; do \
27971
cat=`basename $$cat`; \
27972
case "$$cat" in \
27973
@@ -136,7 +143,11 @@
27974
esac; \
27975
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
27976
dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
27977
- $(mkdir_p) $$dir; \
27978
+ if test -r "$(MKINSTALLDIRS)"; then \
27979
+ $(MKINSTALLDIRS) $$dir; \
27980
+ else \
27981
+ $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
27982
+ fi; \
27983
if test -r $$cat; then \
27984
$(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
27985
echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
27986
@@ -160,7 +171,11 @@
27987
fi; \
27988
done
27989
if test "$(PACKAGE)" = "glib"; then \
27990
- $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
27991
+ if test -r "$(MKINSTALLDIRS)"; then \
27992
+ $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
27993
+ else \
27994
+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
27995
+ fi; \
27996
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
27997
$(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
27998
else \
27999
Index: gtk+-2.21.5/tests/Makefile.in
28000
===================================================================
28001
--- gtk+-2.21.5.orig/tests/Makefile.in 2010-07-22 21:44:03.330072001 +0200
28002
+++ gtk+-2.21.5/tests/Makefile.in 2010-07-22 21:44:24.530072001 +0200
28003
@@ -73,11 +73,14 @@
28004
@HAVE_CXX_TRUE@@HAVE_OBJC_TRUE@am__append_2 = -DHAVE_OBJC=1 -x objective-c++
19050
28005
subdir = tests
19051
28006
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
19052
am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
19053
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
19054
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
19055
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
19056
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
19057
+ $(top_srcdir)/configure.in
28007
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
28008
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
28009
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
28010
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
28011
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
28012
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
19058
28013
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
19059
28014
$(ACLOCAL_M4)
19060
mkinstalldirs = $(install_sh) -d
19061
@@ -437,6 +440,7 @@
19062
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
19063
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
19064
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
28015
-mkinstalldirs = $(install_sh) -d
28016
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
28017
CONFIG_HEADER = $(top_builddir)/config.h
28018
CONFIG_CLEAN_FILES =
28019
CONFIG_CLEAN_VPATH_FILES =
28020
@@ -402,6 +405,7 @@
28021
GDK_PACKAGES = @GDK_PACKAGES@
28022
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
28023
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
19065
28024
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
19066
28025
GDK_WLIBS = @GDK_WLIBS@
19067
28026
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
19068
28027
GLIB_CFLAGS = @GLIB_CFLAGS@
19069
@@ -529,8 +533,6 @@
19070
PATH_SEPARATOR = @PATH_SEPARATOR@
19071
PERL = @PERL@
19072
PKG_CONFIG = @PKG_CONFIG@
19073
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
19074
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
19075
POFILES = @POFILES@
19076
POSUB = @POSUB@
19077
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
28028
@@ -552,6 +556,7 @@
28029
libexecdir = @libexecdir@
28030
localedir = @localedir@
28031
localstatedir = @localstatedir@
28032
+lt_ECHO = @lt_ECHO@
28033
mandir = @mandir@
28034
mkdir_p = @mkdir_p@
28035
ms_librarian = @ms_librarian@
Loggerhead is a web-based interface for Breezy
Version: 2.0.1