diff options
Diffstat (limited to 'libtool.m4')
-rw-r--r-- | libtool.m4 | 35 |
1 files changed, 16 insertions, 19 deletions
@@ -319,7 +319,7 @@ m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], # VALUE may be 0, 1 or 2 for a computed quote escaped value based on # VARNAME. Any other value will be used directly. m4_define([_LT_DECL], -[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], +[lt_if_append_uniq([lt_decl_varnames], [$2], [[, ]], [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], [m4_ifval([$1], [$1], [$2])]) lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) @@ -1993,7 +1993,7 @@ aix3*) soname_spec='${libname}${release}${shared_ext}$major' ;; -aix[[4-9]]*) +aix4* | aix5*) version_type=linux need_lib_prefix=no need_version=no @@ -2834,7 +2834,7 @@ lt_cv_deplibs_check_method='unknown' # whether `pass_all' will *always* work, you probably want this one. case $host_os in -aix[[4-9]]*) +aix4* | aix5*) lt_cv_deplibs_check_method=pass_all ;; @@ -3419,8 +3419,7 @@ m4_if([$1], [CXX], [ # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -3462,7 +3461,7 @@ m4_if([$1], [CXX], [ esac else case $host_os in - aix[[4-9]]*) + aix4* | aix5*) # All AIX code is PIC. if test "$host_cpu" = ia64; then # AIX 5 now supports IA64 processor @@ -3716,8 +3715,7 @@ m4_if([$1], [CXX], [ # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ;; darwin* | rhapsody*) @@ -3793,8 +3791,7 @@ m4_if([$1], [CXX], [ mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ;; hpux9* | hpux10* | hpux11*) @@ -3989,7 +3986,7 @@ AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) m4_if([$1], [CXX], [ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in - aix[[4-9]]*) + aix4* | aix5*) # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then @@ -4095,7 +4092,7 @@ m4_if([$1], [CXX], [ # See if GNU ld supports shared libraries. case $host_os in - aix[[3-9]]*) + aix3* | aix4* | aix5*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then _LT_TAGVAR(ld_shlibs, $1)=no @@ -4329,7 +4326,7 @@ _LT_EOF fi ;; - aix[[4-9]]*) + aix4* | aix5*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -4349,7 +4346,7 @@ _LT_EOF # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes @@ -5141,7 +5138,7 @@ if test -n "$compiler"; then fi ;; - aix[[4-9]]*) + aix4* | aix5*) if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi @@ -5331,7 +5328,7 @@ if test "$_lt_caught_CXX_error" != yes; then # FIXME: insert proper C++ library support _LT_TAGVAR(ld_shlibs, $1)=no ;; - aix[[4-9]]*) + aix4* | aix5*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -5344,7 +5341,7 @@ if test "$_lt_caught_CXX_error" != yes; then # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) for ld_flag in $LDFLAGS; do case $ld_flag in *-brtl*) @@ -6558,7 +6555,7 @@ if test "$_lt_disable_F77" != yes; then postinstall_cmds='$RANLIB $lib' fi ;; - aix[[4-9]]*) + aix4* | aix5*) if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi @@ -6699,7 +6696,7 @@ if test "$_lt_disable_FC" != yes; then postinstall_cmds='$RANLIB $lib' fi ;; - aix[[4-9]]*) + aix4* | aix5*) if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi |