2002-09-08 Andreas Buening <andreas.buening@nexgo.de>

	Fix for automake/334:
	* lib/am/depend2.am: Replaced "cygpath -w" by $(CYGPATH_W).
	* m4/init.m4: New make variable CYGPATH_W.

diff --git a/ChangeLog b/ChangeLog
index 237bb495e7f0bcf06a398d7503c094a04fc56117..77c16bebad4b33092945e9415190c1d46b3e0c90 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-08  Andreas Buening  <andreas.buening@nexgo.de>
+
+       Fix for automake/334:
+       * lib/am/depend2.am: Replaced "cygpath -w" by $(CYGPATH_W).
+       * m4/init.m4: New make variable CYGPATH_W.
+
 2002-09-08  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        * configure.in: Check for EGREP and FGREP.  Create tests/defs.

diff --git a/Makefile.in b/Makefile.in
index 7fb8ec7c63bf70ab40d751c8f0efaaa8018dc9b4..d188a8d95ebcdb6c7319d4232a919afe27c4a94a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -42,6 +42,7 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@

diff --git a/aclocal.m4 b/aclocal.m4
index d836fce4b56a72d184f687063238554ae8d4dd1d..ea4e123de9ae75e994bf07b73c3d265f3597a94f 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -69,6 +69,16 @@ if test "`cd $srcdir && pwd`" != "`pwd`" &&
   AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
 fi
 
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if cygpath --version >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+AC_SUBST([CYGPATH_W])
+
 # Define the identity of the package.
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],

diff --git a/configure b/configure
index 44d0c089aee3b1cd0af9cfec669b7932fcfe710c..fd0e7020fa9409d5c59c9fa0b3d4d902e0db4e02 100755 (executable)
--- a/configure
+++ b/configure
@@ -270,7 +270,7 @@ PACKAGE_STRING='GNU Automake 1.6c'
 PACKAGE_BUGREPORT='bug-automake@gnu.org'
 
 ac_unique_file="automake.in"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE APIVERSION pkgvdatadir PERL LN EGREP FGREP LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE APIVERSION pkgvdatadir PERL LN EGREP FGREP LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1427,6 +1427,16 @@ echo "$as_me: error: source directory already configured; run \"make distclean\"
    { (exit 1); exit 1; }; }
 fi
 
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if cygpath --version >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+
+
 # Define the identity of the package.
  PACKAGE=automake
  VERSION=1.6c
@@ -2328,6 +2338,7 @@ s,@LIBS@,$LIBS,;t t
 s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
 s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
 s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+s,@CYGPATH_W@,$CYGPATH_W,;t t
 s,@PACKAGE@,$PACKAGE,;t t
 s,@VERSION@,$VERSION,;t t
 s,@ACLOCAL@,$ACLOCAL,;t t

diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index 240636ab78b650abea0dc63d719804a81aa763c8..9472751b3adca04be566c5e7bfd962ea789649cf 100644 (file)
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -42,6 +42,7 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@

diff --git a/lib/Makefile.in b/lib/Makefile.in
index c965fa359a19e6bf050026f16c019285a1a54c73..1aac595f67e151903f4bbc3084a353cbe6906b54 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -42,6 +42,7 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@

diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index 9f859234aa26bd6f90c04e2d1ad030d65b2d2065..393e66971bfbf5e2ba3de9166a8c098481408def 100644 (file)
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -42,6 +42,7 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@

diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index 7c19acdba9b53ced35eb85d5edce599ce3a51130..9659dcb22653ec9b4341fd8c43a44e4882f30e63 100644 (file)
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -62,7 +62,7 @@ if %FASTDEP%
        if %COMPILE% -MT %OBJOBJ% -MD -MP -MF "%DEPBASE%.Tpo" \
 ## Ugly invocation here; using a variable fails due to a parsing
 ## problem in automake.
-         %-c% -o %OBJOBJ% `if test -f '%SOURCE%'; then cygpath -w '%SOURCE%'; else cygpath -w '$(srcdir)/%SOURCE%'`; \
+         %-c% -o %OBJOBJ% `if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'`; \
        then mv "%DEPBASE%.Tpo" "%DEPBASE%.Po"; \
        else rm -f "%DEPBASE%.Tpo"; exit 1; \
        fi
@@ -72,8 +72,8 @@ if %AMDEP%
        depfile='%DEPBASE%.Po' tmpdepfile='%DEPBASE%.TPo' @AMDEPBACKSLASH@
        $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
 endif %AMDEP%
-?-o?   %COMPILE% %-c% %-o% %OBJOBJ% `if test -f '%SOURCE%'; then cygpath -w '%SOURCE%'; else cygpath -w '$(srcdir)/%SOURCE%'`
-?!-o?  %COMPILE% %-c% `if test -f '%SOURCE%'; then cygpath -w '%SOURCE%'; else cygpath -w '$(srcdir)/%SOURCE%'`
+?-o?   %COMPILE% %-c% %-o% %OBJOBJ% `if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'`
+?!-o?  %COMPILE% %-c% `if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'`
 endif !%FASTDEP%
 
 if %?LIBTOOL%

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 526ca3dd16c355b911e46273876dc185da8ab598..8ed7004d4da1ccdfa12fc52a960e81df867f7696 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -42,6 +42,7 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@

diff --git a/m4/init.m4 b/m4/init.m4
index 2e2af34453603d624d00d3742487809b70597e9d..2dedfe309003680e2025c18f0e513e4e17143a3f 100644 (file)
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -56,6 +56,16 @@ if test "`cd $srcdir && pwd`" != "`pwd`" &&
   AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
 fi
 
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if cygpath --version >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+AC_SUBST([CYGPATH_W])
+
 # Define the identity of the package.
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],

diff --git a/tests/Makefile.in b/tests/Makefile.in
index a388eabb67d59ddd15592e4a8768540d81456031..81a8eda0cf6da97093b9ad1eeab9e62977b74f07 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -42,6 +42,7 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@