[SCM] GNU Libtool branch, pr-msvc-support, updated. v2.2.6-110-gc1778bd

[Peter Rosin]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".

The branch, pr-msvc-support has been updated
       via  c1778bd15dbd81a09ef190241104635fb3e8e6e8 (commit)
       via  04790afe1388039a4f81a58d238727b5f704c8c9 (commit)
       via  69a4e5ba80667a42a544759a053afcb23cc49c19 (commit)
       via  eaba16eb3a54b27704799d5bfd2619f6732225ce (commit)
       via  6631e515bd208d55f45094405ac185cb8e8d66f9 (commit)
       via  0aef3579d2f8674618a4be638dc7168f0c63303e (commit)
      from  9f84643c8b4a2b83f7962e53921e02edafa56117 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c1778bd15dbd81a09ef190241104635fb3e8e6e8
Merge: 9f84643c8b4a2b83f7962e53921e02edafa56117 
04790afe1388039a4f81a58d238727b5f704c8c9
Author: Peter Rosin <address@hidden>
Date:   Tue Jan 27 00:12:34 2009 +0100

    Merge branch 'master' into pr-msvc-support

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                  |   35 ++++++++++++++++++++++++
 doc/libtool.texi           |    2 +-
 libltdl/config/ltmain.m4sh |   62 +++++++++++++++++++++++++++++---------------
 libltdl/m4/libtool.m4      |    1 +
 tests/cwrapper.at          |    2 +-
 tests/testsuite.at         |    2 +-
 6 files changed, 80 insertions(+), 24 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8b88abc..644a55b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+2009-01-26  Peter Rosin  <address@hidden>
