[PATCH/committed] newlib: delete unused iconvdata subdir config
Mike Frysinger <[email protected]>
| Newsgroups | gmane.comp.lib.newlib |
|---|---|
| Message-ID | <[email protected]> |
Since commit dcbff9eea71d06454e7d55d6b7e72672c0987d6d ("newlib: merge
iconvdata into top-level Makefile"), there is no configure script in
the iconvdata/ subdir, so this call will just issue a warning and not
do anything useful. Punt it.
---
newlib/configure | 9 +++------
newlib/configure.ac | 1 -
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/newlib/configure b/newlib/configure
index 974f4086c100..65b93630315e 100755
--- a/newlib/configure
+++ b/newlib/configure
@@ -871,8 +871,7 @@ LIBS
CPPFLAGS
CPP'
ac_subdirs_all='libc
-libm
-iconvdata'
+libm'
# Initialize some variables set by options.
ac_init_help=
@@ -12009,7 +12008,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12012 "configure"
+#line 12011 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12115,7 +12114,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12118 "configure"
+#line 12117 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12427,8 +12426,6 @@ fi
HAVE_ICONVDATA=false
case $host in
i[34567]86-pc-linux-*)
- subdirs="$subdirs iconvdata"
-
HAVE_ICONVDATA=true
;;
esac
diff --git a/newlib/configure.ac b/newlib/configure.ac
index 5c38fc5b5a7b..c164e5a6494f 100644
--- a/newlib/configure.ac
+++ b/newlib/configure.ac
@@ -350,7 +350,6 @@ AM_CONDITIONAL(HAVE_MULTISUBDIR, test x$have_multisubdir = xyes)
HAVE_ICONVDATA=false
case $host in
i[[34567]]86-pc-linux-*)
- AC_CONFIG_SUBDIRS(iconvdata)
HAVE_ICONVDATA=true
;;
esac
--
2.34.1