From a97edc9556569217601894e647c9a1fee5af678a Mon Sep 17 00:00:00 2001 From: Po Lu Date: Tue, 8 Aug 2023 08:55:02 +0800 Subject: [PATCH] Eschew linking Gnulib files to cross unless building for Android * configure.ac: Don't link Gnulib files to cross unless building for Android. --- configure.ac | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index 41df4618078..663153f8568 100644 --- a/configure.ac +++ b/configure.ac @@ -7848,19 +7848,20 @@ if test "$XCONFIGURE" != "android"; then dnl machine. AS_MKDIR_P([cross/etc]) - dnl Link gnulib files to cross/lib as well. - dnl af_alg.h and lib/save-cwd.h are copied manually from - dnl gnulib, and as such aren't specified in gl_FILE_LIST. - emacs_files='gl_FILE_LIST lib/af_alg.h lib/save-cwd.h' - dnl These files are specific to Emacs. - emacs_files="$emacs_files lib/fingerprint.c lib/fingerprint.h \ - lib/save-cwd.c lib/openat-die.c lib/save-cwd.c \ - lib/min-max.h" - for file in $emacs_files; do - AS_IF([expr "X${file}J" : "Xlib/.*[[ch]]J" >/dev/null], - [AS_IF([test -f "$srcdir/$file"], - [AC_CONFIG_LINKS([cross/$file:$file])])]) - done + AS_IF([test "x$with_android" != "xno"], [ + dnl Link gnulib files to cross/lib as well. af_alg.h and + dnl lib/save-cwd.h are copied manually from gnulib, and as such + dnl aren't specified in gl_FILE_LIST. + emacs_files='gl_FILE_LIST lib/af_alg.h lib/save-cwd.h' + dnl These files are specific to Emacs. + emacs_files="$emacs_files lib/fingerprint.c lib/fingerprint.h \ + lib/save-cwd.c lib/openat-die.c lib/save-cwd.c \ + lib/min-max.h" + for file in $emacs_files; do + AS_IF([expr "X${file}J" : "Xlib/.*[[ch]]J" >/dev/null], + [AS_IF([test -f "$srcdir/$file"], + [AC_CONFIG_LINKS([cross/$file:$file])])]) + done]) fi # Make java/Makefile -- 2.39.2