Ubuntu
libgnomecanvas package

Merge lp:~bcurtiswx/ubuntu/maverick/libgnomecanvas/libgnomecanvas-2.30.2 into lp:ubuntu/maverick/libgnomecanvas

  1. Maverick (10.10)
  2. libgnomecanvas-2.30.2
  3. Merge into maverick
Proposed by Brian Curtis
Status: Merged
Merge reported by: Sebastien Bacher
Merged at revision: not available
Proposed branch: lp:~bcurtiswx/ubuntu/maverick/libgnomecanvas/libgnomecanvas-2.30.2
Merge into: lp:ubuntu/maverick/libgnomecanvas
Diff against target: 32575 lines
To merge this branch: bzr merge lp:~bcurtiswx/ubuntu/maverick/libgnomecanvas/libgnomecanvas-2.30.2
Reviewer Review Type Date Requested Status
Ubuntu Development Team Pending
Review via email: mp+36785@code.launchpad.net

Description of the change

* New Upstream Release

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'INSTALL'
--- INSTALL 2009-02-09 10:31:45 +0000
+++ INSTALL 2010-09-27 20:34:40 +0000
@@ -2,15 +2,15 @@
2*************************2*************************
33
4Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,4Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
52006, 2007 Free Software Foundation, Inc.52006, 2007, 2008 Free Software Foundation, Inc.
66
7This file is free documentation; the Free Software Foundation gives7 This file is free documentation; the Free Software Foundation gives
8unlimited permission to copy, distribute and modify it.8unlimited permission to copy, distribute and modify it.
99
10Basic Installation10Basic Installation
11==================11==================
1212
13Briefly, the shell commands `./configure; make; make install' should13 Briefly, the shell commands `./configure; make; make install' should
14configure, build, and install this package. The following14configure, build, and install this package. The following
15more-detailed instructions are generic; see the `README' file for15more-detailed instructions are generic; see the `README' file for
16instructions specific to this package.16instructions specific to this package.
@@ -73,9 +73,9 @@
73Compilers and Options73Compilers and Options
74=====================74=====================
7575
76Some systems require unusual options for compilation or linking that the76 Some systems require unusual options for compilation or linking that
77`configure' script does not know about. Run `./configure --help' for77the `configure' script does not know about. Run `./configure --help'
78details on some of the pertinent environment variables.78for details on some of the pertinent environment variables.
7979
80 You can give `configure' initial values for configuration parameters80 You can give `configure' initial values for configuration parameters
81by setting variables in the command line or in the environment. Here81by setting variables in the command line or in the environment. Here
@@ -88,7 +88,7 @@
88Compiling For Multiple Architectures88Compiling For Multiple Architectures
89====================================89====================================
9090
91You can compile the package for more than one kind of computer at the91 You can compile the package for more than one kind of computer at the
92same time, by placing the object files for each architecture in their92same time, by placing the object files for each architecture in their
93own directory. To do this, you can use GNU `make'. `cd' to the93own directory. To do this, you can use GNU `make'. `cd' to the
94directory where you want the object files and executables to go and run94directory where you want the object files and executables to go and run
@@ -100,10 +100,24 @@
100installed the package for one architecture, use `make distclean' before100installed the package for one architecture, use `make distclean' before
101reconfiguring for another architecture.101reconfiguring for another architecture.
102102
103 On MacOS X 10.5 and later systems, you can create libraries and
104executables that work on multiple system types--known as "fat" or
105"universal" binaries--by specifying multiple `-arch' options to the
106compiler but only a single `-arch' option to the preprocessor. Like
107this:
108
109 ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
110 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
111 CPP="gcc -E" CXXCPP="g++ -E"
112
113 This is not guaranteed to produce working output in all cases, you
114may have to build one architecture at a time and combine the results
115using the `lipo' tool if you have problems.
116
103Installation Names117Installation Names
104==================118==================
105119
106By default, `make install' installs the package's commands under120 By default, `make install' installs the package's commands under
107`/usr/local/bin', include files under `/usr/local/include', etc. You121`/usr/local/bin', include files under `/usr/local/include', etc. You
108can specify an installation prefix other than `/usr/local' by giving122can specify an installation prefix other than `/usr/local' by giving
109`configure' the option `--prefix=PREFIX'.123`configure' the option `--prefix=PREFIX'.
@@ -126,7 +140,7 @@
126Optional Features140Optional Features
127=================141=================
128142
129Some packages pay attention to `--enable-FEATURE' options to143 Some packages pay attention to `--enable-FEATURE' options to
130`configure', where FEATURE indicates an optional part of the package.144`configure', where FEATURE indicates an optional part of the package.
131They may also pay attention to `--with-PACKAGE' options, where PACKAGE145They may also pay attention to `--with-PACKAGE' options, where PACKAGE
132is something like `gnu-as' or `x' (for the X Window System). The146is something like `gnu-as' or `x' (for the X Window System). The
@@ -138,14 +152,36 @@
138you can use the `configure' options `--x-includes=DIR' and152you can use the `configure' options `--x-includes=DIR' and
139`--x-libraries=DIR' to specify their locations.153`--x-libraries=DIR' to specify their locations.
140154
155Particular systems
156==================
157
158 On HP-UX, the default C compiler is not ANSI C compatible. If GNU
159CC is not installed, it is recommended to use the following options in
160order to use an ANSI C compiler:
161
162 ./configure CC="cc -Ae"
163
164and if that doesn't work, install pre-built binaries of GCC for HP-UX.
165
166 On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
167parse its `<wchar.h>' header file. The option `-nodtk' can be used as
168a workaround. If GNU CC is not installed, it is therefore recommended
169to try
170
171 ./configure CC="cc"
172
173and if that doesn't work, try
174
175 ./configure CC="cc -nodtk"
176
141Specifying the System Type177Specifying the System Type
142==========================178==========================
143179
144There may be some features `configure' cannot figure out automatically,180 There may be some features `configure' cannot figure out
145but needs to determine by the type of machine the package will run on.181automatically, but needs to determine by the type of machine the package
146Usually, assuming the package is built to be run on the _same_182will run on. Usually, assuming the package is built to be run on the
147architectures, `configure' can figure that out, but if it prints a183_same_ architectures, `configure' can figure that out, but if it prints
148message saying it cannot guess the machine type, give it the184a message saying it cannot guess the machine type, give it the
149`--build=TYPE' option. TYPE can either be a short name for the system185`--build=TYPE' option. TYPE can either be a short name for the system
150type, such as `sun4', or a canonical name which has the form:186type, such as `sun4', or a canonical name which has the form:
151187
@@ -171,9 +207,9 @@
171Sharing Defaults207Sharing Defaults
172================208================
173209
174If you want to set default values for `configure' scripts to share, you210 If you want to set default values for `configure' scripts to share,
175can create a site shell script called `config.site' that gives default211you can create a site shell script called `config.site' that gives
176values for variables like `CC', `cache_file', and `prefix'.212default values for variables like `CC', `cache_file', and `prefix'.
177`configure' looks for `PREFIX/share/config.site' if it exists, then213`configure' looks for `PREFIX/share/config.site' if it exists, then
178`PREFIX/etc/config.site' if it exists. Or, you can set the214`PREFIX/etc/config.site' if it exists. Or, you can set the
179`CONFIG_SITE' environment variable to the location of the site script.215`CONFIG_SITE' environment variable to the location of the site script.
@@ -182,7 +218,7 @@
182Defining Variables218Defining Variables
183==================219==================
184220
185Variables not defined in a site shell script can be set in the221 Variables not defined in a site shell script can be set in the
186environment passed to `configure'. However, some packages may run222environment passed to `configure'. However, some packages may run
187configure again during the build, and the customized values of these223configure again during the build, and the customized values of these
188variables may be lost. In order to avoid this problem, you should set224variables may be lost. In order to avoid this problem, you should set
@@ -201,11 +237,19 @@
201`configure' Invocation237`configure' Invocation
202======================238======================
203239
204`configure' recognizes the following options to control how it operates.240 `configure' recognizes the following options to control how it
241operates.
205242
206`--help'243`--help'
207`-h'244`-h'
208 Print a summary of the options to `configure', and exit.245 Print a summary of all of the options to `configure', and exit.
246
247`--help=short'
248`--help=recursive'
249 Print a summary of the options unique to this package's
250 `configure', and exit. The `short' variant lists options used
251 only in the top level, while the `recursive' variant lists options
252 also present in any nested packages.
209253
210`--version'254`--version'
211`-V'255`-V'
@@ -232,6 +276,16 @@
232 Look for the package's source code in directory DIR. Usually276 Look for the package's source code in directory DIR. Usually
233 `configure' can determine that directory automatically.277 `configure' can determine that directory automatically.
234278
279`--prefix=DIR'
280 Use DIR as the installation prefix. *Note Installation Names::
281 for more details, including other options available for fine-tuning
282 the installation locations.
283
284`--no-create'
285`-n'
286 Run the configure checks, but stop before creating any output
287 files.
288
235`configure' also accepts some other, not widely useful, options. Run289`configure' also accepts some other, not widely useful, options. Run
236`configure --help' for more details.290`configure --help' for more details.
237291
238292
=== modified file 'Makefile.in'
--- Makefile.in 2010-03-30 19:58:47 +0000
+++ Makefile.in 2010-09-27 20:34:40 +0000
@@ -1,4 +1,4 @@
1# Makefile.in generated by automake 1.11 from Makefile.am.1# Makefile.in generated by automake 1.11.1 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -189,10 +189,13 @@
189PACKAGE_NAME = @PACKAGE_NAME@189PACKAGE_NAME = @PACKAGE_NAME@
190PACKAGE_STRING = @PACKAGE_STRING@190PACKAGE_STRING = @PACKAGE_STRING@
191PACKAGE_TARNAME = @PACKAGE_TARNAME@191PACKAGE_TARNAME = @PACKAGE_TARNAME@
192PACKAGE_URL = @PACKAGE_URL@
192PACKAGE_VERSION = @PACKAGE_VERSION@193PACKAGE_VERSION = @PACKAGE_VERSION@
193PATH_SEPARATOR = @PATH_SEPARATOR@194PATH_SEPARATOR = @PATH_SEPARATOR@
194PERL = @PERL@195PERL = @PERL@
195PKG_CONFIG = @PKG_CONFIG@196PKG_CONFIG = @PKG_CONFIG@
197PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
198PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
196POFILES = @POFILES@199POFILES = @POFILES@
197POSUB = @POSUB@200POSUB = @POSUB@
198PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@201PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
@@ -243,7 +246,6 @@
243libexecdir = @libexecdir@246libexecdir = @libexecdir@
244localedir = @localedir@247localedir = @localedir@
245localstatedir = @localstatedir@248localstatedir = @localstatedir@
246lt_ECHO = @lt_ECHO@
247mandir = @mandir@249mandir = @mandir@
248mkdir_p = @mkdir_p@250mkdir_p = @mkdir_p@
249oldincludedir = @oldincludedir@251oldincludedir = @oldincludedir@
@@ -348,7 +350,7 @@
348# (which will cause the Makefiles to be regenerated when you run `make');350# (which will cause the Makefiles to be regenerated when you run `make');
349# (2) otherwise, pass the desired values on the `make' command line.351# (2) otherwise, pass the desired values on the `make' command line.
350$(RECURSIVE_TARGETS):352$(RECURSIVE_TARGETS):
351 @failcom='exit 1'; \353 @fail= failcom='exit 1'; \
352 for f in x $$MAKEFLAGS; do \354 for f in x $$MAKEFLAGS; do \
353 case $$f in \355 case $$f in \
354 *=* | --[!k]*);; \356 *=* | --[!k]*);; \
@@ -373,7 +375,7 @@
373 fi; test -z "$$fail"375 fi; test -z "$$fail"
374376
375$(RECURSIVE_CLEAN_TARGETS):377$(RECURSIVE_CLEAN_TARGETS):
376 @failcom='exit 1'; \378 @fail= failcom='exit 1'; \
377 for f in x $$MAKEFLAGS; do \379 for f in x $$MAKEFLAGS; do \
378 case $$f in \380 case $$f in \
379 *=* | --[!k]*);; \381 *=* | --[!k]*);; \
@@ -537,7 +539,8 @@
537 fi; \539 fi; \
538 done540 done
539 -test -n "$(am__skip_mode_fix)" \541 -test -n "$(am__skip_mode_fix)" \
540 || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \542 || find "$(distdir)" -type d ! -perm -755 \
543 -exec chmod u+rwx,go+rx {} \; -o \
541 ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \544 ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
542 ! -type d ! -perm -400 -exec chmod a+r {} \; -o \545 ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
543 ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \546 ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -581,17 +584,17 @@
581distcheck: dist584distcheck: dist
582 case '$(DIST_ARCHIVES)' in \585 case '$(DIST_ARCHIVES)' in \
583 *.tar.gz*) \586 *.tar.gz*) \
584 GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\587 GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
585 *.tar.bz2*) \588 *.tar.bz2*) \
586 bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\589 bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
587 *.tar.lzma*) \590 *.tar.lzma*) \
588 unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\591 lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
589 *.tar.xz*) \592 *.tar.xz*) \
590 xz -dc $(distdir).tar.xz | $(am__untar) ;;\593 xz -dc $(distdir).tar.xz | $(am__untar) ;;\
591 *.tar.Z*) \594 *.tar.Z*) \
592 uncompress -c $(distdir).tar.Z | $(am__untar) ;;\595 uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
593 *.shar.gz*) \596 *.shar.gz*) \
594 GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\597 GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
595 *.zip*) \598 *.zip*) \
596 unzip $(distdir).zip ;;\599 unzip $(distdir).zip ;;\
597 esac600 esac
598601
=== modified file 'NEWS'
--- NEWS 2010-04-01 21:42:40 +0000
+++ NEWS 2010-09-27 20:34:40 +0000
@@ -1,3 +1,19 @@
1libgnomecanvas 2.30.2
2---------------------
3
4What's new since 2.30.1
5
6Translations
7 * Takayuki KUSANO (ja)
8 * Dirgita (in)
9 * Fran Diéguez (ga)
10 * Matej Urbančič (sl)
11 * Kristjan Schmidt (eo)
12 * Thomas Thurman (sh)
13 * Andika Triwidada (in)
14 * Peteris Krisjanis (lv)
15 * Shankar Prasad (ka)
16
1libgnomecanvas 2.30.117libgnomecanvas 2.30.1
2---------------------18---------------------
319
420
=== modified file 'aclocal.m4'
--- aclocal.m4 2010-03-30 19:58:47 +0000
+++ aclocal.m4 2010-09-27 20:34:40 +0000
@@ -1,4 +1,4 @@
1# generated automatically by aclocal 1.11 -*- Autoconf -*-1# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
22
3# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,3# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.4# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
@@ -13,8 +13,8 @@
1313
14m4_ifndef([AC_AUTOCONF_VERSION],14m4_ifndef([AC_AUTOCONF_VERSION],
15 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl15 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
16m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,16m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.66],,
17[m4_warning([this file was generated for autoconf 2.63.17[m4_warning([this file was generated for autoconf 2.66.
18You have another version of autoconf. It may work, but is not guaranteed to.18You have another version of autoconf. It may work, but is not guaranteed to.
19If you have problems, you may need to regenerate the build system entirely.19If you have problems, you may need to regenerate the build system entirely.
20To do so, use the procedure documented by the package, typically `autoreconf'.])])20To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -34,7 +34,7 @@
34[am__api_version='1.11'34[am__api_version='1.11'
35dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to35dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
36dnl require some minimum version. Point them to the right macro.36dnl require some minimum version. Point them to the right macro.
37m4_if([$1], [1.11], [],37m4_if([$1], [1.11.1], [],
38 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl38 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
39])39])
4040
@@ -50,7 +50,7 @@
50# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.50# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
51# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.51# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
52AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],52AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
53[AM_AUTOMAKE_VERSION([1.11])dnl53[AM_AUTOMAKE_VERSION([1.11.1])dnl
54m4_ifndef([AC_AUTOCONF_VERSION],54m4_ifndef([AC_AUTOCONF_VERSION],
55 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl55 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
56_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])56_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -1001,841 +1001,11 @@
1001AC_SUBST([am__untar])1001AC_SUBST([am__untar])
1002]) # _AM_PROG_TAR1002]) # _AM_PROG_TAR
10031003
1004# Copyright (C) 1995-2002 Free Software Foundation, Inc.
1005# Copyright (C) 2001-2003,2004 Red Hat, Inc.
1006#
1007# This file is free software, distributed under the terms of the GNU
1008# General Public License. As a special exception to the GNU General
1009# Public License, this file may be distributed as part of a program
1010# that contains a configuration script generated by Autoconf, under
1011# the same distribution terms as the rest of that program.
1012#
1013# This file can be copied and used freely without restrictions. It can
1014# be used in projects which are not available under the GNU Public License
1015# but which still want to provide support for the GNU gettext functionality.
1016#
1017# Macro to add for using GNU gettext.
1018# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
1019#
1020# Modified to never use included libintl.
1021# Owen Taylor <otaylor@redhat.com>, 12/15/1998
1022#
1023# Major rework to remove unused code
1024# Owen Taylor <otaylor@redhat.com>, 12/11/2002
1025#
1026# Added better handling of ALL_LINGUAS from GNU gettext version
1027# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
1028#
1029# Modified to require ngettext
1030# Matthias Clasen <mclasen@redhat.com> 08/06/2004
1031#
1032# We need this here as well, since someone might use autoconf-2.5x
1033# to configure GLib then an older version to configure a package
1034# using AM_GLIB_GNU_GETTEXT
1035AC_PREREQ(2.53)
1036
1037dnl
1038dnl We go to great lengths to make sure that aclocal won't
1039dnl try to pull in the installed version of these macros
1040dnl when running aclocal in the glib directory.
1041dnl
1042m4_copy([AC_DEFUN],[glib_DEFUN])
1043m4_copy([AC_REQUIRE],[glib_REQUIRE])
1044dnl
1045dnl At the end, if we're not within glib, we'll define the public
1046dnl definitions in terms of our private definitions.
1047dnl
1048
1049# GLIB_LC_MESSAGES
1050#--------------------
1051glib_DEFUN([GLIB_LC_MESSAGES],
1052 [AC_CHECK_HEADERS([locale.h])
1053 if test $ac_cv_header_locale_h = yes; then
1054 AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
1055 [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
1056 am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
1057 if test $am_cv_val_LC_MESSAGES = yes; then
1058 AC_DEFINE(HAVE_LC_MESSAGES, 1,
1059 [Define if your <locale.h> file defines LC_MESSAGES.])
1060 fi
1061 fi])
1062
1063# GLIB_PATH_PROG_WITH_TEST
1064#----------------------------
1065dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
1066dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
1067glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
1068[# Extract the first word of "$2", so it can be a program name with args.
1069set dummy $2; ac_word=[$]2
1070AC_MSG_CHECKING([for $ac_word])
1071AC_CACHE_VAL(ac_cv_path_$1,
1072[case "[$]$1" in
1073 /*)
1074 ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
1075 ;;
1076 *)
1077 IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
1078 for ac_dir in ifelse([$5], , $PATH, [$5]); do
1079 test -z "$ac_dir" && ac_dir=.
1080 if test -f $ac_dir/$ac_word; then
1081 if [$3]; then
1082 ac_cv_path_$1="$ac_dir/$ac_word"
1083 break
1084 fi
1085 fi
1086 done
1087 IFS="$ac_save_ifs"
1088dnl If no 4th arg is given, leave the cache variable unset,
1089dnl so AC_PATH_PROGS will keep looking.
1090ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
1091])dnl
1092 ;;
1093esac])dnl
1094$1="$ac_cv_path_$1"
1095if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
1096 AC_MSG_RESULT([$]$1)
1097else
1098 AC_MSG_RESULT(no)
1099fi
1100AC_SUBST($1)dnl
1101])
1102
1103# GLIB_WITH_NLS
1104#-----------------
1105glib_DEFUN([GLIB_WITH_NLS],
1106 dnl NLS is obligatory
1107 [USE_NLS=yes
1108 AC_SUBST(USE_NLS)
1109
1110 gt_cv_have_gettext=no
1111
1112 CATOBJEXT=NONE
1113 XGETTEXT=:
1114 INTLLIBS=
1115
1116 AC_CHECK_HEADER(libintl.h,
1117 [gt_cv_func_dgettext_libintl="no"
1118 libintl_extra_libs=""
1119
1120 #
1121 # First check in libc
1122 #
1123 AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
1124 [AC_TRY_LINK([
1125#include <libintl.h>
1126],
1127 [return !ngettext ("","", 1)],
1128 gt_cv_func_ngettext_libc=yes,
1129 gt_cv_func_ngettext_libc=no)
1130 ])
1131
1132 if test "$gt_cv_func_ngettext_libc" = "yes" ; then
1133 AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
1134 [AC_TRY_LINK([
1135#include <libintl.h>
1136],
1137 [return !dgettext ("","")],
1138 gt_cv_func_dgettext_libc=yes,
1139 gt_cv_func_dgettext_libc=no)
1140 ])
1141 fi
1142
1143 if test "$gt_cv_func_ngettext_libc" = "yes" ; then
1144 AC_CHECK_FUNCS(bind_textdomain_codeset)
1145 fi
1146
1147 #
1148 # If we don't have everything we want, check in libintl
1149 #
1150 if test "$gt_cv_func_dgettext_libc" != "yes" \
1151 || test "$gt_cv_func_ngettext_libc" != "yes" \
1152 || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
1153
1154 AC_CHECK_LIB(intl, bindtextdomain,
1155 [AC_CHECK_LIB(intl, ngettext,
1156 [AC_CHECK_LIB(intl, dgettext,
1157 gt_cv_func_dgettext_libintl=yes)])])
1158
1159 if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
1160 AC_MSG_CHECKING([if -liconv is needed to use gettext])
1161 AC_MSG_RESULT([])
1162 AC_CHECK_LIB(intl, ngettext,
1163 [AC_CHECK_LIB(intl, dcgettext,
1164 [gt_cv_func_dgettext_libintl=yes
1165 libintl_extra_libs=-liconv],
1166 :,-liconv)],
1167 :,-liconv)
1168 fi
1169
1170 #
1171 # If we found libintl, then check in it for bind_textdomain_codeset();
1172 # we'll prefer libc if neither have bind_textdomain_codeset(),
1173 # and both have dgettext and ngettext
1174 #
1175 if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
1176 glib_save_LIBS="$LIBS"
1177 LIBS="$LIBS -lintl $libintl_extra_libs"
1178 unset ac_cv_func_bind_textdomain_codeset
1179 AC_CHECK_FUNCS(bind_textdomain_codeset)
1180 LIBS="$glib_save_LIBS"
1181
1182 if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
1183 gt_cv_func_dgettext_libc=no
1184 else
1185 if test "$gt_cv_func_dgettext_libc" = "yes" \
1186 && test "$gt_cv_func_ngettext_libc" = "yes"; then
1187 gt_cv_func_dgettext_libintl=no
1188 fi
1189 fi
1190 fi
1191 fi
1192
1193 if test "$gt_cv_func_dgettext_libc" = "yes" \
1194 || test "$gt_cv_func_dgettext_libintl" = "yes"; then
1195 gt_cv_have_gettext=yes
1196 fi
1197
1198 if test "$gt_cv_func_dgettext_libintl" = "yes"; then
1199 INTLLIBS="-lintl $libintl_extra_libs"
1200 fi
1201
1202 if test "$gt_cv_have_gettext" = "yes"; then
1203 AC_DEFINE(HAVE_GETTEXT,1,
1204 [Define if the GNU gettext() function is already present or preinstalled.])
1205 GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
1206 [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
1207 if test "$MSGFMT" != "no"; then
1208 glib_save_LIBS="$LIBS"
1209 LIBS="$LIBS $INTLLIBS"
1210 AC_CHECK_FUNCS(dcgettext)
1211 MSGFMT_OPTS=
1212 AC_MSG_CHECKING([if msgfmt accepts -c])
1213 GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
1214msgid ""
1215msgstr ""
1216"Content-Type: text/plain; charset=UTF-8\n"
1217"Project-Id-Version: test 1.0\n"
1218"PO-Revision-Date: 2007-02-15 12:01+0100\n"
1219"Last-Translator: test <foo@bar.xx>\n"
1220"Language-Team: C <LL@li.org>\n"
1221"MIME-Version: 1.0\n"
1222"Content-Transfer-Encoding: 8bit\n"
1223], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
1224 AC_SUBST(MSGFMT_OPTS)
1225 AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
1226 GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
1227 [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
1228 AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
1229 return _nl_msg_cat_cntr],
1230 [CATOBJEXT=.gmo
1231 DATADIRNAME=share],
1232 [case $host in
1233 *-*-solaris*)
1234 dnl On Solaris, if bind_textdomain_codeset is in libc,
1235 dnl GNU format message catalog is always supported,
1236 dnl since both are added to the libc all together.
1237 dnl Hence, we'd like to go with DATADIRNAME=share and
1238 dnl and CATOBJEXT=.gmo in this case.
1239 AC_CHECK_FUNC(bind_textdomain_codeset,
1240 [CATOBJEXT=.gmo
1241 DATADIRNAME=share],
1242 [CATOBJEXT=.mo
1243 DATADIRNAME=lib])
1244 ;;
1245 *)
1246 CATOBJEXT=.mo
1247 DATADIRNAME=lib
1248 ;;
1249 esac])
1250 LIBS="$glib_save_LIBS"
1251 INSTOBJEXT=.mo
1252 else
1253 gt_cv_have_gettext=no
1254 fi
1255 fi
1256 ])
1257
1258 if test "$gt_cv_have_gettext" = "yes" ; then
1259 AC_DEFINE(ENABLE_NLS, 1,
1260 [always defined to indicate that i18n is enabled])
1261 fi
1262
1263 dnl Test whether we really found GNU xgettext.
1264 if test "$XGETTEXT" != ":"; then
1265 dnl If it is not GNU xgettext we define it as : so that the
1266 dnl Makefiles still can work.
1267 if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
1268 : ;
1269 else
1270 AC_MSG_RESULT(
1271 [found xgettext program is not GNU xgettext; ignore it])
1272 XGETTEXT=":"
1273 fi
1274 fi
1275
1276 # We need to process the po/ directory.
1277 POSUB=po
1278
1279 AC_OUTPUT_COMMANDS(
1280 [case "$CONFIG_FILES" in *po/Makefile.in*)
1281 sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
1282 esac])
1283
1284 dnl These rules are solely for the distribution goal. While doing this
1285 dnl we only have to keep exactly one list of the available catalogs
1286 dnl in configure.in.
1287 for lang in $ALL_LINGUAS; do
1288 GMOFILES="$GMOFILES $lang.gmo"
1289 POFILES="$POFILES $lang.po"
1290 done
1291
1292 dnl Make all variables we use known to autoconf.
1293 AC_SUBST(CATALOGS)
1294 AC_SUBST(CATOBJEXT)
1295 AC_SUBST(DATADIRNAME)
1296 AC_SUBST(GMOFILES)
1297 AC_SUBST(INSTOBJEXT)
1298 AC_SUBST(INTLLIBS)
1299 AC_SUBST(PO_IN_DATADIR_TRUE)
1300 AC_SUBST(PO_IN_DATADIR_FALSE)
1301 AC_SUBST(POFILES)
1302 AC_SUBST(POSUB)
1303 ])
1304
1305# AM_GLIB_GNU_GETTEXT
1306# -------------------
1307# Do checks necessary for use of gettext. If a suitable implementation
1308# of gettext is found in either in libintl or in the C library,
1309# it will set INTLLIBS to the libraries needed for use of gettext
1310# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
1311# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
1312# on various variables needed by the Makefile.in.in installed by
1313# glib-gettextize.
1314dnl
1315glib_DEFUN([GLIB_GNU_GETTEXT],
1316 [AC_REQUIRE([AC_PROG_CC])dnl
1317 AC_REQUIRE([AC_HEADER_STDC])dnl
1318
1319 GLIB_LC_MESSAGES
1320 GLIB_WITH_NLS
1321
1322 if test "$gt_cv_have_gettext" = "yes"; then
1323 if test "x$ALL_LINGUAS" = "x"; then
1324 LINGUAS=
1325 else
1326 AC_MSG_CHECKING(for catalogs to be installed)
1327 NEW_LINGUAS=
1328 for presentlang in $ALL_LINGUAS; do
1329 useit=no
1330 if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
1331 desiredlanguages="$LINGUAS"
1332 else
1333 desiredlanguages="$ALL_LINGUAS"
1334 fi
1335 for desiredlang in $desiredlanguages; do
1336 # Use the presentlang catalog if desiredlang is
1337 # a. equal to presentlang, or
1338 # b. a variant of presentlang (because in this case,
1339 # presentlang can be used as a fallback for messages
1340 # which are not translated in the desiredlang catalog).
1341 case "$desiredlang" in
1342 "$presentlang"*) useit=yes;;
1343 esac
1344 done
1345 if test $useit = yes; then
1346 NEW_LINGUAS="$NEW_LINGUAS $presentlang"
1347 fi
1348 done
1349 LINGUAS=$NEW_LINGUAS
1350 AC_MSG_RESULT($LINGUAS)
1351 fi
1352
1353 dnl Construct list of names of catalog files to be constructed.
1354 if test -n "$LINGUAS"; then
1355 for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
1356 fi
1357 fi
1358
1359 dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
1360 dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
1361 dnl Try to locate is.
1362 MKINSTALLDIRS=
1363 if test -n "$ac_aux_dir"; then
1364 MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
1365 fi
1366 if test -z "$MKINSTALLDIRS"; then
1367 MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
1368 fi
1369 AC_SUBST(MKINSTALLDIRS)
1370
1371 dnl Generate list of files to be processed by xgettext which will
1372 dnl be included in po/Makefile.
1373 test -d po || mkdir po
1374 if test "x$srcdir" != "x."; then
1375 if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
1376 posrcprefix="$srcdir/"
1377 else
1378 posrcprefix="../$srcdir/"
1379 fi
1380 else
1381 posrcprefix="../"
1382 fi
1383 rm -f po/POTFILES
1384 sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
1385 < $srcdir/po/POTFILES.in > po/POTFILES
1386 ])
1387
1388# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
1389# -------------------------------
1390# Define VARIABLE to the location where catalog files will
1391# be installed by po/Makefile.
1392glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
1393[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
1394glib_save_prefix="$prefix"
1395glib_save_exec_prefix="$exec_prefix"
1396glib_save_datarootdir="$datarootdir"
1397test "x$prefix" = xNONE && prefix=$ac_default_prefix
1398test "x$exec_prefix" = xNONE && exec_prefix=$prefix
1399datarootdir=`eval echo "${datarootdir}"`
1400if test "x$CATOBJEXT" = "x.mo" ; then
1401 localedir=`eval echo "${libdir}/locale"`
1402else
1403 localedir=`eval echo "${datadir}/locale"`
1404fi
1405prefix="$glib_save_prefix"
1406exec_prefix="$glib_save_exec_prefix"
1407datarootdir="$glib_save_datarootdir"
1408AC_DEFINE_UNQUOTED($1, "$localedir",
1409 [Define the location where the catalogs will be installed])
1410])
1411
1412dnl
1413dnl Now the definitions that aclocal will find
1414dnl
1415ifdef(glib_configure_in,[],[
1416AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
1417AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
1418])dnl
1419
1420# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
1421#
1422# Create a temporary file with TEST-FILE as its contents and pass the
1423# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
1424# 0 and perform ACTION-IF-FAIL for any other exit status.
1425AC_DEFUN([GLIB_RUN_PROG],
1426[cat >conftest.foo <<_ACEOF
1427$2
1428_ACEOF
1429if AC_RUN_LOG([$1 conftest.foo]); then
1430 m4_ifval([$3], [$3], [:])
1431m4_ifvaln([$4], [else $4])dnl
1432echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
1433sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
1434fi])
1435
1436
1437dnl GNOME_COMPILE_WARNINGS
1438dnl Turn on many useful compiler warnings
1439dnl For now, only works on GCC
1440AC_DEFUN([GNOME_COMPILE_WARNINGS],[
1441 dnl ******************************
1442 dnl More compiler warnings
1443 dnl ******************************
1444
1445 AC_ARG_ENABLE(compile-warnings,
1446 AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
1447 [Turn on compiler warnings]),,
1448 [enable_compile_warnings="m4_default([$1],[yes])"])
1449
1450 warnCFLAGS=
1451 if test "x$GCC" != xyes; then
1452 enable_compile_warnings=no
1453 fi
1454
1455 warning_flags=
1456 realsave_CFLAGS="$CFLAGS"
1457
1458 case "$enable_compile_warnings" in
1459 no)
1460 warning_flags=
1461 ;;
1462 minimum)
1463 warning_flags="-Wall"
1464 ;;
1465 yes)
1466 warning_flags="-Wall -Wmissing-prototypes"
1467 ;;
1468 maximum|error)
1469 warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
1470 CFLAGS="$warning_flags $CFLAGS"
1471 for option in -Wno-sign-compare; do
1472 SAVE_CFLAGS="$CFLAGS"
1473 CFLAGS="$CFLAGS $option"
1474 AC_MSG_CHECKING([whether gcc understands $option])
1475 AC_TRY_COMPILE([], [],
1476 has_option=yes,
1477 has_option=no,)
1478 CFLAGS="$SAVE_CFLAGS"
1479 AC_MSG_RESULT($has_option)
1480 if test $has_option = yes; then
1481 warning_flags="$warning_flags $option"
1482 fi
1483 unset has_option
1484 unset SAVE_CFLAGS
1485 done
1486 unset option
1487 if test "$enable_compile_warnings" = "error" ; then
1488 warning_flags="$warning_flags -Werror"
1489 fi
1490 ;;
1491 *)
1492 AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
1493 ;;
1494 esac
1495 CFLAGS="$realsave_CFLAGS"
1496 AC_MSG_CHECKING(what warning flags to pass to the C compiler)
1497 AC_MSG_RESULT($warning_flags)
1498
1499 AC_ARG_ENABLE(iso-c,
1500 AC_HELP_STRING([--enable-iso-c],
1501 [Try to warn if code is not ISO C ]),,
1502 [enable_iso_c=no])
1503
1504 AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
1505 complCFLAGS=
1506 if test "x$enable_iso_c" != "xno"; then
1507 if test "x$GCC" = "xyes"; then
1508 case " $CFLAGS " in
1509 *[\ \ ]-ansi[\ \ ]*) ;;
1510 *) complCFLAGS="$complCFLAGS -ansi" ;;
1511 esac
1512 case " $CFLAGS " in
1513 *[\ \ ]-pedantic[\ \ ]*) ;;
1514 *) complCFLAGS="$complCFLAGS -pedantic" ;;
1515 esac
1516 fi
1517 fi
1518 AC_MSG_RESULT($complCFLAGS)
1519
1520 WARN_CFLAGS="$warning_flags $complCFLAGS"
1521 AC_SUBST(WARN_CFLAGS)
1522])
1523
1524dnl For C++, do basically the same thing.
1525
1526AC_DEFUN([GNOME_CXX_WARNINGS],[
1527 AC_ARG_ENABLE(cxx-warnings,
1528 AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
1529 [Turn on compiler warnings.]),,
1530 [enable_cxx_warnings="m4_default([$1],[minimum])"])
1531
1532 AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
1533 warnCXXFLAGS=
1534 if test "x$GXX" != xyes; then
1535 enable_cxx_warnings=no
1536 fi
1537 if test "x$enable_cxx_warnings" != "xno"; then
1538 if test "x$GXX" = "xyes"; then
1539 case " $CXXFLAGS " in
1540 *[\ \ ]-Wall[\ \ ]*) ;;
1541 *) warnCXXFLAGS="-Wall -Wno-unused" ;;
1542 esac
1543
1544 ## -W is not all that useful. And it cannot be controlled
1545 ## with individual -Wno-xxx flags, unlike -Wall
1546 if test "x$enable_cxx_warnings" = "xyes"; then
1547 warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
1548 fi
1549 fi
1550 fi
1551 AC_MSG_RESULT($warnCXXFLAGS)
1552
1553 AC_ARG_ENABLE(iso-cxx,
1554 AC_HELP_STRING([--enable-iso-cxx],
1555 [Try to warn if code is not ISO C++ ]),,
1556 [enable_iso_cxx=no])
1557
1558 AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
1559 complCXXFLAGS=
1560 if test "x$enable_iso_cxx" != "xno"; then
1561 if test "x$GXX" = "xyes"; then
1562 case " $CXXFLAGS " in
1563 *[\ \ ]-ansi[\ \ ]*) ;;
1564 *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
1565 esac
1566
1567 case " $CXXFLAGS " in
1568 *[\ \ ]-pedantic[\ \ ]*) ;;
1569 *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
1570 esac
1571 fi
1572 fi
1573 AC_MSG_RESULT($complCXXFLAGS)
1574
1575 WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
1576 AC_SUBST(WARN_CXXFLAGS)
1577])
1578
1579dnl -*- mode: autoconf -*-
1580
1581# serial 1
1582
1583dnl Usage:
1584dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
1585AC_DEFUN([GTK_DOC_CHECK],
1586[
1587 AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
1588 AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
1589
1590 dnl check for tools we added during development
1591 AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
1592 AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
1593 AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
1594
1595 dnl for overriding the documentation installation directory
1596 AC_ARG_WITH([html-dir],
1597 AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
1598 [with_html_dir='${datadir}/gtk-doc/html'])
1599 HTML_DIR="$with_html_dir"
1600 AC_SUBST([HTML_DIR])
1601
1602 dnl enable/disable documentation building
1603 AC_ARG_ENABLE([gtk-doc],
1604 AS_HELP_STRING([--enable-gtk-doc],
1605 [use gtk-doc to build documentation [[default=no]]]),,
1606 [enable_gtk_doc=no])
1607
1608 if test x$enable_gtk_doc = xyes; then
1609 ifelse([$1],[],
1610 [PKG_CHECK_EXISTS([gtk-doc],,
1611 AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
1612 [PKG_CHECK_EXISTS([gtk-doc >= $1],,
1613 AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
1614 fi
1615
1616 AC_MSG_CHECKING([whether to build gtk-doc documentation])
1617 AC_MSG_RESULT($enable_gtk_doc)
1618
1619 dnl enable/disable output formats
1620 AC_ARG_ENABLE([gtk-doc-html],
1621 AS_HELP_STRING([--enable-gtk-doc-html],
1622 [build documentation in html format [[default=yes]]]),,
1623 [enable_gtk_doc_html=yes])
1624 AC_ARG_ENABLE([gtk-doc-pdf],
1625 AS_HELP_STRING([--enable-gtk-doc-pdf],
1626 [build documentation in pdf format [[default=no]]]),,
1627 [enable_gtk_doc_pdf=no])
1628
1629 if test -z "$GTKDOC_MKPDF"; then
1630 enable_gtk_doc_pdf=no
1631 fi
1632
1633
1634 AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
1635 AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
1636 AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
1637 AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
1638 AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
1639])
1640
1641
1642dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
1643# serial 40 IT_PROG_INTLTOOL
1644AC_DEFUN([IT_PROG_INTLTOOL], [
1645AC_PREREQ([2.50])dnl
1646AC_REQUIRE([AM_NLS])dnl
1647
1648case "$am__api_version" in
1649 1.[01234])
1650 AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
1651 ;;
1652 *)
1653 ;;
1654esac
1655
1656if test -n "$1"; then
1657 AC_MSG_CHECKING([for intltool >= $1])
1658
1659 INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
1660 INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
1661 [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
1662 ]
1663 AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
1664 test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
1665 AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
1666fi
1667
1668AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
1669AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
1670AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
1671if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
1672 AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
1673fi
1674
1675 INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1676INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1677 INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1678 INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1679 INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
1680 INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1681 INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1682 INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1683INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1684 INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1685 INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1686 INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@'
1687 INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1688 INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1689 INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1690 INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1691 INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1692 INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1693 INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
1694
1695_IT_SUBST(INTLTOOL_DESKTOP_RULE)
1696_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
1697_IT_SUBST(INTLTOOL_KEYS_RULE)
1698_IT_SUBST(INTLTOOL_PROP_RULE)
1699_IT_SUBST(INTLTOOL_OAF_RULE)
1700_IT_SUBST(INTLTOOL_PONG_RULE)
1701_IT_SUBST(INTLTOOL_SERVER_RULE)
1702_IT_SUBST(INTLTOOL_SHEET_RULE)
1703_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
1704_IT_SUBST(INTLTOOL_UI_RULE)
1705_IT_SUBST(INTLTOOL_XAM_RULE)
1706_IT_SUBST(INTLTOOL_KBD_RULE)
1707_IT_SUBST(INTLTOOL_XML_RULE)
1708_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
1709_IT_SUBST(INTLTOOL_CAVES_RULE)
1710_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
1711_IT_SUBST(INTLTOOL_THEME_RULE)
1712_IT_SUBST(INTLTOOL_SERVICE_RULE)
1713_IT_SUBST(INTLTOOL_POLICY_RULE)
1714
1715# Check the gettext tools to make sure they are GNU
1716AC_PATH_PROG(XGETTEXT, xgettext)
1717AC_PATH_PROG(MSGMERGE, msgmerge)
1718AC_PATH_PROG(MSGFMT, msgfmt)
1719AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
1720if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
1721 AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
1722fi
1723xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
1724mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
1725mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
1726if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
1727 AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
1728fi
1729
1730AC_PATH_PROG(INTLTOOL_PERL, perl)
1731if test -z "$INTLTOOL_PERL"; then
1732 AC_MSG_ERROR([perl not found])
1733fi
1734AC_MSG_CHECKING([for perl >= 5.8.1])
1735$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
1736if test $? -ne 0; then
1737 AC_MSG_ERROR([perl 5.8.1 is required for intltool])
1738else
1739 IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
1740 AC_MSG_RESULT([$IT_PERL_VERSION])
1741fi
1742if test "x$2" != "xno-xml"; then
1743 AC_MSG_CHECKING([for XML::Parser])
1744 if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
1745 AC_MSG_RESULT([ok])
1746 else
1747 AC_MSG_ERROR([XML::Parser perl module is required for intltool])
1748 fi
1749fi
1750
1751# Substitute ALL_LINGUAS so we can use it in po/Makefile
1752AC_SUBST(ALL_LINGUAS)
1753
1754# Set DATADIRNAME correctly if it is not set yet
1755# (copied from glib-gettext.m4)
1756if test -z "$DATADIRNAME"; then
1757 AC_LINK_IFELSE(
1758 [AC_LANG_PROGRAM([[]],
1759 [[extern int _nl_msg_cat_cntr;
1760 return _nl_msg_cat_cntr]])],
1761 [DATADIRNAME=share],
1762 [case $host in
1763 *-*-solaris*)
1764 dnl On Solaris, if bind_textdomain_codeset is in libc,
1765 dnl GNU format message catalog is always supported,
1766 dnl since both are added to the libc all together.
1767 dnl Hence, we'd like to go with DATADIRNAME=share
1768 dnl in this case.
1769 AC_CHECK_FUNC(bind_textdomain_codeset,
1770 [DATADIRNAME=share], [DATADIRNAME=lib])
1771 ;;
1772 *)
1773 [DATADIRNAME=lib]
1774 ;;
1775 esac])
1776fi
1777AC_SUBST(DATADIRNAME)
1778
1779IT_PO_SUBDIR([po])
1780
1781])
1782
1783
1784# IT_PO_SUBDIR(DIRNAME)
1785# ---------------------
1786# All po subdirs have to be declared with this macro; the subdir "po" is
1787# declared by IT_PROG_INTLTOOL.
1788#
1789AC_DEFUN([IT_PO_SUBDIR],
1790[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
1791dnl
1792dnl The following CONFIG_COMMANDS should be exetuted at the very end
1793dnl of config.status.
1794AC_CONFIG_COMMANDS_PRE([
1795 AC_CONFIG_COMMANDS([$1/stamp-it], [
1796 if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
1797 AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
1798 fi
1799 rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
1800 >"$1/stamp-it.tmp"
1801 [sed '/^#/d
1802 s/^[[].*] *//
1803 /^[ ]*$/d
1804 '"s|^| $ac_top_srcdir/|" \
1805 "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
1806 ]
1807 [sed '/^POTFILES =/,/[^\\]$/ {
1808 /^POTFILES =/!d
1809 r $1/POTFILES
1810 }
1811 ' "$1/Makefile.in" >"$1/Makefile"]
1812 rm -f "$1/Makefile.tmp"
1813 mv "$1/stamp-it.tmp" "$1/stamp-it"
1814 ])
1815])dnl
1816])
1817
1818# _IT_SUBST(VARIABLE)
1819# -------------------
1820# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
1821#
1822AC_DEFUN([_IT_SUBST],
1823[
1824AC_SUBST([$1])
1825m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
1826]
1827)
1828
1829# deprecated macros
1830AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
1831# A hint is needed for aclocal from Automake <= 1.9.4:
1832# AC_DEFUN([AC_PROG_INTLTOOL], ...)
1833
1834
1835# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-1004# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
1836#1005#
1837# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,1006# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
1838# 2006, 2007, 2008 Free Software Foundation, Inc.1007# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
1008# Inc.
1839# Written by Gordon Matzigkeit, 19961009# Written by Gordon Matzigkeit, 1996
1840#1010#
1841# This file is free software; the Free Software Foundation gives1011# This file is free software; the Free Software Foundation gives
@@ -1844,7 +1014,8 @@
18441014
1845m4_define([_LT_COPYING], [dnl1015m4_define([_LT_COPYING], [dnl
1846# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,1016# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
1847# 2006, 2007, 2008 Free Software Foundation, Inc.1017# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
1018# Inc.
1848# Written by Gordon Matzigkeit, 19961019# Written by Gordon Matzigkeit, 1996
1849#1020#
1850# This file is part of GNU Libtool.1021# This file is part of GNU Libtool.
@@ -1871,7 +1042,7 @@
1871# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.1042# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1872])1043])
18731044
1874# serial 56 LT_INIT1045# serial 57 LT_INIT
18751046
18761047
1877# LT_PREREQ(VERSION)1048# LT_PREREQ(VERSION)
@@ -1900,6 +1071,7 @@
1900# ------------------1071# ------------------
1901AC_DEFUN([LT_INIT],1072AC_DEFUN([LT_INIT],
1902[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT1073[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
1074AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
1903AC_BEFORE([$0], [LT_LANG])dnl1075AC_BEFORE([$0], [LT_LANG])dnl
1904AC_BEFORE([$0], [LT_OUTPUT])dnl1076AC_BEFORE([$0], [LT_OUTPUT])dnl
1905AC_BEFORE([$0], [LTDL_INIT])dnl1077AC_BEFORE([$0], [LTDL_INIT])dnl
@@ -1916,6 +1088,8 @@
1916AC_REQUIRE([LTOBSOLETE_VERSION])dnl1088AC_REQUIRE([LTOBSOLETE_VERSION])dnl
1917m4_require([_LT_PROG_LTMAIN])dnl1089m4_require([_LT_PROG_LTMAIN])dnl
19181090
1091_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
1092
1919dnl Parse OPTIONS1093dnl Parse OPTIONS
1920_LT_SET_OPTIONS([$0], [$1])1094_LT_SET_OPTIONS([$0], [$1])
19211095
@@ -1952,7 +1126,7 @@
1952 *) break;;1126 *) break;;
1953 esac1127 esac
1954done1128done
1955cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`1129cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
1956])1130])
19571131
19581132
@@ -1972,6 +1146,9 @@
1972m4_defun([_LT_SETUP],1146m4_defun([_LT_SETUP],
1973[AC_REQUIRE([AC_CANONICAL_HOST])dnl1147[AC_REQUIRE([AC_CANONICAL_HOST])dnl
1974AC_REQUIRE([AC_CANONICAL_BUILD])dnl1148AC_REQUIRE([AC_CANONICAL_BUILD])dnl
1149AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
1150AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
1151
1975_LT_DECL([], [host_alias], [0], [The host system])dnl1152_LT_DECL([], [host_alias], [0], [The host system])dnl
1976_LT_DECL([], [host], [0])dnl1153_LT_DECL([], [host], [0])dnl
1977_LT_DECL([], [host_os], [0])dnl1154_LT_DECL([], [host_os], [0])dnl
@@ -2013,7 +1190,6 @@
2013_LT_CHECK_OBJDIR1190_LT_CHECK_OBJDIR
20141191
2015m4_require([_LT_TAG_COMPILER])dnl1192m4_require([_LT_TAG_COMPILER])dnl
2016_LT_PROG_ECHO_BACKSLASH
20171193
2018case $host_os in1194case $host_os in
2019aix3*)1195aix3*)
@@ -2027,23 +1203,6 @@
2027 ;;1203 ;;
2028esac1204esac
20291205
2030# Sed substitution that helps us do robust quoting. It backslashifies
2031# metacharacters that are still active within double-quoted strings.
2032sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
2033
2034# Same as above, but do not quote variable references.
2035double_quote_subst='s/\([["`\\]]\)/\\\1/g'
2036
2037# Sed substitution to delay expansion of an escaped shell variable in a
2038# double_quote_subst'ed string.
2039delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
2040
2041# Sed substitution to delay expansion of an escaped single quote.
2042delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
2043
2044# Sed substitution to avoid accidental globbing in evaled expressions
2045no_glob_subst='s/\*/\\\*/g'
2046
2047# Global variables:1206# Global variables:
2048ofile=libtool1207ofile=libtool
2049can_build_shared=yes1208can_build_shared=yes
@@ -2084,6 +1243,28 @@
2084])# _LT_SETUP1243])# _LT_SETUP
20851244
20861245
1246# _LT_PREPARE_SED_QUOTE_VARS
1247# --------------------------
1248# Define a few sed substitution that help us do robust quoting.
1249m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
1250[# Backslashify metacharacters that are still active within
1251# double-quoted strings.
1252sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
1253
1254# Same as above, but do not quote variable references.
1255double_quote_subst='s/\([["`\\]]\)/\\\1/g'
1256
1257# Sed substitution to delay expansion of an escaped shell variable in a
1258# double_quote_subst'ed string.
1259delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
1260
1261# Sed substitution to delay expansion of an escaped single quote.
1262delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
1263
1264# Sed substitution to avoid accidental globbing in evaled expressions
1265no_glob_subst='s/\*/\\\*/g'
1266])
1267
2087# _LT_PROG_LTMAIN1268# _LT_PROG_LTMAIN
2088# ---------------1269# ---------------
2089# Note that this code is called both from `configure', and `config.status'1270# Note that this code is called both from `configure', and `config.status'
@@ -2236,7 +1417,7 @@
2236# declaration there will have the same value as in `configure'. VARNAME1417# declaration there will have the same value as in `configure'. VARNAME
2237# must have a single quote delimited value for this to work.1418# must have a single quote delimited value for this to work.
2238m4_define([_LT_CONFIG_STATUS_DECLARE],1419m4_define([_LT_CONFIG_STATUS_DECLARE],
2239[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])1420[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
22401421
22411422
2242# _LT_CONFIG_STATUS_DECLARATIONS1423# _LT_CONFIG_STATUS_DECLARATIONS
@@ -2246,7 +1427,7 @@
2246# embedded single quotes properly. In configure, this macro expands1427# embedded single quotes properly. In configure, this macro expands
2247# each variable declared with _LT_DECL (and _LT_TAGDECL) into:1428# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
2248#1429#
2249# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'1430# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
2250m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],1431m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
2251[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),1432[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
2252 [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])1433 [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
@@ -2345,12 +1526,20 @@
2345LTCFLAGS='$LTCFLAGS'1526LTCFLAGS='$LTCFLAGS'
2346compiler='$compiler_DEFAULT'1527compiler='$compiler_DEFAULT'
23471528
1529# A function that is used when there is no print builtin or printf.
1530func_fallback_echo ()
1531{
1532 eval 'cat <<_LTECHO_EOF
1533\$[]1
1534_LTECHO_EOF'
1535}
1536
2348# Quote evaled strings.1537# Quote evaled strings.
2349for var in lt_decl_all_varnames([[ \1538for var in lt_decl_all_varnames([[ \
2350]], lt_decl_quote_varnames); do1539]], lt_decl_quote_varnames); do
2351 case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in1540 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
2352 *[[\\\\\\\`\\"\\\$]]*)1541 *[[\\\\\\\`\\"\\\$]]*)
2353 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""1542 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
2354 ;;1543 ;;
2355 *)1544 *)
2356 eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""1545 eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -2361,9 +1550,9 @@
2361# Double-quote double-evaled strings.1550# Double-quote double-evaled strings.
2362for var in lt_decl_all_varnames([[ \1551for var in lt_decl_all_varnames([[ \
2363]], lt_decl_dquote_varnames); do1552]], lt_decl_dquote_varnames); do
2364 case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in1553 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
2365 *[[\\\\\\\`\\"\\\$]]*)1554 *[[\\\\\\\`\\"\\\$]]*)
2366 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""1555 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
2367 ;;1556 ;;
2368 *)1557 *)
2369 eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""1558 eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -2371,16 +1560,38 @@
2371 esac1560 esac
2372done1561done
23731562
2374# Fix-up fallback echo if it was mangled by the above quoting rules.
2375case \$lt_ECHO in
2376*'\\\[$]0 --fallback-echo"')dnl "
2377 lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
2378 ;;
2379esac
2380
2381_LT_OUTPUT_LIBTOOL_INIT1563_LT_OUTPUT_LIBTOOL_INIT
2382])1564])
23831565
1566# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
1567# ------------------------------------
1568# Generate a child script FILE with all initialization necessary to
1569# reuse the environment learned by the parent script, and make the
1570# file executable. If COMMENT is supplied, it is inserted after the
1571# `#!' sequence but before initialization text begins. After this
1572# macro, additional text can be appended to FILE to form the body of
1573# the child script. The macro ends with non-zero status if the
1574# file could not be fully written (such as if the disk is full).
1575m4_ifdef([AS_INIT_GENERATED],
1576[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
1577[m4_defun([_LT_GENERATED_FILE_INIT],
1578[m4_require([AS_PREPARE])]dnl
1579[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
1580[lt_write_fail=0
1581cat >$1 <<_ASEOF || lt_write_fail=1
1582#! $SHELL
1583# Generated by $as_me.
1584$2
1585SHELL=\${CONFIG_SHELL-$SHELL}
1586export SHELL
1587_ASEOF
1588cat >>$1 <<\_ASEOF || lt_write_fail=1
1589AS_SHELL_SANITIZE
1590_AS_PREPARE
1591exec AS_MESSAGE_FD>&1
1592_ASEOF
1593test $lt_write_fail = 0 && chmod +x $1[]dnl
1594m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
23841595
2385# LT_OUTPUT1596# LT_OUTPUT
2386# ---------1597# ---------
@@ -2390,20 +1601,11 @@
2390AC_DEFUN([LT_OUTPUT],1601AC_DEFUN([LT_OUTPUT],
2391[: ${CONFIG_LT=./config.lt}1602[: ${CONFIG_LT=./config.lt}
2392AC_MSG_NOTICE([creating $CONFIG_LT])1603AC_MSG_NOTICE([creating $CONFIG_LT])
2393cat >"$CONFIG_LT" <<_LTEOF1604_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
2394#! $SHELL1605[# Run this file to recreate a libtool stub with the current configuration.])
2395# Generated by $as_me.
2396# Run this file to recreate a libtool stub with the current configuration.
23971606
1607cat >>"$CONFIG_LT" <<\_LTEOF
2398lt_cl_silent=false1608lt_cl_silent=false
2399SHELL=\${CONFIG_SHELL-$SHELL}
2400_LTEOF
2401
2402cat >>"$CONFIG_LT" <<\_LTEOF
2403AS_SHELL_SANITIZE
2404_AS_PREPARE
2405
2406exec AS_MESSAGE_FD>&1
2407exec AS_MESSAGE_LOG_FD>>config.log1609exec AS_MESSAGE_LOG_FD>>config.log
2408{1610{
2409 echo1611 echo
@@ -2429,7 +1631,7 @@
2429m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])1631m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
2430configured by $[0], generated by m4_PACKAGE_STRING.1632configured by $[0], generated by m4_PACKAGE_STRING.
24311633
2432Copyright (C) 2008 Free Software Foundation, Inc.1634Copyright (C) 2010 Free Software Foundation, Inc.
2433This config.lt script is free software; the Free Software Foundation1635This config.lt script is free software; the Free Software Foundation
2434gives unlimited permision to copy, distribute and modify it."1636gives unlimited permision to copy, distribute and modify it."
24351637
@@ -2474,15 +1676,13 @@
2474# appending to config.log, which fails on DOS, as config.log is still kept1676# appending to config.log, which fails on DOS, as config.log is still kept
2475# open by configure. Here we exec the FD to /dev/null, effectively closing1677# open by configure. Here we exec the FD to /dev/null, effectively closing
2476# config.log, so it can be properly (re)opened and appended to by config.lt.1678# config.log, so it can be properly (re)opened and appended to by config.lt.
2477if test "$no_create" != yes; then1679lt_cl_success=:
2478 lt_cl_success=:1680test "$silent" = yes &&
2479 test "$silent" = yes &&1681 lt_config_lt_args="$lt_config_lt_args --quiet"
2480 lt_config_lt_args="$lt_config_lt_args --quiet"1682exec AS_MESSAGE_LOG_FD>/dev/null
2481 exec AS_MESSAGE_LOG_FD>/dev/null1683$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
2482 $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false1684exec AS_MESSAGE_LOG_FD>>config.log
2483 exec AS_MESSAGE_LOG_FD>>config.log1685$lt_cl_success || AS_EXIT(1)
2484 $lt_cl_success || AS_EXIT(1)
2485fi
2486])# LT_OUTPUT1686])# LT_OUTPUT
24871687
24881688
@@ -2659,11 +1859,13 @@
2659AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])1859AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
2660AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])1860AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
2661AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])1861AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
1862AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
2662dnl aclocal-1.4 backwards compatibility:1863dnl aclocal-1.4 backwards compatibility:
2663dnl AC_DEFUN([AC_LIBTOOL_CXX], [])1864dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
2664dnl AC_DEFUN([AC_LIBTOOL_F77], [])1865dnl AC_DEFUN([AC_LIBTOOL_F77], [])
2665dnl AC_DEFUN([AC_LIBTOOL_FC], [])1866dnl AC_DEFUN([AC_LIBTOOL_FC], [])
2666dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])1867dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
1868dnl AC_DEFUN([AC_LIBTOOL_RC], [])
26671869
26681870
2669# _LT_TAG_COMPILER1871# _LT_TAG_COMPILER
@@ -2768,6 +1970,31 @@
2768 [lt_cv_ld_exported_symbols_list=no])1970 [lt_cv_ld_exported_symbols_list=no])
2769 LDFLAGS="$save_LDFLAGS"1971 LDFLAGS="$save_LDFLAGS"
2770 ])1972 ])
1973 AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
1974 [lt_cv_ld_force_load=no
1975 cat > conftest.c << _LT_EOF
1976int forced_loaded() { return 2;}
1977_LT_EOF
1978 echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
1979 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
1980 echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
1981 $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
1982 echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
1983 $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
1984 cat > conftest.c << _LT_EOF
1985int main() { return 0;}
1986_LT_EOF
1987 echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
1988 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
1989 _lt_result=$?
1990 if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
1991 lt_cv_ld_force_load=yes
1992 else
1993 cat conftest.err >&AS_MESSAGE_LOG_FD
1994 fi
1995 rm -f conftest.err libconftest.a conftest conftest.c
1996 rm -rf conftest.dSYM
1997 ])
2771 case $host_os in1998 case $host_os in
2772 rhapsody* | darwin1.[[012]])1999 rhapsody* | darwin1.[[012]])
2773 _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;2000 _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -2795,7 +2022,7 @@
2795 else2022 else
2796 _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'2023 _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
2797 fi2024 fi
2798 if test "$DSYMUTIL" != ":"; then2025 if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
2799 _lt_dsymutil='~$DSYMUTIL $lib || :'2026 _lt_dsymutil='~$DSYMUTIL $lib || :'
2800 else2027 else
2801 _lt_dsymutil=2028 _lt_dsymutil=
@@ -2815,7 +2042,11 @@
2815 _LT_TAGVAR(hardcode_direct, $1)=no2042 _LT_TAGVAR(hardcode_direct, $1)=no
2816 _LT_TAGVAR(hardcode_automatic, $1)=yes2043 _LT_TAGVAR(hardcode_automatic, $1)=yes
2817 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported2044 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
2818 _LT_TAGVAR(whole_archive_flag_spec, $1)=''2045 if test "$lt_cv_ld_force_load" = "yes"; then
2046 _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\"`'
2047 else
2048 _LT_TAGVAR(whole_archive_flag_spec, $1)=''
2049 fi
2819 _LT_TAGVAR(link_all_deplibs, $1)=yes2050 _LT_TAGVAR(link_all_deplibs, $1)=yes
2820 _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"2051 _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
2821 case $cc_basename in2052 case $cc_basename in
@@ -2823,7 +2054,7 @@
2823 *) _lt_dar_can_shared=$GCC ;;2054 *) _lt_dar_can_shared=$GCC ;;
2824 esac2055 esac
2825 if test "$_lt_dar_can_shared" = "yes"; then2056 if test "$_lt_dar_can_shared" = "yes"; then
2826 output_verbose_link_cmd=echo2057 output_verbose_link_cmd=func_echo_all
2827 _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}"2058 _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}"
2828 _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"2059 _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
2829 _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}"2060 _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}"
@@ -2869,170 +2100,65 @@
2869# _LT_SHELL_INIT(ARG)2100# _LT_SHELL_INIT(ARG)
2870# -------------------2101# -------------------
2871m4_define([_LT_SHELL_INIT],2102m4_define([_LT_SHELL_INIT],
2872[ifdef([AC_DIVERSION_NOTICE],2103[m4_divert_text([M4SH-INIT], [$1
2873 [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],2104])])# _LT_SHELL_INIT
2874 [AC_DIVERT_PUSH(NOTICE)])2105
2875$1
2876AC_DIVERT_POP
2877])# _LT_SHELL_INIT
28782106
28792107
2880# _LT_PROG_ECHO_BACKSLASH2108# _LT_PROG_ECHO_BACKSLASH
2881# -----------------------2109# -----------------------
2882# Add some code to the start of the generated configure script which2110# Find how we can fake an echo command that does not interpret backslash.
2883# will find an echo command which doesn't interpret backslashes.2111# In particular, with Autoconf 2.60 or later we add some code to the start
2112# of the generated configure script which will find a shell with a builtin
2113# printf (which we can use as an echo command).
2884m4_defun([_LT_PROG_ECHO_BACKSLASH],2114m4_defun([_LT_PROG_ECHO_BACKSLASH],
2885[_LT_SHELL_INIT([2115[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
2886# Check that we are running under the correct shell.2116ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
2887SHELL=${CONFIG_SHELL-/bin/sh}2117ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
28882118
2889case X$lt_ECHO in2119AC_MSG_CHECKING([how to print strings])
2890X*--fallback-echo)2120# Test print first, because it will be a builtin if present.
2891 # Remove one level of quotation (which was required for Make).2121if test "X`print -r -- -n 2>/dev/null`" = X-n && \
2892 ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`2122 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
2893 ;;2123 ECHO='print -r --'
2124elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
2125 ECHO='printf %s\n'
2126else
2127 # Use this function as a fallback that always works.
2128 func_fallback_echo ()
2129 {
2130 eval 'cat <<_LTECHO_EOF
2131$[]1
2132_LTECHO_EOF'
2133 }
2134 ECHO='func_fallback_echo'
2135fi
2136
2137# func_echo_all arg...
2138# Invoke $ECHO with all args, space-separated.
2139func_echo_all ()
2140{
2141 $ECHO "$*"
2142}
2143
2144case "$ECHO" in
2145 printf*) AC_MSG_RESULT([printf]) ;;
2146 print*) AC_MSG_RESULT([print -r]) ;;
2147 *) AC_MSG_RESULT([cat]) ;;
2894esac2148esac
28952149
2896ECHO=${lt_ECHO-echo}2150m4_ifdef([_AS_DETECT_SUGGESTED],
2897if test "X[$]1" = X--no-reexec; then2151[_AS_DETECT_SUGGESTED([
2898 # Discard the --no-reexec flag, and continue.2152 test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
2899 shift2153 ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
2900elif test "X[$]1" = X--fallback-echo; then2154 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
2901 # Avoid inline document here, it may be left over2155 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
2902 :2156 PATH=/empty FPATH=/empty; export PATH FPATH
2903elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then2157 test "X`printf %s $ECHO`" = "X$ECHO" \
2904 # Yippee, $ECHO works!2158 || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
2905 :2159
2906else
2907 # Restart under the correct shell.
2908 exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
2909fi
2910
2911if test "X[$]1" = X--fallback-echo; then
2912 # used as fallback echo
2913 shift
2914 cat <<_LT_EOF
2915[$]*
2916_LT_EOF
2917 exit 0
2918fi
2919
2920# The HP-UX ksh and POSIX shell print the target directory to stdout
2921# if CDPATH is set.
2922(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
2923
2924if test -z "$lt_ECHO"; then
2925 if test "X${echo_test_string+set}" != Xset; then
2926 # find a string as large as possible, as long as the shell can cope with it
2927 for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
2928 # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
2929 if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
2930 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
2931 then
2932 break
2933 fi
2934 done
2935 fi
2936
2937 if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
2938 echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
2939 test "X$echo_testing_string" = "X$echo_test_string"; then
2940 :
2941 else
2942 # The Solaris, AIX, and Digital Unix default echo programs unquote
2943 # backslashes. This makes it impossible to quote backslashes using
2944 # echo "$something" | sed 's/\\/\\\\/g'
2945 #
2946 # So, first we look for a working echo in the user's PATH.
2947
2948 lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
2949 for dir in $PATH /usr/ucb; do
2950 IFS="$lt_save_ifs"
2951 if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
2952 test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
2953 echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
2954 test "X$echo_testing_string" = "X$echo_test_string"; then
2955 ECHO="$dir/echo"
2956 break
2957 fi
2958 done
2959 IFS="$lt_save_ifs"
2960
2961 if test "X$ECHO" = Xecho; then
2962 # We didn't find a better echo, so look for alternatives.
2963 if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
2964 echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
2965 test "X$echo_testing_string" = "X$echo_test_string"; then
2966 # This shell has a builtin print -r that does the trick.
2967 ECHO='print -r'
2968 elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
2969 test "X$CONFIG_SHELL" != X/bin/ksh; then
2970 # If we have ksh, try running configure again with it.
2971 ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
2972 export ORIGINAL_CONFIG_SHELL
2973 CONFIG_SHELL=/bin/ksh
2974 export CONFIG_SHELL
2975 exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
2976 else
2977 # Try using printf.
2978 ECHO='printf %s\n'
2979 if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
2980 echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
2981 test "X$echo_testing_string" = "X$echo_test_string"; then
2982 # Cool, printf works
2983 :
2984 elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
2985 test "X$echo_testing_string" = 'X\t' &&
2986 echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
2987 test "X$echo_testing_string" = "X$echo_test_string"; then
2988 CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
2989 export CONFIG_SHELL
2990 SHELL="$CONFIG_SHELL"
2991 export SHELL
2992 ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
2993 elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
2994 test "X$echo_testing_string" = 'X\t' &&
2995 echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
2996 test "X$echo_testing_string" = "X$echo_test_string"; then
2997 ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
2998 else
2999 # maybe with a smaller string...
3000 prev=:
3001
3002 for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
3003 if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
3004 then
3005 break
3006 fi
3007 prev="$cmd"
3008 done
3009
3010 if test "$prev" != 'sed 50q "[$]0"'; then
3011 echo_test_string=`eval $prev`
3012 export echo_test_string
3013 exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
3014 else
3015 # Oops. We lost completely, so just stick with echo.
3016 ECHO=echo
3017 fi
3018 fi
3019 fi
3020 fi
3021 fi
3022fi
3023
3024# Copy echo and quote the copy suitably for passing to libtool from
3025# the Makefile, instead of quoting the original, which is used later.
3026lt_ECHO=$ECHO
3027if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
3028 lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
3029fi
3030
3031AC_SUBST(lt_ECHO)
3032])
3033_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])2160_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
3034_LT_DECL([], [ECHO], [1],2161_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
3035 [An echo program that does not interpret backslashes])
3036])# _LT_PROG_ECHO_BACKSLASH2162])# _LT_PROG_ECHO_BACKSLASH
30372163
30382164
@@ -3064,7 +2190,7 @@
3064 ;;2190 ;;
3065*-*-irix6*)2191*-*-irix6*)
3066 # Find out which ABI we are using.2192 # Find out which ABI we are using.
3067 echo '[#]line __oline__ "configure"' > conftest.$ac_ext2193 echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
3068 if AC_TRY_EVAL(ac_compile); then2194 if AC_TRY_EVAL(ac_compile); then
3069 if test "$lt_cv_prog_gnu_ld" = yes; then2195 if test "$lt_cv_prog_gnu_ld" = yes; then
3070 case `/usr/bin/file conftest.$ac_objext` in2196 case `/usr/bin/file conftest.$ac_objext` in
@@ -3216,10 +2342,19 @@
3216 esac2342 esac
3217 old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"2343 old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
3218fi2344fi
2345
2346case $host_os in
2347 darwin*)
2348 lock_old_archive_extraction=yes ;;
2349 *)
2350 lock_old_archive_extraction=no ;;
2351esac
3219_LT_DECL([], [old_postinstall_cmds], [2])2352_LT_DECL([], [old_postinstall_cmds], [2])
3220_LT_DECL([], [old_postuninstall_cmds], [2])2353_LT_DECL([], [old_postuninstall_cmds], [2])
3221_LT_TAGDECL([], [old_archive_cmds], [2],2354_LT_TAGDECL([], [old_archive_cmds], [2],
3222 [Commands used to build an old-style archive])2355 [Commands used to build an old-style archive])
2356_LT_DECL([], [lock_old_archive_extraction], [0],
2357 [Whether to use a lock for old archive extraction])
3223])# _LT_CMD_OLD_ARCHIVE2358])# _LT_CMD_OLD_ARCHIVE
32242359
32252360
@@ -3244,15 +2379,15 @@
3244 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \2379 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
3245 -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \2380 -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
3246 -e 's:$: $lt_compiler_flag:'`2381 -e 's:$: $lt_compiler_flag:'`
3247 (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)2382 (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
3248 (eval "$lt_compile" 2>conftest.err)2383 (eval "$lt_compile" 2>conftest.err)
3249 ac_status=$?2384 ac_status=$?
3250 cat conftest.err >&AS_MESSAGE_LOG_FD2385 cat conftest.err >&AS_MESSAGE_LOG_FD
3251 echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD2386 echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
3252 if (exit $ac_status) && test -s "$ac_outfile"; then2387 if (exit $ac_status) && test -s "$ac_outfile"; then
3253 # The compiler can only warn and ignore the option if not recognized2388 # The compiler can only warn and ignore the option if not recognized
3254 # So say no if there are warnings other than the usual output.2389 # So say no if there are warnings other than the usual output.
3255 $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp2390 $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
3256 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er22391 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
3257 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then2392 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
3258 $2=yes2393 $2=yes
@@ -3292,7 +2427,7 @@
3292 if test -s conftest.err; then2427 if test -s conftest.err; then
3293 # Append any errors to the config.log.2428 # Append any errors to the config.log.
3294 cat conftest.err 1>&AS_MESSAGE_LOG_FD2429 cat conftest.err 1>&AS_MESSAGE_LOG_FD
3295 $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp2430 $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
3296 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er22431 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
3297 if diff conftest.exp conftest.er2 >/dev/null; then2432 if diff conftest.exp conftest.er2 >/dev/null; then
3298 $2=yes2433 $2=yes
@@ -3355,6 +2490,11 @@
3355 lt_cv_sys_max_cmd_len=8192;2490 lt_cv_sys_max_cmd_len=8192;
3356 ;;2491 ;;
33572492
2493 mint*)
2494 # On MiNT this can take a long time and run out of memory.
2495 lt_cv_sys_max_cmd_len=8192;
2496 ;;
2497
3358 amigaos*)2498 amigaos*)
3359 # On AmigaOS with pdksh, this test takes hours, literally.2499 # On AmigaOS with pdksh, this test takes hours, literally.
3360 # So we just punt and use a minimum line length of 8192.2500 # So we just punt and use a minimum line length of 8192.
@@ -3419,8 +2559,8 @@
3419 # If test is not a shell built-in, we'll probably end up computing a2559 # If test is not a shell built-in, we'll probably end up computing a
3420 # maximum length that is only half of the actual maximum length, but2560 # maximum length that is only half of the actual maximum length, but
3421 # we can't tell.2561 # we can't tell.
3422 while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \2562 while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
3423 = "XX$teststring$teststring"; } >/dev/null 2>&1 &&2563 = "X$teststring$teststring"; } >/dev/null 2>&1 &&
3424 test $i != 17 # 1/2 MB should be enough2564 test $i != 17 # 1/2 MB should be enough
3425 do2565 do
3426 i=`expr $i + 1`2566 i=`expr $i + 1`
@@ -3471,7 +2611,7 @@
3471 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=22611 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
3472 lt_status=$lt_dlunknown2612 lt_status=$lt_dlunknown
3473 cat > conftest.$ac_ext <<_LT_EOF2613 cat > conftest.$ac_ext <<_LT_EOF
3474[#line __oline__ "configure"2614[#line $LINENO "configure"
3475#include "confdefs.h"2615#include "confdefs.h"
34762616
3477#if HAVE_DLFCN_H2617#if HAVE_DLFCN_H
@@ -3512,7 +2652,13 @@
3512# endif2652# endif
3513#endif2653#endif
35142654
3515void fnord() { int i=42;}2655/* When -fvisbility=hidden is used, assume the code has been annotated
2656 correspondingly for the symbols needed. */
2657#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
2658void fnord () __attribute__((visibility("default")));
2659#endif
2660
2661void fnord () { int i=42; }
3516int main ()2662int main ()
3517{2663{
3518 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);2664 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -3521,7 +2667,11 @@
3521 if (self)2667 if (self)
3522 {2668 {
3523 if (dlsym (self,"fnord")) status = $lt_dlno_uscore;2669 if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
3524 else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;2670 else
2671 {
2672 if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
2673 else puts (dlerror ());
2674 }
3525 /* dlclose (self); */2675 /* dlclose (self); */
3526 }2676 }
3527 else2677 else
@@ -3697,16 +2847,16 @@
3697 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \2847 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
3698 -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \2848 -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
3699 -e 's:$: $lt_compiler_flag:'`2849 -e 's:$: $lt_compiler_flag:'`
3700 (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)2850 (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
3701 (eval "$lt_compile" 2>out/conftest.err)2851 (eval "$lt_compile" 2>out/conftest.err)
3702 ac_status=$?2852 ac_status=$?
3703 cat out/conftest.err >&AS_MESSAGE_LOG_FD2853 cat out/conftest.err >&AS_MESSAGE_LOG_FD
3704 echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD2854 echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
3705 if (exit $ac_status) && test -s out/conftest2.$ac_objext2855 if (exit $ac_status) && test -s out/conftest2.$ac_objext
3706 then2856 then
3707 # The compiler can only warn and ignore the option if not recognized2857 # The compiler can only warn and ignore the option if not recognized
3708 # So say no if there are warnings2858 # So say no if there are warnings
3709 $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp2859 $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
3710 $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er22860 $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
3711 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then2861 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
3712 _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes2862 _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
@@ -3865,6 +3015,7 @@
3865m4_require([_LT_FILEUTILS_DEFAULTS])dnl3015m4_require([_LT_FILEUTILS_DEFAULTS])dnl
3866m4_require([_LT_DECL_OBJDUMP])dnl3016m4_require([_LT_DECL_OBJDUMP])dnl
3867m4_require([_LT_DECL_SED])dnl3017m4_require([_LT_DECL_SED])dnl
3018m4_require([_LT_CHECK_SHELL_FEATURES])dnl
3868AC_MSG_CHECKING([dynamic linker characteristics])3019AC_MSG_CHECKING([dynamic linker characteristics])
3869m4_if([$1],3020m4_if([$1],
3870 [], [3021 [], [
@@ -3873,16 +3024,23 @@
3873 darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;3024 darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
3874 *) lt_awk_arg="/^libraries:/" ;;3025 *) lt_awk_arg="/^libraries:/" ;;
3875 esac3026 esac
3876 lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`3027 case $host_os in
3877 if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then3028 mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
3029 *) lt_sed_strip_eq="s,=/,/,g" ;;
3030 esac
3031 lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
3032 case $lt_search_path_spec in
3033 *\;*)
3878 # if the path contains ";" then we assume it to be the separator3034 # if the path contains ";" then we assume it to be the separator
3879 # otherwise default to the standard path separator (i.e. ":") - it is3035 # otherwise default to the standard path separator (i.e. ":") - it is
3880 # assumed that no part of a normal pathname contains ";" but that should3036 # assumed that no part of a normal pathname contains ";" but that should
3881 # okay in the real world where ";" in dirpaths is itself problematic.3037 # okay in the real world where ";" in dirpaths is itself problematic.
3882 lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`3038 lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
3883 else3039 ;;
3884 lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`3040 *)
3885 fi3041 lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
3042 ;;
3043 esac
3886 # Ok, now we have the path, separated by spaces, we can step through it3044 # Ok, now we have the path, separated by spaces, we can step through it
3887 # and add multilib dir if necessary.3045 # and add multilib dir if necessary.
3888 lt_tmp_lt_search_path_spec=3046 lt_tmp_lt_search_path_spec=
@@ -3895,7 +3053,7 @@
3895 lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"3053 lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
3896 fi3054 fi
3897 done3055 done
3898 lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '3056 lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
3899BEGIN {RS=" "; FS="/|\n";} {3057BEGIN {RS=" "; FS="/|\n";} {
3900 lt_foo="";3058 lt_foo="";
3901 lt_count=0;3059 lt_count=0;
@@ -3915,7 +3073,13 @@
3915 if (lt_foo != "") { lt_freq[[lt_foo]]++; }3073 if (lt_foo != "") { lt_freq[[lt_foo]]++; }
3916 if (lt_freq[[lt_foo]] == 1) { print lt_foo; }3074 if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
3917}'`3075}'`
3918 sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`3076 # AWK program above erroneously prepends '/' to C:/dos/paths
3077 # for these hosts.
3078 case $host_os in
3079 mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
3080 $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
3081 esac
3082 sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
3919else3083else
3920 sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"3084 sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
3921fi])3085fi])
@@ -4003,7 +3167,7 @@
4003 m68k)3167 m68k)
4004 library_names_spec='$libname.ixlibrary $libname.a'3168 library_names_spec='$libname.ixlibrary $libname.a'
4005 # Create ${libname}_ixlibrary.a entries in /sys/libs.3169 # Create ${libname}_ixlibrary.a entries in /sys/libs.
4006 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'3170 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'
4007 ;;3171 ;;
4008 esac3172 esac
4009 ;;3173 ;;
@@ -4056,23 +3220,12 @@
4056 cygwin*)3220 cygwin*)
4057 # Cygwin DLLs use 'cyg' prefix rather than 'lib'3221 # Cygwin DLLs use 'cyg' prefix rather than 'lib'
4058 soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'3222 soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
4059 sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"3223m4_if([$1], [],[
3224 sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
4060 ;;3225 ;;
4061 mingw* | cegcc*)3226 mingw* | cegcc*)
4062 # MinGW DLLs use traditional 'lib' prefix3227 # MinGW DLLs use traditional 'lib' prefix
4063 soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'3228 soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
4064 sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
4065 if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
4066 # It is most probably a Windows format PATH printed by
4067 # mingw gcc, but we are running on Cygwin. Gcc prints its search
4068 # path with ; separators, and with drive letters. We can handle the
4069 # drive letters (cygwin fileutils understands them), so leave them,
4070 # especially as we might pass files found there to a mingw objdump,
4071 # which wouldn't understand a cygwinified path. Ahh.
4072 sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
4073 else
4074 sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
4075 fi
4076 ;;3229 ;;
4077 pw32*)3230 pw32*)
4078 # pw32 DLLs use 'pw' prefix rather than 'lib'3231 # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -4172,6 +3325,19 @@
4172 hardcode_into_libs=yes3325 hardcode_into_libs=yes
4173 ;;3326 ;;
41743327
3328haiku*)
3329 version_type=linux
3330 need_lib_prefix=no
3331 need_version=no
3332 dynamic_linker="$host_os runtime_loader"
3333 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
3334 soname_spec='${libname}${release}${shared_ext}$major'
3335 shlibpath_var=LIBRARY_PATH
3336 shlibpath_overrides_runpath=yes
3337 sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
3338 hardcode_into_libs=yes
3339 ;;
3340
4175hpux9* | hpux10* | hpux11*)3341hpux9* | hpux10* | hpux11*)
4176 # Give a soname corresponding to the major version so that dld.sl refuses to3342 # Give a soname corresponding to the major version so that dld.sl refuses to
4177 # link against other versions.3343 # link against other versions.
@@ -4214,8 +3380,10 @@
4214 soname_spec='${libname}${release}${shared_ext}$major'3380 soname_spec='${libname}${release}${shared_ext}$major'
4215 ;;3381 ;;
4216 esac3382 esac
4217 # HP-UX runs *really* slowly unless shared libraries are mode 555.3383 # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
4218 postinstall_cmds='chmod 555 $lib'3384 postinstall_cmds='chmod 555 $lib'
3385 # or fails outright, so override atomically:
3386 install_override_mode=555
4219 ;;3387 ;;
42203388
4221interix[[3-9]]*)3389interix[[3-9]]*)
@@ -4273,7 +3441,7 @@
4273 ;;3441 ;;
42743442
4275# This must be Linux ELF.3443# This must be Linux ELF.
4276linux* | k*bsd*-gnu)3444linux* | k*bsd*-gnu | kopensolaris*-gnu)
4277 version_type=linux3445 version_type=linux
4278 need_lib_prefix=no3446 need_lib_prefix=no
4279 need_version=no3447 need_version=no
@@ -4282,26 +3450,35 @@
4282 finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'3450 finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
4283 shlibpath_var=LD_LIBRARY_PATH3451 shlibpath_var=LD_LIBRARY_PATH
4284 shlibpath_overrides_runpath=no3452 shlibpath_overrides_runpath=no
3453
4285 # Some binutils ld are patched to set DT_RUNPATH3454 # Some binutils ld are patched to set DT_RUNPATH
4286 save_LDFLAGS=$LDFLAGS3455 AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
4287 save_libdir=$libdir3456 [lt_cv_shlibpath_overrides_runpath=no
4288 eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \3457 save_LDFLAGS=$LDFLAGS
4289 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""3458 save_libdir=$libdir
4290 AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],3459 eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
4291 [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],3460 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
4292 [shlibpath_overrides_runpath=yes])])3461 AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
4293 LDFLAGS=$save_LDFLAGS3462 [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
4294 libdir=$save_libdir3463 [lt_cv_shlibpath_overrides_runpath=yes])])
3464 LDFLAGS=$save_LDFLAGS
3465 libdir=$save_libdir
3466 ])
3467 shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
42953468
4296 # This implies no fast_install, which is unacceptable.3469 # This implies no fast_install, which is unacceptable.
4297 # Some rework will be needed to allow for fast_install3470 # Some rework will be needed to allow for fast_install
4298 # before this can be enabled.3471 # before this can be enabled.
4299 hardcode_into_libs=yes3472 hardcode_into_libs=yes
43003473
3474 # Add ABI-specific directories to the system library path.
3475 sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
3476
4301 # Append ld.so.conf contents to the search path3477 # Append ld.so.conf contents to the search path
4302 if test -f /etc/ld.so.conf; then3478 if test -f /etc/ld.so.conf; then
4303 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' ' '`3479 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' ' '`
4304 sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"3480 sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
3481
4305 fi3482 fi
43063483
4307 # We used to test for /lib/ld.so.1 and disable shared libraries on3484 # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -4533,6 +3710,8 @@
4533 The last name is the one that the linker finds with -lNAME]])3710 The last name is the one that the linker finds with -lNAME]])
4534_LT_DECL([], [soname_spec], [1],3711_LT_DECL([], [soname_spec], [1],
4535 [[The coded name of the library, if different from the real name]])3712 [[The coded name of the library, if different from the real name]])
3713_LT_DECL([], [install_override_mode], [1],
3714 [Permission mode override for installation of shared libraries])
4536_LT_DECL([], [postinstall_cmds], [2],3715_LT_DECL([], [postinstall_cmds], [2],
4537 [Command to use after installation of a shared archive])3716 [Command to use after installation of a shared archive])
4538_LT_DECL([], [postuninstall_cmds], [2],3717_LT_DECL([], [postuninstall_cmds], [2],
@@ -4645,6 +3824,7 @@
4645AC_REQUIRE([AC_CANONICAL_BUILD])dnl3824AC_REQUIRE([AC_CANONICAL_BUILD])dnl
4646m4_require([_LT_DECL_SED])dnl3825m4_require([_LT_DECL_SED])dnl
4647m4_require([_LT_DECL_EGREP])dnl3826m4_require([_LT_DECL_EGREP])dnl
3827m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
46483828
4649AC_ARG_WITH([gnu-ld],3829AC_ARG_WITH([gnu-ld],
4650 [AS_HELP_STRING([--with-gnu-ld],3830 [AS_HELP_STRING([--with-gnu-ld],
@@ -4774,8 +3954,8 @@
4774 fi3954 fi
4775 ;;3955 ;;
4776esac3956esac
4777_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl3957_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
4778_LT_DECL([], [reload_cmds], [2])dnl3958_LT_TAGDECL([], [reload_cmds], [2])dnl
4779])# _LT_CMD_RELOAD3959])# _LT_CMD_RELOAD
47803960
47813961
@@ -4827,16 +4007,18 @@
4827 # Base MSYS/MinGW do not provide the 'file' command needed by4007 # Base MSYS/MinGW do not provide the 'file' command needed by
4828 # func_win32_libid shell function, so use a weaker test based on 'objdump',4008 # func_win32_libid shell function, so use a weaker test based on 'objdump',
4829 # unless we find 'file', for example because we are cross-compiling.4009 # unless we find 'file', for example because we are cross-compiling.
4830 if ( file / ) >/dev/null 2>&1; then4010 # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
4011 if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
4831 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'4012 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
4832 lt_cv_file_magic_cmd='func_win32_libid'4013 lt_cv_file_magic_cmd='func_win32_libid'
4833 else4014 else
4834 lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'4015 # Keep this pattern in sync with the one in func_win32_libid.
4016 lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
4835 lt_cv_file_magic_cmd='$OBJDUMP -f'4017 lt_cv_file_magic_cmd='$OBJDUMP -f'
4836 fi4018 fi
4837 ;;4019 ;;
48384020
4839cegcc)4021cegcc*)
4840 # use the weaker test based on 'objdump'. See mingw*.4022 # use the weaker test based on 'objdump'. See mingw*.
4841 lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'4023 lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
4842 lt_cv_file_magic_cmd='$OBJDUMP -f'4024 lt_cv_file_magic_cmd='$OBJDUMP -f'
@@ -4866,6 +4048,10 @@
4866 lt_cv_deplibs_check_method=pass_all4048 lt_cv_deplibs_check_method=pass_all
4867 ;;4049 ;;
48684050
4051haiku*)
4052 lt_cv_deplibs_check_method=pass_all
4053 ;;
4054
4869hpux10.20* | hpux11*)4055hpux10.20* | hpux11*)
4870 lt_cv_file_magic_cmd=/usr/bin/file4056 lt_cv_file_magic_cmd=/usr/bin/file
4871 case $host_cpu in4057 case $host_cpu in
@@ -4874,11 +4060,11 @@
4874 lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so4060 lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
4875 ;;4061 ;;
4876 hppa*64*)4062 hppa*64*)
4877 [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]']4063 [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]']
4878 lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl4064 lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
4879 ;;4065 ;;
4880 *)4066 *)
4881 lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'4067 lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
4882 lt_cv_file_magic_test_file=/usr/lib/libc.sl4068 lt_cv_file_magic_test_file=/usr/lib/libc.sl
4883 ;;4069 ;;
4884 esac4070 esac
@@ -4900,7 +4086,7 @@
4900 ;;4086 ;;
49014087
4902# This must be Linux ELF.4088# This must be Linux ELF.
4903linux* | k*bsd*-gnu)4089linux* | k*bsd*-gnu | kopensolaris*-gnu)
4904 lt_cv_deplibs_check_method=pass_all4090 lt_cv_deplibs_check_method=pass_all
4905 ;;4091 ;;
49064092
@@ -5042,7 +4228,19 @@
5042 NM="$lt_cv_path_NM"4228 NM="$lt_cv_path_NM"
5043else4229else
5044 # Didn't find any BSD compatible name lister, look for dumpbin.4230 # Didn't find any BSD compatible name lister, look for dumpbin.
5045 AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)4231 if test -n "$DUMPBIN"; then :
4232 # Let the user override the test.
4233 else
4234 AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
4235 case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
4236 *COFF*)
4237 DUMPBIN="$DUMPBIN -symbols"
4238 ;;
4239 *)
4240 DUMPBIN=:
4241 ;;
4242 esac
4243 fi
5046 AC_SUBST([DUMPBIN])4244 AC_SUBST([DUMPBIN])
5047 if test "$DUMPBIN" != ":"; then4245 if test "$DUMPBIN" != ":"; then
5048 NM="$DUMPBIN"4246 NM="$DUMPBIN"
@@ -5055,13 +4253,13 @@
5055AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],4253AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
5056 [lt_cv_nm_interface="BSD nm"4254 [lt_cv_nm_interface="BSD nm"
5057 echo "int some_variable = 0;" > conftest.$ac_ext4255 echo "int some_variable = 0;" > conftest.$ac_ext
5058 (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)4256 (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
5059 (eval "$ac_compile" 2>conftest.err)4257 (eval "$ac_compile" 2>conftest.err)
5060 cat conftest.err >&AS_MESSAGE_LOG_FD4258 cat conftest.err >&AS_MESSAGE_LOG_FD
5061 (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)4259 (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
5062 (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)4260 (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
5063 cat conftest.err >&AS_MESSAGE_LOG_FD4261 cat conftest.err >&AS_MESSAGE_LOG_FD
5064 (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)4262 (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
5065 cat conftest.out >&AS_MESSAGE_LOG_FD4263 cat conftest.out >&AS_MESSAGE_LOG_FD
5066 if $GREP 'External.*some_variable' conftest.out > /dev/null; then4264 if $GREP 'External.*some_variable' conftest.out > /dev/null; then
5067 lt_cv_nm_interface="MS dumpbin"4265 lt_cv_nm_interface="MS dumpbin"
@@ -5084,7 +4282,7 @@
5084[AC_REQUIRE([AC_CANONICAL_HOST])dnl4282[AC_REQUIRE([AC_CANONICAL_HOST])dnl
5085LIBM=4283LIBM=
5086case $host in4284case $host in
5087*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)4285*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
5088 # These system don't have libm, or don't need it4286 # These system don't have libm, or don't need it
5089 ;;4287 ;;
5090*-ncr-sysv4.3*)4288*-ncr-sysv4.3*)
@@ -5112,7 +4310,12 @@
5112_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=4310_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
51134311
5114if test "$GCC" = yes; then4312if test "$GCC" = yes; then
5115 _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'4313 case $cc_basename in
4314 nvcc*)
4315 _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
4316 *)
4317 _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
4318 esac
51164319
5117 _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],4320 _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
5118 lt_cv_prog_compiler_rtti_exceptions,4321 lt_cv_prog_compiler_rtti_exceptions,
@@ -5129,6 +4332,7 @@
5129m4_defun([_LT_CMD_GLOBAL_SYMBOLS],4332m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
5130[AC_REQUIRE([AC_CANONICAL_HOST])dnl4333[AC_REQUIRE([AC_CANONICAL_HOST])dnl
5131AC_REQUIRE([AC_PROG_CC])dnl4334AC_REQUIRE([AC_PROG_CC])dnl
4335AC_REQUIRE([AC_PROG_AWK])dnl
5132AC_REQUIRE([LT_PATH_NM])dnl4336AC_REQUIRE([LT_PATH_NM])dnl
5133AC_REQUIRE([LT_PATH_LD])dnl4337AC_REQUIRE([LT_PATH_LD])dnl
5134m4_require([_LT_DECL_SED])dnl4338m4_require([_LT_DECL_SED])dnl
@@ -5254,7 +4458,7 @@
5254 if AC_TRY_EVAL(ac_compile); then4458 if AC_TRY_EVAL(ac_compile); then
5255 # Now try to grab the symbols.4459 # Now try to grab the symbols.
5256 nlist=conftest.nm4460 nlist=conftest.nm
5257 if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then4461 if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
5258 # Try sorting and uniquifying the output.4462 # Try sorting and uniquifying the output.
5259 if sort "$nlist" | uniq > "$nlist"T; then4463 if sort "$nlist" | uniq > "$nlist"T; then
5260 mv -f "$nlist"T "$nlist"4464 mv -f "$nlist"T "$nlist"
@@ -5416,6 +4620,11 @@
5416 # DJGPP does not support shared libraries at all4620 # DJGPP does not support shared libraries at all
5417 _LT_TAGVAR(lt_prog_compiler_pic, $1)=4621 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
5418 ;;4622 ;;
4623 haiku*)
4624 # PIC is the default for Haiku.
4625 # The "-static" flag exists, but is broken.
4626 _LT_TAGVAR(lt_prog_compiler_static, $1)=
4627 ;;
5419 interix[[3-9]]*)4628 interix[[3-9]]*)
5420 # Interix 3.x gcc -fpic/-fPIC options generate broken code.4629 # Interix 3.x gcc -fpic/-fPIC options generate broken code.
5421 # Instead, we relocate shared libraries at runtime.4630 # Instead, we relocate shared libraries at runtime.
@@ -5521,7 +4730,7 @@
5521 ;;4730 ;;
5522 esac4731 esac
5523 ;;4732 ;;
5524 linux* | k*bsd*-gnu)4733 linux* | k*bsd*-gnu | kopensolaris*-gnu)
5525 case $cc_basename in4734 case $cc_basename in
5526 KCC*)4735 KCC*)
5527 # KAI C++ Compiler4736 # KAI C++ Compiler
@@ -5554,8 +4763,8 @@
5554 _LT_TAGVAR(lt_prog_compiler_pic, $1)=4763 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
5555 _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'4764 _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
5556 ;;4765 ;;
5557 xlc* | xlC*)4766 xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
5558 # IBM XL 8.0 on PPC4767 # IBM XL 8.0, 9.0 on PPC and BlueGene
5559 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'4768 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
5560 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'4769 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
5561 _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'4770 _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
@@ -5617,7 +4826,7 @@
5617 ;;4826 ;;
5618 solaris*)4827 solaris*)
5619 case $cc_basename in4828 case $cc_basename in
5620 CC*)4829 CC* | sunCC*)
5621 # Sun C++ 4.2, 5.x and Centerline C++4830 # Sun C++ 4.2, 5.x and Centerline C++
5622 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'4831 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
5623 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'4832 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -5721,6 +4930,12 @@
5721 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'4930 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
5722 ;;4931 ;;
57234932
4933 haiku*)
4934 # PIC is the default for Haiku.
4935 # The "-static" flag exists, but is broken.
4936 _LT_TAGVAR(lt_prog_compiler_static, $1)=
4937 ;;
4938
5724 hpux*)4939 hpux*)
5725 # PIC is the default for 64-bit PA HP-UX, but not for 32-bit4940 # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
5726 # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag4941 # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
@@ -5763,6 +4978,13 @@
5763 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'4978 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
5764 ;;4979 ;;
5765 esac4980 esac
4981
4982 case $cc_basename in
4983 nvcc*) # Cuda Compiler Driver 2.2
4984 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
4985 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
4986 ;;
4987 esac
5766 else4988 else
5767 # PORTME Check for flag to pass linker flags through the system compiler.4989 # PORTME Check for flag to pass linker flags through the system compiler.
5768 case $host_os in4990 case $host_os in
@@ -5805,7 +5027,7 @@
5805 _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'5027 _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
5806 ;;5028 ;;
58075029
5808 linux* | k*bsd*-gnu)5030 linux* | k*bsd*-gnu | kopensolaris*-gnu)
5809 case $cc_basename in5031 case $cc_basename in
5810 # old Intel for x86_64 which still supported -KPIC.5032 # old Intel for x86_64 which still supported -KPIC.
5811 ecc*)5033 ecc*)
@@ -5826,7 +5048,7 @@
5826 _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'5048 _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
5827 _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'5049 _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
5828 ;;5050 ;;
5829 pgcc* | pgf77* | pgf90* | pgf95*)5051 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
5830 # Portland Group compilers (*not* the Pentium gcc compiler,5052 # Portland Group compilers (*not* the Pentium gcc compiler,
5831 # which looks to be a dead project)5053 # which looks to be a dead project)
5832 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'5054 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -5838,26 +5060,26 @@
5838 # All Alpha code is PIC.5060 # All Alpha code is PIC.
5839 _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'5061 _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
5840 ;;5062 ;;
5841 xl*)5063 xl* | bgxl* | bgf* | mpixl*)
5842 # IBM XL C 8.0/Fortran 10.1 on PPC5064 # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
5843 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'5065 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
5844 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'5066 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
5845 _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'5067 _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
5846 ;;5068 ;;
5847 *)5069 *)
5848 case `$CC -V 2>&1 | sed 5q` in5070 case `$CC -V 2>&1 | sed 5q` in
5071 *Sun\ F* | *Sun*Fortran*)
5072 # Sun Fortran 8.3 passes all unrecognized flags to the linker
5073 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
5074 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
5075 _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
5076 ;;
5849 *Sun\ C*)5077 *Sun\ C*)
5850 # Sun C 5.95078 # Sun C 5.9
5851 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'5079 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
5852 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'5080 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
5853 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'5081 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
5854 ;;5082 ;;
5855 *Sun\ F*)
5856 # Sun Fortran 8.3 passes all unrecognized flags to the linker
5857 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
5858 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
5859 _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
5860 ;;
5861 esac5083 esac
5862 ;;5084 ;;
5863 esac5085 esac
@@ -5888,7 +5110,7 @@
5888 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'5110 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
5889 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'5111 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
5890 case $cc_basename in5112 case $cc_basename in
5891 f77* | f90* | f95*)5113 f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
5892 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;5114 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
5893 *)5115 *)
5894 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;5116 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
@@ -5998,8 +5220,10 @@
5998 aix[[4-9]]*)5220 aix[[4-9]]*)
5999 # If we're using GNU nm, then we don't want the "-C" option.5221 # If we're using GNU nm, then we don't want the "-C" option.
6000 # -C means demangle to AIX nm, but means don't demangle with GNU nm5222 # -C means demangle to AIX nm, but means don't demangle with GNU nm
5223 # Also, AIX nm treats weak defined symbols like other global defined
5224 # symbols, whereas GNU nm marks them as "W".
6001 if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then5225 if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
6002 _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'5226 _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'
6003 else5227 else
6004 _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'5228 _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'
6005 fi5229 fi
@@ -6077,7 +5301,33 @@
6077 esac5301 esac
60785302
6079 _LT_TAGVAR(ld_shlibs, $1)=yes5303 _LT_TAGVAR(ld_shlibs, $1)=yes
5304
5305 # On some targets, GNU ld is compatible enough with the native linker
5306 # that we're better off using the native interface for both.
5307 lt_use_gnu_ld_interface=no
6080 if test "$with_gnu_ld" = yes; then5308 if test "$with_gnu_ld" = yes; then
5309 case $host_os in
5310 aix*)
5311 # The AIX port of GNU ld has always aspired to compatibility
5312 # with the native linker. However, as the warning in the GNU ld
5313 # block says, versions before 2.19.5* couldn't really create working
5314 # shared libraries, regardless of the interface used.
5315 case `$LD -v 2>&1` in
5316 *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
5317 *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
5318 *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
5319 *)
5320 lt_use_gnu_ld_interface=yes
5321 ;;
5322 esac
5323 ;;
5324 *)
5325 lt_use_gnu_ld_interface=yes
5326 ;;
5327 esac
5328 fi
5329
5330 if test "$lt_use_gnu_ld_interface" = yes; then
6081 # If archive_cmds runs LD, not CC, wlarc should be empty5331 # If archive_cmds runs LD, not CC, wlarc should be empty
6082 wlarc='${wl}'5332 wlarc='${wl}'
60835333
@@ -6095,6 +5345,7 @@
6095 fi5345 fi
6096 supports_anon_versioning=no5346 supports_anon_versioning=no
6097 case `$LD -v 2>&1` in5347 case `$LD -v 2>&1` in
5348 *GNU\ gold*) supports_anon_versioning=yes ;;
6098 *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.115349 *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
6099 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...5350 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
6100 *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...5351 *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -6110,11 +5361,12 @@
6110 _LT_TAGVAR(ld_shlibs, $1)=no5361 _LT_TAGVAR(ld_shlibs, $1)=no
6111 cat <<_LT_EOF 1>&25362 cat <<_LT_EOF 1>&2
61125363
6113*** Warning: the GNU linker, at least up to release 2.9.1, is reported5364*** Warning: the GNU linker, at least up to release 2.19, is reported
6114*** to be unable to reliably create shared libraries on AIX.5365*** to be unable to reliably create shared libraries on AIX.
6115*** Therefore, libtool is disabling shared libraries support. If you5366*** Therefore, libtool is disabling shared libraries support. If you
6116*** really care for shared libraries, you may want to modify your PATH5367*** really care for shared libraries, you may want to install binutils
6117*** so that a non-GNU linker is found, and then restart.5368*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
5369*** You will then need to restart the configuration process.
61185370
6119_LT_EOF5371_LT_EOF
6120 fi5372 fi
@@ -6150,6 +5402,7 @@
6150 # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,5402 # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
6151 # as there is no search path for DLLs.5403 # as there is no search path for DLLs.
6152 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'5404 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
5405 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
6153 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported5406 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
6154 _LT_TAGVAR(always_export_symbols, $1)=no5407 _LT_TAGVAR(always_export_symbols, $1)=no
6155 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes5408 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -6171,6 +5424,11 @@
6171 fi5424 fi
6172 ;;5425 ;;
61735426
5427 haiku*)
5428 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
5429 _LT_TAGVAR(link_all_deplibs, $1)=yes
5430 ;;
5431
6174 interix[[3-9]]*)5432 interix[[3-9]]*)
6175 _LT_TAGVAR(hardcode_direct, $1)=no5433 _LT_TAGVAR(hardcode_direct, $1)=no
6176 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no5434 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -6186,7 +5444,7 @@
6186 _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'5444 _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'
6187 ;;5445 ;;
61885446
6189 gnu* | linux* | tpf* | k*bsd*-gnu)5447 gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
6190 tmp_diet=no5448 tmp_diet=no
6191 if test "$host_os" = linux-dietlibc; then5449 if test "$host_os" = linux-dietlibc; then
6192 case $cc_basename in5450 case $cc_basename in
@@ -6200,11 +5458,12 @@
6200 tmp_sharedflag='-shared'5458 tmp_sharedflag='-shared'
6201 case $cc_basename,$host_cpu in5459 case $cc_basename,$host_cpu in
6202 pgcc*) # Portland Group C compiler5460 pgcc*) # Portland Group C compiler
6203 _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'5461 _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'
6204 tmp_addflag=' $pic_flag'5462 tmp_addflag=' $pic_flag'
6205 ;;5463 ;;
6206 pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers5464 pgf77* | pgf90* | pgf95* | pgfortran*)
6207 _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'5465 # Portland Group f77 and f90 compilers
5466 _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'
6208 tmp_addflag=' $pic_flag -Mnomain' ;;5467 tmp_addflag=' $pic_flag -Mnomain' ;;
6209 ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia645468 ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
6210 tmp_addflag=' -i_dynamic' ;;5469 tmp_addflag=' -i_dynamic' ;;
@@ -6215,13 +5474,17 @@
6215 lf95*) # Lahey Fortran 8.15474 lf95*) # Lahey Fortran 8.1
6216 _LT_TAGVAR(whole_archive_flag_spec, $1)=5475 _LT_TAGVAR(whole_archive_flag_spec, $1)=
6217 tmp_sharedflag='--shared' ;;5476 tmp_sharedflag='--shared' ;;
6218 xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)5477 xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
6219 tmp_sharedflag='-qmkshrobj'5478 tmp_sharedflag='-qmkshrobj'
6220 tmp_addflag= ;;5479 tmp_addflag= ;;
5480 nvcc*) # Cuda Compiler Driver 2.2
5481 _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'
5482 _LT_TAGVAR(compiler_needs_object, $1)=yes
5483 ;;
6221 esac5484 esac
6222 case `$CC -V 2>&1 | sed 5q` in5485 case `$CC -V 2>&1 | sed 5q` in
6223 *Sun\ C*) # Sun C 5.95486 *Sun\ C*) # Sun C 5.9
6224 _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'5487 _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'
6225 _LT_TAGVAR(compiler_needs_object, $1)=yes5488 _LT_TAGVAR(compiler_needs_object, $1)=yes
6226 tmp_sharedflag='-G' ;;5489 tmp_sharedflag='-G' ;;
6227 *Sun\ F*) # Sun Fortran 8.35490 *Sun\ F*) # Sun Fortran 8.3
@@ -6237,17 +5500,17 @@
6237 fi5500 fi
62385501
6239 case $cc_basename in5502 case $cc_basename in
6240 xlf*)5503 xlf* | bgf* | bgxlf* | mpixlf*)
6241 # IBM XL Fortran 10.1 on PPC cannot create shared libs itself5504 # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
6242 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'5505 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
6243 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=5506 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
6244 _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'5507 _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
6245 _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'5508 _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
6246 if test "x$supports_anon_versioning" = xyes; then5509 if test "x$supports_anon_versioning" = xyes; then
6247 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~5510 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
6248 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~5511 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
6249 echo "local: *; };" >> $output_objdir/$libname.ver~5512 echo "local: *; };" >> $output_objdir/$libname.ver~
6250 $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'5513 $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
6251 fi5514 fi
6252 ;;5515 ;;
6253 esac5516 esac
@@ -6368,8 +5631,10 @@
6368 else5631 else
6369 # If we're using GNU nm, then we don't want the "-C" option.5632 # If we're using GNU nm, then we don't want the "-C" option.
6370 # -C means demangle to AIX nm, but means don't demangle with GNU nm5633 # -C means demangle to AIX nm, but means don't demangle with GNU nm
5634 # Also, AIX nm treats weak defined symbols like other global
5635 # defined symbols, whereas GNU nm marks them as "W".
6371 if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then5636 if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
6372 _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'5637 _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'
6373 else5638 else
6374 _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'5639 _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'
6375 fi5640 fi
@@ -6458,7 +5723,7 @@
6458 # empty executable.5723 # empty executable.
6459 _LT_SYS_MODULE_PATH_AIX5724 _LT_SYS_MODULE_PATH_AIX
6460 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"5725 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
6461 _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"5726 _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"
6462 else5727 else
6463 if test "$host_cpu" = ia64; then5728 if test "$host_cpu" = ia64; then
6464 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'5729 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
@@ -6473,8 +5738,13 @@
6473 # -berok will link without error, but may produce a broken library.5738 # -berok will link without error, but may produce a broken library.
6474 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'5739 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
6475 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'5740 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
6476 # Exported symbols can be pulled into shared objects from archives5741 if test "$with_gnu_ld" = yes; then
6477 _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'5742 # We only use this code for GNU lds that support --whole-archive.
5743 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
5744 else
5745 # Exported symbols can be pulled into shared objects from archives
5746 _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
5747 fi
6478 _LT_TAGVAR(archive_cmds_need_lc, $1)=yes5748 _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
6479 # This is similar to how AIX traditionally builds its shared libraries.5749 # This is similar to how AIX traditionally builds its shared libraries.
6480 _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'5750 _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'
@@ -6513,7 +5783,7 @@
6513 # Tell ltmain to make .dll files, not .so files.5783 # Tell ltmain to make .dll files, not .so files.
6514 shrext_cmds=".dll"5784 shrext_cmds=".dll"
6515 # FIXME: Setting linknames here is a bad hack.5785 # FIXME: Setting linknames here is a bad hack.
6516 _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='5786 _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
6517 # The linker will automatically build a .lib file if we build a DLL.5787 # The linker will automatically build a .lib file if we build a DLL.
6518 _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'5788 _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
6519 # FIXME: Should let the user specify the lib program.5789 # FIXME: Should let the user specify the lib program.
@@ -6580,7 +5850,7 @@
6580 ;;5850 ;;
65815851
6582 hpux10*)5852 hpux10*)
6583 if test "$GCC" = yes -a "$with_gnu_ld" = no; then5853 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
6584 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'5854 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
6585 else5855 else
6586 _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'5856 _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
@@ -6599,7 +5869,7 @@
6599 ;;5869 ;;
66005870
6601 hpux11*)5871 hpux11*)
6602 if test "$GCC" = yes -a "$with_gnu_ld" = no; then5872 if test "$GCC" = yes && test "$with_gnu_ld" = no; then
6603 case $host_cpu in5873 case $host_cpu in
6604 hppa*64*)5874 hppa*64*)
6605 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'5875 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -6620,7 +5890,14 @@
6620 _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'5890 _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
6621 ;;5891 ;;
6622 *)5892 *)
6623 _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'5893 m4_if($1, [], [
5894 # Older versions of the 11.00 compiler do not understand -b yet
5895 # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
5896 _LT_LINKER_OPTION([if $CC understands -b],
5897 _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
5898 [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
5899 [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
5900 [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
6624 ;;5901 ;;
6625 esac5902 esac
6626 fi5903 fi
@@ -6648,19 +5925,19 @@
66485925
6649 irix5* | irix6* | nonstopux*)5926 irix5* | irix6* | nonstopux*)
6650 if test "$GCC" = yes; then5927 if test "$GCC" = yes; then
6651 _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'5928 _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'
6652 # Try to use the -exported_symbol ld option, if it does not5929 # Try to use the -exported_symbol ld option, if it does not
6653 # work, assume that -exports_file does not work either and5930 # work, assume that -exports_file does not work either and
6654 # implicitly export all symbols.5931 # implicitly export all symbols.
6655 save_LDFLAGS="$LDFLAGS"5932 save_LDFLAGS="$LDFLAGS"
6656 LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"5933 LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
6657 AC_LINK_IFELSE(int foo(void) {},5934 AC_LINK_IFELSE(int foo(void) {},
6658 _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'5935 _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'
6659 )5936 )
6660 LDFLAGS="$save_LDFLAGS"5937 LDFLAGS="$save_LDFLAGS"
6661 else5938 else
6662 _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'5939 _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'
6663 _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'5940 _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'
6664 fi5941 fi
6665 _LT_TAGVAR(archive_cmds_need_lc, $1)='no'5942 _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
6666 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'5943 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
@@ -6722,17 +5999,17 @@
6722 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'5999 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
6723 _LT_TAGVAR(hardcode_minus_L, $1)=yes6000 _LT_TAGVAR(hardcode_minus_L, $1)=yes
6724 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported6001 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
6725 _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'6002 _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'
6726 _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'6003 _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
6727 ;;6004 ;;
67286005
6729 osf3*)6006 osf3*)
6730 if test "$GCC" = yes; then6007 if test "$GCC" = yes; then
6731 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'6008 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
6732 _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'6009 _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'
6733 else6010 else
6734 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'6011 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
6735 _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'6012 _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'
6736 fi6013 fi
6737 _LT_TAGVAR(archive_cmds_need_lc, $1)='no'6014 _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
6738 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'6015 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
@@ -6742,13 +6019,13 @@
6742 osf4* | osf5*) # as osf3* with the addition of -msym flag6019 osf4* | osf5*) # as osf3* with the addition of -msym flag
6743 if test "$GCC" = yes; then6020 if test "$GCC" = yes; then
6744 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'6021 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
6745 _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'6022 _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'
6746 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'6023 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
6747 else6024 else
6748 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'6025 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
6749 _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'6026 _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'
6750 _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~6027 _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~
6751 $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'6028 $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'
67526029
6753 # Both c and cxx compiler support -rpath directly6030 # Both c and cxx compiler support -rpath directly
6754 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'6031 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -6939,36 +6216,38 @@
6939 # Test whether the compiler implicitly links with -lc since on some6216 # Test whether the compiler implicitly links with -lc since on some
6940 # systems, -lgcc has to come before -lc. If gcc already passes -lc6217 # systems, -lgcc has to come before -lc. If gcc already passes -lc
6941 # to ld, don't add -lc before -lgcc.6218 # to ld, don't add -lc before -lgcc.
6942 AC_MSG_CHECKING([whether -lc should be explicitly linked in])6219 AC_CACHE_CHECK([whether -lc should be explicitly linked in],
6943 $RM conftest*6220 [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
6944 echo "$lt_simple_compile_test_code" > conftest.$ac_ext6221 [$RM conftest*
6222 echo "$lt_simple_compile_test_code" > conftest.$ac_ext
69456223
6946 if AC_TRY_EVAL(ac_compile) 2>conftest.err; then6224 if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
6947 soname=conftest6225 soname=conftest
6948 lib=conftest6226 lib=conftest
6949 libobjs=conftest.$ac_objext6227 libobjs=conftest.$ac_objext
6950 deplibs=6228 deplibs=
6951 wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)6229 wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
6952 pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)6230 pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
6953 compiler_flags=-v6231 compiler_flags=-v
6954 linker_flags=-v6232 linker_flags=-v
6955 verstring=6233 verstring=
6956 output_objdir=.6234 output_objdir=.
6957 libname=conftest6235 libname=conftest
6958 lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)6236 lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
6959 _LT_TAGVAR(allow_undefined_flag, $1)=6237 _LT_TAGVAR(allow_undefined_flag, $1)=
6960 if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)6238 if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
6961 then6239 then
6962 _LT_TAGVAR(archive_cmds_need_lc, $1)=no6240 lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
6963 else6241 else
6964 _LT_TAGVAR(archive_cmds_need_lc, $1)=yes6242 lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
6965 fi6243 fi
6966 _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag6244 _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
6967 else6245 else
6968 cat conftest.err 1>&56246 cat conftest.err 1>&5
6969 fi6247 fi
6970 $RM conftest*6248 $RM conftest*
6971 AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])6249 ])
6250 _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
6972 ;;6251 ;;
6973 esac6252 esac
6974 fi6253 fi
@@ -7134,14 +6413,14 @@
7134])# _LT_LANG_C_CONFIG6413])# _LT_LANG_C_CONFIG
71356414
71366415
7137# _LT_PROG_CXX6416# _LT_LANG_CXX_CONFIG([TAG])
7138# ------------6417# --------------------------
7139# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++6418# Ensure that the configuration variables for a C++ compiler are suitably
7140# compiler, we have our own version here.6419# defined. These variables are subsequently used by _LT_CONFIG to write
7141m4_defun([_LT_PROG_CXX],6420# the compiler configuration to `libtool'.
7142[6421m4_defun([_LT_LANG_CXX_CONFIG],
7143pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])6422[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
7144AC_PROG_CXX6423m4_require([_LT_DECL_EGREP])dnl
7145if test -n "$CXX" && ( test "X$CXX" != "Xno" &&6424if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
7146 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||6425 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
7147 (test "X$CXX" != "Xg++"))) ; then6426 (test "X$CXX" != "Xg++"))) ; then
@@ -7149,22 +6428,6 @@
7149else6428else
7150 _lt_caught_CXX_error=yes6429 _lt_caught_CXX_error=yes
7151fi6430fi
7152popdef([AC_MSG_ERROR])
7153])# _LT_PROG_CXX
7154
7155dnl aclocal-1.4 backwards compatibility:
7156dnl AC_DEFUN([_LT_PROG_CXX], [])
7157
7158
7159# _LT_LANG_CXX_CONFIG([TAG])
7160# --------------------------
7161# Ensure that the configuration variables for a C++ compiler are suitably
7162# defined. These variables are subsequently used by _LT_CONFIG to write
7163# the compiler configuration to `libtool'.
7164m4_defun([_LT_LANG_CXX_CONFIG],
7165[AC_REQUIRE([_LT_PROG_CXX])dnl
7166m4_require([_LT_FILEUTILS_DEFAULTS])dnl
7167m4_require([_LT_DECL_EGREP])dnl
71686431
7169AC_LANG_PUSH(C++)6432AC_LANG_PUSH(C++)
7170_LT_TAGVAR(archive_cmds_need_lc, $1)=no6433_LT_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -7186,6 +6449,8 @@
7186_LT_TAGVAR(module_expsym_cmds, $1)=6449_LT_TAGVAR(module_expsym_cmds, $1)=
7187_LT_TAGVAR(link_all_deplibs, $1)=unknown6450_LT_TAGVAR(link_all_deplibs, $1)=unknown
7188_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds6451_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
6452_LT_TAGVAR(reload_flag, $1)=$reload_flag
6453_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
7189_LT_TAGVAR(no_undefined_flag, $1)=6454_LT_TAGVAR(no_undefined_flag, $1)=
7190_LT_TAGVAR(whole_archive_flag_spec, $1)=6455_LT_TAGVAR(whole_archive_flag_spec, $1)=
7191_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no6456_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -7288,7 +6553,7 @@
7288 # Commands to make compiler produce verbose output that lists6553 # Commands to make compiler produce verbose output that lists
7289 # what "hidden" libraries, object files and flags are used when6554 # what "hidden" libraries, object files and flags are used when
7290 # linking a shared library.6555 # linking a shared library.
7291 output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'6556 output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
72926557
7293 else6558 else
7294 GXX=no6559 GXX=no
@@ -7400,7 +6665,7 @@
7400 _LT_SYS_MODULE_PATH_AIX6665 _LT_SYS_MODULE_PATH_AIX
7401 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"6666 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
74026667
7403 _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"6668 _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"
7404 else6669 else
7405 if test "$host_cpu" = ia64; then6670 if test "$host_cpu" = ia64; then
7406 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'6671 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
@@ -7415,8 +6680,13 @@
7415 # -berok will link without error, but may produce a broken library.6680 # -berok will link without error, but may produce a broken library.
7416 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'6681 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
7417 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'6682 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
7418 # Exported symbols can be pulled into shared objects from archives6683 if test "$with_gnu_ld" = yes; then
7419 _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'6684 # We only use this code for GNU lds that support --whole-archive.
6685 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
6686 else
6687 # Exported symbols can be pulled into shared objects from archives
6688 _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
6689 fi
7420 _LT_TAGVAR(archive_cmds_need_lc, $1)=yes6690 _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
7421 # This is similar to how AIX traditionally builds its shared6691 # This is similar to how AIX traditionally builds its shared
7422 # libraries.6692 # libraries.
@@ -7449,6 +6719,7 @@
7449 # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,6719 # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
7450 # as there is no search path for DLLs.6720 # as there is no search path for DLLs.
7451 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'6721 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
6722 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
7452 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported6723 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
7453 _LT_TAGVAR(always_export_symbols, $1)=no6724 _LT_TAGVAR(always_export_symbols, $1)=no
7454 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes6725 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -7509,6 +6780,11 @@
7509 gnu*)6780 gnu*)
7510 ;;6781 ;;
75116782
6783 haiku*)
6784 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6785 _LT_TAGVAR(link_all_deplibs, $1)=yes
6786 ;;
6787
7512 hpux9*)6788 hpux9*)
7513 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'6789 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
7514 _LT_TAGVAR(hardcode_libdir_separator, $1)=:6790 _LT_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -7533,7 +6809,7 @@
7533 # explicitly linking system object files so we need to strip them6809 # explicitly linking system object files so we need to strip them
7534 # from the output so that they don't get included in the library6810 # from the output so that they don't get included in the library
7535 # dependencies.6811 # dependencies.
7536 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'6812 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"'
7537 ;;6813 ;;
7538 *)6814 *)
7539 if test "$GXX" = yes; then6815 if test "$GXX" = yes; then
@@ -7598,7 +6874,7 @@
7598 # explicitly linking system object files so we need to strip them6874 # explicitly linking system object files so we need to strip them
7599 # from the output so that they don't get included in the library6875 # from the output so that they don't get included in the library
7600 # dependencies.6876 # dependencies.
7601 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'6877 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"'
7602 ;;6878 ;;
7603 *)6879 *)
7604 if test "$GXX" = yes; then6880 if test "$GXX" = yes; then
@@ -7641,7 +6917,7 @@
7641 case $cc_basename in6917 case $cc_basename in
7642 CC*)6918 CC*)
7643 # SGI C++6919 # SGI C++
7644 _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'6920 _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'
76456921
7646 # Archives containing C++ object files must be created using6922 # Archives containing C++ object files must be created using
7647 # "CC -ar", where "CC" is the IRIX C++ compiler. This is6923 # "CC -ar", where "CC" is the IRIX C++ compiler. This is
@@ -7652,9 +6928,9 @@
7652 *)6928 *)
7653 if test "$GXX" = yes; then6929 if test "$GXX" = yes; then
7654 if test "$with_gnu_ld" = no; then6930 if test "$with_gnu_ld" = no; then
7655 _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'6931 _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'
7656 else6932 else
7657 _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'6933 _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'
7658 fi6934 fi
7659 fi6935 fi
7660 _LT_TAGVAR(link_all_deplibs, $1)=yes6936 _LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -7665,7 +6941,7 @@
7665 _LT_TAGVAR(inherit_rpath, $1)=yes6941 _LT_TAGVAR(inherit_rpath, $1)=yes
7666 ;;6942 ;;
76676943
7668 linux* | k*bsd*-gnu)6944 linux* | k*bsd*-gnu | kopensolaris*-gnu)
7669 case $cc_basename in6945 case $cc_basename in
7670 KCC*)6946 KCC*)
7671 # Kuck and Associates, Inc. (KAI) C++ Compiler6947 # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -7683,7 +6959,7 @@
7683 # explicitly linking system object files so we need to strip them6959 # explicitly linking system object files so we need to strip them
7684 # from the output so that they don't get included in the library6960 # from the output so that they don't get included in the library
7685 # dependencies.6961 # dependencies.
7686 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'6962 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"'
76876963
7688 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'6964 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
7689 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'6965 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -7720,26 +6996,26 @@
7720 pgCC* | pgcpp*)6996 pgCC* | pgcpp*)
7721 # Portland Group C++ compiler6997 # Portland Group C++ compiler
7722 case `$CC -V` in6998 case `$CC -V` in
7723 *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)6999 *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
7724 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~7000 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
7725 rm -rf $tpldir~7001 rm -rf $tpldir~
7726 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~7002 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
7727 compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'7003 compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
7728 _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~7004 _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
7729 rm -rf $tpldir~7005 rm -rf $tpldir~
7730 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~7006 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
7731 $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~7007 $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
7732 $RANLIB $oldlib'7008 $RANLIB $oldlib'
7733 _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~7009 _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
7734 rm -rf $tpldir~7010 rm -rf $tpldir~
7735 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~7011 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
7736 $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'7012 $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
7737 _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~7013 _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
7738 rm -rf $tpldir~7014 rm -rf $tpldir~
7739 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~7015 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
7740 $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'7016 $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'
7741 ;;7017 ;;
7742 *) # Version 6 will use weak symbols7018 *) # Version 6 and above use weak symbols
7743 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'7019 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
7744 _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'7020 _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'
7745 ;;7021 ;;
@@ -7747,7 +7023,7 @@
77477023
7748 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'7024 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
7749 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'7025 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
7750 _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'7026 _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'
7751 ;;7027 ;;
7752 cxx*)7028 cxx*)
7753 # Compaq C++7029 # Compaq C++
@@ -7766,9 +7042,9 @@
7766 # explicitly linking system object files so we need to strip them7042 # explicitly linking system object files so we need to strip them
7767 # from the output so that they don't get included in the library7043 # from the output so that they don't get included in the library
7768 # dependencies.7044 # dependencies.
7769 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'7045 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'
7770 ;;7046 ;;
7771 xl*)7047 xl* | mpixl* | bgxl*)
7772 # IBM XL 8.0 on PPC, with GNU ld7048 # IBM XL 8.0 on PPC, with GNU ld
7773 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'7049 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
7774 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'7050 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -7788,13 +7064,13 @@
7788 _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'7064 _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
7789 _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'7065 _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'
7790 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'7066 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
7791 _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'7067 _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'
7792 _LT_TAGVAR(compiler_needs_object, $1)=yes7068 _LT_TAGVAR(compiler_needs_object, $1)=yes
77937069
7794 # Not sure whether something based on7070 # Not sure whether something based on
7795 # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&17071 # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
7796 # would be better.7072 # would be better.
7797 output_verbose_link_cmd='echo'7073 output_verbose_link_cmd='func_echo_all'
77987074
7799 # Archives containing C++ object files must be created using7075 # Archives containing C++ object files must be created using
7800 # "CC -xar", where "CC" is the Sun C++ compiler. This is7076 # "CC -xar", where "CC" is the Sun C++ compiler. This is
@@ -7863,7 +7139,7 @@
7863 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'7139 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
7864 _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'7140 _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
7865 fi7141 fi
7866 output_verbose_link_cmd=echo7142 output_verbose_link_cmd=func_echo_all
7867 else7143 else
7868 _LT_TAGVAR(ld_shlibs, $1)=no7144 _LT_TAGVAR(ld_shlibs, $1)=no
7869 fi7145 fi
@@ -7898,15 +7174,15 @@
7898 case $host in7174 case $host in
7899 osf3*)7175 osf3*)
7900 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'7176 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
7901 _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'7177 _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'
7902 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'7178 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
7903 ;;7179 ;;
7904 *)7180 *)
7905 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'7181 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
7906 _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'7182 _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'
7907 _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~7183 _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
7908 echo "-hidden">> $lib.exp~7184 echo "-hidden">> $lib.exp~
7909 $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~7185 $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~
7910 $RM $lib.exp'7186 $RM $lib.exp'
7911 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'7187 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
7912 ;;7188 ;;
@@ -7922,17 +7198,17 @@
7922 # explicitly linking system object files so we need to strip them7198 # explicitly linking system object files so we need to strip them
7923 # from the output so that they don't get included in the library7199 # from the output so that they don't get included in the library
7924 # dependencies.7200 # dependencies.
7925 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'7201 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"'
7926 ;;7202 ;;
7927 *)7203 *)
7928 if test "$GXX" = yes && test "$with_gnu_ld" = no; then7204 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
7929 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'7205 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
7930 case $host in7206 case $host in
7931 osf3*)7207 osf3*)
7932 _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'7208 _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'
7933 ;;7209 ;;
7934 *)7210 *)
7935 _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'7211 _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'
7936 ;;7212 ;;
7937 esac7213 esac
79387214
@@ -7942,7 +7218,7 @@
7942 # Commands to make compiler produce verbose output that lists7218 # Commands to make compiler produce verbose output that lists
7943 # what "hidden" libraries, object files and flags are used when7219 # what "hidden" libraries, object files and flags are used when
7944 # linking a shared library.7220 # linking a shared library.
7945 output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'7221 output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
79467222
7947 else7223 else
7948 # FIXME: insert proper C++ library support7224 # FIXME: insert proper C++ library support
@@ -7978,7 +7254,7 @@
79787254
7979 solaris*)7255 solaris*)
7980 case $cc_basename in7256 case $cc_basename in
7981 CC*)7257 CC* | sunCC*)
7982 # Sun C++ 4.2, 5.x and Centerline C++7258 # Sun C++ 4.2, 5.x and Centerline C++
7983 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes7259 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
7984 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'7260 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -7999,7 +7275,7 @@
7999 esac7275 esac
8000 _LT_TAGVAR(link_all_deplibs, $1)=yes7276 _LT_TAGVAR(link_all_deplibs, $1)=yes
80017277
8002 output_verbose_link_cmd='echo'7278 output_verbose_link_cmd='func_echo_all'
80037279
8004 # Archives containing C++ object files must be created using7280 # Archives containing C++ object files must be created using
8005 # "CC -xar", where "CC" is the Sun C++ compiler. This is7281 # "CC -xar", where "CC" is the Sun C++ compiler. This is
@@ -8026,7 +7302,7 @@
8026 # Commands to make compiler produce verbose output that lists7302 # Commands to make compiler produce verbose output that lists
8027 # what "hidden" libraries, object files and flags are used when7303 # what "hidden" libraries, object files and flags are used when
8028 # linking a shared library.7304 # linking a shared library.
8029 output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'7305 output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
8030 else7306 else
8031 # g++ 2.7 appears to require `-G' NOT `-shared' on this7307 # g++ 2.7 appears to require `-G' NOT `-shared' on this
8032 # platform.7308 # platform.
@@ -8037,7 +7313,7 @@
8037 # Commands to make compiler produce verbose output that lists7313 # Commands to make compiler produce verbose output that lists
8038 # what "hidden" libraries, object files and flags are used when7314 # what "hidden" libraries, object files and flags are used when
8039 # linking a shared library.7315 # linking a shared library.
8040 output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'7316 output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
8041 fi7317 fi
80427318
8043 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'7319 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
@@ -8091,6 +7367,10 @@
8091 CC*)7367 CC*)
8092 _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'7368 _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
8093 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'7369 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
7370 _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
7371 '"$_LT_TAGVAR(old_archive_cmds, $1)"
7372 _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
7373 '"$_LT_TAGVAR(reload_cmds, $1)"
8094 ;;7374 ;;
8095 *)7375 *)
8096 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'7376 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -8337,7 +7617,7 @@
83377617
8338solaris*)7618solaris*)
8339 case $cc_basename in7619 case $cc_basename in
8340 CC*)7620 CC* | sunCC*)
8341 # The more standards-conforming stlport4 library is7621 # The more standards-conforming stlport4 library is
8342 # incompatible with the Cstd library. Avoid specifying7622 # incompatible with the Cstd library. Avoid specifying
8343 # it if it's in CXXFLAGS. Ignore libCrun as7623 # it if it's in CXXFLAGS. Ignore libCrun as
@@ -8381,32 +7661,16 @@
8381])# _LT_SYS_HIDDEN_LIBDEPS7661])# _LT_SYS_HIDDEN_LIBDEPS
83827662
83837663
8384# _LT_PROG_F77
8385# ------------
8386# Since AC_PROG_F77 is broken, in that it returns the empty string
8387# if there is no fortran compiler, we have our own version here.
8388m4_defun([_LT_PROG_F77],
8389[
8390pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
8391AC_PROG_F77
8392if test -z "$F77" || test "X$F77" = "Xno"; then
8393 _lt_disable_F77=yes
8394fi
8395popdef([AC_MSG_ERROR])
8396])# _LT_PROG_F77
8397
8398dnl aclocal-1.4 backwards compatibility:
8399dnl AC_DEFUN([_LT_PROG_F77], [])
8400
8401
8402# _LT_LANG_F77_CONFIG([TAG])7664# _LT_LANG_F77_CONFIG([TAG])
8403# --------------------------7665# --------------------------
8404# Ensure that the configuration variables for a Fortran 77 compiler are7666# Ensure that the configuration variables for a Fortran 77 compiler are
8405# suitably defined. These variables are subsequently used by _LT_CONFIG7667# suitably defined. These variables are subsequently used by _LT_CONFIG
8406# to write the compiler configuration to `libtool'.7668# to write the compiler configuration to `libtool'.
8407m4_defun([_LT_LANG_F77_CONFIG],7669m4_defun([_LT_LANG_F77_CONFIG],
8408[AC_REQUIRE([_LT_PROG_F77])dnl7670[AC_LANG_PUSH(Fortran 77)
8409AC_LANG_PUSH(Fortran 77)7671if test -z "$F77" || test "X$F77" = "Xno"; then
7672 _lt_disable_F77=yes
7673fi
84107674
8411_LT_TAGVAR(archive_cmds_need_lc, $1)=no7675_LT_TAGVAR(archive_cmds_need_lc, $1)=no
8412_LT_TAGVAR(allow_undefined_flag, $1)=7676_LT_TAGVAR(allow_undefined_flag, $1)=
@@ -8425,6 +7689,8 @@
8425_LT_TAGVAR(module_expsym_cmds, $1)=7689_LT_TAGVAR(module_expsym_cmds, $1)=
8426_LT_TAGVAR(link_all_deplibs, $1)=unknown7690_LT_TAGVAR(link_all_deplibs, $1)=unknown
8427_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds7691_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
7692_LT_TAGVAR(reload_flag, $1)=$reload_flag
7693_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
8428_LT_TAGVAR(no_undefined_flag, $1)=7694_LT_TAGVAR(no_undefined_flag, $1)=
8429_LT_TAGVAR(whole_archive_flag_spec, $1)=7695_LT_TAGVAR(whole_archive_flag_spec, $1)=
8430_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no7696_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -8524,32 +7790,17 @@
8524])# _LT_LANG_F77_CONFIG7790])# _LT_LANG_F77_CONFIG
85257791
85267792
8527# _LT_PROG_FC
8528# -----------
8529# Since AC_PROG_FC is broken, in that it returns the empty string
8530# if there is no fortran compiler, we have our own version here.
8531m4_defun([_LT_PROG_FC],
8532[
8533pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
8534AC_PROG_FC
8535if test -z "$FC" || test "X$FC" = "Xno"; then
8536 _lt_disable_FC=yes
8537fi
8538popdef([AC_MSG_ERROR])
8539])# _LT_PROG_FC
8540
8541dnl aclocal-1.4 backwards compatibility:
8542dnl AC_DEFUN([_LT_PROG_FC], [])
8543
8544
8545# _LT_LANG_FC_CONFIG([TAG])7793# _LT_LANG_FC_CONFIG([TAG])
8546# -------------------------7794# -------------------------
8547# Ensure that the configuration variables for a Fortran compiler are7795# Ensure that the configuration variables for a Fortran compiler are
8548# suitably defined. These variables are subsequently used by _LT_CONFIG7796# suitably defined. These variables are subsequently used by _LT_CONFIG
8549# to write the compiler configuration to `libtool'.7797# to write the compiler configuration to `libtool'.
8550m4_defun([_LT_LANG_FC_CONFIG],7798m4_defun([_LT_LANG_FC_CONFIG],
8551[AC_REQUIRE([_LT_PROG_FC])dnl7799[AC_LANG_PUSH(Fortran)
8552AC_LANG_PUSH(Fortran)7800
7801if test -z "$FC" || test "X$FC" = "Xno"; then
7802 _lt_disable_FC=yes
7803fi
85537804
8554_LT_TAGVAR(archive_cmds_need_lc, $1)=no7805_LT_TAGVAR(archive_cmds_need_lc, $1)=no
8555_LT_TAGVAR(allow_undefined_flag, $1)=7806_LT_TAGVAR(allow_undefined_flag, $1)=
@@ -8568,6 +7819,8 @@
8568_LT_TAGVAR(module_expsym_cmds, $1)=7819_LT_TAGVAR(module_expsym_cmds, $1)=
8569_LT_TAGVAR(link_all_deplibs, $1)=unknown7820_LT_TAGVAR(link_all_deplibs, $1)=unknown
8570_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds7821_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
7822_LT_TAGVAR(reload_flag, $1)=$reload_flag
7823_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
8571_LT_TAGVAR(no_undefined_flag, $1)=7824_LT_TAGVAR(no_undefined_flag, $1)=
8572_LT_TAGVAR(whole_archive_flag_spec, $1)=7825_LT_TAGVAR(whole_archive_flag_spec, $1)=
8573_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no7826_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -8713,6 +7966,8 @@
8713_LT_TAGVAR(archive_cmds_need_lc, $1)=no7966_LT_TAGVAR(archive_cmds_need_lc, $1)=no
87147967
8715_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds7968_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
7969_LT_TAGVAR(reload_flag, $1)=$reload_flag
7970_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
87167971
8717if test -n "$compiler"; then7972if test -n "$compiler"; then
8718 _LT_COMPILER_NO_RTTI($1)7973 _LT_COMPILER_NO_RTTI($1)
@@ -9074,7 +8329,7 @@
9074func_dirname ()8329func_dirname ()
9075{8330{
9076 # Extract subdirectory from the argument.8331 # Extract subdirectory from the argument.
9077 func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`8332 func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
9078 if test "X$func_dirname_result" = "X${1}"; then8333 if test "X$func_dirname_result" = "X${1}"; then
9079 func_dirname_result="${3}"8334 func_dirname_result="${3}"
9080 else8335 else
@@ -9085,7 +8340,7 @@
9085# func_basename file8340# func_basename file
9086func_basename ()8341func_basename ()
9087{8342{
9088 func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`8343 func_basename_result=`$ECHO "${1}" | $SED "$basename"`
9089}8344}
90908345
9091dnl func_dirname_and_basename8346dnl func_dirname_and_basename
@@ -9101,10 +8356,8 @@
9101func_stripname ()8356func_stripname ()
9102{8357{
9103 case ${2} in8358 case ${2} in
9104 .*) func_stripname_result=`$ECHO "X${3}" \8359 .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
9105 | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;8360 *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
9106 *) func_stripname_result=`$ECHO "X${3}" \
9107 | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
9108 esac8361 esac
9109}8362}
91108363
@@ -9115,20 +8368,20 @@
9115# func_opt_split8368# func_opt_split
9116func_opt_split ()8369func_opt_split ()
9117{8370{
9118 func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`8371 func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
9119 func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`8372 func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
9120}8373}
91218374
9122# func_lo2o object8375# func_lo2o object
9123func_lo2o ()8376func_lo2o ()
9124{8377{
9125 func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`8378 func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
9126}8379}
91278380
9128# func_xform libobj-or-source8381# func_xform libobj-or-source
9129func_xform ()8382func_xform ()
9130{8383{
9131 func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`8384 func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
9132}8385}
91338386
9134# func_arith arithmetic-term...8387# func_arith arithmetic-term...
@@ -9176,14 +8429,15 @@
91768429
9177# Helper functions for option handling. -*- Autoconf -*-8430# Helper functions for option handling. -*- Autoconf -*-
9178#8431#
9179# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.8432# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
8433# Inc.
9180# Written by Gary V. Vaughan, 20048434# Written by Gary V. Vaughan, 2004
9181#8435#
9182# This file is free software; the Free Software Foundation gives8436# This file is free software; the Free Software Foundation gives
9183# unlimited permission to copy and/or distribute it, with or without8437# unlimited permission to copy and/or distribute it, with or without
9184# modifications, as long as this notice is preserved.8438# modifications, as long as this notice is preserved.
91858439
9186# serial 6 ltoptions.m48440# serial 7 ltoptions.m4
91878441
9188# This is to help aclocal find these macros, as it can't see m4_define.8442# This is to help aclocal find these macros, as it can't see m4_define.
9189AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])8443AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@@ -9298,7 +8552,7 @@
9298[enable_win32_dll=yes8552[enable_win32_dll=yes
92998553
9300case $host in8554case $host in
9301*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)8555*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
9302 AC_CHECK_TOOL(AS, as, false)8556 AC_CHECK_TOOL(AS, as, false)
9303 AC_CHECK_TOOL(DLLTOOL, dlltool, false)8557 AC_CHECK_TOOL(DLLTOOL, dlltool, false)
9304 AC_CHECK_TOOL(OBJDUMP, objdump, false)8558 AC_CHECK_TOOL(OBJDUMP, objdump, false)
@@ -9306,13 +8560,13 @@
9306esac8560esac
93078561
9308test -z "$AS" && AS=as8562test -z "$AS" && AS=as
9309_LT_DECL([], [AS], [0], [Assembler program])dnl8563_LT_DECL([], [AS], [1], [Assembler program])dnl
93108564
9311test -z "$DLLTOOL" && DLLTOOL=dlltool8565test -z "$DLLTOOL" && DLLTOOL=dlltool
9312_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl8566_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
93138567
9314test -z "$OBJDUMP" && OBJDUMP=objdump8568test -z "$OBJDUMP" && OBJDUMP=objdump
9315_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl8569_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
9316])# win32-dll8570])# win32-dll
93178571
9318AU_DEFUN([AC_LIBTOOL_WIN32_DLL],8572AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
@@ -9672,29 +8926,29 @@
96728926
9673# Generated from ltversion.in.8927# Generated from ltversion.in.
96748928
9675# serial 3012 ltversion.m48929# serial 3175 ltversion.m4
9676# This file is part of GNU Libtool8930# This file is part of GNU Libtool
96778931
9678m4_define([LT_PACKAGE_VERSION], [2.2.6])8932m4_define([LT_PACKAGE_VERSION], [2.2.10])
9679m4_define([LT_PACKAGE_REVISION], [1.3012])8933m4_define([LT_PACKAGE_REVISION], [1.3175])
96808934
9681AC_DEFUN([LTVERSION_VERSION],8935AC_DEFUN([LTVERSION_VERSION],
9682[macro_version='2.2.6'8936[macro_version='2.2.10'
9683macro_revision='1.3012'8937macro_revision='1.3175'
9684_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])8938_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
9685_LT_DECL(, macro_revision, 0)8939_LT_DECL(, macro_revision, 0)
9686])8940])
96878941
9688# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-8942# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
9689#8943#
9690# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.8944# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
9691# Written by Scott James Remnant, 2004.8945# Written by Scott James Remnant, 2004.
9692#8946#
9693# This file is free software; the Free Software Foundation gives8947# This file is free software; the Free Software Foundation gives
9694# unlimited permission to copy and/or distribute it, with or without8948# unlimited permission to copy and/or distribute it, with or without
9695# modifications, as long as this notice is preserved.8949# modifications, as long as this notice is preserved.
96968950
9697# serial 4 lt~obsolete.m48951# serial 5 lt~obsolete.m4
96988952
9699# These exist entirely to fool aclocal when bootstrapping libtool.8953# These exist entirely to fool aclocal when bootstrapping libtool.
9700#8954#
@@ -9764,7 +9018,6 @@
9764m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])9018m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])
9765m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])9019m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])
9766m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])9020m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])
9767m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])])
9768m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])9021m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
9769m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])9022m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
9770m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])9023m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
@@ -9777,9 +9030,17 @@
9777m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])9030m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
9778m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])9031m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
9779m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])9032m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
9033m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
9034m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])])
9035m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
9036m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
9037m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
9038m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
9039m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
97809040
9781# nls.m4 serial 3 (gettext-0.15)9041# nls.m4 serial 5 (gettext-0.18)
9782dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.9042dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
9043dnl Inc.
9783dnl This file is free software; the Free Software Foundation9044dnl This file is free software; the Free Software Foundation
9784dnl gives unlimited permission to copy and/or distribute it,9045dnl gives unlimited permission to copy and/or distribute it,
9785dnl with or without modifications, as long as this notice is preserved.9046dnl with or without modifications, as long as this notice is preserved.
@@ -9797,20 +9058,21 @@
9797dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.9058dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
9798dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.9059dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
97999060
9800AC_PREREQ(2.50)9061AC_PREREQ([2.50])
98019062
9802AC_DEFUN([AM_NLS],9063AC_DEFUN([AM_NLS],
9803[9064[
9804 AC_MSG_CHECKING([whether NLS is requested])9065 AC_MSG_CHECKING([whether NLS is requested])
9805 dnl Default is enabled NLS9066 dnl Default is enabled NLS
9806 AC_ARG_ENABLE(nls,9067 AC_ARG_ENABLE([nls],
9807 [ --disable-nls do not use Native Language Support],9068 [ --disable-nls do not use Native Language Support],
9808 USE_NLS=$enableval, USE_NLS=yes)9069 USE_NLS=$enableval, USE_NLS=yes)
9809 AC_MSG_RESULT($USE_NLS)9070 AC_MSG_RESULT([$USE_NLS])
9810 AC_SUBST(USE_NLS)9071 AC_SUBST([USE_NLS])
9811])9072])
98129073
9813# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-9074# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
9075# serial 1 (pkg-config-0.24)
9814# 9076#
9815# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.9077# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
9816#9078#
@@ -9838,7 +9100,10 @@
9838AC_DEFUN([PKG_PROG_PKG_CONFIG],9100AC_DEFUN([PKG_PROG_PKG_CONFIG],
9839[m4_pattern_forbid([^_?PKG_[A-Z_]+$])9101[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
9840m4_pattern_allow([^PKG_CONFIG(_PATH)?$])9102m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
9841AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl9103AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
9104AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
9105AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
9106
9842if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then9107if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
9843 AC_PATH_TOOL([PKG_CONFIG], [pkg-config])9108 AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
9844fi9109fi
@@ -9851,7 +9116,6 @@
9851 AC_MSG_RESULT([no])9116 AC_MSG_RESULT([no])
9852 PKG_CONFIG=""9117 PKG_CONFIG=""
9853 fi9118 fi
9854
9855fi[]dnl9119fi[]dnl
9856])# PKG_PROG_PKG_CONFIG9120])# PKG_PROG_PKG_CONFIG
98579121
@@ -9860,21 +9124,20 @@
9860# Check to see whether a particular set of modules exists. Similar9124# Check to see whether a particular set of modules exists. Similar
9861# to PKG_CHECK_MODULES(), but does not set variables or print errors.9125# to PKG_CHECK_MODULES(), but does not set variables or print errors.
9862#9126#
9863#9127# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
9864# Similar to PKG_CHECK_MODULES, make sure that the first instance of9128# only at the first occurence in configure.ac, so if the first place
9865# this or PKG_CHECK_MODULES is called, or make sure to call9129# it's called might be skipped (such as if it is within an "if", you
9866# PKG_CHECK_EXISTS manually9130# have to call PKG_CHECK_EXISTS manually
9867# --------------------------------------------------------------9131# --------------------------------------------------------------
9868AC_DEFUN([PKG_CHECK_EXISTS],9132AC_DEFUN([PKG_CHECK_EXISTS],
9869[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl9133[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
9870if test -n "$PKG_CONFIG" && \9134if test -n "$PKG_CONFIG" && \
9871 AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then9135 AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
9872 m4_ifval([$2], [$2], [:])9136 m4_default([$2], [:])
9873m4_ifvaln([$3], [else9137m4_ifvaln([$3], [else
9874 $3])dnl9138 $3])dnl
9875fi])9139fi])
98769140
9877
9878# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])9141# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
9879# ---------------------------------------------9142# ---------------------------------------------
9880m4_define([_PKG_CONFIG],9143m4_define([_PKG_CONFIG],
@@ -9927,6 +9190,7 @@
9927See the pkg-config man page for more details.])9190See the pkg-config man page for more details.])
99289191
9929if test $pkg_failed = yes; then9192if test $pkg_failed = yes; then
9193 AC_MSG_RESULT([no])
9930 _PKG_SHORT_ERRORS_SUPPORTED9194 _PKG_SHORT_ERRORS_SUPPORTED
9931 if test $_pkg_short_errors_supported = yes; then9195 if test $_pkg_short_errors_supported = yes; then
9932 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`9196 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
@@ -9936,7 +9200,7 @@
9936 # Put the nasty error message in config.log where it belongs9200 # Put the nasty error message in config.log where it belongs
9937 echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD9201 echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
99389202
9939 ifelse([$4], , [AC_MSG_ERROR(dnl9203 m4_default([$4], [AC_MSG_ERROR(
9940[Package requirements ($2) were not met:9204[Package requirements ($2) were not met:
99419205
9942$$1_PKG_ERRORS9206$$1_PKG_ERRORS
@@ -9944,25 +9208,855 @@
9944Consider adjusting the PKG_CONFIG_PATH environment variable if you9208Consider adjusting the PKG_CONFIG_PATH environment variable if you
9945installed software in a non-standard prefix.9209installed software in a non-standard prefix.
99469210
9947_PKG_TEXT9211_PKG_TEXT])
9948])],9212 ])
9949 [AC_MSG_RESULT([no])
9950 $4])
9951elif test $pkg_failed = untried; then9213elif test $pkg_failed = untried; then
9952 ifelse([$4], , [AC_MSG_FAILURE(dnl9214 AC_MSG_RESULT([no])
9215 m4_default([$4], [AC_MSG_FAILURE(
9953[The pkg-config script could not be found or is too old. Make sure it9216[The pkg-config script could not be found or is too old. Make sure it
9954is in your PATH or set the PKG_CONFIG environment variable to the full9217is in your PATH or set the PKG_CONFIG environment variable to the full
9955path to pkg-config.9218path to pkg-config.
99569219
9957_PKG_TEXT9220_PKG_TEXT
99589221
9959To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],9222To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
9960 [$4])9223 ])
9961else9224else
9962 $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS9225 $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
9963 $1[]_LIBS=$pkg_cv_[]$1[]_LIBS9226 $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
9964 AC_MSG_RESULT([yes])9227 AC_MSG_RESULT([yes])
9965 ifelse([$3], , :, [$3])9228 $3
9966fi[]dnl9229fi[]dnl
9967])# PKG_CHECK_MODULES9230])# PKG_CHECK_MODULES
99689231
9232# Copyright (C) 1995-2002 Free Software Foundation, Inc.
9233# Copyright (C) 2001-2003,2004 Red Hat, Inc.
9234#
9235# This file is free software, distributed under the terms of the GNU
9236# General Public License. As a special exception to the GNU General
9237# Public License, this file may be distributed as part of a program
9238# that contains a configuration script generated by Autoconf, under
9239# the same distribution terms as the rest of that program.
9240#
9241# This file can be copied and used freely without restrictions. It can
9242# be used in projects which are not available under the GNU Public License
9243# but which still want to provide support for the GNU gettext functionality.
9244#
9245# Macro to add for using GNU gettext.
9246# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
9247#
9248# Modified to never use included libintl.
9249# Owen Taylor <otaylor@redhat.com>, 12/15/1998
9250#
9251# Major rework to remove unused code
9252# Owen Taylor <otaylor@redhat.com>, 12/11/2002
9253#
9254# Added better handling of ALL_LINGUAS from GNU gettext version
9255# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
9256#
9257# Modified to require ngettext
9258# Matthias Clasen <mclasen@redhat.com> 08/06/2004
9259#
9260# We need this here as well, since someone might use autoconf-2.5x
9261# to configure GLib then an older version to configure a package
9262# using AM_GLIB_GNU_GETTEXT
9263AC_PREREQ(2.53)
9264
9265dnl
9266dnl We go to great lengths to make sure that aclocal won't
9267dnl try to pull in the installed version of these macros
9268dnl when running aclocal in the glib directory.
9269dnl
9270m4_copy([AC_DEFUN],[glib_DEFUN])
9271m4_copy([AC_REQUIRE],[glib_REQUIRE])
9272dnl
9273dnl At the end, if we're not within glib, we'll define the public
9274dnl definitions in terms of our private definitions.
9275dnl
9276
9277# GLIB_LC_MESSAGES
9278#--------------------
9279glib_DEFUN([GLIB_LC_MESSAGES],
9280 [AC_CHECK_HEADERS([locale.h])
9281 if test $ac_cv_header_locale_h = yes; then
9282 AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
9283 [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
9284 am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
9285 if test $am_cv_val_LC_MESSAGES = yes; then
9286 AC_DEFINE(HAVE_LC_MESSAGES, 1,
9287 [Define if your <locale.h> file defines LC_MESSAGES.])
9288 fi
9289 fi])
9290
9291# GLIB_PATH_PROG_WITH_TEST
9292#----------------------------
9293dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
9294dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
9295glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
9296[# Extract the first word of "$2", so it can be a program name with args.
9297set dummy $2; ac_word=[$]2
9298AC_MSG_CHECKING([for $ac_word])
9299AC_CACHE_VAL(ac_cv_path_$1,
9300[case "[$]$1" in
9301 /*)
9302 ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
9303 ;;
9304 *)
9305 IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
9306 for ac_dir in ifelse([$5], , $PATH, [$5]); do
9307 test -z "$ac_dir" && ac_dir=.
9308 if test -f $ac_dir/$ac_word; then
9309 if [$3]; then
9310 ac_cv_path_$1="$ac_dir/$ac_word"
9311 break
9312 fi
9313 fi
9314 done
9315 IFS="$ac_save_ifs"
9316dnl If no 4th arg is given, leave the cache variable unset,
9317dnl so AC_PATH_PROGS will keep looking.
9318ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
9319])dnl
9320 ;;
9321esac])dnl
9322$1="$ac_cv_path_$1"
9323if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
9324 AC_MSG_RESULT([$]$1)
9325else
9326 AC_MSG_RESULT(no)
9327fi
9328AC_SUBST($1)dnl
9329])
9330
9331# GLIB_WITH_NLS
9332#-----------------
9333glib_DEFUN([GLIB_WITH_NLS],
9334 dnl NLS is obligatory
9335 [USE_NLS=yes
9336 AC_SUBST(USE_NLS)
9337
9338 gt_cv_have_gettext=no
9339
9340 CATOBJEXT=NONE
9341 XGETTEXT=:
9342 INTLLIBS=
9343
9344 AC_CHECK_HEADER(libintl.h,
9345 [gt_cv_func_dgettext_libintl="no"
9346 libintl_extra_libs=""
9347
9348 #
9349 # First check in libc
9350 #
9351 AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
9352 [AC_TRY_LINK([
9353#include <libintl.h>
9354],
9355 [return !ngettext ("","", 1)],
9356 gt_cv_func_ngettext_libc=yes,
9357 gt_cv_func_ngettext_libc=no)
9358 ])
9359
9360 if test "$gt_cv_func_ngettext_libc" = "yes" ; then
9361 AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
9362 [AC_TRY_LINK([
9363#include <libintl.h>
9364],
9365 [return !dgettext ("","")],
9366 gt_cv_func_dgettext_libc=yes,
9367 gt_cv_func_dgettext_libc=no)
9368 ])
9369 fi
9370
9371 if test "$gt_cv_func_ngettext_libc" = "yes" ; then
9372 AC_CHECK_FUNCS(bind_textdomain_codeset)
9373 fi
9374
9375 #
9376 # If we don't have everything we want, check in libintl
9377 #
9378 if test "$gt_cv_func_dgettext_libc" != "yes" \
9379 || test "$gt_cv_func_ngettext_libc" != "yes" \
9380 || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
9381
9382 AC_CHECK_LIB(intl, bindtextdomain,
9383 [AC_CHECK_LIB(intl, ngettext,
9384 [AC_CHECK_LIB(intl, dgettext,
9385 gt_cv_func_dgettext_libintl=yes)])])
9386
9387 if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
9388 AC_MSG_CHECKING([if -liconv is needed to use gettext])
9389 AC_MSG_RESULT([])
9390 AC_CHECK_LIB(intl, ngettext,
9391 [AC_CHECK_LIB(intl, dcgettext,
9392 [gt_cv_func_dgettext_libintl=yes
9393 libintl_extra_libs=-liconv],
9394 :,-liconv)],
9395 :,-liconv)
9396 fi
9397
9398 #
9399 # If we found libintl, then check in it for bind_textdomain_codeset();
9400 # we'll prefer libc if neither have bind_textdomain_codeset(),
9401 # and both have dgettext and ngettext
9402 #
9403 if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
9404 glib_save_LIBS="$LIBS"
9405 LIBS="$LIBS -lintl $libintl_extra_libs"
9406 unset ac_cv_func_bind_textdomain_codeset
9407 AC_CHECK_FUNCS(bind_textdomain_codeset)
9408 LIBS="$glib_save_LIBS"
9409
9410 if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
9411 gt_cv_func_dgettext_libc=no
9412 else
9413 if test "$gt_cv_func_dgettext_libc" = "yes" \
9414 && test "$gt_cv_func_ngettext_libc" = "yes"; then
9415 gt_cv_func_dgettext_libintl=no
9416 fi
9417 fi
9418 fi
9419 fi
9420
9421 if test "$gt_cv_func_dgettext_libc" = "yes" \
9422 || test "$gt_cv_func_dgettext_libintl" = "yes"; then
9423 gt_cv_have_gettext=yes
9424 fi
9425
9426 if test "$gt_cv_func_dgettext_libintl" = "yes"; then
9427 INTLLIBS="-lintl $libintl_extra_libs"
9428 fi
9429
9430 if test "$gt_cv_have_gettext" = "yes"; then
9431 AC_DEFINE(HAVE_GETTEXT,1,
9432 [Define if the GNU gettext() function is already present or preinstalled.])
9433 GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
9434 [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
9435 if test "$MSGFMT" != "no"; then
9436 glib_save_LIBS="$LIBS"
9437 LIBS="$LIBS $INTLLIBS"
9438 AC_CHECK_FUNCS(dcgettext)
9439 MSGFMT_OPTS=
9440 AC_MSG_CHECKING([if msgfmt accepts -c])
9441 GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
9442msgid ""
9443msgstr ""
9444"Content-Type: text/plain; charset=UTF-8\n"
9445"Project-Id-Version: test 1.0\n"
9446"PO-Revision-Date: 2007-02-15 12:01+0100\n"
9447"Last-Translator: test <foo@bar.xx>\n"
9448"Language-Team: C <LL@li.org>\n"
9449"MIME-Version: 1.0\n"
9450"Content-Transfer-Encoding: 8bit\n"
9451], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
9452 AC_SUBST(MSGFMT_OPTS)
9453 AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
9454 GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
9455 [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
9456 AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
9457 return _nl_msg_cat_cntr],
9458 [CATOBJEXT=.gmo
9459 DATADIRNAME=share],
9460 [case $host in
9461 *-*-solaris*)
9462 dnl On Solaris, if bind_textdomain_codeset is in libc,
9463 dnl GNU format message catalog is always supported,
9464 dnl since both are added to the libc all together.
9465 dnl Hence, we'd like to go with DATADIRNAME=share and
9466 dnl and CATOBJEXT=.gmo in this case.
9467 AC_CHECK_FUNC(bind_textdomain_codeset,
9468 [CATOBJEXT=.gmo
9469 DATADIRNAME=share],
9470 [CATOBJEXT=.mo
9471 DATADIRNAME=lib])
9472 ;;
9473 *)
9474 CATOBJEXT=.mo
9475 DATADIRNAME=lib
9476 ;;
9477 esac])
9478 LIBS="$glib_save_LIBS"
9479 INSTOBJEXT=.mo
9480 else
9481 gt_cv_have_gettext=no
9482 fi
9483 fi
9484 ])
9485
9486 if test "$gt_cv_have_gettext" = "yes" ; then
9487 AC_DEFINE(ENABLE_NLS, 1,
9488 [always defined to indicate that i18n is enabled])
9489 fi
9490
9491 dnl Test whether we really found GNU xgettext.
9492 if test "$XGETTEXT" != ":"; then
9493 dnl If it is not GNU xgettext we define it as : so that the
9494 dnl Makefiles still can work.
9495 if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
9496 : ;
9497 else
9498 AC_MSG_RESULT(
9499 [found xgettext program is not GNU xgettext; ignore it])
9500 XGETTEXT=":"
9501 fi
9502 fi
9503
9504 # We need to process the po/ directory.
9505 POSUB=po
9506
9507 AC_OUTPUT_COMMANDS(
9508 [case "$CONFIG_FILES" in *po/Makefile.in*)
9509 sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
9510 esac])
9511
9512 dnl These rules are solely for the distribution goal. While doing this
9513 dnl we only have to keep exactly one list of the available catalogs
9514 dnl in configure.ac.
9515 for lang in $ALL_LINGUAS; do
9516 GMOFILES="$GMOFILES $lang.gmo"
9517 POFILES="$POFILES $lang.po"
9518 done
9519
9520 dnl Make all variables we use known to autoconf.
9521 AC_SUBST(CATALOGS)
9522 AC_SUBST(CATOBJEXT)
9523 AC_SUBST(DATADIRNAME)
9524 AC_SUBST(GMOFILES)
9525 AC_SUBST(INSTOBJEXT)
9526 AC_SUBST(INTLLIBS)
9527 AC_SUBST(PO_IN_DATADIR_TRUE)
9528 AC_SUBST(PO_IN_DATADIR_FALSE)
9529 AC_SUBST(POFILES)
9530 AC_SUBST(POSUB)
9531 ])
9532
9533# AM_GLIB_GNU_GETTEXT
9534# -------------------
9535# Do checks necessary for use of gettext. If a suitable implementation
9536# of gettext is found in either in libintl or in the C library,
9537# it will set INTLLIBS to the libraries needed for use of gettext
9538# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
9539# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
9540# on various variables needed by the Makefile.in.in installed by
9541# glib-gettextize.
9542dnl
9543glib_DEFUN([GLIB_GNU_GETTEXT],
9544 [AC_REQUIRE([AC_PROG_CC])dnl
9545 AC_REQUIRE([AC_HEADER_STDC])dnl
9546
9547 GLIB_LC_MESSAGES
9548 GLIB_WITH_NLS
9549
9550 if test "$gt_cv_have_gettext" = "yes"; then
9551 if test "x$ALL_LINGUAS" = "x"; then
9552 LINGUAS=
9553 else
9554 AC_MSG_CHECKING(for catalogs to be installed)
9555 NEW_LINGUAS=
9556 for presentlang in $ALL_LINGUAS; do
9557 useit=no
9558 if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
9559 desiredlanguages="$LINGUAS"
9560 else
9561 desiredlanguages="$ALL_LINGUAS"
9562 fi
9563 for desiredlang in $desiredlanguages; do
9564 # Use the presentlang catalog if desiredlang is
9565 # a. equal to presentlang, or
9566 # b. a variant of presentlang (because in this case,
9567 # presentlang can be used as a fallback for messages
9568 # which are not translated in the desiredlang catalog).
9569 case "$desiredlang" in
9570 "$presentlang"*) useit=yes;;
9571 esac
9572 done
9573 if test $useit = yes; then
9574 NEW_LINGUAS="$NEW_LINGUAS $presentlang"
9575 fi
9576 done
9577 LINGUAS=$NEW_LINGUAS
9578 AC_MSG_RESULT($LINGUAS)
9579 fi
9580
9581 dnl Construct list of names of catalog files to be constructed.
9582 if test -n "$LINGUAS"; then
9583 for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
9584 fi
9585 fi
9586
9587 dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
9588 dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
9589 dnl Try to locate is.
9590 MKINSTALLDIRS=
9591 if test -n "$ac_aux_dir"; then
9592 MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
9593 fi
9594 if test -z "$MKINSTALLDIRS"; then
9595 MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
9596 fi
9597 AC_SUBST(MKINSTALLDIRS)
9598
9599 dnl Generate list of files to be processed by xgettext which will
9600 dnl be included in po/Makefile.
9601 test -d po || mkdir po
9602 if test "x$srcdir" != "x."; then
9603 if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
9604 posrcprefix="$srcdir/"
9605 else
9606 posrcprefix="../$srcdir/"
9607 fi
9608 else
9609 posrcprefix="../"
9610 fi
9611 rm -f po/POTFILES
9612 sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
9613 < $srcdir/po/POTFILES.in > po/POTFILES
9614 ])
9615
9616# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
9617# -------------------------------
9618# Define VARIABLE to the location where catalog files will
9619# be installed by po/Makefile.
9620glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
9621[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
9622glib_save_prefix="$prefix"
9623glib_save_exec_prefix="$exec_prefix"
9624glib_save_datarootdir="$datarootdir"
9625test "x$prefix" = xNONE && prefix=$ac_default_prefix
9626test "x$exec_prefix" = xNONE && exec_prefix=$prefix
9627datarootdir=`eval echo "${datarootdir}"`
9628if test "x$CATOBJEXT" = "x.mo" ; then
9629 localedir=`eval echo "${libdir}/locale"`
9630else
9631 localedir=`eval echo "${datadir}/locale"`
9632fi
9633prefix="$glib_save_prefix"
9634exec_prefix="$glib_save_exec_prefix"
9635datarootdir="$glib_save_datarootdir"
9636AC_DEFINE_UNQUOTED($1, "$localedir",
9637 [Define the location where the catalogs will be installed])
9638])
9639
9640dnl
9641dnl Now the definitions that aclocal will find
9642dnl
9643ifdef(glib_configure_ac,[],[
9644AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
9645AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
9646])dnl
9647
9648# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
9649#
9650# Create a temporary file with TEST-FILE as its contents and pass the
9651# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
9652# 0 and perform ACTION-IF-FAIL for any other exit status.
9653AC_DEFUN([GLIB_RUN_PROG],
9654[cat >conftest.foo <<_ACEOF
9655$2
9656_ACEOF
9657if AC_RUN_LOG([$1 conftest.foo]); then
9658 m4_ifval([$3], [$3], [:])
9659m4_ifvaln([$4], [else $4])dnl
9660echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
9661sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
9662fi])
9663
9664
9665dnl GNOME_COMPILE_WARNINGS
9666dnl Turn on many useful compiler warnings
9667dnl For now, only works on GCC
9668AC_DEFUN([GNOME_COMPILE_WARNINGS],[
9669 dnl ******************************
9670 dnl More compiler warnings
9671 dnl ******************************
9672
9673 AC_ARG_ENABLE(compile-warnings,
9674 AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
9675 [Turn on compiler warnings]),,
9676 [enable_compile_warnings="m4_default([$1],[yes])"])
9677
9678 warnCFLAGS=
9679 if test "x$GCC" != xyes; then
9680 enable_compile_warnings=no
9681 fi
9682
9683 warning_flags=
9684 realsave_CFLAGS="$CFLAGS"
9685
9686 case "$enable_compile_warnings" in
9687 no)
9688 warning_flags=
9689 ;;
9690 minimum)
9691 warning_flags="-Wall"
9692 ;;
9693 yes)
9694 warning_flags="-Wall -Wmissing-prototypes"
9695 ;;
9696 maximum|error)
9697 warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
9698 CFLAGS="$warning_flags $CFLAGS"
9699 for option in -Wno-sign-compare; do
9700 SAVE_CFLAGS="$CFLAGS"
9701 CFLAGS="$CFLAGS $option"
9702 AC_MSG_CHECKING([whether gcc understands $option])
9703 AC_TRY_COMPILE([], [],
9704 has_option=yes,
9705 has_option=no,)
9706 CFLAGS="$SAVE_CFLAGS"
9707 AC_MSG_RESULT($has_option)
9708 if test $has_option = yes; then
9709 warning_flags="$warning_flags $option"
9710 fi
9711 unset has_option
9712 unset SAVE_CFLAGS
9713 done
9714 unset option
9715 if test "$enable_compile_warnings" = "error" ; then
9716 warning_flags="$warning_flags -Werror"
9717 fi
9718 ;;
9719 *)
9720 AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
9721 ;;
9722 esac
9723 CFLAGS="$realsave_CFLAGS"
9724 AC_MSG_CHECKING(what warning flags to pass to the C compiler)
9725 AC_MSG_RESULT($warning_flags)
9726
9727 AC_ARG_ENABLE(iso-c,
9728 AC_HELP_STRING([--enable-iso-c],
9729 [Try to warn if code is not ISO C ]),,
9730 [enable_iso_c=no])
9731
9732 AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
9733 complCFLAGS=
9734 if test "x$enable_iso_c" != "xno"; then
9735 if test "x$GCC" = "xyes"; then
9736 case " $CFLAGS " in
9737 *[\ \ ]-ansi[\ \ ]*) ;;
9738 *) complCFLAGS="$complCFLAGS -ansi" ;;
9739 esac
9740 case " $CFLAGS " in
9741 *[\ \ ]-pedantic[\ \ ]*) ;;
9742 *) complCFLAGS="$complCFLAGS -pedantic" ;;
9743 esac
9744 fi
9745 fi
9746 AC_MSG_RESULT($complCFLAGS)
9747
9748 WARN_CFLAGS="$warning_flags $complCFLAGS"
9749 AC_SUBST(WARN_CFLAGS)
9750])
9751
9752dnl For C++, do basically the same thing.
9753
9754AC_DEFUN([GNOME_CXX_WARNINGS],[
9755 AC_ARG_ENABLE(cxx-warnings,
9756 AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
9757 [Turn on compiler warnings.]),,
9758 [enable_cxx_warnings="m4_default([$1],[minimum])"])
9759
9760 AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
9761 warnCXXFLAGS=
9762 if test "x$GXX" != xyes; then
9763 enable_cxx_warnings=no
9764 fi
9765 if test "x$enable_cxx_warnings" != "xno"; then
9766 if test "x$GXX" = "xyes"; then
9767 case " $CXXFLAGS " in
9768 *[\ \ ]-Wall[\ \ ]*) ;;
9769 *) warnCXXFLAGS="-Wall -Wno-unused" ;;
9770 esac
9771
9772 ## -W is not all that useful. And it cannot be controlled
9773 ## with individual -Wno-xxx flags, unlike -Wall
9774 if test "x$enable_cxx_warnings" = "xyes"; then
9775 warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
9776 fi
9777 fi
9778 fi
9779 AC_MSG_RESULT($warnCXXFLAGS)
9780
9781 AC_ARG_ENABLE(iso-cxx,
9782 AC_HELP_STRING([--enable-iso-cxx],
9783 [Try to warn if code is not ISO C++ ]),,
9784 [enable_iso_cxx=no])
9785
9786 AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
9787 complCXXFLAGS=
9788 if test "x$enable_iso_cxx" != "xno"; then
9789 if test "x$GXX" = "xyes"; then
9790 case " $CXXFLAGS " in
9791 *[\ \ ]-ansi[\ \ ]*) ;;
9792 *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
9793 esac
9794
9795 case " $CXXFLAGS " in
9796 *[\ \ ]-pedantic[\ \ ]*) ;;
9797 *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
9798 esac
9799 fi
9800 fi
9801 AC_MSG_RESULT($complCXXFLAGS)
9802
9803 WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
9804 AC_SUBST(WARN_CXXFLAGS)
9805])
9806
9807dnl -*- mode: autoconf -*-
9808
9809# serial 1
9810
9811dnl Usage:
9812dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
9813AC_DEFUN([GTK_DOC_CHECK],
9814[
9815 AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
9816 AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
9817
9818 dnl check for tools we added during development
9819 AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
9820 AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
9821 AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
9822
9823 dnl for overriding the documentation installation directory
9824 AC_ARG_WITH([html-dir],
9825 AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
9826 [with_html_dir='${datadir}/gtk-doc/html'])
9827 HTML_DIR="$with_html_dir"
9828 AC_SUBST([HTML_DIR])
9829
9830 dnl enable/disable documentation building
9831 AC_ARG_ENABLE([gtk-doc],
9832 AS_HELP_STRING([--enable-gtk-doc],
9833 [use gtk-doc to build documentation [[default=no]]]),,
9834 [enable_gtk_doc=no])
9835
9836 if test x$enable_gtk_doc = xyes; then
9837 ifelse([$1],[],
9838 [PKG_CHECK_EXISTS([gtk-doc],,
9839 AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
9840 [PKG_CHECK_EXISTS([gtk-doc >= $1],,
9841 AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
9842 fi
9843
9844 AC_MSG_CHECKING([whether to build gtk-doc documentation])
9845 AC_MSG_RESULT($enable_gtk_doc)
9846
9847 dnl enable/disable output formats
9848 AC_ARG_ENABLE([gtk-doc-html],
9849 AS_HELP_STRING([--enable-gtk-doc-html],
9850 [build documentation in html format [[default=yes]]]),,
9851 [enable_gtk_doc_html=yes])
9852 AC_ARG_ENABLE([gtk-doc-pdf],
9853 AS_HELP_STRING([--enable-gtk-doc-pdf],
9854 [build documentation in pdf format [[default=no]]]),,
9855 [enable_gtk_doc_pdf=no])
9856
9857 if test -z "$GTKDOC_MKPDF"; then
9858 enable_gtk_doc_pdf=no
9859 fi
9860
9861
9862 AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
9863 AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
9864 AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
9865 AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
9866 AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
9867])
9868
9869
9870dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
9871# serial 40 IT_PROG_INTLTOOL
9872AC_DEFUN([IT_PROG_INTLTOOL], [
9873AC_PREREQ([2.50])dnl
9874AC_REQUIRE([AM_NLS])dnl
9875
9876case "$am__api_version" in
9877 1.[01234])
9878 AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
9879 ;;
9880 *)
9881 ;;
9882esac
9883
9884if test -n "$1"; then
9885 AC_MSG_CHECKING([for intltool >= $1])
9886
9887 INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
9888 INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
9889 [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
9890 ]
9891 AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
9892 test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
9893 AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
9894fi
9895
9896AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
9897AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
9898AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
9899if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
9900 AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
9901fi
9902
9903 INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
9904INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
9905 INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
9906 INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
9907 INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
9908 INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
9909 INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
9910 INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
9911INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
9912 INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
9913 INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
9914 INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@'
9915 INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
9916 INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
9917 INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
9918 INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
9919 INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
9920 INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
9921 INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
9922
9923_IT_SUBST(INTLTOOL_DESKTOP_RULE)
9924_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
9925_IT_SUBST(INTLTOOL_KEYS_RULE)
9926_IT_SUBST(INTLTOOL_PROP_RULE)
9927_IT_SUBST(INTLTOOL_OAF_RULE)
9928_IT_SUBST(INTLTOOL_PONG_RULE)
9929_IT_SUBST(INTLTOOL_SERVER_RULE)
9930_IT_SUBST(INTLTOOL_SHEET_RULE)
9931_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
9932_IT_SUBST(INTLTOOL_UI_RULE)
9933_IT_SUBST(INTLTOOL_XAM_RULE)
9934_IT_SUBST(INTLTOOL_KBD_RULE)
9935_IT_SUBST(INTLTOOL_XML_RULE)
9936_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
9937_IT_SUBST(INTLTOOL_CAVES_RULE)
9938_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
9939_IT_SUBST(INTLTOOL_THEME_RULE)
9940_IT_SUBST(INTLTOOL_SERVICE_RULE)
9941_IT_SUBST(INTLTOOL_POLICY_RULE)
9942
9943# Check the gettext tools to make sure they are GNU
9944AC_PATH_PROG(XGETTEXT, xgettext)
9945AC_PATH_PROG(MSGMERGE, msgmerge)
9946AC_PATH_PROG(MSGFMT, msgfmt)
9947AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
9948if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
9949 AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
9950fi
9951xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
9952mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
9953mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
9954if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
9955 AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
9956fi
9957
9958AC_PATH_PROG(INTLTOOL_PERL, perl)
9959if test -z "$INTLTOOL_PERL"; then
9960 AC_MSG_ERROR([perl not found])
9961fi
9962AC_MSG_CHECKING([for perl >= 5.8.1])
9963$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
9964if test $? -ne 0; then
9965 AC_MSG_ERROR([perl 5.8.1 is required for intltool])
9966else
9967 IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
9968 AC_MSG_RESULT([$IT_PERL_VERSION])
9969fi
9970if test "x$2" != "xno-xml"; then
9971 AC_MSG_CHECKING([for XML::Parser])
9972 if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
9973 AC_MSG_RESULT([ok])
9974 else
9975 AC_MSG_ERROR([XML::Parser perl module is required for intltool])
9976 fi
9977fi
9978
9979# Substitute ALL_LINGUAS so we can use it in po/Makefile
9980AC_SUBST(ALL_LINGUAS)
9981
9982# Set DATADIRNAME correctly if it is not set yet
9983# (copied from glib-gettext.m4)
9984if test -z "$DATADIRNAME"; then
9985 AC_LINK_IFELSE(
9986 [AC_LANG_PROGRAM([[]],
9987 [[extern int _nl_msg_cat_cntr;
9988 return _nl_msg_cat_cntr]])],
9989 [DATADIRNAME=share],
9990 [case $host in
9991 *-*-solaris*)
9992 dnl On Solaris, if bind_textdomain_codeset is in libc,
9993 dnl GNU format message catalog is always supported,
9994 dnl since both are added to the libc all together.
9995 dnl Hence, we'd like to go with DATADIRNAME=share
9996 dnl in this case.
9997 AC_CHECK_FUNC(bind_textdomain_codeset,
9998 [DATADIRNAME=share], [DATADIRNAME=lib])
9999 ;;
10000 *)
10001 [DATADIRNAME=lib]
10002 ;;
10003 esac])
10004fi
10005AC_SUBST(DATADIRNAME)
10006
10007IT_PO_SUBDIR([po])
10008
10009])
10010
10011
10012# IT_PO_SUBDIR(DIRNAME)
10013# ---------------------
10014# All po subdirs have to be declared with this macro; the subdir "po" is
10015# declared by IT_PROG_INTLTOOL.
10016#
10017AC_DEFUN([IT_PO_SUBDIR],
10018[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
10019dnl
10020dnl The following CONFIG_COMMANDS should be executed at the very end
10021dnl of config.status.
10022AC_CONFIG_COMMANDS_PRE([
10023 AC_CONFIG_COMMANDS([$1/stamp-it], [
10024 if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
10025 AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
10026 fi
10027 rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
10028 >"$1/stamp-it.tmp"
10029 [sed '/^#/d
10030 s/^[[].*] *//
10031 /^[ ]*$/d
10032 '"s|^| $ac_top_srcdir/|" \
10033 "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
10034 ]
10035 [sed '/^POTFILES =/,/[^\\]$/ {
10036 /^POTFILES =/!d
10037 r $1/POTFILES
10038 }
10039 ' "$1/Makefile.in" >"$1/Makefile"]
10040 rm -f "$1/Makefile.tmp"
10041 mv "$1/stamp-it.tmp" "$1/stamp-it"
10042 ])
10043])dnl
10044])
10045
10046# _IT_SUBST(VARIABLE)
10047# -------------------
10048# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
10049#
10050AC_DEFUN([_IT_SUBST],
10051[
10052AC_SUBST([$1])
10053m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
10054]
10055)
10056
10057# deprecated macros
10058AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
10059# A hint is needed for aclocal from Automake <= 1.9.4:
10060# AC_DEFUN([AC_PROG_INTLTOOL], ...)
10061
10062
996910063
=== modified file 'config.guess'
--- config.guess 2010-03-30 19:58:47 +0000
+++ config.guess 2010-09-27 20:34:40 +0000
@@ -1,10 +1,10 @@
1#! /bin/sh1#! /bin/sh
2# Attempt to guess a canonical system name.2# Attempt to guess a canonical system name.
3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 20084# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
5# Free Software Foundation, Inc.5# Free Software Foundation, Inc.
66
7timestamp='2009-04-27'7timestamp='2009-11-20'
88
9# This file is free software; you can redistribute it and/or modify it9# This file is free software; you can redistribute it and/or modify it
10# under the terms of the GNU General Public License as published by10# under the terms of the GNU General Public License as published by
@@ -27,16 +27,16 @@
27# the same distribution terms that you use for the rest of that program.27# the same distribution terms that you use for the rest of that program.
2828
2929
30# Originally written by Per Bothner <per@bothner.com>.30# Originally written by Per Bothner. Please send patches (context
31# Please send patches to <config-patches@gnu.org>. Submit a context31# diff format) to <config-patches@gnu.org> and include a ChangeLog
32# diff and a properly formatted ChangeLog entry.32# entry.
33#33#
34# This script attempts to guess a canonical system name similar to34# This script attempts to guess a canonical system name similar to
35# config.sub. If it succeeds, it prints the system name on stdout, and35# config.sub. If it succeeds, it prints the system name on stdout, and
36# exits with 0. Otherwise, it exits with 1.36# exits with 0. Otherwise, it exits with 1.
37#37#
38# The plan is that this can be called by configure scripts if you38# You can get the latest version of this script from:
39# don't specify an explicit build system type.39# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
4040
41me=`echo "$0" | sed -e 's,.*/,,'`41me=`echo "$0" | sed -e 's,.*/,,'`
4242
@@ -170,7 +170,7 @@
170 arm*|i386|m68k|ns32k|sh3*|sparc|vax)170 arm*|i386|m68k|ns32k|sh3*|sparc|vax)
171 eval $set_cc_for_build171 eval $set_cc_for_build
172 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \172 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
173 | grep __ELF__ >/dev/null173 | grep -q __ELF__
174 then174 then
175 # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).175 # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
176 # Return netbsd for either. FIX?176 # Return netbsd for either. FIX?
@@ -333,6 +333,9 @@
333 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)333 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
334 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`334 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
335 exit ;;335 exit ;;
336 i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
337 echo i386-pc-auroraux${UNAME_RELEASE}
338 exit ;;
336 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)339 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
337 eval $set_cc_for_build340 eval $set_cc_for_build
338 SUN_ARCH="i386"341 SUN_ARCH="i386"
@@ -656,7 +659,7 @@
656 # => hppa64-hp-hpux11.23659 # => hppa64-hp-hpux11.23
657660
658 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |661 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
659 grep __LP64__ >/dev/null662 grep -q __LP64__
660 then663 then
661 HP_ARCH="hppa2.0w"664 HP_ARCH="hppa2.0w"
662 else665 else
@@ -807,12 +810,12 @@
807 i*:PW*:*)810 i*:PW*:*)
808 echo ${UNAME_MACHINE}-pc-pw32811 echo ${UNAME_MACHINE}-pc-pw32
809 exit ;;812 exit ;;
810 *:Interix*:[3456]*)813 *:Interix*:*)
811 case ${UNAME_MACHINE} in814 case ${UNAME_MACHINE} in
812 x86)815 x86)
813 echo i586-pc-interix${UNAME_RELEASE}816 echo i586-pc-interix${UNAME_RELEASE}
814 exit ;;817 exit ;;
815 EM64T | authenticamd | genuineintel)818 authenticamd | genuineintel | EM64T)
816 echo x86_64-unknown-interix${UNAME_RELEASE}819 echo x86_64-unknown-interix${UNAME_RELEASE}
817 exit ;;820 exit ;;
818 IA64)821 IA64)
@@ -822,6 +825,9 @@
822 [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)825 [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
823 echo i${UNAME_MACHINE}-pc-mks826 echo i${UNAME_MACHINE}-pc-mks
824 exit ;;827 exit ;;
828 8664:Windows_NT:*)
829 echo x86_64-pc-mks
830 exit ;;
825 i*:Windows_NT*:* | Pentium*:Windows_NT*:*)831 i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
826 # How do we know it's Interix rather than the generic POSIX subsystem?832 # How do we know it's Interix rather than the generic POSIX subsystem?
827 # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we833 # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -851,6 +857,20 @@
851 i*86:Minix:*:*)857 i*86:Minix:*:*)
852 echo ${UNAME_MACHINE}-pc-minix858 echo ${UNAME_MACHINE}-pc-minix
853 exit ;;859 exit ;;
860 alpha:Linux:*:*)
861 case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
862 EV5) UNAME_MACHINE=alphaev5 ;;
863 EV56) UNAME_MACHINE=alphaev56 ;;
864 PCA56) UNAME_MACHINE=alphapca56 ;;
865 PCA57) UNAME_MACHINE=alphapca56 ;;
866 EV6) UNAME_MACHINE=alphaev6 ;;
867 EV67) UNAME_MACHINE=alphaev67 ;;
868 EV68*) UNAME_MACHINE=alphaev68 ;;
869 esac
870 objdump --private-headers /bin/sh | grep -q ld.so.1
871 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
872 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
873 exit ;;
854 arm*:Linux:*:*)874 arm*:Linux:*:*)
855 eval $set_cc_for_build875 eval $set_cc_for_build
856 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \876 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -873,6 +893,17 @@
873 frv:Linux:*:*)893 frv:Linux:*:*)
874 echo frv-unknown-linux-gnu894 echo frv-unknown-linux-gnu
875 exit ;;895 exit ;;
896 i*86:Linux:*:*)
897 LIBC=gnu
898 eval $set_cc_for_build
899 sed 's/^ //' << EOF >$dummy.c
900 #ifdef __dietlibc__
901 LIBC=dietlibc
902 #endif
903EOF
904 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
905 echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
906 exit ;;
876 ia64:Linux:*:*)907 ia64:Linux:*:*)
877 echo ${UNAME_MACHINE}-unknown-linux-gnu908 echo ${UNAME_MACHINE}-unknown-linux-gnu
878 exit ;;909 exit ;;
@@ -882,78 +913,34 @@
882 m68*:Linux:*:*)913 m68*:Linux:*:*)
883 echo ${UNAME_MACHINE}-unknown-linux-gnu914 echo ${UNAME_MACHINE}-unknown-linux-gnu
884 exit ;;915 exit ;;
885 mips:Linux:*:*)916 mips:Linux:*:* | mips64:Linux:*:*)
886 eval $set_cc_for_build917 eval $set_cc_for_build
887 sed 's/^ //' << EOF >$dummy.c918 sed 's/^ //' << EOF >$dummy.c
888 #undef CPU919 #undef CPU
889 #undef mips920 #undef ${UNAME_MACHINE}
890 #undef mipsel921 #undef ${UNAME_MACHINE}el
891 #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)922 #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
892 CPU=mipsel923 CPU=${UNAME_MACHINE}el
893 #else924 #else
894 #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)925 #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
895 CPU=mips926 CPU=${UNAME_MACHINE}
896 #else927 #else
897 CPU=928 CPU=
898 #endif929 #endif
899 #endif930 #endif
900EOF931EOF
901 eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '932 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
902 /^CPU/{
903 s: ::g
904 p
905 }'`"
906 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
907 ;;
908 mips64:Linux:*:*)
909 eval $set_cc_for_build
910 sed 's/^ //' << EOF >$dummy.c
911 #undef CPU
912 #undef mips64
913 #undef mips64el
914 #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
915 CPU=mips64el
916 #else
917 #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
918 CPU=mips64
919 #else
920 CPU=
921 #endif
922 #endif
923EOF
924 eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
925 /^CPU/{
926 s: ::g
927 p
928 }'`"
929 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }933 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
930 ;;934 ;;
931 or32:Linux:*:*)935 or32:Linux:*:*)
932 echo or32-unknown-linux-gnu936 echo or32-unknown-linux-gnu
933 exit ;;937 exit ;;
934 ppc:Linux:*:*)
935 echo powerpc-unknown-linux-gnu
936 exit ;;
937 ppc64:Linux:*:*)
938 echo powerpc64-unknown-linux-gnu
939 exit ;;
940 alpha:Linux:*:*)
941 case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
942 EV5) UNAME_MACHINE=alphaev5 ;;
943 EV56) UNAME_MACHINE=alphaev56 ;;
944 PCA56) UNAME_MACHINE=alphapca56 ;;
945 PCA57) UNAME_MACHINE=alphapca56 ;;
946 EV6) UNAME_MACHINE=alphaev6 ;;
947 EV67) UNAME_MACHINE=alphaev67 ;;
948 EV68*) UNAME_MACHINE=alphaev68 ;;
949 esac
950 objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
951 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
952 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
953 exit ;;
954 padre:Linux:*:*)938 padre:Linux:*:*)
955 echo sparc-unknown-linux-gnu939 echo sparc-unknown-linux-gnu
956 exit ;;940 exit ;;
941 parisc64:Linux:*:* | hppa64:Linux:*:*)
942 echo hppa64-unknown-linux-gnu
943 exit ;;
957 parisc:Linux:*:* | hppa:Linux:*:*)944 parisc:Linux:*:* | hppa:Linux:*:*)
958 # Look for CPU level945 # Look for CPU level
959 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in946 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -962,8 +949,11 @@
962 *) echo hppa-unknown-linux-gnu ;;949 *) echo hppa-unknown-linux-gnu ;;
963 esac950 esac
964 exit ;;951 exit ;;
965 parisc64:Linux:*:* | hppa64:Linux:*:*)952 ppc64:Linux:*:*)
966 echo hppa64-unknown-linux-gnu953 echo powerpc64-unknown-linux-gnu
954 exit ;;
955 ppc:Linux:*:*)
956 echo powerpc-unknown-linux-gnu
967 exit ;;957 exit ;;
968 s390:Linux:*:* | s390x:Linux:*:*)958 s390:Linux:*:* | s390x:Linux:*:*)
969 echo ${UNAME_MACHINE}-ibm-linux959 echo ${UNAME_MACHINE}-ibm-linux
@@ -986,66 +976,6 @@
986 xtensa*:Linux:*:*)976 xtensa*:Linux:*:*)
987 echo ${UNAME_MACHINE}-unknown-linux-gnu977 echo ${UNAME_MACHINE}-unknown-linux-gnu
988 exit ;;978 exit ;;
989 i*86:Linux:*:*)
990 # The BFD linker knows what the default object file format is, so
991 # first see if it will tell us. cd to the root directory to prevent
992 # problems with other programs or directories called `ld' in the path.
993 # Set LC_ALL=C to ensure ld outputs messages in English.
994 ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
995 | sed -ne '/supported targets:/!d
996 s/[ ][ ]*/ /g
997 s/.*supported targets: *//
998 s/ .*//
999 p'`
1000 case "$ld_supported_targets" in
1001 elf32-i386)
1002 TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
1003 ;;
1004 a.out-i386-linux)
1005 echo "${UNAME_MACHINE}-pc-linux-gnuaout"
1006 exit ;;
1007 "")
1008 # Either a pre-BFD a.out linker (linux-gnuoldld) or
1009 # one that does not give us useful --help.
1010 echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
1011 exit ;;
1012 esac
1013 # Determine whether the default compiler is a.out or elf
1014 eval $set_cc_for_build
1015 sed 's/^ //' << EOF >$dummy.c
1016 #include <features.h>
1017 #ifdef __ELF__
1018 # ifdef __GLIBC__
1019 # if __GLIBC__ >= 2
1020 LIBC=gnu
1021 # else
1022 LIBC=gnulibc1
1023 # endif
1024 # else
1025 LIBC=gnulibc1
1026 # endif
1027 #else
1028 #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
1029 LIBC=gnu
1030 #else
1031 LIBC=gnuaout
1032 #endif
1033 #endif
1034 #ifdef __dietlibc__
1035 LIBC=dietlibc
1036 #endif
1037EOF
1038 eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
1039 /^LIBC/{
1040 s: ::g
1041 p
1042 }'`"
1043 test x"${LIBC}" != x && {
1044 echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
1045 exit
1046 }
1047 test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
1048 ;;
1049 i*86:DYNIX/ptx:4*:*)979 i*86:DYNIX/ptx:4*:*)
1050 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.980 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
1051 # earlier versions are messed up and put the nodename in both981 # earlier versions are messed up and put the nodename in both
@@ -1074,7 +1004,7 @@
1074 i*86:syllable:*:*)1004 i*86:syllable:*:*)
1075 echo ${UNAME_MACHINE}-pc-syllable1005 echo ${UNAME_MACHINE}-pc-syllable
1076 exit ;;1006 exit ;;
1077 i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)1007 i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
1078 echo i386-unknown-lynxos${UNAME_RELEASE}1008 echo i386-unknown-lynxos${UNAME_RELEASE}
1079 exit ;;1009 exit ;;
1080 i*86:*DOS:*:*)1010 i*86:*DOS:*:*)
@@ -1182,7 +1112,7 @@
1182 rs6000:LynxOS:2.*:*)1112 rs6000:LynxOS:2.*:*)
1183 echo rs6000-unknown-lynxos${UNAME_RELEASE}1113 echo rs6000-unknown-lynxos${UNAME_RELEASE}
1184 exit ;;1114 exit ;;
1185 PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)1115 PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
1186 echo powerpc-unknown-lynxos${UNAME_RELEASE}1116 echo powerpc-unknown-lynxos${UNAME_RELEASE}
1187 exit ;;1117 exit ;;
1188 SM[BE]S:UNIX_SV:*:*)1118 SM[BE]S:UNIX_SV:*:*)
@@ -1275,6 +1205,16 @@
1275 *:Darwin:*:*)1205 *:Darwin:*:*)
1276 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown1206 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1277 case $UNAME_PROCESSOR in1207 case $UNAME_PROCESSOR in
1208 i386)
1209 eval $set_cc_for_build
1210 if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
1211 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1212 (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1213 grep IS_64BIT_ARCH >/dev/null
1214 then
1215 UNAME_PROCESSOR="x86_64"
1216 fi
1217 fi ;;
1278 unknown) UNAME_PROCESSOR=powerpc ;;1218 unknown) UNAME_PROCESSOR=powerpc ;;
1279 esac1219 esac
1280 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}1220 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
12811221
=== modified file 'config.h.in'
--- config.h.in 2010-03-30 19:58:47 +0000
+++ config.h.in 2010-09-27 20:34:40 +0000
@@ -73,6 +73,9 @@
73/* Define to the one symbol short name of this package. */73/* Define to the one symbol short name of this package. */
74#undef PACKAGE_TARNAME74#undef PACKAGE_TARNAME
7575
76/* Define to the home page for this package. */
77#undef PACKAGE_URL
78
76/* Define to the version of this package. */79/* Define to the version of this package. */
77#undef PACKAGE_VERSION80#undef PACKAGE_VERSION
7881
7982
=== modified file 'config.sub'
--- config.sub 2010-03-30 19:58:47 +0000
+++ config.sub 2010-09-27 20:34:40 +0000
@@ -1,10 +1,10 @@
1#! /bin/sh1#! /bin/sh
2# Configuration validation subroutine script.2# Configuration validation subroutine script.
3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 20084# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
5# Free Software Foundation, Inc.5# Free Software Foundation, Inc.
66
7timestamp='2009-04-17'7timestamp='2009-11-20'
88
9# This file is (in principle) common to ALL GNU software.9# This file is (in principle) common to ALL GNU software.
10# The presence of a machine in this file suggests that SOME GNU software10# The presence of a machine in this file suggests that SOME GNU software
@@ -32,13 +32,16 @@
3232
3333
34# Please send patches to <config-patches@gnu.org>. Submit a context34# Please send patches to <config-patches@gnu.org>. Submit a context
35# diff and a properly formatted ChangeLog entry.35# diff and a properly formatted GNU ChangeLog entry.
36#36#
37# Configuration subroutine to validate and canonicalize a configuration type.37# Configuration subroutine to validate and canonicalize a configuration type.
38# Supply the specified configuration type as an argument.38# Supply the specified configuration type as an argument.
39# If it is invalid, we print an error message on stderr and exit with code 1.39# If it is invalid, we print an error message on stderr and exit with code 1.
40# Otherwise, we print the canonical config type on stdout and succeed.40# Otherwise, we print the canonical config type on stdout and succeed.
4141
42# You can get the latest version of this script from:
43# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
44
42# This file is supposed to be the same for all GNU packages45# This file is supposed to be the same for all GNU packages
43# and recognize all the CPU types, system types and aliases46# and recognize all the CPU types, system types and aliases
44# that are meaningful with *any* GNU software.47# that are meaningful with *any* GNU software.
@@ -149,10 +152,13 @@
149 -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\152 -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
150 -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \153 -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
151 -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \154 -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
152 -apple | -axis | -knuth | -cray)155 -apple | -axis | -knuth | -cray | -microblaze)
153 os=156 os=
154 basic_machine=$1157 basic_machine=$1
155 ;;158 ;;
159 -bluegene*)
160 os=-cnk
161 ;;
156 -sim | -cisco | -oki | -wec | -winbond)162 -sim | -cisco | -oki | -wec | -winbond)
157 os=163 os=
158 basic_machine=$1164 basic_machine=$1
@@ -281,6 +287,7 @@
281 | pdp10 | pdp11 | pj | pjl \287 | pdp10 | pdp11 | pj | pjl \
282 | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \288 | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
283 | pyramid \289 | pyramid \
290 | rx \
284 | score \291 | score \
285 | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \292 | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
286 | sh64 | sh64le \293 | sh64 | sh64le \
@@ -288,13 +295,14 @@
288 | sparcv8 | sparcv9 | sparcv9b | sparcv9v \295 | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
289 | spu | strongarm \296 | spu | strongarm \
290 | tahoe | thumb | tic4x | tic80 | tron \297 | tahoe | thumb | tic4x | tic80 | tron \
298 | ubicom32 \
291 | v850 | v850e \299 | v850 | v850e \
292 | we32k \300 | we32k \
293 | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \301 | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
294 | z8k | z80)302 | z8k | z80)
295 basic_machine=$basic_machine-unknown303 basic_machine=$basic_machine-unknown
296 ;;304 ;;
297 m6811 | m68hc11 | m6812 | m68hc12)305 m6811 | m68hc11 | m6812 | m68hc12 | picochip)
298 # Motorola 68HC11/12.306 # Motorola 68HC11/12.
299 basic_machine=$basic_machine-unknown307 basic_machine=$basic_machine-unknown
300 os=-none308 os=-none
@@ -337,7 +345,7 @@
337 | lm32-* \345 | lm32-* \
338 | m32c-* | m32r-* | m32rle-* \346 | m32c-* | m32r-* | m32rle-* \
339 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \347 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
340 | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \348 | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
341 | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \349 | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
342 | mips16-* \350 | mips16-* \
343 | mips64-* | mips64el-* \351 | mips64-* | mips64el-* \
@@ -365,7 +373,7 @@
365 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \373 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
366 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \374 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
367 | pyramid-* \375 | pyramid-* \
368 | romp-* | rs6000-* \376 | romp-* | rs6000-* | rx-* \
369 | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \377 | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
370 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \378 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
371 | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \379 | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
@@ -374,6 +382,7 @@
374 | tahoe-* | thumb-* \382 | tahoe-* | thumb-* \
375 | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \383 | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
376 | tron-* \384 | tron-* \
385 | ubicom32-* \
377 | v850-* | v850e-* | vax-* \386 | v850-* | v850e-* | vax-* \
378 | we32k-* \387 | we32k-* \
379 | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \388 | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
@@ -467,6 +476,10 @@
467 basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`476 basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
468 os=-linux477 os=-linux
469 ;;478 ;;
479 bluegene*)
480 basic_machine=powerpc-ibm
481 os=-cnk
482 ;;
470 c90)483 c90)
471 basic_machine=c90-cray484 basic_machine=c90-cray
472 os=-unicos485 os=-unicos
@@ -719,6 +732,9 @@
719 basic_machine=ns32k-utek732 basic_machine=ns32k-utek
720 os=-sysv733 os=-sysv
721 ;;734 ;;
735 microblaze)
736 basic_machine=microblaze-xilinx
737 ;;
722 mingw32)738 mingw32)
723 basic_machine=i386-pc739 basic_machine=i386-pc
724 os=-mingw32740 os=-mingw32
@@ -1240,6 +1256,9 @@
1240 # First match some system type aliases1256 # First match some system type aliases
1241 # that might get confused with valid system types.1257 # that might get confused with valid system types.
1242 # -solaris* is a basic system type, with this one exception.1258 # -solaris* is a basic system type, with this one exception.
1259 -auroraux)
1260 os=-auroraux
1261 ;;
1243 -solaris1 | -solaris1.*)1262 -solaris1 | -solaris1.*)
1244 os=`echo $os | sed -e 's|solaris1|sunos4|'`1263 os=`echo $os | sed -e 's|solaris1|sunos4|'`
1245 ;;1264 ;;
@@ -1260,9 +1279,9 @@
1260 # Each alternative MUST END IN A *, to match a version number.1279 # Each alternative MUST END IN A *, to match a version number.
1261 # -sysv* is not here because it comes later, after sysvr4.1280 # -sysv* is not here because it comes later, after sysvr4.
1262 -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \1281 -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
1263 | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\1282 | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
1264 | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \1283 | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
1265 | -kopensolaris* \1284 | -sym* | -kopensolaris* \
1266 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \1285 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
1267 | -aos* | -aros* \1286 | -aos* | -aros* \
1268 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \1287 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1283,7 +1302,7 @@
1283 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \1302 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1284 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \1303 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1285 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \1304 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1286 | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)1305 | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
1287 # Remember, each alternative MUST END IN *, to match a version number.1306 # Remember, each alternative MUST END IN *, to match a version number.
1288 ;;1307 ;;
1289 -qnx*)1308 -qnx*)
@@ -1613,7 +1632,7 @@
1613 -sunos*)1632 -sunos*)
1614 vendor=sun1633 vendor=sun
1615 ;;1634 ;;
1616 -aix*)1635 -cnk*|-aix*)
1617 vendor=ibm1636 vendor=ibm
1618 ;;1637 ;;
1619 -beos*)1638 -beos*)
16201639
=== modified file 'configure'
--- configure 2010-04-01 21:42:40 +0000
+++ configure 2010-09-27 20:34:40 +0000
@@ -1,20 +1,24 @@
1#! /bin/sh1#! /bin/sh
2# Guess values for system-dependent variables and create Makefiles.2# Guess values for system-dependent variables and create Makefiles.
3# Generated by GNU Autoconf 2.63 for libgnomecanvas 2.30.1.3# Generated by GNU Autoconf 2.66 for libgnomecanvas 2.30.2.
4#4#
5# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=libgnomecanvas>.5# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=libgnomecanvas>.
6#6#
7#
7# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,8# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
8# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.9# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
10# Foundation, Inc.
11#
12#
9# This configure script is free software; the Free Software Foundation13# This configure script is free software; the Free Software Foundation
10# gives unlimited permission to copy, distribute and modify it.14# gives unlimited permission to copy, distribute and modify it.
11## --------------------- ##15## -------------------- ##
12## M4sh Initialization. ##16## M4sh Initialization. ##
13## --------------------- ##17## -------------------- ##
1418
15# Be more Bourne compatible19# Be more Bourne compatible
16DUALCASE=1; export DUALCASE # for MKS sh20DUALCASE=1; export DUALCASE # for MKS sh
17if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then21if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
18 emulate sh22 emulate sh
19 NULLCMD=:23 NULLCMD=:
20 # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which24 # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -22,23 +26,15 @@
22 alias -g '${1+"$@"}'='"$@"'26 alias -g '${1+"$@"}'='"$@"'
23 setopt NO_GLOB_SUBST27 setopt NO_GLOB_SUBST
24else28else
25 case `(set -o) 2>/dev/null` in29 case `(set -o) 2>/dev/null` in #(
26 *posix*) set -o posix ;;30 *posix*) :
31 set -o posix ;; #(
32 *) :
33 ;;
27esac34esac
28
29fi35fi
3036
3137
32
33
34# PATH needs CR
35# Avoid depending upon Character Ranges.
36as_cr_letters='abcdefghijklmnopqrstuvwxyz'
37as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
38as_cr_Letters=$as_cr_letters$as_cr_LETTERS
39as_cr_digits='0123456789'
40as_cr_alnum=$as_cr_Letters$as_cr_digits
41
42as_nl='38as_nl='
43'39'
44export as_nl40export as_nl
@@ -46,7 +42,13 @@
46as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'42as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
47as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo43as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
48as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo44as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
49if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then45# Prefer a ksh shell builtin over an external printf program on Solaris,
46# but without wasting forks for bash or zsh.
47if test -z "$BASH_VERSION$ZSH_VERSION" \
48 && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
49 as_echo='print -r --'
50 as_echo_n='print -rn --'
51elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
50 as_echo='printf %s\n'52 as_echo='printf %s\n'
51 as_echo_n='printf %s'53 as_echo_n='printf %s'
52else54else
@@ -57,7 +59,7 @@
57 as_echo_body='eval expr "X$1" : "X\\(.*\\)"'59 as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
58 as_echo_n_body='eval60 as_echo_n_body='eval
59 arg=$1;61 arg=$1;
60 case $arg in62 case $arg in #(
61 *"$as_nl"*)63 *"$as_nl"*)
62 expr "X$arg" : "X\\(.*\\)$as_nl";64 expr "X$arg" : "X\\(.*\\)$as_nl";
63 arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;65 arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -80,13 +82,6 @@
80 }82 }
81fi83fi
8284
83# Support unset when possible.
84if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
85 as_unset=unset
86else
87 as_unset=false
88fi
89
9085
91# IFS86# IFS
92# We need space, tab and new line, in precisely that order. Quoting is87# We need space, tab and new line, in precisely that order. Quoting is
@@ -96,15 +91,15 @@
96IFS=" "" $as_nl"91IFS=" "" $as_nl"
9792
98# Find who we are. Look in the path if we contain no directory separator.93# Find who we are. Look in the path if we contain no directory separator.
99case $0 in94case $0 in #((
100 *[\\/]* ) as_myself=$0 ;;95 *[\\/]* ) as_myself=$0 ;;
101 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR96 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
102for as_dir in $PATH97for as_dir in $PATH
103do98do
104 IFS=$as_save_IFS99 IFS=$as_save_IFS
105 test -z "$as_dir" && as_dir=.100 test -z "$as_dir" && as_dir=.
106 test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break101 test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
107done102 done
108IFS=$as_save_IFS103IFS=$as_save_IFS
109104
110 ;;105 ;;
@@ -116,12 +111,16 @@
116fi111fi
117if test ! -f "$as_myself"; then112if test ! -f "$as_myself"; then
118 $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2113 $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
119 { (exit 1); exit 1; }114 exit 1
120fi115fi
121116
122# Work around bugs in pre-3.0 UWIN ksh.117# Unset variables that we do not need and which cause bugs (e.g. in
123for as_var in ENV MAIL MAILPATH118# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
124do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var119# suppresses any "Segmentation fault" message there. '((' could
120# trigger a bug in pdksh 5.2.14.
121for as_var in BASH_ENV ENV MAIL MAILPATH
122do eval test x\${$as_var+set} = xset \
123 && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
125done124done
126PS1='$ '125PS1='$ '
127PS2='> '126PS2='> '
@@ -133,330 +132,309 @@
133LANGUAGE=C132LANGUAGE=C
134export LANGUAGE133export LANGUAGE
135134
136# Required to use basename.
137if expr a : '\(a\)' >/dev/null 2>&1 &&
138 test "X`expr 00001 : '.*\(...\)'`" = X001; then
139 as_expr=expr
140else
141 as_expr=false
142fi
143
144if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
145 as_basename=basename
146else
147 as_basename=false
148fi
149
150
151# Name of the executable.
152as_me=`$as_basename -- "$0" ||
153$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
154 X"$0" : 'X\(//\)$' \| \
155 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
156$as_echo X/"$0" |
157 sed '/^.*\/\([^/][^/]*\)\/*$/{
158 s//\1/
159 q
160 }
161 /^X\/\(\/\/\)$/{
162 s//\1/
163 q
164 }
165 /^X\/\(\/\).*/{
166 s//\1/
167 q
168 }
169 s/.*/./; q'`
170
171# CDPATH.135# CDPATH.
172$as_unset CDPATH136(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
173
174137
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: