← Back to branch summary

~p-ch-e/gnuhello/gnuhello

« back to all changes in this revision

Viewing changes to gnulib/m4/lib-link.m4

  • Committer: Reuben Thomas
  • Date: 2011-12-17 11:23:38 UTC
  • Revision ID: rrt@sc3d.org-20111217112338-kurwdy8nu69g3t6f
Update gnulib and convert .cvsignore to .bzrignore.

        * gnulib: Update.
        * .bzrignore: Add.
        * .cvsignore: Remove.
        * contrib/.cvsignore: Likewise.
        * doc/.cvsignore: Likewise.
        * man/.cvsignore: Likewise.
        * po/.cvsignore: Likewise.
        * src/.cvsignore: Likewise.
        * tests/.cvsignore: Likewise.
        * build/mkinstalldirs: Remove: no longer needed.
        * po: Update.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gnulib/m4/lib-link.m4
1
 
# lib-link.m4 serial 21 (gettext-0.18)
2
 
dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
 
1
# lib-link.m4 serial 26 (gettext-0.18.2)
 
2
dnl Copyright (C) 2001-2011 Free Software Foundation, Inc.
3
3
dnl This file is free software; the Free Software Foundation
4
4
dnl gives unlimited permission to copy and/or distribute it,
5
5
dnl with or without modifications, as long as this notice is preserved.
18
18
[
19
19
  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
20
20
  AC_REQUIRE([AC_LIB_RPATH])
21
 
  pushdef([Name],[translit([$1],[./-], [___])])
22
 
  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
23
 
                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
 
21
  pushdef([Name],[m4_translit([$1],[./+-], [____])])
 
22
  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
 
23
                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
24
24
  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
25
25
    AC_LIB_LINKFLAGS_BODY([$1], [$2])
26
26
    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
58
58
[
59
59
  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
60
60
  AC_REQUIRE([AC_LIB_RPATH])
61
 
  pushdef([Name],[translit([$1],[./-], [___])])
62
 
  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
63
 
                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
 
61
  pushdef([Name],[m4_translit([$1],[./+-], [____])])
 
62
  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
 
63
                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
64
64
 
65
65
  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
66
66
  dnl accordingly.
85
85
      *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
86
86
      *)       LIBS="$LIB[]NAME $LIBS" ;;
87
87
    esac
88
 
    AC_TRY_LINK([$3], [$4],
 
88
    AC_LINK_IFELSE(
 
89
      [AC_LANG_PROGRAM([[$3]], [[$4]])],
89
90
      [ac_cv_lib[]Name=yes],
90
91
      [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
91
92
    LIBS="$ac_save_LIBS"
115
116
dnl Determine the platform dependent parameters needed to use rpath:
116
117
dnl   acl_libext,
117
118
dnl   acl_shlibext,
 
119
dnl   acl_libname_spec,
 
120
dnl   acl_library_names_spec,
118
121
dnl   acl_hardcode_libdir_flag_spec,
119
122
dnl   acl_hardcode_libdir_separator,
120
123
dnl   acl_hardcode_direct,
157
160
dnl macro call that searches for libname.
158
161
AC_DEFUN([AC_LIB_FROMPACKAGE],
159
162
[
160
 
  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
161
 
                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
 
163
  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
 
164
                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
162
165
  define([acl_frompackage_]NAME, [$2])
163
166
  popdef([NAME])
164
167
  pushdef([PACK],[$2])
165
 
  pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
166
 
                                  [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
 
168
  pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
 
169
                                     [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
167
170
  define([acl_libsinpackage_]PACKUP,
168
 
    m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
 
171
    m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1])
169
172
  popdef([PACKUP])
170
173
  popdef([PACK])
171
174
])
178
181
AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
179
182
[
180
183
  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
181
 
  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
182
 
                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
 
184
  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
 
185
                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
183
186
  pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
184
 
  pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
185
 
                                  [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
 
187
  pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
 
188
                                     [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
186
189
  pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
187
190
  dnl Autoconf >= 2.61 supports dots in --with options.
188
 
  pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)])
 
191
  pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)])
189
192
  dnl By default, look in $includedir and $libdir.
190
193
  use_additional=yes
191
194
  AC_LIB_WITH_FINAL_PREFIX([
242
245
        names_already_handled="$names_already_handled $name"
243
246
        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
244
247
        dnl or AC_LIB_HAVE_LINKFLAGS call.
245
 
        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
 
248
        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
246
249
        eval value=\"\$HAVE_LIB$uppername\"
247
250
        if test -n "$value"; then
248
251
          if test "$value" = yes; then