+
+       AWK is required, make sure it is set.
+       * libltdl/m4/libtool.m4 (_LT_CMD_GLOBAL_SYMBOLS: Make sure
+       AWK is set (automake brings it in, but is not always used).
+       Fixes old-m4-iface.at on MSYS/MSVC.
+
+2009-01-25  Mike Frysinger  <address@hidden>
+
+       Fix typo in libtool install mode documentation.
+       * libltdl/config/ltmain.m4sh (func_mode_help): Change -inst-prefix
+       to -inst-prefix-dir.
+       * doc/libtool.texi (Install mode): Likewise.
+
+2009-01-24  Charles Wilson  <address@hidden>
+
+       Add -Wall to cwrapper tests.
+       * tests/cwrapper.at: Add -Wall existing tests. Add additional
+       round of tests with -Wall alone.
+
+2009-01-24  Charles Wilson  <address@hidden>
+
+       [cygwin|mingw] cwrapper cleanups.
+       * libltdl/config/ltmain.m4sh (func_emit_cwrapperexe_src)
+       [file scope]: re-organized includes and portability
+       macros. Avoid oldnames on MINGW32 and MSVC for
+       setmode/stat/chmod/getcwd/putenv. Declare _putenv on
+       MINGW32 when -ansi. Use namespaced macro LT_DEBUGWRAPPER.
+
+2009-01-24  Peter Rosin  <address@hidden>
+
+       Expand exit status test in LT_AT_NOINST_EXEC_CHECK correctly
+       * tests/testsuite.at (LT_AT_NOINST_EXEC_CHECK): STATUS is
+       argument $3, not $2.
+
 2009-01-23  Charles Wilson  <address@hidden>
 
        Add tests for cwrapper with -std=c89 and -std=c99
diff --git a/doc/libtool.texi b/doc/libtool.texi
index dede669..6307530 100644
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -1575,7 +1575,7 @@ In @dfn{install} mode, libtool interprets most of the 
elements of
 The following components of @var{mode-args} are treated specially:
 
 @table @option
address@hidden -inst-prefix @var{inst-prefix-dir}
address@hidden -inst-prefix-dir @var{inst-prefix-dir}
 When installing into a temporary staging area, rather than the
 final @var{prefix}, this argument is used to reflect the
 temporary path, in much the same way @command{automake} uses
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 0f6173f..799299a 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -1162,7 +1162,7 @@ either the \`install' or \`cp' program.
 
 The following components of INSTALL-COMMAND are treated specially:
 
-  -inst-prefix PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
+  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for 
installation
 
 The rest of the components are interpreted as arguments to that command (only
 BSD-compatible install options are recognized)."
@@ -2778,18 +2778,11 @@ EOF
 # include <direct.h>
 # include <process.h>
 # include <io.h>
-# define setmode _setmode
 #else
 # include <unistd.h>
 # include <stdint.h>
 # ifdef __CYGWIN__
 #  include <io.h>
-#  define HAVE_SETENV
-#  ifdef __STRICT_ANSI__
-char *realpath (const char *, char *);
-int putenv (char *);
-int setenv (const char *, const char *, int);
-#  endif
 # endif
 #endif
 #include <malloc.h>
@@ -2803,6 +2796,44 @@ int setenv (const char *, const char *, int);
 #include <fcntl.h>
 #include <sys/stat.h>
 
+/* declarations of non-ANSI functions */
+#if defined(__MINGW32__)
+# ifdef __STRICT_ANSI__
+int _putenv (const char *);
+# endif
+#elif defined(__CYGWIN__)
+# ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+# endif
+/* #elif defined (other platforms) ... */
+#endif
+
+/* portability defines, excluding path handling macros */
+#if defined(_MSC_VER)
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+# define S_IXUSR _S_IEXEC
+# ifndef _INTPTR_T_DEFINED
+#  define _INTPTR_T_DEFINED
+#  define intptr_t int
+# endif
+#elif defined(__MINGW32__) && !defined(__MINGW32CE__)
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+#elif defined(__CYGWIN__)
+# define HAVE_SETENV
+# define FOPEN_WB "wb"
+/* #elif defined (other platforms) ... */
+#endif
+
 #if defined(PATH_MAX)
 # define LT_PATHMAX PATH_MAX
 #elif defined(MAXPATHLEN)
@@ -2818,14 +2849,7 @@ int setenv (const char *, const char *, int);
 # define S_IXGRP 0
 #endif
 
-#ifdef _MSC_VER
-# define S_IXUSR _S_IEXEC
-# define stat _stat
-# ifndef _INTPTR_T_DEFINED
-#  define intptr_t int
-# endif
-#endif
-
+/* path handling portability macros */
 #ifndef DIR_SEPARATOR
 # define DIR_SEPARATOR '/'
 # define PATH_SEPARATOR ':'
@@ -2856,10 +2880,6 @@ int setenv (const char *, const char *, int);
 # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
 #endif /* PATH_SEPARATOR_2 */
 
-#ifdef __CYGWIN__
-# define FOPEN_WB "wb"
-#endif
-
 #ifndef FOPEN_WB
 # define FOPEN_WB "w"
 #endif
@@ -2873,7 +2893,7 @@ int setenv (const char *, const char *, int);
 } while (0)
 
 #undef LTWRAPPER_DEBUGPRINTF
-#if defined DEBUGWRAPPER
+#if defined LT_DEBUGWRAPPER
 # define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
 static void
 ltwrapper_debugprintf (const char *fmt, ...)
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 35cdd12..cec2aaa 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -3361,6 +3361,7 @@ _LT_TAGDECL([no_builtin_flag], 
[lt_prog_compiler_no_builtin_flag], [1],
 m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([LT_PATH_NM])dnl
 AC_REQUIRE([LT_PATH_LD])dnl
 m4_require([_LT_DECL_SED])dnl
diff --git a/tests/cwrapper.at b/tests/cwrapper.at
index 30e591e..ce4572e 100644
--- a/tests/cwrapper.at
+++ b/tests/cwrapper.at
@@ -55,7 +55,7 @@ int main (void)
 
 orig_CFLAGS=$CFLAGS
 orig_LIBTOOL=$LIBTOOL
-for restrictive_flags in '-std=c89 -Werror' '-std=c99 -Werror'; do
+for restrictive_flags in '-Wall -Werror' '-std=c89 -Wall -Werror' '-std=c99 
-Wall -Werror'; do
   CFLAGS="$orig_CFLAGS $restrictive_flags"
   sed "s/LTCFLAGS=.*/&' $restrictive_flags'/" < "$orig_LIBTOOL" > ./libtool
   LIBTOOL=./libtool
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 56ca3a2..24e8174 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -248,7 +248,7 @@ AT_CHECK([if "$lt_exe" $5; then :; else lt_status=$?; ]dnl
 m4_define([LT_AT_NOINST_EXEC_CHECK],
 [lt_exe=$1; if test -f "$1$EXEEXT"; then lt_exe=$lt_exe$EXEEXT; fi
 AT_CHECK([if $LIBTOOL --mode=execute $2 "$lt_exe" $6; then :; else 
lt_status=$?; ]dnl
-        [  m4_ifval([$2], [test $lt_status != $2 && ])]dnl
+        [  m4_ifval([$3], [test $lt_status != $3 && ])]dnl
         [  test "X$host" != "X$build" && test -x "$lt_exe" && exit 77; ]dnl
         [  exit $lt_status; fi],[$3],[$4],[$5])
 ])


hooks/post-receive
--
GNU Libtool