Commit debian/2.18.3-1 - gnome-menus

* New upstream stable release; no API change. - Update autotools patch, 70_reautogen. Loïc Minier 16 years ago

2 changed file(s) with 527 addition(s) and 502 deletion(s). Raw diff Collapse all Expand all

-0

debian/changelog less more

	0	gnome-menus (2.18.3-1) unstable; urgency=low
	1
	2	* New upstream stable release; no API change.
	3	- Update autotools patch, 70_reautogen.
	4
	5	-- Loic Minier <lool@dooz.org> Tue, 03 Jul 2007 19:58:18 +0200
	6
0	7	gnome-menus (2.18.2-1) unstable; urgency=low
1	8
2	9	* New upstream stable release; no API change.

+520

-502

debian/patches/70_reautogen.patch less more

5	5	automake-1.9
6	6	rm -rf autom4te.cache
7	7
8		diff -Nur gnome-menus-2.18.2/aclocal.m4 gnome-menus-2.18.2.new/aclocal.m4
9		--- gnome-menus-2.18.2/aclocal.m4 2007-05-28 13:51:12.000000000 +0200
10		+++ gnome-menus-2.18.2.new/aclocal.m4 2007-05-28 15:39:53.000000000 +0200
	8	diff -Nur gnome-menus-2.18.3/aclocal.m4 gnome-menus-2.18.3.new/aclocal.m4
	9	--- gnome-menus-2.18.3/aclocal.m4 2007-07-02 19:17:14.000000000 +0200
	10	+++ gnome-menus-2.18.3.new/aclocal.m4 2007-07-03 19:57:07.000000000 +0200
11	11	@@ -11,5784 +11,4698 @@
12	12	# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
13	13	# PARTICULAR PURPOSE.

10198	10198	+
10199	10199	+# Transform the output of nm in a C name address pair
10200	10200	+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
10201		+
	10201
	10202	-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
	10203	-Xsed="$SED -e 1s/^X//"
10202	10204	+# This is the shared library runtime path variable.
10203	10205	+runpath_var=$runpath_var
10204
10205		-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
10206		-Xsed="$SED -e 1s/^X//"
10207		+# This is the shared library path variable.
10208		+shlibpath_var=$shlibpath_var
10209	10206
10210	10207	-# The HP-UX ksh and POSIX shell print the target directory to stdout
10211	10208	-# if CDPATH is set.
10212	10209	-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
	10210	+# This is the shared library path variable.
	10211	+shlibpath_var=$shlibpath_var
	10212
	10213	-# The names of the tagged configurations supported by this script.
	10214	-available_tags=
10213	10215	+# Is shlibpath searched before the hard-coded library search path?
10214	10216	+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
10215	10217
10216		-# The names of the tagged configurations supported by this script.
10217		-available_tags=
	10218	-# ### BEGIN LIBTOOL CONFIG],
	10219	-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
10218	10220	+# How to hardcode a shared library path into an executable.
10219	10221	+hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
10220	10222
10221		-# ### BEGIN LIBTOOL CONFIG],
10222		-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
	10223	-# Libtool was configured on host `(hostname \|\| uname -n) 2>/dev/null \| sed 1q`:
10223	10224	+# Whether we should hardcode library paths into libraries.
10224	10225	+hardcode_into_libs=$hardcode_into_libs
10225	10226
10226		-# Libtool was configured on host `(hostname \|\| uname -n) 2>/dev/null \| sed 1q`:
	10227	-# Shell to use when invoking shell scripts.
	10228	-SHELL=$lt_SHELL
10227	10229	+# Flag to hardcode \$libdir into a binary during linking.
10228	10230	+# This must work even if \$libdir does not exist.
10229	10231	+hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
10230	10232
10231		-# Shell to use when invoking shell scripts.
10232		-SHELL=$lt_SHELL
	10233	-# Whether or not to build shared libraries.
	10234	-build_libtool_libs=$enable_shared
10233	10235	+# If ld is used when linking, flag to hardcode \$libdir into
10234	10236	+# a binary during linking. This must work even if \$libdir does
10235	10237	+# not exist.
10236	10238	+hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
10237	10239
10238		-# Whether or not to build shared libraries.
10239		-build_libtool_libs=$enable_shared
	10240	-# Whether or not to build static libraries.
	10241	-build_old_libs=$enable_static
10240	10242	+# Whether we need a single -rpath flag with a separated argument.
10241	10243	+hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
10242	10244
10243		-# Whether or not to build static libraries.
10244		-build_old_libs=$enable_static
	10245	-# Whether or not to add -lc for building shared libraries.
	10246	-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
10245	10247	+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
10246	10248	+# resulting binary.
10247	10249	+hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
10248	10250
10249		-# Whether or not to add -lc for building shared libraries.
10250		-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
	10251	-# Whether or not to disallow shared libs when runtime libs are static
	10252	-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
10251	10253	+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
10252	10254	+# resulting binary.
10253	10255	+hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
10254	10256
10255		-# Whether or not to disallow shared libs when runtime libs are static
10256		-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
	10257	-# Whether or not to optimize for fast installation.
	10258	-fast_install=$enable_fast_install
10257	10259	+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
10258	10260	+# the resulting binary.
10259	10261	+hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
10260
10261		-# Whether or not to optimize for fast installation.
10262		-fast_install=$enable_fast_install
10263		+# Set to yes if building a shared library automatically hardcodes DIR into the library
10264		+# and all subsequent libraries and executables linked against it.
10265		+hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
10266	10262
10267	10263	-# The host system.
10268	10264	-host_alias=$host_alias
10269	10265	-host=$host
10270	10266	-host_os=$host_os
10271		+# Variables whose values should be saved in libtool wrapper scripts and
10272		+# restored at relink time.
10273		+variables_saved_for_relink="$variables_saved_for_relink"
	10267	+# Set to yes if building a shared library automatically hardcodes DIR into the library
	10268	+# and all subsequent libraries and executables linked against it.
	10269	+hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
10274	10270
10275	10271	-# The build system.
10276	10272	-build_alias=$build_alias
10277	10273	-build=$build
10278	10274	-build_os=$build_os
	10275	+# Variables whose values should be saved in libtool wrapper scripts and
	10276	+# restored at relink time.
	10277	+variables_saved_for_relink="$variables_saved_for_relink"
	10278
	10279	-# An echo program that does not interpret backslashes.
	10280	-echo=$lt_echo
10279	10281	+# Whether libtool must link a program against all its dependency libraries.
10280	10282	+link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
10281
10282		-# An echo program that does not interpret backslashes.
10283		-echo=$lt_echo
10284		+# Compile-time system search path for libraries
10285		+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
10286	10283
10287	10284	-# The archiver.
10288	10285	-AR=$lt_AR
10289	10286	-AR_FLAGS=$lt_AR_FLAGS
	10287	+# Compile-time system search path for libraries
	10288	+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
	10289
	10290	-# A C compiler.
	10291	-LTCC=$lt_LTCC
10290	10292	+# Run-time system search path for libraries
10291	10293	+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
10292	10294
10293		-# A C compiler.
10294		-LTCC=$lt_LTCC
	10295	-# LTCC compiler flags.
	10296	-LTCFLAGS=$lt_LTCFLAGS
10295	10297	+# Fix the shell variable \$srcfile for the compiler.
10296	10298	+fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
10297	10299
10298		-# LTCC compiler flags.
10299		-LTCFLAGS=$lt_LTCFLAGS
	10300	-# A language-specific compiler.
	10301	-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
10300	10302	+# Set to yes if exported symbols are required.
10301	10303	+always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
10302	10304
10303		-# A language-specific compiler.
10304		-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
	10305	-# Is the compiler the GNU C compiler?
	10306	-with_gcc=$_LT_AC_TAGVAR(GCC, $1)
10305	10307	+# The commands to list exported symbols.
10306	10308	+export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
10307	10309
10308		-# Is the compiler the GNU C compiler?
10309		-with_gcc=$_LT_AC_TAGVAR(GCC, $1)
	10310	-# An ERE matcher.
	10311	-EGREP=$lt_EGREP
10310	10312	+# The commands to extract the exported symbol list from a shared archive.
10311	10313	+extract_expsyms_cmds=$lt_extract_expsyms_cmds
10312	10314
10313		-# An ERE matcher.
10314		-EGREP=$lt_EGREP
	10315	-# The linker used to build libraries.
	10316	-LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
10315	10317	+# Symbols that should not be listed in the preloaded symbols.
10316	10318	+exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
10317	10319
10318		-# The linker used to build libraries.
10319		-LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
	10320	-# Whether we need hard or soft links.
	10321	-LN_S=$lt_LN_S
10320	10322	+# Symbols that must always be exported.
10321	10323	+include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
10322	10324
10323		-# Whether we need hard or soft links.
10324		-LN_S=$lt_LN_S
	10325	-# A BSD-compatible nm program.
	10326	-NM=$lt_NM
