summaryrefslogtreecommitdiff
path: root/gcc/configure
diff options
context:
space:
mode:
authordj <dj@138bc75d-0d04-0410-961f-82ee72b054a4>2015-08-07 05:13:52 +0000
committerdj <dj@138bc75d-0d04-0410-961f-82ee72b054a4>2015-08-07 05:13:52 +0000
commit29890f2ede84580ebc07431f87e20cc787db8598 (patch)
treefe4a555c5372a25485b0bc8224f9107f52ef87e6 /gcc/configure
parent70fb6752d16bfdf6fcba6626ec1eef0d8a4388fb (diff)
downloadgcc-29890f2ede84580ebc07431f87e20cc787db8598.tar.gz
2015-08-06 Yaakov Selkowitz <yselkowi@redhat.com>
* Makefile.def (libiconv): Define bootstrap=true. Mark pdf/html/info as missing. (configure-gcc): Depend on all-libiconv. (all-gcc): Ditto. (configure-libcpp): Ditto. (all-libcpp): Ditto. (configure-intl): Ditto. (all-intl): Ditto. * Makefile.in: Regenerate. intl/ * configure: Reflects renaming of configure.in to configure.ac libcpp/ * configure: Regenerate. gcc/ * configure.ac: Define LIBICONV_DEP with in-tree libiconv. * configure: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@226712 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/configure')
-rwxr-xr-xgcc/configure7
1 files changed, 5 insertions, 2 deletions
diff --git a/gcc/configure b/gcc/configure
index 271316ad295..8e89dd9c6eb 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -10764,6 +10764,9 @@ _ACEOF
# Until we have in-tree GNU iconv:
LIBICONV_DEP=
+if test -f "$LTLIBICONV"; then
+ LIBICONV_DEP=$LTLIBICONV
+fi
@@ -18338,7 +18341,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 18341 "configure"
+#line 18344 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18444,7 +18447,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 18447 "configure"
+#line 18450 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H