FYI: pmake ./ ignorance fix [290]

[Gary V. Vaughan]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Applied to HEAD.

  * looking for address@hidden/libtool--devo--1.0--patch-308 to compare with
  * comparing to address@hidden/libtool--devo--1.0--patch-308
  M  libltdl/m4/ltdl.m4
  M  ChangeLog
  
  * modified files
  
  Index: Changelog
  from  Gary V. Vaughan  <address@hidden>
  
        * libltdl/m4/ltdl.m4 (_LT_CONFIG_LTDL_DIR): Spurious './' prefixes
        upset BSD pmake, don't set lt_ltdl_dir in this case.
        (LTDL_CONVENIENCE, LTDL_INSTALLABLE): Adjust.
  
  --- orig/libltdl/m4/ltdl.m4
  +++ mod/libltdl/m4/ltdl.m4
  @@ -19,10 +19,14 @@
   # We break this out into a separate macro, so that we can call it safely
   # internally without being caught accidentally by the sed scan in libtoolize.
   m4_defun([_LT_CONFIG_LTDL_DIR],
  -[m4_pushdef([_ARG_DIR], m4_bpatsubst([$1], [/*$]))
  +[dnl remove trailing slashes
  +m4_pushdef([_ARG_DIR], m4_bpatsubst([$1], [/*$]))
   m4_case(_LTDL_DIR,
  -     [], [m4_define([_LTDL_DIR], _ARG_DIR)
  -         _LT_SHELL_INIT([lt_ltdl_dir=']_ARG_DIR['])],
  +     [], [dnl only set lt_ltdl_dir if _ARG_DIR is not simply `.'
  +          m4_if(_ARG_DIR, [.],
  +                  [],
  +              [m4_define([_LTDL_DIR], _ARG_DIR)
  +               _LT_SHELL_INIT([lt_ltdl_dir=']_ARG_DIR['])])],
       [m4_if(_ARG_DIR, _LTDL_DIR,
            [],
        [m4_fatal([multiple libltdl directories: `]_LTDL_DIR[', 
`]_ARG_DIR['])])])
  @@ -57,8 +61,8 @@
     "") enable_ltdl_convenience=yes
         ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
     esac
  -LIBLTDL='${top_builddir}/'"$lt_ltdl_dir/libltdlc.la"
  -LTDLINCL='-I${top_srcdir}/'"$lt_ltdl_dir"
  +LIBLTDL='${top_builddir}'"${lt_ltdl_dir+/$lt_ltdl_dir}/libltdlc.la"
  +LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}"
   
   AC_SUBST([LIBLTDL])
   AC_SUBST([LTDLINCL])
  @@ -108,8 +112,8 @@
     ])
   if test x"$enable_ltdl_install" = x"yes"; then
     ac_configure_args="$ac_configure_args --enable-ltdl-install"
  -  LIBLTDL='${top_builddir}/'"$lt_ltdl_dir/libltdl.la"
  -  LTDLINCL='-I${top_srcdir}/'"$lt_ltdl_dir"
  +  LIBLTDL='${top_builddir}'"${lt_ltdl_dir+/$lt_ltdl_dir}/libltdl.la"
  +  LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}"
   else
     ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
     LIBLTDL="-lltdl"
  
  
  
- -- 
Gary V. Vaughan      ())_.  address@hidden,gnu.org}
Research Scientist   ( '/   http://tkd.kicks-ass.net
GNU Hacker           / )=   http://www.gnu.org/software/libtool
Technical Author   `(_~)_   http://sources.redhat.com/autobook
_________________________________________________________
This patch notification generated by tlaapply version 1.0
http://tkd.kicks-ass.net/arch/address@hidden/cvs-utils--tla--1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (Darwin)

iD8DBQFDQ6BaFRMICSmD1gYRAqQ6AJ9bNtVm3NihyWVp0nytgJ9kS4fAnACdHP6j
amxjXVVv6wBcwt4g+IIczV8=
=BFkL
-----END PGP SIGNATURE-----