10325	10327	+ifelse([$1],[],
10326	10328	+[# ### END LIBTOOL CONFIG],
10327	10329	+[# ### END LIBTOOL TAG CONFIG: $tagname])
10328	10330
10329		-# A BSD-compatible nm program.
10330		-NM=$lt_NM
10331		+__EOF__
10332
10333	10331	-# A symbol stripping program
10334	10332	-STRIP=$lt_STRIP
	10333	+__EOF__
	10334
	10335	-# Used to examine libraries when file_magic_cmd begins "file"
	10336	-MAGIC_CMD=$MAGIC_CMD
10335	10337	+ifelse([$1],[], [
10336	10338	+ case $host_os in
10337	10339	+ aix3*)
10338	10340	+ cat <<\EOF >> "$cfgfile"
10339	10341
10340		-# Used to examine libraries when file_magic_cmd begins "file"
10341		-MAGIC_CMD=$MAGIC_CMD
	10342	-# Used on cygwin: DLL creation program.
	10343	-DLLTOOL="$DLLTOOL"
10342	10344	+# AIX sometimes has problems with the GCC collect2 program. For some
10343	10345	+# reason, if we set the COLLECT_NAMES environment variable, the problems
10344	10346	+# vanish in a puff of smoke.

10350	10352	+ ;;
10351	10353	+ esac
10352	10354
10353		-# Used on cygwin: DLL creation program.
10354		-DLLTOOL="$DLLTOOL"
	10355	-# Used on cygwin: object dumper.
	10356	-OBJDUMP="$OBJDUMP"
10355	10357	+ # We use sed instead of cat because bash on DJGPP gets confused if
10356	10358	+ # if finds mixed CR/LF and LF-only lines. Since sed operates in
10357	10359	+ # text mode, it properly converts lines to CR/LF. This bash problem
10358	10360	+ # is reportedly fixed, but why not run on old versions too?
10359	10361	+ sed '$q' "$ltmain" >> "$cfgfile" \|\| (rm -f "$cfgfile"; exit 1)
10360	10362
10361		-# Used on cygwin: object dumper.
10362		-OBJDUMP="$OBJDUMP"
	10363	-# Used on cygwin: assembler.
	10364	-AS="$AS"
10363	10365	+ mv -f "$cfgfile" "$ofile" \|\| \
10364	10366	+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
10365	10367	+ chmod +x "$ofile"

10375	10377	+fi
10376	10378	+])# AC_LIBTOOL_CONFIG
10377	10379
10378		-# Used on cygwin: assembler.
10379		-AS="$AS"
10380
10381	10380	-# The name of the directory that contains temporary libtool files.
10382	10381	-objdir=$objdir
	10382
	10383	-# How to create reloadable object files.
	10384	-reload_flag=$lt_reload_flag
	10385	-reload_cmds=$lt_reload_cmds
10383	10386	+# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
10384	10387	+# -------------------------------------------
10385	10388	+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
10386	10389	+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
10387	10390
10388		-# How to create reloadable object files.
10389		-reload_flag=$lt_reload_flag
10390		-reload_cmds=$lt_reload_cmds
10391		+_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
10392
10393	10391	-# How to pass a linker flag through the compiler.
10394	10392	-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
	10393	+_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
	10394
	10395	-# Object file suffix (normally "o").
	10396	-objext="$ac_objext"
10395	10397	+if test "$GCC" = yes; then
10396	10398	+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
10397	10399
10398		-# Object file suffix (normally "o").
10399		-objext="$ac_objext"
	10400	-# Old archive suffix (normally "a").
	10401	-libext="$libext"
10400	10402	+ AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
10401	10403	+ lt_cv_prog_compiler_rtti_exceptions,
10402	10404	+ [-fno-rtti -fno-exceptions], [],

10404	10406	+fi
10405	10407	+])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
10406	10408
10407		-# Old archive suffix (normally "a").
10408		-libext="$libext"
10409
10410	10409	-# Shared library suffix (normally ".so").
10411	10410	-shrext_cmds='$shrext_cmds'
	10411
	10412	-# Executable file suffix (normally "").
	10413	-exeext="$exeext"
10412	10414	+# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
10413	10415	+# ---------------------------------
10414	10416	+AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],

10422	10424	+# These are sane defaults that work on at least a few old systems.
10423	10425	+# [They come from Ultrix. What could be older than Ultrix?!! ;)]
10424	10426
10425		-# Executable file suffix (normally "").
10426		-exeext="$exeext"
	10427	-# Additional compiler flags for building library objects.
	10428	-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
	10429	-pic_mode=$pic_mode
10427	10430	+# Character class describing NM global symbol codes.
10428	10431	+symcode='[[BCDEGRST]]'
10429	10432	+

10489	10492	+ ;;
10490	10493	+esac
10491	10494
10492		-# Additional compiler flags for building library objects.
10493		-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
10494		-pic_mode=$pic_mode
	10495	-# What is the maximum length of a command?
	10496	-max_cmd_len=$lt_cv_sys_max_cmd_len
10495	10497	+# If we're using GNU nm, then use its standard symbol codes.
10496	10498	+case `$NM -V 2>&1` in
10497	10499	+GNU \| 'with BFD')
10498	10500	+ symcode='[[ABCDGIRSTW]]' ;;
10499	10501	+esac
10500	10502
10501		-# What is the maximum length of a command?
10502		-max_cmd_len=$lt_cv_sys_max_cmd_len
	10503	-# Does compiler simultaneously support -c and -o options?
	10504	-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
10503	10505	+# Try without a prefix undercore, then with it.
10504	10506	+for ac_symprfx in "" "_"; do
10505	10507
10506		-# Does compiler simultaneously support -c and -o options?
10507		-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
	10508	-# Must we lock files when doing compilation?
	10509	-need_locks=$lt_need_locks
10508	10510	+ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
10509	10511	+ symxfrm="\\1 $ac_symprfx\\2 \\2"
10510	10512
10511		-# Must we lock files when doing compilation?
10512		-need_locks=$lt_need_locks
	10513	-# Do we need the lib prefix for modules?
	10514	-need_lib_prefix=$need_lib_prefix
10513	10515	+ # Write the raw and C identifiers.
10514	10516	+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.[[ ]]$$symcode$symcode$[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
10515	10517
10516		-# Do we need the lib prefix for modules?
10517		-need_lib_prefix=$need_lib_prefix
	10518	-# Do we need a version for libraries?
	10519	-need_version=$need_version
10518	10520	+ # Check to see that the pipe works correctly.
10519	10521	+ pipe_works=no
10520	10522
10521		-# Do we need a version for libraries?
10522		-need_version=$need_version
	10523	-# Whether dlopen is supported.
	10524	-dlopen_support=$enable_dlopen
10523	10525	+ rm -f conftest*
10524	10526	+ cat > conftest.$ac_ext <<EOF
10525	10527	+#ifdef __cplusplus

10533	10535	+int main(){nm_test_var='a';nm_test_func();return(0);}
10534	10536	+EOF
10535	10537
10536		-# Whether dlopen is supported.
10537		-dlopen_support=$enable_dlopen
	10538	-# Whether dlopen of programs is supported.
	10539	-dlopen_self=$enable_dlopen_self
10538	10540	+ if AC_TRY_EVAL(ac_compile); then
10539	10541	+ # Now try to grab the symbols.
10540	10542	+ nlist=conftest.nm

10546	10548	+ rm -f "$nlist"T
10547	10549	+ fi
10548	10550
10549		-# Whether dlopen of programs is supported.
10550		-dlopen_self=$enable_dlopen_self
	10551	-# Whether dlopen of statically linked programs is supported.
	10552	-dlopen_self_static=$enable_dlopen_self_static
10551	10553	+ # Make sure that we snagged all the symbols we need.
10552	10554	+ if grep ' nm_test_var$' "$nlist" >/dev/null; then
10553	10555	+ if grep ' nm_test_func$' "$nlist" >/dev/null; then

10556	10558	+extern "C" {
10557	10559	+#endif
10558	10560
10559		-# Whether dlopen of statically linked programs is supported.
10560		-dlopen_self_static=$enable_dlopen_self_static
	10561	-# Compiler flag to prevent dynamic linking.
	10562	-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
10561	10563	+EOF
10562	10564	+ # Now generate the symbol file.
10563	10565	+ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" \| grep -v main >> conftest.$ac_ext'
10564	10566
10565		-# Compiler flag to prevent dynamic linking.
10566		-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
	10567	-# Compiler flag to turn off builtin functions.
	10568	-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
10567	10569	+ cat <<EOF >> conftest.$ac_ext
10568	10570	+#if defined (__STDC__) && __STDC__
10569	10571	+# define lt_ptr_t void *

10572	10574	+# define const
10573	10575	+#endif
10574	10576
10575		-# Compiler flag to turn off builtin functions.
10576		-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
	10577	-# Compiler flag to allow reflexive dlopens.
	10578	-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
10577	10579	+/* The mapping between symbol names and symbols. */
10578	10580	+const struct {
10579	10581	+ const char *name;

10587	10589	+ {0, (lt_ptr_t) 0}
10588	10590	+};
10589	10591
10590		-# Compiler flag to allow reflexive dlopens.
10591		-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
	10592	-# Compiler flag to generate shared objects directly from archives.
	10593	-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
10592	10594	+#ifdef __cplusplus
10593	10595	+}
10594	10596	+#endif

10619	10621	+ fi
10620	10622	+ rm -f conftest* conftst*
10621	10623
10622		-# Compiler flag to generate shared objects directly from archives.
10623		-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
	10624	-# Compiler flag to generate thread-safe objects.
	10625	-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
10624	10626	+ # Do not use the global_symbol_pipe unless it works.
10625	10627	+ if test "$pipe_works" = yes; then
10626	10628	+ break

10639	10641	+fi
10640	10642	+]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
10641	10643
10642		-# Compiler flag to generate thread-safe objects.
10643		-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
10644
10645	10644	-# Library versioning type.
10646	10645	-version_type=$version_type
	10646
	10647	-# Format of library name prefix.
	10648	-libname_spec=$lt_libname_spec
10647	10649	+# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
10648	10650	+# ---------------------------------------
10649	10651	+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],

10651	10653	+_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
10652	10654	+_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
10653	10655
10654		-# Format of library name prefix.
10655		-libname_spec=$lt_libname_spec
	10656	-# List of archive names. First name is the real one, the rest are links.
	10657	-# The last name is the one that the linker finds with -lNAME.
	10658	-library_names_spec=$lt_library_names_spec
