[gawk-diffs] [SCM] gawk branch, master, updated. ae0d3255ddd792402650ad0caaf611dcc3ada091

[Arnold Robbins]

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 "gawk".

The branch, master has been updated
       via  ae0d3255ddd792402650ad0caaf611dcc3ada091 (commit)
       via  e893d68460908a358a3a0cfbb08c177610955eaf (commit)
      from  1ff958d4fcd4d458c433c416fb119cc20e5eeba8 (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 -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=ae0d3255ddd792402650ad0caaf611dcc3ada091

commit ae0d3255ddd792402650ad0caaf611dcc3ada091
Author: Arnold D. Robbins <address@hidden>
Date:   Sun Feb 3 20:12:12 2013 +0200

    Additional changes for cross-compiling.

diff --git a/ChangeLog b/ChangeLog
index f1ef7f3..e52e3eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-03         Arnold D. Robbins     <address@hidden>
+
+       * configure.ac: Add Automake test for cross compiling.
+
 2013-01-31         Arnold D. Robbins     <address@hidden>
 
        * dfa.c: Include "dfa.h" which includes regex.h after limits.h
diff --git a/awklib/ChangeLog b/awklib/ChangeLog
index 1b6a31e..e286a46 100644
--- a/awklib/ChangeLog
+++ b/awklib/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-03         Arnold D. Robbins     <address@hidden>
+
+       * Makefile.am (AWKPROG): Add definition and conditional for
+       cross compiling. Thanks to Juergen Kahrs.
+
 2013-01-08         Andrew J. Schorr     <address@hidden>
 
        * eg/lib/inplace.awk: Add new file generated from doc/gawk.texi.
diff --git a/awklib/Makefile.am b/awklib/Makefile.am
index 4ff1403..b10fa64 100644
--- a/awklib/Makefile.am
+++ b/awklib/Makefile.am
@@ -26,7 +26,12 @@
 EXTRA_DIST = ChangeLog ChangeLog.0 extract.awk eg $(srcdir)/stamp-eg
 # With some locales, the script extract.awk fails.
 # So we fix the locale to some sensible value.
+
+if TEST_CROSS_COMPILE
+AWKPROG = LC_ALL=C LANG=C awk$(EXEEXT)
+else
 AWKPROG = LC_ALL=C LANG=C $(abs_top_builddir)/gawk$(EXEEXT)
+endif
 
 # Get config.h from the build directory and custom.h from the source directory.
 AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
diff --git a/awklib/Makefile.in b/awklib/Makefile.in
index d4a7788..f392eeb 100644
--- a/awklib/Makefile.in
+++ b/awklib/Makefile.in
@@ -276,9 +276,10 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 EXTRA_DIST = ChangeLog ChangeLog.0 extract.awk eg $(srcdir)/stamp-eg
address@hidden@AWKPROG = LC_ALL=C LANG=C $(abs_top_builddir)/gawk$(EXEEXT)
 # With some locales, the script extract.awk fails.
 # So we fix the locale to some sensible value.
-AWKPROG = LC_ALL=C LANG=C $(abs_top_builddir)/gawk$(EXEEXT)
address@hidden@AWKPROG = LC_ALL=C LANG=C awk$(EXEEXT)
 
 # Get config.h from the build directory and custom.h from the source directory.
 AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
diff --git a/configure b/configure
index 769237e..c4c8913 100755
--- a/configure
+++ b/configure
@@ -638,6 +638,8 @@ LTLIBSIGSEGV
 LIBSIGSEGV
 HAVE_LIBSIGSEGV
 LIBOBJS
+TEST_CROSS_COMPILE_FALSE
+TEST_CROSS_COMPILE_TRUE
 POSUB
 LTLIBINTL
 LIBINTL
@@ -8375,6 +8377,15 @@ done
 
 fi
 
+ if test "x$build_alias" != "x$host_alias"; then
+  TEST_CROSS_COMPILE_TRUE=
+  TEST_CROSS_COMPILE_FALSE='#'
+else
+  TEST_CROSS_COMPILE_TRUE='#'
+  TEST_CROSS_COMPILE_FALSE=
+fi
+
+
 ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
 if test "x$ac_cv_type_pid_t" = xyes; then :
 
@@ -11021,6 +11032,10 @@ if test -z "${am__fastdepCC_TRUE}" && test -z 
"${am__fastdepCC_FALSE}"; then
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${TEST_CROSS_COMPILE_TRUE}" && test -z 
"${TEST_CROSS_COMPILE_FALSE}"; then
+  as_fn_error $? "conditional \"TEST_CROSS_COMPILE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
diff --git a/configure.ac b/configure.ac
index 4ba5f6a..5b2507e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -156,6 +156,9 @@ else
        AC_CHECK_HEADERS(strings.h)
 fi
 
+dnl Check cross compiling
+AM_CONDITIONAL([TEST_CROSS_COMPILE], [test "x$build_alias" != "x$host_alias"])
+
 dnl checks for typedefs
 AC_TYPE_PID_T
 AC_TYPE_SIGNAL

http://git.sv.gnu.org/cgit/gawk.git/commit/?id=e893d68460908a358a3a0cfbb08c177610955eaf

commit e893d68460908a358a3a0cfbb08c177610955eaf
Author: Arnold D. Robbins <address@hidden>
Date:   Thu Jan 31 20:43:57 2013 +0200

    Cross compile fix for readline checks.

diff --git a/ChangeLog b/ChangeLog
index d00b1fb..f1ef7f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
        * main.c (version): Print out API version numbers if DYNAMIC.
        Helpful also for knowing if to run the shlib tests.
 
+       * configure: Regenerated after change in m4/readline.m4.
+
 2013-01-31         Arnold D. Robbins     <address@hidden>
 
        * PROBLEMS: Removed. It is no longer needed.
diff --git a/configure b/configure
index 246641d..769237e 100755
--- a/configure
+++ b/configure
@@ -10355,10 +10355,8 @@ fi
 $as_echo_n "checking whether readline via \"$_combo\" is present and sane... " 
>&6; }
 
        if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
+              _found_readline=no
+
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
diff --git a/m4/ChangeLog b/m4/ChangeLog
index e90d4d0..418cf04 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-31         Arnold D. Robbins     <address@hidden>
+
+       * readline.m4: Add cross-compiling action.
+
 2013-01-25         Arnold D. Robbins     <address@hidden>
 
        * readline.m4 (GAWK_CHECK_READLINE): Renamed from GNUPG_CHECK_READLINE.
diff --git a/m4/readline.m4 b/m4/readline.m4
index 648ea38..76605af 100644
--- a/m4/readline.m4
+++ b/m4/readline.m4
@@ -60,6 +60,8 @@ dnl action if true:
             [_found_readline=yes],
 dnl action if false:
             [_found_readline=no],
+dnl action if cross compiling:
+            [_found_readline=no]
        )
 
         AC_MSG_RESULT([$_found_readline])

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

Summary of changes:
 ChangeLog          |    6 ++++++
 awklib/ChangeLog   |    5 +++++
 awklib/Makefile.am |    5 +++++
 awklib/Makefile.in |    3 ++-
 configure          |   21 +++++++++++++++++----
 configure.ac       |    3 +++
 m4/ChangeLog       |    4 ++++
 m4/readline.m4     |    2 ++
 8 files changed, 44 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
gawk