[BACK]Return to lib-link.m4 CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / libiconv / srcm4

Diff for /embedaddon/libiconv/srcm4/lib-link.m4 between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2012/05/29 09:29:44 version 1.1.1.3, 2021/03/17 13:38:46
Line 1 Line 1
# lib-link.m4 serial 26 (gettext-0.18.2)# lib-link.m4 serial 28
dnl Copyright (C) 2001-2011 Free Software Foundation, Inc.dnl Copyright (C) 2001-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation  dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,  dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.  dnl with or without modifications, as long as this notice is preserved.
   
 dnl From Bruno Haible.  dnl From Bruno Haible.
   
AC_PREREQ([2.54])AC_PREREQ([2.61])
   
 dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and  dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
 dnl the libraries corresponding to explicit and implicit dependencies.  dnl the libraries corresponding to explicit and implicit dependencies.
Line 124  dnl   acl_hardcode_direct, Line 124  dnl   acl_hardcode_direct,
 dnl   acl_hardcode_minus_L.  dnl   acl_hardcode_minus_L.
 AC_DEFUN([AC_LIB_RPATH],  AC_DEFUN([AC_LIB_RPATH],
 [  [
  dnl Tell automake >= 1.10 to complain if config.rpath is missing.  dnl Complain if config.rpath is missing.
  m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])  AC_REQUIRE_AUX_FILE([config.rpath])
   AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS    AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
   AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld    AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
   AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host    AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
Line 187  AC_DEFUN([AC_LIB_LINKFLAGS_BODY], Line 187  AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
   pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],    pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
                                      [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])                                       [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
   pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])    pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
   dnl Autoconf >= 2.61 supports dots in --with options.  
   pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)])  
   dnl By default, look in $includedir and $libdir.    dnl By default, look in $includedir and $libdir.
   use_additional=yes    use_additional=yes
   AC_LIB_WITH_FINAL_PREFIX([    AC_LIB_WITH_FINAL_PREFIX([
     eval additional_includedir=\"$includedir\"      eval additional_includedir=\"$includedir\"
     eval additional_libdir=\"$libdir\"      eval additional_libdir=\"$libdir\"
   ])    ])
  AC_ARG_WITH(P_A_C_K[-prefix],  AC_ARG_WITH(PACK[-prefix],
[[  --with-]]P_A_C_K[[-prefix[=DIR]  search for ]PACKLIBS[ in DIR/include and DIR/lib[[  --with-]]PACK[[-prefix[=DIR]  search for ]PACKLIBS[ in DIR/include and DIR/lib
  --without-]]P_A_C_K[[-prefix     don't search for ]PACKLIBS[ in includedir and libdir]],  --without-]]PACK[[-prefix     don't search for ]PACKLIBS[ in includedir and libdir]],
 [  [
     if test "X$withval" = "Xno"; then      if test "X$withval" = "Xno"; then
       use_additional=no        use_additional=no
Line 211  AC_DEFUN([AC_LIB_LINKFLAGS_BODY], Line 209  AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
         additional_includedir="$withval/include"          additional_includedir="$withval/include"
         additional_libdir="$withval/$acl_libdirstem"          additional_libdir="$withval/$acl_libdirstem"
         if test "$acl_libdirstem2" != "$acl_libdirstem" \          if test "$acl_libdirstem2" != "$acl_libdirstem" \
           && ! test -d "$withval/$acl_libdirstem"; then           && test ! -d "$withval/$acl_libdirstem"; then
           additional_libdir="$withval/$acl_libdirstem2"            additional_libdir="$withval/$acl_libdirstem2"
         fi          fi
       fi        fi
Line 670  AC_DEFUN([AC_LIB_LINKFLAGS_BODY], Line 668  AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
       LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"        LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
     done      done
   fi    fi
   popdef([P_A_C_K])  
   popdef([PACKLIBS])    popdef([PACKLIBS])
   popdef([PACKUP])    popdef([PACKUP])
   popdef([PACK])    popdef([PACK])
Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>