10656	10659	+AC_MSG_CHECKING([for $compiler option to produce PIC])
10657	10660	+ ifelse([$1],[CXX],[
10658	10661	+ # C++ specific cases for pic, static, wl, etc.

10660	10663	+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
10661	10664	+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
10662	10665
10663		-# List of archive names. First name is the real one, the rest are links.
10664		-# The last name is the one that the linker finds with -lNAME.
10665		-library_names_spec=$lt_library_names_spec
	10666	-# The coded name of the library, if different from the real name.
	10667	-soname_spec=$lt_soname_spec
10666	10668	+ case $host_os in
10667	10669	+ aix*)
10668	10670	+ # All AIX code is PIC.

10934	10936	+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
10935	10937	+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
10936	10938
10937		-# The coded name of the library, if different from the real name.
10938		-soname_spec=$lt_soname_spec
	10939	-# Commands used to build and install an old-style archive.
	10940	-RANLIB=$lt_RANLIB
	10941	-old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
	10942	-old_postinstall_cmds=$lt_old_postinstall_cmds
	10943	-old_postuninstall_cmds=$lt_old_postuninstall_cmds
10939	10944	+ case $host_os in
10940	10945	+ aix*)
10941	10946	+ # All AIX code is PIC.

10945	10950	+ fi
10946	10951	+ ;;
10947	10952
10948		-# Commands used to build and install an old-style archive.
10949		-RANLIB=$lt_RANLIB
10950		-old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
10951		-old_postinstall_cmds=$lt_old_postinstall_cmds
10952		-old_postuninstall_cmds=$lt_old_postuninstall_cmds
	10953	-# Create an old-style archive from a shared archive.
	10954	-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
10953	10955	+ amigaos*)
10954	10956	+ # FIXME: we need at least 68020 code to build shared libraries, but
10955	10957	+ # adding the `-m68020' flag to GCC prevents building anything better,

10957	10959	+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
10958	10960	+ ;;
10959	10961
10960		-# Create an old-style archive from a shared archive.
10961		-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
	10962	-# Create a temporary old-style archive to link instead of a shared archive.
	10963	-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
10962	10964	+ beos* \| cygwin* \| irix5* \| irix6* \| nonstopux* \| osf3* \| osf4* \| osf5*)
10963	10965	+ # PIC is the default for these OSes.
10964	10966	+ ;;
10965	10967
10966		-# Create a temporary old-style archive to link instead of a shared archive.
10967		-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
	10968	-# Commands used to build and install a shared archive.
	10969	-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
	10970	-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
	10971	-postinstall_cmds=$lt_postinstall_cmds
	10972	-postuninstall_cmds=$lt_postuninstall_cmds
10968	10973	+ mingw* \| pw32* \| os2*)
10969	10974	+ # This hack is so that the source file can tell whether it is being
10970	10975	+ # built for inclusion in a dll (and should export symbols for example).
10971	10976	+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
10972	10977	+ ;;
10973	10978
10974		-# Commands used to build and install a shared archive.
10975		-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
10976		-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
10977		-postinstall_cmds=$lt_postinstall_cmds
10978		-postuninstall_cmds=$lt_postuninstall_cmds
	10979	-# Commands used to build a loadable module (assumed same as above if empty)
	10980	-module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
	10981	-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
10979	10982	+ darwin* \| rhapsody*)
10980	10983	+ # PIC is the default on this platform
10981	10984	+ # Common symbols not allowed in MH_DYLIB files
10982	10985	+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
10983	10986	+ ;;
10984	10987
10985		-# Commands used to build a loadable module (assumed same as above if empty)
10986		-module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
10987		-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
	10988	-# Commands to strip libraries.
	10989	-old_striplib=$lt_old_striplib
	10990	-striplib=$lt_striplib
10988	10991	+ interix3*)
10989	10992	+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
10990	10993	+ # Instead, we relocate shared libraries at runtime.
10991	10994	+ ;;
10992	10995
10993		-# Commands to strip libraries.
10994		-old_striplib=$lt_old_striplib
10995		-striplib=$lt_striplib
	10996	-# Dependencies to place before the objects being linked to create a
	10997	-# shared library.
	10998	-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
10996	10999	+ msdosdjgpp*)
10997	11000	+ # Just because we use GCC doesn't mean we suddenly get shared libraries
10998	11001	+ # on systems that don't support them.

11000	11003	+ enable_shared=no
11001	11004	+ ;;
11002	11005
11003		-# Dependencies to place before the objects being linked to create a
	11006	-# Dependencies to place after the objects being linked to create a
11004	11007	-# shared library.
11005		-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
	11008	-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
11006	11009	+ sysv4MP)
11007	11010	+ if test -d /usr/nec; then
11008	11011	+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
11009	11012	+ fi
11010	11013	+ ;;
11011	11014
11012		-# Dependencies to place after the objects being linked to create a
	11015	-# Dependencies to place before the objects being linked to create a
11013	11016	-# shared library.
11014		-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
	11017	-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
11015	11018	+ hpux*)
11016	11019	+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
11017	11020	+ # not for PA HP-UX.

11025	11028	+ esac
11026	11029	+ ;;
11027	11030
11028		-# Dependencies to place before the objects being linked to create a
	11031	-# Dependencies to place after the objects being linked to create a
11029	11032	-# shared library.
11030		-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
	11033	-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
11031	11034	+ *)
11032	11035	+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
11033	11036	+ ;;

11055	11058	+ esac
11056	11059	+ ;;
11057	11060
11058		-# Dependencies to place after the objects being linked to create a
11059		-# shared library.
11060		-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
	11061	-# The library search path used internally by the compiler when linking
	11062	-# a shared library.
	11063	-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
11061	11064	+ mingw* \| pw32* \| os2*)
11062	11065	+ # This hack is so that the source file can tell whether it is being
11063	11066	+ # built for inclusion in a dll (and should export symbols for example).
11064	11067	+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
11065	11068	+ ;;
11066	11069
11067		-# The library search path used internally by the compiler when linking
11068		-# a shared library.
11069		-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
	11070	-# Method to check whether dependent libraries are shared objects.
	11071	-deplibs_check_method=$lt_deplibs_check_method
11070	11072	+ hpux9* \| hpux10* \| hpux11*)
11071	11073	+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
11072	11074	+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but

11083	11085	+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
11084	11086	+ ;;
11085	11087
11086		-# Method to check whether dependent libraries are shared objects.
11087		-deplibs_check_method=$lt_deplibs_check_method
	11088	-# Command to use when deplibs_check_method == file_magic.
	11089	-file_magic_cmd=$lt_file_magic_cmd
11088	11090	+ irix5* \| irix6* \| nonstopux*)
11089	11091	+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
11090	11092	+ # PIC (with -KPIC) is the default.
11091	11093	+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
11092	11094	+ ;;
11093	11095
11094		-# Command to use when deplibs_check_method == file_magic.
11095		-file_magic_cmd=$lt_file_magic_cmd
	11096	-# Flag that allows shared libraries with undefined symbols to be built.
	11097	-allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
11096	11098	+ newsos6)
11097	11099	+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
11098	11100	+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
11099	11101	+ ;;
11100	11102
11101		-# Flag that allows shared libraries with undefined symbols to be built.
11102		-allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
	11103	-# Flag that forces no undefined symbols.
	11104	-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
11103	11105	+ linux* \| kbsd-gnu)
11104	11106	+ case $cc_basename in
11105	11107	+ icc* \| ecc*)

11122	11124	+ esac
11123	11125	+ ;;
11124	11126
11125		-# Flag that forces no undefined symbols.
11126		-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
	11127	-# Commands used to finish a libtool library installation in a directory.
	11128	-finish_cmds=$lt_finish_cmds
11127	11129	+ osf3* \| osf4* \| osf5*)
11128	11130	+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
11129	11131	+ # All OSF/1 code is PIC.
11130	11132	+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
11131	11133	+ ;;
11132	11134
11133		-# Commands used to finish a libtool library installation in a directory.
11134		-finish_cmds=$lt_finish_cmds
	11135	-# Same as above, but a single script fragment to be evaled but not shown.
	11136	-finish_eval=$lt_finish_eval
11135	11137	+ solaris*)
11136	11138	+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
11137	11139	+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'

11143	11145	+ esac
11144	11146	+ ;;
11145	11147
11146		-# Same as above, but a single script fragment to be evaled but not shown.
11147		-finish_eval=$lt_finish_eval
	11148	-# Take the output of nm and produce a listing of raw symbols and C names.
	11149	-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
11148	11150	+ sunos4*)
11149	11151	+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
11150	11152	+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
11151	11153	+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
11152	11154	+ ;;
11153	11155
11154		-# Take the output of nm and produce a listing of raw symbols and C names.
11155		-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
	11156	-# Transform the output of nm in a proper C declaration
	11157	-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
11156	11158	+ sysv4 \| sysv4.2uw2* \| sysv4.3*)
11157	11159	+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
11158	11160	+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
11159	11161	+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
11160	11162	+ ;;
11161	11163
11162		-# Transform the output of nm in a proper C declaration
11163		-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
	11164	-# Transform the output of nm in a C name address pair
	11165	-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
11164	11166	+ sysv4MP)
11165	11167	+ if test -d /usr/nec ;then
11166	11168	+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'

11168	11170	+ fi
11169	11171	+ ;;
11170	11172
11171		-# Transform the output of nm in a C name address pair
11172		-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
	11173	-# This is the shared library runtime path variable.
	11174	-runpath_var=$runpath_var
11173	11175	+ sysv5* \| unixware* \| sco3.2v5* \| sco5v6* \| OpenUNIX*)
11174	11176	+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
11175	11177	+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
11176	11178	+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
11177	11179	+ ;;
11178	11180
11179		-# This is the shared library runtime path variable.
11180		-runpath_var=$runpath_var
	11181	-# This is the shared library path variable.
	11182	-shlibpath_var=$shlibpath_var
11181	11183	+ unicos*)
11182	11184	+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
11183	11185	+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
11184	11186	+ ;;
11185	11187
11186		-# This is the shared library path variable.
11187		-shlibpath_var=$shlibpath_var
	11188	-# Is shlibpath searched before the hard-coded library search path?
	11189	-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
11188	11190	+ uts4*)
11189	11191	+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
11190	11192	+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
11191	11193	+ ;;
11192	11194
11193		-# Is shlibpath searched before the hard-coded library search path?
11194		-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
	11195	-# How to hardcode a shared library path into an executable.
	11196	-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
