mirror of
https://github.com/fish-shell/fish-shell
synced 2024-12-27 05:13:10 +00:00
d83ef07ca7
This adds the new builtin 'string' which supports various string manipulation and matching algorithms, including PCRE based regular expressions. Fixes #2296 Squashed commit of the following: commit 4c3eaeb6e57d76463e9683c327142b0aeafb92b8 Author: ridiculousfish <corydoras@ridiculousfish.com> Date: Sat Sep 12 12:51:30 2015 -0700 Remove testdata and doc dirs from pcre2 source commit b2a8b4b50f2398b204fb72cfe4b5ba77ece2e1ab Merge:11c8a47
7974aab
Author: ridiculousfish <corydoras@ridiculousfish.com> Date: Sat Sep 12 12:32:40 2015 -0700 Merge branch 'string' of git://github.com/msteed/fish-shell into string-test commit7974aab6d3
Author: Michael Steed <msteed@saltstack.com> Date: Fri Sep 11 13:00:02 2015 -0600 build pcre2 lib only, no docs commiteb20b43d2d
Merge:1a09e70
5f519cb
Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 20:00:47 2015 -0600 Merge branch 'string' of github.com:msteed/fish-shell into string commit1a09e709d0
Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:58:24 2015 -0600 rebase on master & address the fallout commita0ec9772cd
Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:26:45 2015 -0600 use fish's wildcard_match() for glob matching commit64c25a01e3
Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 27 08:19:23 2015 -0600 some fixes from review - string_get_arg_stdin(): simplify and don't discard the argument when the trailing newline is absent - fix calls to pcre2 for e.g. string match -r -a 'a*' 'b' - correct test for args coming from stdin commitece7f35ec5
Author: Michael Steed <msteed68@gmail.com> Date: Sat Aug 22 19:35:56 2015 -0600 fixes from review - Makefile.in: restore iwyu target - regex_replacer_t::replace_matches(): correct size passed to realloc() commit9ff7477a92
Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 20 13:08:33 2015 -0600 Minor doc improvements commitbaf4e096b2
Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:29:02 2015 -0600 another attempt to fix the ci build commit896a2c2b27
Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:03:49 2015 -0600 Updates after review comments - make match/replace without -a operate on the first match on each argument - use different exit codes for "no operation performed" and errors, as grep does - refactor regex compile code - use human-friendly error messages from pcre2 - improve error handling & reporting elsewhere - add a few tests - make some doc fixes - some simplification & cleanup - fix ci build failure (I hope) commitefd47dcbda
Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 12 00:26:07 2015 -0600 fix dependencies for parallel make commited0850e2db
Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 23:37:22 2015 -0600 Add missing pcre2 files + .gitignore commit9492e7a7e9
Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:44:05 2015 -0600 add pcre2-10.20 and update license.hdr commit1a60b93371
Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:41:19 2015 -0600 add string builtin files - string builtin source, tests, & docs - changes to configure.ac & Makefile.in commit5f519cb2a2
Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:26:45 2015 -0600 use fish's wildcard_match() for glob matching commit2ecd24f795
Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 27 08:19:23 2015 -0600 some fixes from review - string_get_arg_stdin(): simplify and don't discard the argument when the trailing newline is absent - fix calls to pcre2 for e.g. string match -r -a 'a*' 'b' - correct test for args coming from stdin commit45b777e4dc
Author: Michael Steed <msteed68@gmail.com> Date: Sat Aug 22 19:35:56 2015 -0600 fixes from review - Makefile.in: restore iwyu target - regex_replacer_t::replace_matches(): correct size passed to realloc() commit981cbb6ddf
Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 20 13:08:33 2015 -0600 Minor doc improvements commitddb6a2a8fd
Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:29:02 2015 -0600 another attempt to fix the ci build commit1e34e3191b
Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:03:49 2015 -0600 Updates after review comments - make match/replace without -a operate on the first match on each argument - use different exit codes for "no operation performed" and errors, as grep does - refactor regex compile code - use human-friendly error messages from pcre2 - improve error handling & reporting elsewhere - add a few tests - make some doc fixes - some simplification & cleanup - fix ci build failure (I hope) commit34232e152d
Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 12 00:26:07 2015 -0600 fix dependencies for parallel make commit00d7e78169
Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 23:37:22 2015 -0600 Add missing pcre2 files + .gitignore commit4498aa5f57
Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:44:05 2015 -0600 add pcre2-10.20 and update license.hdr commit290c58c72e
Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:41:19 2015 -0600 add string builtin files - string builtin source, tests, & docs - changes to configure.ac & Makefile.in
437 lines
14 KiB
Text
437 lines
14 KiB
Text
# Helper functions for option handling. -*- Autoconf -*-
|
|
#
|
|
# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
|
|
# Foundation, Inc.
|
|
# Written by Gary V. Vaughan, 2004
|
|
#
|
|
# This file is free software; the Free Software Foundation gives
|
|
# unlimited permission to copy and/or distribute it, with or without
|
|
# modifications, as long as this notice is preserved.
|
|
|
|
# serial 8 ltoptions.m4
|
|
|
|
# This is to help aclocal find these macros, as it can't see m4_define.
|
|
AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
|
|
|
|
|
|
# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
|
|
# ------------------------------------------
|
|
m4_define([_LT_MANGLE_OPTION],
|
|
[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
|
|
|
|
|
|
# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
|
|
# ---------------------------------------
|
|
# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
|
|
# matching handler defined, dispatch to it. Other OPTION-NAMEs are
|
|
# saved as a flag.
|
|
m4_define([_LT_SET_OPTION],
|
|
[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
|
|
m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
|
|
_LT_MANGLE_DEFUN([$1], [$2]),
|
|
[m4_warning([Unknown $1 option '$2'])])[]dnl
|
|
])
|
|
|
|
|
|
# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
|
|
# ------------------------------------------------------------
|
|
# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
|
|
m4_define([_LT_IF_OPTION],
|
|
[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
|
|
|
|
|
|
# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
|
|
# -------------------------------------------------------
|
|
# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
|
|
# are set.
|
|
m4_define([_LT_UNLESS_OPTIONS],
|
|
[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
|
|
[m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
|
|
[m4_define([$0_found])])])[]dnl
|
|
m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
|
|
])[]dnl
|
|
])
|
|
|
|
|
|
# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
|
|
# ----------------------------------------
|
|
# OPTION-LIST is a space-separated list of Libtool options associated
|
|
# with MACRO-NAME. If any OPTION has a matching handler declared with
|
|
# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
|
|
# the unknown option and exit.
|
|
m4_defun([_LT_SET_OPTIONS],
|
|
[# Set options
|
|
m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
|
|
[_LT_SET_OPTION([$1], _LT_Option)])
|
|
|
|
m4_if([$1],[LT_INIT],[
|
|
dnl
|
|
dnl Simply set some default values (i.e off) if boolean options were not
|
|
dnl specified:
|
|
_LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
|
|
])
|
|
_LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
|
|
])
|
|
dnl
|
|
dnl If no reference was made to various pairs of opposing options, then
|
|
dnl we run the default mode handler for the pair. For example, if neither
|
|
dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
|
|
dnl archives by default:
|
|
_LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
|
|
_LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
|
|
_LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
|
|
_LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
|
|
[_LT_ENABLE_FAST_INSTALL])
|
|
_LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
|
|
[_LT_WITH_AIX_SONAME([aix])])
|
|
])
|
|
])# _LT_SET_OPTIONS
|
|
|
|
|
|
## --------------------------------- ##
|
|
## Macros to handle LT_INIT options. ##
|
|
## --------------------------------- ##
|
|
|
|
# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
|
|
# -----------------------------------------
|
|
m4_define([_LT_MANGLE_DEFUN],
|
|
[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
|
|
|
|
|
|
# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
|
|
# -----------------------------------------------
|
|
m4_define([LT_OPTION_DEFINE],
|
|
[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
|
|
])# LT_OPTION_DEFINE
|
|
|
|
|
|
# dlopen
|
|
# ------
|
|
LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
|
|
])
|
|
|
|
AU_DEFUN([AC_LIBTOOL_DLOPEN],
|
|
[_LT_SET_OPTION([LT_INIT], [dlopen])
|
|
AC_DIAGNOSE([obsolete],
|
|
[$0: Remove this warning and the call to _LT_SET_OPTION when you
|
|
put the 'dlopen' option into LT_INIT's first parameter.])
|
|
])
|
|
|
|
dnl aclocal-1.4 backwards compatibility:
|
|
dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
|
|
|
|
|
|
# win32-dll
|
|
# ---------
|
|
# Declare package support for building win32 dll's.
|
|
LT_OPTION_DEFINE([LT_INIT], [win32-dll],
|
|
[enable_win32_dll=yes
|
|
|
|
case $host in
|
|
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
|
|
AC_CHECK_TOOL(AS, as, false)
|
|
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
|
|
AC_CHECK_TOOL(OBJDUMP, objdump, false)
|
|
;;
|
|
esac
|
|
|
|
test -z "$AS" && AS=as
|
|
_LT_DECL([], [AS], [1], [Assembler program])dnl
|
|
|
|
test -z "$DLLTOOL" && DLLTOOL=dlltool
|
|
_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
|
|
|
|
test -z "$OBJDUMP" && OBJDUMP=objdump
|
|
_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
|
|
])# win32-dll
|
|
|
|
AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
|
|
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
|
_LT_SET_OPTION([LT_INIT], [win32-dll])
|
|
AC_DIAGNOSE([obsolete],
|
|
[$0: Remove this warning and the call to _LT_SET_OPTION when you
|
|
put the 'win32-dll' option into LT_INIT's first parameter.])
|
|
])
|
|
|
|
dnl aclocal-1.4 backwards compatibility:
|
|
dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
|
|
|
|
|
|
# _LT_ENABLE_SHARED([DEFAULT])
|
|
# ----------------------------
|
|
# implement the --enable-shared flag, and supports the 'shared' and
|
|
# 'disable-shared' LT_INIT options.
|
|
# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
|
|
m4_define([_LT_ENABLE_SHARED],
|
|
[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
|
|
AC_ARG_ENABLE([shared],
|
|
[AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
|
|
[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
|
|
[p=${PACKAGE-default}
|
|
case $enableval in
|
|
yes) enable_shared=yes ;;
|
|
no) enable_shared=no ;;
|
|
*)
|
|
enable_shared=no
|
|
# Look at the argument we got. We use all the common list separators.
|
|
lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
|
|
for pkg in $enableval; do
|
|
IFS=$lt_save_ifs
|
|
if test "X$pkg" = "X$p"; then
|
|
enable_shared=yes
|
|
fi
|
|
done
|
|
IFS=$lt_save_ifs
|
|
;;
|
|
esac],
|
|
[enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
|
|
|
|
_LT_DECL([build_libtool_libs], [enable_shared], [0],
|
|
[Whether or not to build shared libraries])
|
|
])# _LT_ENABLE_SHARED
|
|
|
|
LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
|
|
LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
|
|
|
|
# Old names:
|
|
AC_DEFUN([AC_ENABLE_SHARED],
|
|
[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
|
|
])
|
|
|
|
AC_DEFUN([AC_DISABLE_SHARED],
|
|
[_LT_SET_OPTION([LT_INIT], [disable-shared])
|
|
])
|
|
|
|
AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
|
|
AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
|
|
|
|
dnl aclocal-1.4 backwards compatibility:
|
|
dnl AC_DEFUN([AM_ENABLE_SHARED], [])
|
|
dnl AC_DEFUN([AM_DISABLE_SHARED], [])
|
|
|
|
|
|
|
|
# _LT_ENABLE_STATIC([DEFAULT])
|
|
# ----------------------------
|
|
# implement the --enable-static flag, and support the 'static' and
|
|
# 'disable-static' LT_INIT options.
|
|
# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
|
|
m4_define([_LT_ENABLE_STATIC],
|
|
[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
|
|
AC_ARG_ENABLE([static],
|
|
[AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
|
|
[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
|
|
[p=${PACKAGE-default}
|
|
case $enableval in
|
|
yes) enable_static=yes ;;
|
|
no) enable_static=no ;;
|
|
*)
|
|
enable_static=no
|
|
# Look at the argument we got. We use all the common list separators.
|
|
lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
|
|
for pkg in $enableval; do
|
|
IFS=$lt_save_ifs
|
|
if test "X$pkg" = "X$p"; then
|
|
enable_static=yes
|
|
fi
|
|
done
|
|
IFS=$lt_save_ifs
|
|
;;
|
|
esac],
|
|
[enable_static=]_LT_ENABLE_STATIC_DEFAULT)
|
|
|
|
_LT_DECL([build_old_libs], [enable_static], [0],
|
|
[Whether or not to build static libraries])
|
|
])# _LT_ENABLE_STATIC
|
|
|
|
LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
|
|
LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
|
|
|
|
# Old names:
|
|
AC_DEFUN([AC_ENABLE_STATIC],
|
|
[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
|
|
])
|
|
|
|
AC_DEFUN([AC_DISABLE_STATIC],
|
|
[_LT_SET_OPTION([LT_INIT], [disable-static])
|
|
])
|
|
|
|
AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
|
|
AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
|
|
|
|
dnl aclocal-1.4 backwards compatibility:
|
|
dnl AC_DEFUN([AM_ENABLE_STATIC], [])
|
|
dnl AC_DEFUN([AM_DISABLE_STATIC], [])
|
|
|
|
|
|
|
|
# _LT_ENABLE_FAST_INSTALL([DEFAULT])
|
|
# ----------------------------------
|
|
# implement the --enable-fast-install flag, and support the 'fast-install'
|
|
# and 'disable-fast-install' LT_INIT options.
|
|
# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
|
|
m4_define([_LT_ENABLE_FAST_INSTALL],
|
|
[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
|
|
AC_ARG_ENABLE([fast-install],
|
|
[AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
|
|
[optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
|
|
[p=${PACKAGE-default}
|
|
case $enableval in
|
|
yes) enable_fast_install=yes ;;
|
|
no) enable_fast_install=no ;;
|
|
*)
|
|
enable_fast_install=no
|
|
# Look at the argument we got. We use all the common list separators.
|
|
lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
|
|
for pkg in $enableval; do
|
|
IFS=$lt_save_ifs
|
|
if test "X$pkg" = "X$p"; then
|
|
enable_fast_install=yes
|
|
fi
|
|
done
|
|
IFS=$lt_save_ifs
|
|
;;
|
|
esac],
|
|
[enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
|
|
|
|
_LT_DECL([fast_install], [enable_fast_install], [0],
|
|
[Whether or not to optimize for fast installation])dnl
|
|
])# _LT_ENABLE_FAST_INSTALL
|
|
|
|
LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
|
|
LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
|
|
|
|
# Old names:
|
|
AU_DEFUN([AC_ENABLE_FAST_INSTALL],
|
|
[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
|
|
AC_DIAGNOSE([obsolete],
|
|
[$0: Remove this warning and the call to _LT_SET_OPTION when you put
|
|
the 'fast-install' option into LT_INIT's first parameter.])
|
|
])
|
|
|
|
AU_DEFUN([AC_DISABLE_FAST_INSTALL],
|
|
[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
|
|
AC_DIAGNOSE([obsolete],
|
|
[$0: Remove this warning and the call to _LT_SET_OPTION when you put
|
|
the 'disable-fast-install' option into LT_INIT's first parameter.])
|
|
])
|
|
|
|
dnl aclocal-1.4 backwards compatibility:
|
|
dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
|
|
dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
|
|
|
|
|
|
# _LT_WITH_AIX_SONAME([DEFAULT])
|
|
# ----------------------------------
|
|
# implement the --with-aix-soname flag, and support the `aix-soname=aix'
|
|
# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
|
|
# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'.
|
|
m4_define([_LT_WITH_AIX_SONAME],
|
|
[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
|
|
shared_archive_member_spec=
|
|
case $host,$enable_shared in
|
|
power*-*-aix[[5-9]]*,yes)
|
|
AC_MSG_CHECKING([which variant of shared library versioning to provide])
|
|
AC_ARG_WITH([aix-soname],
|
|
[AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
|
|
[shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
|
|
[case $withval in
|
|
aix|svr4|both)
|
|
;;
|
|
*)
|
|
AC_MSG_ERROR([Unknown argument to --with-aix-soname])
|
|
;;
|
|
esac
|
|
lt_cv_with_aix_soname=$with_aix_soname],
|
|
[AC_CACHE_VAL([lt_cv_with_aix_soname],
|
|
[lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
|
|
with_aix_soname=$lt_cv_with_aix_soname])
|
|
AC_MSG_RESULT([$with_aix_soname])
|
|
if test aix != "$with_aix_soname"; then
|
|
# For the AIX way of multilib, we name the shared archive member
|
|
# based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
|
|
# and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
|
|
# Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
|
|
# the AIX toolchain works better with OBJECT_MODE set (default 32).
|
|
if test 64 = "${OBJECT_MODE-32}"; then
|
|
shared_archive_member_spec=shr_64
|
|
else
|
|
shared_archive_member_spec=shr
|
|
fi
|
|
fi
|
|
;;
|
|
*)
|
|
with_aix_soname=aix
|
|
;;
|
|
esac
|
|
|
|
_LT_DECL([], [shared_archive_member_spec], [0],
|
|
[Shared archive member basename, for filename based shared library versioning on AIX])dnl
|
|
])# _LT_WITH_AIX_SONAME
|
|
|
|
LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
|
|
LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
|
|
LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
|
|
|
|
|
|
# _LT_WITH_PIC([MODE])
|
|
# --------------------
|
|
# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
|
|
# LT_INIT options.
|
|
# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'.
|
|
m4_define([_LT_WITH_PIC],
|
|
[AC_ARG_WITH([pic],
|
|
[AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
|
|
[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
|
|
[lt_p=${PACKAGE-default}
|
|
case $withval in
|
|
yes|no) pic_mode=$withval ;;
|
|
*)
|
|
pic_mode=default
|
|
# Look at the argument we got. We use all the common list separators.
|
|
lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
|
|
for lt_pkg in $withval; do
|
|
IFS=$lt_save_ifs
|
|
if test "X$lt_pkg" = "X$lt_p"; then
|
|
pic_mode=yes
|
|
fi
|
|
done
|
|
IFS=$lt_save_ifs
|
|
;;
|
|
esac],
|
|
[pic_mode=m4_default([$1], [default])])
|
|
|
|
_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
|
|
])# _LT_WITH_PIC
|
|
|
|
LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
|
|
LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
|
|
|
|
# Old name:
|
|
AU_DEFUN([AC_LIBTOOL_PICMODE],
|
|
[_LT_SET_OPTION([LT_INIT], [pic-only])
|
|
AC_DIAGNOSE([obsolete],
|
|
[$0: Remove this warning and the call to _LT_SET_OPTION when you
|
|
put the 'pic-only' option into LT_INIT's first parameter.])
|
|
])
|
|
|
|
dnl aclocal-1.4 backwards compatibility:
|
|
dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
|
|
|
|
## ----------------- ##
|
|
## LTDL_INIT Options ##
|
|
## ----------------- ##
|
|
|
|
m4_define([_LTDL_MODE], [])
|
|
LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
|
|
[m4_define([_LTDL_MODE], [nonrecursive])])
|
|
LT_OPTION_DEFINE([LTDL_INIT], [recursive],
|
|
[m4_define([_LTDL_MODE], [recursive])])
|
|
LT_OPTION_DEFINE([LTDL_INIT], [subproject],
|
|
[m4_define([_LTDL_MODE], [subproject])])
|
|
|
|
m4_define([_LTDL_TYPE], [])
|
|
LT_OPTION_DEFINE([LTDL_INIT], [installable],
|
|
[m4_define([_LTDL_TYPE], [installable])])
|
|
LT_OPTION_DEFINE([LTDL_INIT], [convenience],
|
|
[m4_define([_LTDL_TYPE], [convenience])])
|