From: Alexandre Duret-Lutz Date: Sun, 8 Sep 2002 13:40:02 +0000 (+0000) Subject: 2002-09-08 Andreas Buening X-Git-Tag: Release-1-6d~32 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=ae9fd2904edad830eaf023398381073d1e9968f4;p=automake.git 2002-09-08 Andreas Buening 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 237bb495..77c16beb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-09-08 Andreas Buening + + 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 * configure.in: Check for EGREP and FGREP. Create tests/defs. diff --git a/Makefile.in b/Makefile.in index 7fb8ec7c..d188a8d9 100644 --- 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 d836fce4..ea4e123d 100644 --- 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 44d0c089..fd0e7020 100755 --- 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 240636ab..9472751b 100644 --- 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 c965fa35..1aac595f 100644 --- 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 9f859234..393e6697 100644 --- 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 7c19acdb..9659dcb2 100644 --- 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 526ca3dd..8ed7004d 100644 --- 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 2e2af344..2dedfe30 100644 --- 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 a388eabb..81a8eda0 100644 --- 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@