11195	11197	+ *)
11196	11198	+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
11197	11199	+ ;;

11200	11202	+])
11201	11203	+AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
11202	11204
11203		-# How to hardcode a shared library path into an executable.
11204		-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
	11205	-# Whether we should hardcode library paths into libraries.
	11206	-hardcode_into_libs=$hardcode_into_libs
11205	11207	+#
11206	11208	+# Check to make sure the PIC flag actually works.
11207	11209	+#

11226	11228	+ ;;
11227	11229	+esac
11228	11230
11229		-# Whether we should hardcode library paths into libraries.
11230		-hardcode_into_libs=$hardcode_into_libs
	11231	-# Flag to hardcode \$libdir into a binary during linking.
	11232	-# This must work even if \$libdir does not exist.
	11233	-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
11231	11234	+#
11232	11235	+# Check to make sure the static flag actually works.
11233	11236	+#

11239	11242	+ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
11240	11243	+])
11241	11244
11242		-# Flag to hardcode \$libdir into a binary during linking.
11243		-# This must work even if \$libdir does not exist.
11244		-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
11245
11246	11245	-# If ld is used when linking, flag to hardcode \$libdir into
11247	11246	-# a binary during linking. This must work even if \$libdir does
11248	11247	-# not exist.
11249	11248	-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
	11249
	11250	-# Whether we need a single -rpath flag with a separated argument.
	11251	-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
11250	11252	+# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
11251	11253	+# ------------------------------------
11252	11254	+# See if the linker supports building shared libraries.

11333	11335	+ with_gnu_ld=no
11334	11336	+ ;;
11335	11337	+ esac
11336
11337		-# Whether we need a single -rpath flag with a separated argument.
11338		-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
	11338	+
11339	11339	+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes
11340	11340	+ if test "$with_gnu_ld" = yes; then
11341	11341	+ # If archive_cmds runs LD, not CC, wlarc should be empty

12777	12777	+# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
12778	12778	+# ---------------------------------
12779	12779	+AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
12780		+
12781		+
	12780
	12781	- interix3*)
	12782	- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
	12783	- # Instead, we relocate shared libraries at runtime.
	12784	- ;;
	12785
	12786	- msdosdjgpp*)
	12787	- # Just because we use GCC doesn't mean we suddenly get shared libraries
	12788	- # on systems that don't support them.
	12789	- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
	12790	- enable_shared=no
	12791	- ;;
12782	12792	+# old names
12783	12793	+AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL])
12784	12794	+AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])

12925	12935	+m4_ifvaln([$3], [else
12926	12936	+ $3])dnl
12927	12937	+fi])
12928
12929		- interix3*)
12930		- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
12931		- # Instead, we relocate shared libraries at runtime.
12932		- ;;
12933
12934		- msdosdjgpp*)
12935		- # Just because we use GCC doesn't mean we suddenly get shared libraries
12936		- # on systems that don't support them.
12937		- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
12938		- enable_shared=no
	12938	+
	12939
	12940	- sysv4MP)
	12941	- if test -d /usr/nec; then
	12942	- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
	12943	- fi
12939	12944	- ;;
12940	12945	+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
12941	12946	+# ---------------------------------------------

12953	12958	+fi[]dnl
12954	12959	+])# _PKG_CONFIG
12955	12960
12956		- sysv4MP)
12957		- if test -d /usr/nec; then
12958		- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
12959		- fi
12960		- ;;
12961		+# _PKG_SHORT_ERRORS_SUPPORTED
12962		+# -----------------------------
12963		+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
12964		+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
12965		+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
12966		+ _pkg_short_errors_supported=yes
12967		+else
12968		+ _pkg_short_errors_supported=no
12969		+fi[]dnl
12970		+])# _PKG_SHORT_ERRORS_SUPPORTED
12971
12972	12961	- hpux*)
12973	12962	- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
12974	12963	- # not for PA HP-UX.

12981	12970	- ;;
12982	12971	- esac
12983	12972	- ;;
	12973	+# _PKG_SHORT_ERRORS_SUPPORTED
	12974	+# -----------------------------
	12975	+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
	12976	+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
	12977	+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
	12978	+ _pkg_short_errors_supported=yes
	12979	+else
	12980	+ _pkg_short_errors_supported=no
	12981	+fi[]dnl
	12982	+])# _PKG_SHORT_ERRORS_SUPPORTED
12984	12983
12985	12984	- *)
12986	12985	- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'

13008	13007	- ;;
13009	13008	- esac
13010	13009	- ;;
	13010
	13011	- mingw* \| pw32* \| os2*)
	13012	- # This hack is so that the source file can tell whether it is being
	13013	- # built for inclusion in a dll (and should export symbols for example).
	13014	- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
	13015	- ;;
13011	13016	+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
13012	13017	+# [ACTION-IF-NOT-FOUND])
13013	13018	+#

13022	13027	+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
13023	13028	+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
13024	13029	+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
13025
13026		- mingw* \| pw32* \| os2*)
13027		- # This hack is so that the source file can tell whether it is being
13028		- # built for inclusion in a dll (and should export symbols for example).
13029		- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
13030		- ;;
13031		+pkg_failed=no
13032		+AC_MSG_CHECKING([for $1])
13033	13030
13034	13031	- hpux9* \| hpux10* \| hpux11*)
13035	13032	- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'

13046	13043	- # Is there a better lt_prog_compiler_static that works with the bundled CC?
13047	13044	- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
13048	13045	- ;;
13049		+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
13050		+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
	13046	+pkg_failed=no
	13047	+AC_MSG_CHECKING([for $1])
13051	13048
13052	13049	- irix5* \| irix6* \| nonstopux*)
13053	13050	- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
13054	13051	- # PIC (with -KPIC) is the default.
13055	13052	- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
13056	13053	- ;;
13057		+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
13058		+and $1[]_LIBS to avoid the need to call pkg-config.
13059		+See the pkg-config man page for more details.])
	13054	+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
	13055	+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
13060	13056
13061	13057	- newsos6)
13062	13058	- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
13063	13059	- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
13064	13060	- ;;
13065		+if test $pkg_failed = yes; then
13066		+ _PKG_SHORT_ERRORS_SUPPORTED
13067		+ if test $_pkg_short_errors_supported = yes; then
13068		+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
13069		+ else
13070		+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
13071		+ fi
13072		+ # Put the nasty error message in config.log where it belongs
13073		+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
	13061	+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
	13062	+and $1[]_LIBS to avoid the need to call pkg-config.
	13063	+See the pkg-config man page for more details.])
13074	13064
13075	13065	- linux*)
13076	13066	- case $cc_basename in

13093	13083	- ;;
13094	13084	- esac
13095	13085	- ;;
13096		+ ifelse([$4], , [AC_MSG_ERROR(dnl
13097		+[Package requirements ($2) were not met:
	13086	+if test $pkg_failed = yes; then
	13087	+ _PKG_SHORT_ERRORS_SUPPORTED
	13088	+ if test $_pkg_short_errors_supported = yes; then
	13089	+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
	13090	+ else
	13091	+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
	13092	+ fi
	13093	+ # Put the nasty error message in config.log where it belongs
	13094	+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
13098	13095
13099	13096	- osf3* \| osf4* \| osf5*)
13100	13097	- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
13101	13098	- # All OSF/1 code is PIC.
13102	13099	- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
13103	13100	- ;;
13104		+$$1_PKG_ERRORS
	13101	+ ifelse([$4], , [AC_MSG_ERROR(dnl
	13102	+[Package requirements ($2) were not met:
13105	13103
13106	13104	- solaris*)
13107	13105	- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'

13113	13111	- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
13114	13112	- esac
13115	13113	- ;;
13116		+Consider adjusting the PKG_CONFIG_PATH environment variable if you
13117		+installed software in a non-standard prefix.
	13114	+$$1_PKG_ERRORS
13118	13115
13119	13116	- sunos4*)
13120	13117	- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
13121	13118	- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
	13119	- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
	13120	- ;;
	13121	+Consider adjusting the PKG_CONFIG_PATH environment variable if you
	13122	+installed software in a non-standard prefix.
	13123
	13124	- sysv4 \| sysv4.2uw2* \| sysv4.3*)
	13125	- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
	13126	- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
13122	13127	- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
13123	13128	- ;;
13124	13129	+_PKG_TEXT

13131	13136	+is in your PATH or set the PKG_CONFIG environment variable to the full
13132	13137	+path to pkg-config.
13133	13138
13134		- sysv4 \| sysv4.2uw2* \| sysv4.3*)
13135		- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
13136		- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
13137		- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
13138		- ;;
13139		+_PKG_TEXT
13140
13141	13139	- sysv4MP)
13142	13140	- if test -d /usr/nec ;then
13143	13141	- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
13144	13142	- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
13145	13143	- fi
13146	13144	- ;;
13147		+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
	13145	+_PKG_TEXT
	13146
	13147	- sysv5* \| unixware* \| sco3.2v5* \| sco5v6* \| OpenUNIX*)
	13148	- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
	13149	- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
	13150	- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
	13151	- ;;
	13152	+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
13148	13153	+ [$4])
13149	13154	+else
13150	13155	+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS

13154	13159	+fi[]dnl
13155	13160	+])# PKG_CHECK_MODULES
13156	13161
13157		- sysv5* \| unixware* \| sco3.2v5* \| sco5v6* \| OpenUNIX*)
	13162	- unicos*)
13158	13163	- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
13159		- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
13160		- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
	13164	- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
13161	13165	- ;;
13162	13166	+# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
13163	13167	+#

13165	13169	+# gives unlimited permission to copy and/or distribute it,
13166	13170	+# with or without modifications, as long as this notice is preserved.
13167	13171
13168		- unicos*)
13169		- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
13170		- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
	13172	- uts4*)
	13173	- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
	13174	- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
