Changeset 52b649e in mod_gnutls for m4/libtool.m4


Ignore:
Timestamp:
Jan 11, 2013, 12:57:39 AM (9 years ago)
Author:
Daniel Kahn Gillmor <dkg@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, upstream
Children:
4e539d3, 66b608e
Parents:
4ecf14f
Message:

Imported Upstream version 0.5.5

File:
1 edited

Legend:

Unmodified
Added
Removed
  • m4/libtool.m4

    r4ecf14f r52b649e  
    381381# ---------------------------------------------------
    382382m4_define([lt_decl_varnames_tagged],
    383 [_$0(m4_quote(m4_default([$1], [[, ]])),
    384      m4_quote(m4_if([$2], [],
    385                      m4_quote(lt_decl_tag_varnames),
    386                   m4_quote(m4_shift($@)))),
    387      m4_split(m4_normalize(m4_quote(_LT_TAGS))))])
    388 m4_define([_lt_decl_varnames_tagged], [lt_combine([$1], [$2], [_], $3)])
     383[m4_assert([$# <= 2])dnl
     384_$0(m4_quote(m4_default([$1], [[, ]])),
     385    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
     386    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
     387m4_define([_lt_decl_varnames_tagged],
     388[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
    389389
    390390
     
    946946    darwin1.*)
    947947      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
    948     darwin*) # darwin 5.x on 
     948    darwin*) # darwin 5.x on
    949949      # if running on 10.5 or later, the deployment target defaults
    950950      # to the OS version, if on x86, and 10.4, the deployment
    951       # target defaults to 10.4. Don't you love it? 
     951      # target defaults to 10.4. Don't you love it?
    952952      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
    953953        10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
     
    991991  _LT_TAGVAR(link_all_deplibs, $1)=yes
    992992  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
    993   if test "$GCC" = "yes"; then
     993  case $cc_basename in
     994     ifort*) _lt_dar_can_shared=yes ;;
     995     *) _lt_dar_can_shared=$GCC ;;
     996  esac
     997  if test "$_lt_dar_can_shared" = "yes"; then
    994998    output_verbose_link_cmd=echo
    995999    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
     
    15131517    ;;
    15141518
    1515   cygwin* | mingw*)
     1519  cygwin* | mingw* | cegcc*)
    15161520    # On Win9x/ME, this test blows up -- it succeeds, but takes
    15171521    # about 5 minutes as the teststring grows exponentially.
     
    16811685#endif
    16821686
    1683 #ifdef __cplusplus
    1684 extern "C" void exit (int);
    1685 #endif
    1686 
    16871687void fnord() { int i=42;}
    16881688int main ()
     
    17001700    puts (dlerror ());
    17011701
    1702     exit (status);
     1702  return status;
    17031703}]
    17041704_LT_EOF
     
    17391739    ;;
    17401740
    1741   mingw* | pw32*)
     1741  mingw* | pw32* | cegcc*)
    17421742    lt_cv_dlopen="LoadLibrary"
    17431743    lt_cv_dlopen_libs=
     
    20362036m4_require([_LT_DECL_EGREP])dnl
    20372037m4_require([_LT_FILEUTILS_DEFAULTS])dnl
     2038m4_require([_LT_DECL_OBJDUMP])dnl
    20382039m4_require([_LT_DECL_SED])dnl
    20392040AC_MSG_CHECKING([dynamic linker characteristics])
     
    22002201  ;;
    22012202
    2202 cygwin* | mingw* | pw32*)
     2203cygwin* | mingw* | pw32* | cegcc*)
    22032204  version_type=windows
    22042205  shrext_cmds=".dll"
     
    22072208
    22082209  case $GCC,$host_os in
    2209   yes,cygwin* | yes,mingw* | yes,pw32*)
     2210  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
    22102211    library_names_spec='$libname.dll.a'
    22112212    # DLL is installed to $(libdir)/../bin by postinstall_cmds
     
    22302231      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
    22312232      ;;
    2232     mingw*)
     2233    mingw* | cegcc*)
    22332234      # MinGW DLLs use traditional 'lib' prefix
    22342235      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
     
    26682669  need_lib_prefix=no
    26692670  need_version=no
    2670   library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
     2671  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    26712672  shlibpath_var=LD_LIBRARY_PATH
    26722673  shlibpath_overrides_runpath=no
     
    26922693  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
    26932694fi
    2694  
     2695
    26952696if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
    26962697  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
     
    29692970m4_defun([_LT_CHECK_MAGIC_METHOD],
    29702971[m4_require([_LT_DECL_EGREP])
     2972m4_require([_LT_DECL_OBJDUMP])
    29712973AC_CACHE_CHECK([how to recognize dependent libraries],
    29722974lt_cv_deplibs_check_method,
     
    30173019    lt_cv_file_magic_cmd='$OBJDUMP -f'
    30183020  fi
     3021  ;;
     3022
     3023cegcc)
     3024  # use the weaker test based on 'objdump'. See mingw*.
     3025  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
     3026  lt_cv_file_magic_cmd='$OBJDUMP -f'
    30193027  ;;
    30203028
     
    33303338  symcode='[[BCDT]]'
    33313339  ;;
    3332 cygwin* | mingw* | pw32*)
     3340cygwin* | mingw* | pw32* | cegcc*)
    33333341  symcode='[[ABCDGISTW]]'
    33343342  ;;
     
    35763584      # PIC is the default for these OSes.
    35773585      ;;
    3578     mingw* | cygwin* | os2* | pw32*)
     3586    mingw* | cygwin* | os2* | pw32* | cegcc*)
    35793587      # This hack is so that the source file can tell whether it is being
    35803588      # built for inclusion in a dll (and should export symbols for example).
     
    36033611      ;;
    36043612    hpux*)
    3605       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
    3606       # not for PA HP-UX.
     3613      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
     3614      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
     3615      # sets the default TLS model and affects inlining.
    36073616      case $host_cpu in
    3608       hppa*64*|ia64*)
     3617      hppa*64*)
    36093618        ;;
    36103619      *)
     
    37043713            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
    37053714            ;;
    3706           icpc* | ecpc* )
    3707             # Intel C++
     3715          ecpc* )
     3716            # old Intel C++ for x86_64 which still supported -KPIC.
    37083717            _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
    37093718            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
     3719            _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
     3720            ;;
     3721          icpc* )
     3722            # Intel C++, used to be incompatible with GCC.
     3723            # ICC 10 doesn't accept -KPIC any more.
     3724            _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
     3725            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
    37103726            _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
    37113727            ;;
     
    38753891      ;;
    38763892
    3877     mingw* | cygwin* | pw32* | os2*)
     3893    mingw* | cygwin* | pw32* | os2* | cegcc*)
    38783894      # This hack is so that the source file can tell whether it is being
    38793895      # built for inclusion in a dll (and should export symbols for example).
     
    38913907
    38923908    hpux*)
    3893       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
    3894       # not for PA HP-UX.
     3909      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
     3910      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
     3911      # sets the default TLS model and affects inlining.
    38953912      case $host_cpu in
    3896       hppa*64*|ia64*)
     3913      hppa*64*)
    38973914        # +Z the default
    38983915        ;;
     
    39443961      ;;
    39453962
    3946     mingw* | cygwin* | pw32* | os2*)
     3963    mingw* | cygwin* | pw32* | os2* | cegcc*)
    39473964      # This hack is so that the source file can tell whether it is being
    39483965      # built for inclusion in a dll (and should export symbols for example).
     
    39753992    linux* | k*bsd*-gnu)
    39763993      case $cc_basename in
    3977       icc* | ecc* | ifort*)
     3994      # old Intel for x86_64 which still supported -KPIC.
     3995      ecc*)
    39783996        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
    39793997        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
    39803998        _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
    39813999        ;;
     4000      # icc used to be incompatible with GCC.
     4001      # ICC 10 doesn't accept -KPIC any more.
     4002      icc* | ifort*)
     4003        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
     4004        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
     4005        _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
     4006        ;;
     4007      # Lahey Fortran 8.1.
     4008      lf95*)
     4009        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
     4010        _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
     4011        _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
     4012        ;;
    39824013      pgcc* | pgf77* | pgf90* | pgf95*)
    39834014        # Portland Group compilers (*not* the Pentium gcc compiler,
     
    41614192    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
    41624193  ;;
    4163   cygwin* | mingw*)
     4194  cygwin* | mingw* | cegcc*)
    41644195    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
    41654196  ;;
     
    42164247
    42174248  case $host_os in
    4218   cygwin* | mingw* | pw32*)
     4249  cygwin* | mingw* | pw32* | cegcc*)
    42194250    # FIXME: the MSVC++ port hasn't been tested in a loooong time
    42204251    # When not using gcc, we currently assume that we are using
     
    43034334      ;;
    43044335
    4305     cygwin* | mingw* | pw32*)
     4336    cygwin* | mingw* | pw32* | cegcc*)
    43064337      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
    43074338      # as there is no search path for DLLs.
     
    43694400        ifc* | ifort*)                  # Intel Fortran compiler
    43704401          tmp_addflag=' -nofor_main' ;;
     4402        lf95*)                          # Lahey Fortran 8.1
     4403          _LT_TAGVAR(whole_archive_flag_spec, $1)=
     4404          tmp_sharedflag='--shared' ;;
    43714405        xl[[cC]]*)                      # IBM XL C 8.0 on PPC (deal with xlf below)
    43724406          tmp_sharedflag='-qmkshrobj'
     
    46014635      fi
    46024636
     4637      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
    46034638      # It seems that -bexpall does not export symbols beginning with
    46044639      # underscore (_), so it is better to generate a list of symbols to export.
     
    46554690      ;;
    46564691
    4657     cygwin* | mingw* | pw32*)
     4692    cygwin* | mingw* | pw32* | cegcc*)
    46584693      # When not using gcc, we currently assume that we are using
    46594694      # Microsoft Visual C++.
     
    47594794          ;;
    47604795        ia64*)
    4761           _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
     4796          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
    47624797          ;;
    47634798        *)
     
    55445579        fi
    55455580
     5581        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
    55465582        # It seems that -bexpall does not export symbols beginning with
    55475583        # underscore (_), so it is better to generate a list of symbols to
     
    56025638        ;;
    56035639
    5604       cygwin* | mingw* | pw32*)
     5640      cygwin* | mingw* | pw32* | cegcc*)
    56055641        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
    56065642        # as there is no search path for DLLs.
     
    69877023
    69887024
     7025# _LT_DECL_OBJDUMP
     7026# --------------
     7027# If we don't have a new enough Autoconf to choose the best objdump
     7028# available, choose the one first in the user's PATH.
     7029m4_defun([_LT_DECL_OBJDUMP],
     7030[AC_CHECK_TOOL(OBJDUMP, objdump, false)
     7031test -z "$OBJDUMP" && OBJDUMP=objdump
     7032_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
     7033AC_SUBST([OBJDUMP])
     7034])
     7035
     7036
    69897037# _LT_DECL_SED
    69907038# ------------
Note: See TracChangeset for help on using the changeset viewer.