13171	13175	- ;;
13172	13176	+# AM_AUTOMAKE_VERSION(VERSION)
13173	13177	+# ----------------------------
13174	13178	+# Automake X.Y traces this macro to ensure aclocal.m4 has been
13175	13179	+# generated from the m4 files accompanying Automake X.Y.
13176	13180	+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
13177
13178		- uts4*)
13179		- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
13180		- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
13181		- ;;
13182		+# AM_SET_CURRENT_AUTOMAKE_VERSION
13183		+# -------------------------------
13184		+# Call AM_AUTOMAKE_VERSION so it can be traced.
13185		+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
13186		+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
13187		+ [AM_AUTOMAKE_VERSION([1.9.6])])
13188	13181
13189	13182	- *)
13190	13183	- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no

13193	13186	- fi
13194	13187	-])
13195	13188	-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
	13189	+# AM_SET_CURRENT_AUTOMAKE_VERSION
	13190	+# -------------------------------
	13191	+# Call AM_AUTOMAKE_VERSION so it can be traced.
	13192	+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
	13193	+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
	13194	+ [AM_AUTOMAKE_VERSION([1.9.6])])
	13195	+
13196	13196	+# AM_AUX_DIR_EXPAND -- Autoconf --
13197	13197	+
13198	13198	+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.

13605	13605	- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
13606	13606	- _LT_AC_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'
13607	13607	- ;;
13608		-
	13608	+ cd ..
	13609	+ rm -rf conftest.dir
	13610	+else
	13611	+ am_cv_$1_dependencies_compiler_type=none
	13612	+fi
	13613	+])
	13614	+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
	13615	+AM_CONDITIONAL([am__fastdep$1], [
	13616	+ test "x$enable_dependency_tracking" != xno \
	13617	+ && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
	13618	+])
	13619
13609	13620	- linux*)
13610	13621	- if $LD --help 2>&1 \| grep ': supported targets:.* elf' > /dev/null; then
13611	13622	- tmp_addflag=

13625	13636	- tmp_addflag=' -nofor_main' ;;
13626	13637	- esac
13627	13638	- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
13628		+ cd ..
13629		+ rm -rf conftest.dir
13630		+else
13631		+ am_cv_$1_dependencies_compiler_type=none
13632		+fi
13633		+])
13634		+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
13635		+AM_CONDITIONAL([am__fastdep$1], [
13636		+ test "x$enable_dependency_tracking" != xno \
13637		+ && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
13638		+])
13639	13639
13640	13640	- if test $supports_anon_versioning = yes; then
13641	13641	- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~

13647	13647	- _LT_AC_TAGVAR(ld_shlibs, $1)=no
13648	13648	- fi
13649	13649	- ;;
	13650	+# AM_SET_DEPDIR
	13651	+# -------------
	13652	+# Choose a directory name for dependency files.
	13653	+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
	13654	+AC_DEFUN([AM_SET_DEPDIR],
	13655	+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
	13656	+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
	13657	+])
13650	13658
13651	13659	- netbsd*)
13652	13660	- if echo __ELF__ \| $CC -E - \| grep __ELF__ >/dev/null; then

13657	13665	- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
13658	13666	- fi
13659	13667	- ;;
13660		+# AM_SET_DEPDIR
13661		+# -------------
13662		+# Choose a directory name for dependency files.
13663		+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
13664		+AC_DEFUN([AM_SET_DEPDIR],
13665		+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
13666		+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
13667		+])
13668	13668
13669	13669	- solaris*)
13670	13670	- if $LD -v 2>&1 \| grep 'BFD 2\.8' > /dev/null; then
13671	13671	- _LT_AC_TAGVAR(ld_shlibs, $1)=no
13672	13672	- cat <<EOF 1>&2
13673
13674		-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
13675		-*** create shared libraries on Solaris systems. Therefore, libtool
13676		-*** is disabling shared libraries support. We urge you to upgrade GNU
13677		-*** binutils to release 2.9.1 or newer. Another option is to modify
13678		-*** your PATH or compiler configuration so that the native linker is
13679		-*** used, and then restart.
13680	13673	+# AM_DEP_TRACK
13681	13674	+# ------------
13682	13675	+AC_DEFUN([AM_DEP_TRACK],

13691	13684	+AC_SUBST([AMDEPBACKSLASH])
13692	13685	+])
13693	13686
	13687	-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
	13688	-*** create shared libraries on Solaris systems. Therefore, libtool
	13689	-*** is disabling shared libraries support. We urge you to upgrade GNU
	13690	-*** binutils to release 2.9.1 or newer. Another option is to modify
	13691	-*** your PATH or compiler configuration so that the native linker is
	13692	-*** used, and then restart.
	13693	+# Generate code to set up dependency tracking. -- Autoconf --
	13694
13694	13695	-EOF
13695	13696	- elif $LD --help 2>&1 \| grep ': supported targets:.* elf' > /dev/null; then
13696	13697	- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

13699	13700	- _LT_AC_TAGVAR(ld_shlibs, $1)=no
13700	13701	- fi
13701	13702	- ;;
13702		+# Generate code to set up dependency tracking. -- Autoconf --
13703
13704		- sysv5* \| sco3.2v5* \| sco5v6* \| unixware* \| OpenUNIX*)
13705		- case `$LD -v 2>&1` in
13706		- \ [[01]]. \| \ 2.[[0-9]]. \| \ 2.1[[0-5]].)
13707		- _LT_AC_TAGVAR(ld_shlibs, $1)=no
13708		- cat <<_LT_EOF 1>&2
13709	13703	+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
13710	13704	+# Free Software Foundation, Inc.
13711	13705	+#

13713	13707	+# gives unlimited permission to copy and/or distribute it,
13714	13708	+# with or without modifications, as long as this notice is preserved.
13715	13709
	13710	- sysv5* \| sco3.2v5* \| sco5v6* \| unixware* \| OpenUNIX*)
	13711	- case `$LD -v 2>&1` in
	13712	- \ [[01]]. \| \ 2.[[0-9]]. \| \ 2.1[[0-5]].)
	13713	- _LT_AC_TAGVAR(ld_shlibs, $1)=no
	13714	- cat <<_LT_EOF 1>&2
	13715	+#serial 3
	13716
13716	13717	-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
13717	13718	-*** reliably create shared libraries on SCO systems. Therefore, libtool
13718	13719	-*** is disabling shared libraries support. We urge you to upgrade GNU
13719	13720	-*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
13720	13721	-*** your PATH or compiler configuration so that the native linker is
13721	13722	-*** used, and then restart.
13722		+#serial 3
13723
13724		-_LT_EOF
13725		- ;;
13726		- *)
13727		- if $LD --help 2>&1 \| grep ': supported targets:.* elf' > /dev/null; then
13728		- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
13729		- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
13730		- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
13731		- else
13732		- _LT_AC_TAGVAR(ld_shlibs, $1)=no
13733		- fi
13734		- ;;
13735		- esac
13736		- ;;
13737	13723	+# _AM_OUTPUT_DEPENDENCY_COMMANDS
13738	13724	+# ------------------------------
13739	13725	+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],

13777	13763	+done
13778	13764	+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
13779	13765
	13766	-_LT_EOF
	13767	- ;;
	13768	- *)
	13769	- if $LD --help 2>&1 \| grep ': supported targets:.* elf' > /dev/null; then
	13770	- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
	13771	- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
	13772	- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
	13773	- else
	13774	- _LT_AC_TAGVAR(ld_shlibs, $1)=no
	13775	- fi
	13776	- ;;
	13777	- esac
	13778	- ;;
	13779
13780	13780	- sunos4*)
13781	13781	- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
13782	13782	- wlarc=
13783	13783	- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
13784	13784	- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
13785	13785	- ;;
13786
13787		- *)
13788		- if $LD --help 2>&1 \| grep ': supported targets:.* elf' > /dev/null; then
13789		- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
13790		- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
13791		- else
13792		- _LT_AC_TAGVAR(ld_shlibs, $1)=no
13793		- fi
13794		- ;;
13795		- esac
13796	13786	+# AM_OUTPUT_DEPENDENCY_COMMANDS
13797	13787	+# -----------------------------
13798	13788	+# This macro should only be invoked once -- use via AC_REQUIRE.

13805	13795	+ [test x"$AMDEP_TRUE" != x"" \|\| _AM_OUTPUT_DEPENDENCY_COMMANDS],
13806	13796	+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
13807	13797	+])
	13798
	13799	- *)
	13800	- if $LD --help 2>&1 \| grep ': supported targets:.* elf' > /dev/null; then
	13801	- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
	13802	- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
	13803	- else
	13804	- _LT_AC_TAGVAR(ld_shlibs, $1)=no
	13805	- fi
	13806	- ;;
	13807	- esac
	13808	+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
	13809	+# Free Software Foundation, Inc.
	13810	+#
	13811	+# This file is free software; the Free Software Foundation
	13812	+# gives unlimited permission to copy and/or distribute it,
	13813	+# with or without modifications, as long as this notice is preserved.
13808	13814
13809	13815	- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
13810	13816	- runpath_var=

13828	13834	- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
13829	13835	- fi
13830	13836	- ;;
13831		+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
13832		+# Free Software Foundation, Inc.
13833		+#
13834		+# This file is free software; the Free Software Foundation
13835		+# gives unlimited permission to copy and/or distribute it,
13836		+# with or without modifications, as long as this notice is preserved.
	13837	+# serial 8
13837	13838
13838	13839	- aix4* \| aix5*)
13839	13840	- if test "$host_cpu" = ia64; then

13851	13852	- _LT_AC_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'
13852	13853	- fi
13853	13854	- aix_use_runtimelinking=no
13854		+# serial 8
	13855	+# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
	13856	+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
13855	13857
13856	13858	- # Test if we are trying to use run time linking or normal
13857	13859	- # AIX style linking. If -brtl is somewhere in LDFLAGS, we

13865	13867	- done
13866	13868	- ;;
13867	13869	- esac
13868		+# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
13869		+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
	13870	+# Do all the work for Automake. -- Autoconf --
13870	13871
13871	13872	- exp_sym_flag='-bexport'
13872	13873	- no_entry_flag='-bnoentry'
13873	13874	- fi
13874		+# Do all the work for Automake. -- Autoconf --
13875
13876		- # When large executables or shared objects are built, AIX ld can
13877		- # have problems creating the table of contents. If linking a library
13878		- # or program results in "error TOC overflow" add -mminimal-toc to
13879		- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
13880		- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
13881	13875	+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
13882	13876	+# Free Software Foundation, Inc.
13883	13877	+#

13885	13879	+# gives unlimited permission to copy and/or distribute it,
13886	13880	+# with or without modifications, as long as this notice is preserved.
13887	13881
	13882	- # When large executables or shared objects are built, AIX ld can
	13883	- # have problems creating the table of contents. If linking a library
	13884	- # or program results in "error TOC overflow" add -mminimal-toc to
	13885	- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
	13886	- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
	13887	+# serial 12
	13888
13888	13889	- _LT_AC_TAGVAR(archive_cmds, $1)=''
13889	13890	- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
13890	13891	- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
13891	13892	- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
13892		+# serial 12
	13893	+# This macro actually does too much. Some checks are only needed if
	13894	+# your package does certain things. But this isn't really a big deal.
13893	13895
13894	13896	- if test "$GCC" = yes; then
13895	13897	- case $host_os in aix4.[[012]]\|aix4.[[012]].*)

13931	13933	- fi
13932	13934	- fi
13933	13935	- fi
13934		+# This macro actually does too much. Some checks are only needed if
13935		+# your package does certain things. But this isn't really a big deal.
	13936	+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
	13937	+# AM_INIT_AUTOMAKE([OPTIONS])
	13938	+# -----------------------------------------------
	13939	+# The call with PACKAGE and VERSION arguments is the old style
	13940	+# call (pre autoconf-2.50), which is being phased out. PACKAGE
	13941	+# and VERSION should now be passed to AC_INIT and removed from
	13942	+# the call to AM_INIT_AUTOMAKE.
	13943	+# We support both call styles for the transition. After
	13944	+# the next Automake release, Autoconf can make the AC_INIT
	13945	+# arguments mandatory, and then we can depend on a new Autoconf
	13946	+# release and drop the old call support.
	13947	+AC_DEFUN([AM_INIT_AUTOMAKE],
	13948	+[AC_PREREQ([2.58])dnl
	13949	+dnl Autoconf wants to disallow AM_ names. We explicitly allow
	13950	+dnl the ones we care about.
	13951	+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
	13952	+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
	13953	+AC_REQUIRE([AC_PROG_INSTALL])dnl
	13954	+# test to see if srcdir already configured
	13955	+if test "`cd $srcdir && pwd`" != "`pwd`" &&
	13956	+ test -f $srcdir/config.status; then
	13957	+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
	13958	+fi
13936	13959
13937	13960	- # It seems that -bexpall does not export symbols beginning with
13938	13961	- # underscore (_), so it is better to generate a list of symbols to export.

13966	13989	- fi
13967	13990	- fi
13968	13991	- ;;
13969		+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
13970		+# AM_INIT_AUTOMAKE([OPTIONS])
13971		+# -----------------------------------------------
13972		+# The call with PACKAGE and VERSION arguments is the old style
13973		+# call (pre autoconf-2.50), which is being phased out. PACKAGE
13974		+# and VERSION should now be passed to AC_INIT and removed from
13975		+# the call to AM_INIT_AUTOMAKE.
13976		+# We support both call styles for the transition. After
13977		+# the next Automake release, Autoconf can make the AC_INIT
13978		+# arguments mandatory, and then we can depend on a new Autoconf
13979		+# release and drop the old call support.
13980		+AC_DEFUN([AM_INIT_AUTOMAKE],
13981		+[AC_PREREQ([2.58])dnl
13982		+dnl Autoconf wants to disallow AM_ names. We explicitly allow
13983		+dnl the ones we care about.
13984		+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
13985		+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
13986		+AC_REQUIRE([AC_PROG_INSTALL])dnl
13987		+# test to see if srcdir already configured
13988		+if test "`cd $srcdir && pwd`" != "`pwd`" &&
13989		+ test -f $srcdir/config.status; then
13990		+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
13991		+fi
13992
13993		- amigaos*)
13994		- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
13995		- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
13996		- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
13997		- # see comment about different semantics on the GNU ld section
13998		- _LT_AC_TAGVAR(ld_shlibs, $1)=no
13999		- ;;
14000	13992	+# test whether we have cygpath
14001	13993	+if test -z "$CYGPATH_W"; then
14002	13994	+ if (cygpath --version) >/dev/null 2>/dev/null; then

14007	13999	+fi
14008	14000	+AC_SUBST([CYGPATH_W])
14009	14001
14010		- bsdi[[45]]*)
14011		- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
	14002	- amigaos*)
	14003	- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
	14004	- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
	14005	- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
	14006	- # see comment about different semantics on the GNU ld section
	14007	- _LT_AC_TAGVAR(ld_shlibs, $1)=no
14012	14008	- ;;
14013	14009	+# Define the identity of the package.
14014	14010	+dnl Distinguish between old-style and new-style calls.

14019	14015	+[_AM_SET_OPTIONS([$1])dnl
14020	14016	+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
14021	14017	+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
	14018
	14019	- bsdi[[45]]*)
	14020	- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
	14021	- ;;
	14022	+_AM_IF_OPTION([no-define],,
	14023	+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
	14024	+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
14022	14025
14023	14026	- cygwin* \| mingw* \| pw32*)
14024	14027	- # When not using gcc, we currently assume that we are using

14040	14043	- _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
14041	14044	- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
14042	14045	- ;;
14043		+_AM_IF_OPTION([no-define],,
14044		+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
14045		+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
	14046	+# Some tools Automake needs.
	14047	+AC_REQUIRE([AM_SANITY_CHECK])dnl
	14048	+AC_REQUIRE([AC_ARG_PROGRAM])dnl
	14049	+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
	14050	+AM_MISSING_PROG(AUTOCONF, autoconf)
	14051	+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
	14052	+AM_MISSING_PROG(AUTOHEADER, autoheader)
	14053	+AM_MISSING_PROG(MAKEINFO, makeinfo)
	14054	+AM_PROG_INSTALL_SH
	14055	+AM_PROG_INSTALL_STRIP
	14056	+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
	14057	+# We need awk for the "check" target. The system "awk" is bad on
	14058	+# some platforms.
	14059	+AC_REQUIRE([AC_PROG_AWK])dnl
	14060	+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
	14061	+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
	14062	+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
	14063	+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
	14064	+ [_AM_PROG_TAR([v7])])])
	14065	+_AM_IF_OPTION([no-dependencies],,
	14066	+[AC_PROVIDE_IFELSE([AC_PROG_CC],
	14067	+ [_AM_DEPENDENCIES(CC)],
	14068	+ [define([AC_PROG_CC],
	14069	+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
	14070	+AC_PROVIDE_IFELSE([AC_PROG_CXX],
	14071	+ [_AM_DEPENDENCIES(CXX)],
	14072	+ [define([AC_PROG_CXX],
	14073	+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
	14074	+])
	14075	+])
14046	14076
14047	14077	- darwin* \| rhapsody*)
14048	14078	- case $host_os in

14093	14123	- esac
14094	14124	- fi
14095	14125	- ;;
14096		+# Some tools Automake needs.
14097		+AC_REQUIRE([AM_SANITY_CHECK])dnl
14098		+AC_REQUIRE([AC_ARG_PROGRAM])dnl
14099		+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
14100		+AM_MISSING_PROG(AUTOCONF, autoconf)
14101		+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
14102		+AM_MISSING_PROG(AUTOHEADER, autoheader)
14103		+AM_MISSING_PROG(MAKEINFO, makeinfo)
14104		+AM_PROG_INSTALL_SH
14105		+AM_PROG_INSTALL_STRIP
14106		+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
14107		+# We need awk for the "check" target. The system "awk" is bad on
14108		+# some platforms.
14109		+AC_REQUIRE([AC_PROG_AWK])dnl
14110		+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
14111		+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
14112		+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
14113		+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
14114		+ [_AM_PROG_TAR([v7])])])
14115		+_AM_IF_OPTION([no-dependencies],,
14116		+[AC_PROVIDE_IFELSE([AC_PROG_CC],
14117		+ [_AM_DEPENDENCIES(CC)],
14118		+ [define([AC_PROG_CC],
14119		+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
14120		+AC_PROVIDE_IFELSE([AC_PROG_CXX],
14121		+ [_AM_DEPENDENCIES(CXX)],
14122		+ [define([AC_PROG_CXX],
14123		+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
14124		+])
14125		+])
14126	14126
14127	14127	- dgux*)
14128	14128	- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
14129	14129	- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
14130	14130	- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
14131	14131	- ;;
14132
14133		- freebsd1*)
14134		- _LT_AC_TAGVAR(ld_shlibs, $1)=no
14135		- ;;
14136	14132	+# When config.status generates a header, we must update the stamp-h file.
14137	14133	+# This file resides in the same directory as the config header
14138	14134	+# that is generated. The stamp files are numbered to have different names.
14139	14135
14140		- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
14141		- # support. Future versions do this automatically, but an explicit c++rt0.o
14142		- # does not break anything, and helps significantly (at the cost of a little
14143		- # extra space).
14144		- freebsd2.2*)
14145		- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
14146		- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
14147		- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
14148		- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
	14136	- freebsd1*)
	14137	- _LT_AC_TAGVAR(ld_shlibs, $1)=no
14149	14138	- ;;
14150	14139	+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
14151	14140	+# loop where config.status creates the headers, so we can generate

14163	14152	+done
14164	14153	+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
14165	14154
14166		- # Unfortunately, older versions of FreeBSD 2 do not have this feature.
14167		- freebsd2*)
14168		- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
	14155	- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
	14156	- # support. Future versions do this automatically, but an explicit c++rt0.o
	14157	- # does not break anything, and helps significantly (at the cost of a little
	14158	- # extra space).
	14159	- freebsd2.2*)
	14160	- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
	14161	- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
14169	14162	- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
14170		- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
14171	14163	- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
14172	14164	- ;;
14173	14165	+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.

14176	14168	+# gives unlimited permission to copy and/or distribute it,
14177	14169	+# with or without modifications, as long as this notice is preserved.
14178	14170
14179		- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
14180		- freebsd* \| kfreebsd-gnu \| dragonfly)
14181		- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
14182		- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
	14171	- # Unfortunately, older versions of FreeBSD 2 do not have this feature.
	14172	- freebsd2*)
	14173	- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
14183	14174	- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
	14175	- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
14184	14176	- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
14185	14177	- ;;
14186	14178	+# AM_PROG_INSTALL_SH

14191	14183	+install_sh=${install_sh-"$am_aux_dir/install-sh"}
14192	14184	+AC_SUBST(install_sh)])
14193	14185
	14186	- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
	14187	- freebsd* \| kfreebsd-gnu \| dragonfly)
	14188	- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
	14189	- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
	14190	- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
	14191	- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
	14192	- ;;
	14193	+# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
	14194	+#
	14195	+# This file is free software; the Free Software Foundation
	14196	+# gives unlimited permission to copy and/or distribute it,
	14197	+# with or without modifications, as long as this notice is preserved.
	14198
14194	14199	- hpux9*)
14195	14200	- if test "$GCC" = yes; then
14196	14201	- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib \|\| mv $output_objdir/$soname $lib'

14200	14205	- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
14201	14206	- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
14202	14207	- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
14203		+# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
14204		+#
14205		+# This file is free software; the Free Software Foundation
14206		+# gives unlimited permission to copy and/or distribute it,
14207		+# with or without modifications, as long as this notice is preserved.
	14208	+# serial 2
14208	14209
14209	14210	- # hardcode_minus_L: Not really in the search PATH,
14210	14211	- # but as the default location of the library.
14211	14212	- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
14212	14213	- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
14213	14214	- ;;
14214		+# serial 2
14215
14216		- hpux10*)
14217		- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
14218		- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
14219		- else
14220		- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
14221		- fi
14222		- if test "$with_gnu_ld" = no; then
14223		- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
14224		- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
14225	14215	+# Check whether the underlying file-system supports filenames
14226	14216	+# with a leading dot. For instance MS-DOS doesn't.
14227	14217	+AC_DEFUN([AM_SET_LEADING_DOT],

14235	14225	+rmdir .tst 2>/dev/null
14236	14226	+AC_SUBST([am__leading_dot])])
14237	14227
	14228	- hpux10*)
	14229	- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
	14230	- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
	14231	- else
	14232	- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
	14233	- fi
	14234	- if test "$with_gnu_ld" = no; then
	14235	- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
	14236	- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
	14237	+# Add --enable-maintainer-mode option to configure. -- Autoconf --
	14238	+# From Jim Meyering
	14239
14238	14240	- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
14239	14241	- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
14240		+# Add --enable-maintainer-mode option to configure. -- Autoconf --
14241		+# From Jim Meyering
14242
14243		- # hardcode_minus_L: Not really in the search PATH,
14244		- # but as the default location of the library.
14245		- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
14246		- fi
14247		- ;;
14248	14242	+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
14249	14243	+# Free Software Foundation, Inc.
14250	14244	+#
14251	14245	+# This file is free software; the Free Software Foundation
14252	14246	+# gives unlimited permission to copy and/or distribute it,
14253	14247	+# with or without modifications, as long as this notice is preserved.
	14248
	14249	- # hardcode_minus_L: Not really in the search PATH,
	14250	- # but as the default location of the library.
	14251	- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
	14252	- fi
	14253	- ;;
	14254	+# serial 4
14254	14255
14255	14256	- hpux11*)
14256	14257	- if test "$GCC" = yes -a "$with_gnu_ld" = no; then

14281	14282	- if test "$with_gnu_ld" = no; then
14282	14283	- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
14283	14284	- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
14284		+# serial 4
14285		+
14286	14285	+AC_DEFUN([AM_MAINTAINER_MODE],
14287	14286	+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
14288	14287	+ dnl maintainer-mode is disabled by default

14789	14788	- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
14790	14789	- fi
14791	14790	- _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
	14791	- else
	14792	- cat conftest.err 1>&5
	14793	- fi
	14794	- $rm conftest*
	14795	- AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
	14796	- ;;
	14797	- esac
	14798	- fi
	14799	- ;;
	14800	-esac
	14801	-])# AC_LIBTOOL_PROG_LD_SHLIBS
14792	14802	+ m4_if([$1],[],[
14793	14803	+ dnl No version check is needed.
14794	14804	+ # Find any Python interpreter.

14817	14827	+ # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
14818	14828	+ if test "$am_cv_pathless_PYTHON" = none; then
14819	14829	+ PYTHON=:
14820		else
14821		- cat conftest.err 1>&5
14822		- fi
14823		- $rm conftest*
14824		- AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
14825		- ;;
14826		- esac
14827		- fi
14828		- ;;
14829		-esac
14830		-])# AC_LIBTOOL_PROG_LD_SHLIBS
	14830	+ else
14831	14831	+ AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON])
14832	14832	+ fi
14833	14833	+ am_display_PYTHON=$am_cv_pathless_PYTHON

15373	15373	+]) # _AM_PROG_TAR
15374	15374
15375	15375	m4_include([acinclude.m4])
15376		diff -Nur gnome-menus-2.18.2/configure gnome-menus-2.18.2.new/configure
15377		--- gnome-menus-2.18.2/configure 2007-05-28 13:51:26.000000000 +0200
15378		+++ gnome-menus-2.18.2.new/configure 2007-05-28 15:39:56.000000000 +0200
	15376	diff -Nur gnome-menus-2.18.3/configure gnome-menus-2.18.3.new/configure
	15377	--- gnome-menus-2.18.3/configure 2007-07-02 19:17:17.000000000 +0200
	15378	+++ gnome-menus-2.18.3.new/configure 2007-07-03 19:57:10.000000000 +0200
15379	15379	@@ -1,6 +1,6 @@
15380	15380	#! /bin/sh
15381	15381	# Guess values for system-dependent variables and create Makefiles.
15382		-# Generated by GNU Autoconf 2.60 for gnome-menus 2.18.2.
15383		+# Generated by GNU Autoconf 2.61 for gnome-menus 2.18.2.
	15382	-# Generated by GNU Autoconf 2.60 for gnome-menus 2.18.3.
	15383	+# Generated by GNU Autoconf 2.61 for gnome-menus 2.18.3.
15384	15384	#
15385	15385	# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-menus>.
15386	15386	#

15658	15658	@@ -1634,7 +1658,7 @@
15659	15659	if $ac_init_version; then
15660	15660	cat <<\_ACEOF
15661		gnome-menus configure 2.18.2
	15661	gnome-menus configure 2.18.3
15662	15662	-generated by GNU Autoconf 2.60
15663	15663	+generated by GNU Autoconf 2.61
15664	15664

15667	15667	@@ -1648,7 +1672,7 @@
15668	15668	running configure, to aid debugging if configure makes a mistake.
15669	15669
15670		It was created by gnome-menus $as_me 2.18.2, which was
	15670	It was created by gnome-menus $as_me 2.18.3, which was
15671	15671	-generated by GNU Autoconf 2.60. Invocation command line was
15672	15672	+generated by GNU Autoconf 2.61. Invocation command line was
15673	15673

19131	19131	ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
19132	19132	echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
19133	19133	break 2
	19134	@@ -23834,7 +22773,7 @@
	19135	and GLIB_LIBS to avoid the need to call pkg-config.
	19136	See the pkg-config man page for more details.
	19137
	19138	-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
	19139	+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
	19140	See \`config.log' for more details." >&5
	19141	echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
	19142	is in your PATH or set the PKG_CONFIG environment variable to the full
	19143	@@ -23844,7 +22783,7 @@
	19144	and GLIB_LIBS to avoid the need to call pkg-config.
	19145	See the pkg-config man page for more details.
	19146
	19147	-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
	19148	+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
	19149	See \`config.log' for more details." >&2;}
	19150	{ (exit 1); exit 1; }; }
	19151	else
19134	19152	@@ -23857,6 +22796,119 @@
19135	19153
19136	19154

19225	19243	+and GNOMEVFS_LIBS to avoid the need to call pkg-config.
19226	19244	+See the pkg-config man page for more details.
19227	19245	+
19228		+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
	19246	+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
19229	19247	+See \`config.log' for more details." >&5
19230	19248	+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
19231	19249	+is in your PATH or set the PKG_CONFIG environment variable to the full

19235	19253	+and GNOMEVFS_LIBS to avoid the need to call pkg-config.
19236	19254	+See the pkg-config man page for more details.
19237	19255	+
19238		+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
	19256	+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
19239	19257	+See \`config.log' for more details." >&2;}
19240	19258	+ { (exit 1); exit 1; }; }
19241	19259	+else

19971	19989	@@ -25504,7 +24126,7 @@
19972	19990	# values after options handling.
19973	19991	ac_log="
19974		This file was extended by gnome-menus $as_me 2.18.2, which was
	19992	This file was extended by gnome-menus $as_me 2.18.3, which was
19975	19993	-generated by GNU Autoconf 2.60. Invocation command line was
19976	19994	+generated by GNU Autoconf 2.61. Invocation command line was
19977	19995

19989	20007	@@ -25557,7 +24179,7 @@
19990	20008	cat >>$CONFIG_STATUS <<_ACEOF
19991	20009	ac_cs_version="\\
19992		gnome-menus config.status 2.18.2
	20010	gnome-menus config.status 2.18.3
19993	20011	-configured by $0, generated by GNU Autoconf 2.60,
19994	20012	+configured by $0, generated by GNU Autoconf 2.61,
19995	20013	with options \\"`echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

20016	20034	break
20017	20035	elif $ac_last_try; then
20018	20036	{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
20019		diff -Nur gnome-menus-2.18.2/desktop-directories/Makefile.in gnome-menus-2.18.2.new/desktop-directories/Makefile.in
20020		--- gnome-menus-2.18.2/desktop-directories/Makefile.in 2007-05-28 13:51:41.000000000 +0200
20021		+++ gnome-menus-2.18.2.new/desktop-directories/Makefile.in 2007-05-28 15:39:57.000000000 +0200
	20037	diff -Nur gnome-menus-2.18.3/desktop-directories/Makefile.in gnome-menus-2.18.3.new/desktop-directories/Makefile.in
	20038	--- gnome-menus-2.18.3/desktop-directories/Makefile.in 2007-07-02 19:17:21.000000000 +0200
	20039	+++ gnome-menus-2.18.3.new/desktop-directories/Makefile.in 2007-07-03 19:57:11.000000000 +0200
20022	20040	@@ -95,13 +95,14 @@
20023	20041	EGREP = @EGREP@
20024	20042	EXEEXT = @EXEEXT@

20035	20053	GREP = @GREP@
20036	20054	HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
20037	20055	HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
20038		diff -Nur gnome-menus-2.18.2/layout/Makefile.in gnome-menus-2.18.2.new/layout/Makefile.in
20039		--- gnome-menus-2.18.2/layout/Makefile.in 2007-05-28 13:51:41.000000000 +0200
20040		+++ gnome-menus-2.18.2.new/layout/Makefile.in 2007-05-28 15:39:57.000000000 +0200
	20056	diff -Nur gnome-menus-2.18.3/layout/Makefile.in gnome-menus-2.18.3.new/layout/Makefile.in
	20057	--- gnome-menus-2.18.3/layout/Makefile.in 2007-07-02 19:17:22.000000000 +0200
	20058	+++ gnome-menus-2.18.3.new/layout/Makefile.in 2007-07-03 19:57:11.000000000 +0200
20041	20059	@@ -95,13 +95,14 @@
20042	20060	EGREP = @EGREP@
20043	20061	EXEEXT = @EXEEXT@

20054	20072	GREP = @GREP@
20055	20073	HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
20056	20074	HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
20057		diff -Nur gnome-menus-2.18.2/libmenu/Makefile.in gnome-menus-2.18.2.new/libmenu/Makefile.in
20058		--- gnome-menus-2.18.2/libmenu/Makefile.in 2007-05-28 13:51:42.000000000 +0200
20059		+++ gnome-menus-2.18.2.new/libmenu/Makefile.in 2007-05-28 15:39:57.000000000 +0200
	20075	diff -Nur gnome-menus-2.18.3/libmenu/Makefile.in gnome-menus-2.18.3.new/libmenu/Makefile.in
	20076	--- gnome-menus-2.18.3/libmenu/Makefile.in 2007-07-02 19:17:22.000000000 +0200
	20077	+++ gnome-menus-2.18.3.new/libmenu/Makefile.in 2007-07-03 19:57:11.000000000 +0200
20060	20078	@@ -69,8 +69,8 @@
20061	20079	entry-directories.h gmenu-tree.c gmenu-tree.h menu-layout.c \
20062	20080	menu-layout.h menu-monitor.c menu-monitor.h \

20123	20141	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menu-monitor-inotify.Plo@am__quote@
20124	20142	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menu-monitor.Plo@am__quote@
20125	20143	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menu-util.Plo@am__quote@
20126		diff -Nur gnome-menus-2.18.2/ltmain.sh gnome-menus-2.18.2.new/ltmain.sh
20127		--- gnome-menus-2.18.2/ltmain.sh 2007-02-17 10:05:30.000000000 +0100
20128		+++ gnome-menus-2.18.2.new/ltmain.sh 2006-03-11 19:49:04.000000000 +0100
	20144	diff -Nur gnome-menus-2.18.3/ltmain.sh gnome-menus-2.18.3.new/ltmain.sh
	20145	--- gnome-menus-2.18.3/ltmain.sh 2007-02-17 10:05:30.000000000 +0100
	20146	+++ gnome-menus-2.18.3.new/ltmain.sh 2006-03-11 19:49:04.000000000 +0100
20129	20147	@@ -43,7 +43,7 @@
20130	20148
20131	20149	PROGRAM=ltmain.sh

20159	20177	esac
20160	20178	;;
20161	20179	no)
20162		diff -Nur gnome-menus-2.18.2/Makefile.in gnome-menus-2.18.2.new/Makefile.in
20163		--- gnome-menus-2.18.2/Makefile.in 2007-05-28 13:51:46.000000000 +0200
20164		+++ gnome-menus-2.18.2.new/Makefile.in 2007-05-28 15:39:58.000000000 +0200
	20180	diff -Nur gnome-menus-2.18.3/Makefile.in gnome-menus-2.18.3.new/Makefile.in
	20181	--- gnome-menus-2.18.3/Makefile.in 2007-07-02 19:17:23.000000000 +0200
	20182	+++ gnome-menus-2.18.3.new/Makefile.in 2007-07-03 19:57:11.000000000 +0200
20165	20183	@@ -109,13 +109,14 @@
20166	20184	EGREP = @EGREP@
20167	20185	EXEEXT = @EXEEXT@

20178	20196	GREP = @GREP@
20179	20197	HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
20180	20198	HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
20181		diff -Nur gnome-menus-2.18.2/python/Makefile.in gnome-menus-2.18.2.new/python/Makefile.in
20182		--- gnome-menus-2.18.2/python/Makefile.in 2007-05-28 13:51:43.000000000 +0200
20183		+++ gnome-menus-2.18.2.new/python/Makefile.in 2007-05-28 15:39:57.000000000 +0200
	20199	diff -Nur gnome-menus-2.18.3/python/Makefile.in gnome-menus-2.18.3.new/python/Makefile.in
	20200	--- gnome-menus-2.18.3/python/Makefile.in 2007-07-02 19:17:22.000000000 +0200
	20201	+++ gnome-menus-2.18.3.new/python/Makefile.in 2007-07-03 19:57:11.000000000 +0200
20184	20202	@@ -113,13 +113,14 @@
20185	20203	EGREP = @EGREP@
20186	20204	EXEEXT = @EXEEXT@

20197	20215	GREP = @GREP@
20198	20216	HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
20199	20217	HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
20200		diff -Nur gnome-menus-2.18.2/simple-editor/GMenuSimpleEditor/Makefile.in gnome-menus-2.18.2.new/simple-editor/GMenuSimpleEditor/Makefile.in
20201		--- gnome-menus-2.18.2/simple-editor/GMenuSimpleEditor/Makefile.in 2007-05-28 13:51:45.000000000 +0200
20202		+++ gnome-menus-2.18.2.new/simple-editor/GMenuSimpleEditor/Makefile.in 2007-05-28 15:39:58.000000000 +0200
	20218	diff -Nur gnome-menus-2.18.3/simple-editor/GMenuSimpleEditor/Makefile.in gnome-menus-2.18.3.new/simple-editor/GMenuSimpleEditor/Makefile.in
	20219	--- gnome-menus-2.18.3/simple-editor/GMenuSimpleEditor/Makefile.in 2007-07-02 19:17:22.000000000 +0200
	20220	+++ gnome-menus-2.18.3.new/simple-editor/GMenuSimpleEditor/Makefile.in 2007-07-03 19:57:11.000000000 +0200
20203	20221	@@ -96,13 +96,14 @@
20204	20222	EGREP = @EGREP@
20205	20223	EXEEXT = @EXEEXT@

20216	20234	GREP = @GREP@
20217	20235	HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
20218	20236	HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
20219		diff -Nur gnome-menus-2.18.2/simple-editor/Makefile.in gnome-menus-2.18.2.new/simple-editor/Makefile.in
20220		--- gnome-menus-2.18.2/simple-editor/Makefile.in 2007-05-28 13:51:45.000000000 +0200
20221		+++ gnome-menus-2.18.2.new/simple-editor/Makefile.in 2007-05-28 15:39:58.000000000 +0200
	20237	diff -Nur gnome-menus-2.18.3/simple-editor/Makefile.in gnome-menus-2.18.3.new/simple-editor/Makefile.in
	20238	--- gnome-menus-2.18.3/simple-editor/Makefile.in 2007-07-02 19:17:22.000000000 +0200
	20239	+++ gnome-menus-2.18.3.new/simple-editor/Makefile.in 2007-07-03 19:57:11.000000000 +0200
20222	20240	@@ -109,13 +109,14 @@
20223	20241	EGREP = @EGREP@
20224	20242	EXEEXT = @EXEEXT@

20235	20253	GREP = @GREP@
20236	20254	HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
20237	20255	HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
20238		diff -Nur gnome-menus-2.18.2/util/Makefile.in gnome-menus-2.18.2.new/util/Makefile.in
20239		--- gnome-menus-2.18.2/util/Makefile.in 2007-05-28 13:51:46.000000000 +0200
20240		+++ gnome-menus-2.18.2.new/util/Makefile.in 2007-05-28 15:39:58.000000000 +0200
	20256	diff -Nur gnome-menus-2.18.3/util/Makefile.in gnome-menus-2.18.3.new/util/Makefile.in
	20257	--- gnome-menus-2.18.3/util/Makefile.in 2007-07-02 19:17:23.000000000 +0200
	20258	+++ gnome-menus-2.18.3.new/util/Makefile.in 2007-07-03 19:57:11.000000000 +0200
20241	20259	@@ -111,13 +111,14 @@
20242	20260	EGREP = @EGREP@
20243	20261	EXEEXT = @EXEEXT@