diff options
| author | kcook <kcook@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-09-22 23:53:59 +0000 |
|---|---|---|
| committer | kcook <kcook@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-09-22 23:53:59 +0000 |
| commit | 986086aaf32dbfc0d41ad004bdb9063c9f46eb8d (patch) | |
| tree | 1591f8f1fd2ecee0b66f132b65126799ed3a78a1 /libcpp/configure | |
| parent | ad8f53f5646a96ecddded02ba24722d39bd479c0 (diff) | |
| download | gcc-986086aaf32dbfc0d41ad004bdb9063c9f46eb8d.tar.gz | |
config/
2004-09-22 Kelley Cook <kcook@gcc.gnu.org>
* gettext-sister.m4: Renamed from gettext.m4
* codeset.m4, gettext.m4, glibc21.m4, iconv.m4, intdiv0.m4, po.m4,
inttypes.m4, inttypes-pri.m4, inttypes_h.m4, lcmessage.m4, lib-ld.m4,
lib-link.m4, lib-prefix.m4, nls.m4, progtest.m4, stdint_h.m4,
uintmax_t.m4, ulonglong.m4: Import from gettext-0.12.1 sources.
gcc/
2004-09-22 Kelley Cook <kcook@gcc.gnu.org>
* aclocal.m4: Update for rename of gettext-sister.m4.
libcpp/
2004-09-22 Kelley Cook <kcook@gcc.gnu.org>
* Makefile.in (aclocal.m4): Update dependencies.
* configure.ac (AC_CONFIG_MACRO_DIR): New.
* aclocal.m4, configure: Regenerate.
intl/
2004-09-22 Kelley Cook <kcook@gcc.gnu.org>
* configure.ac (AC_CONFIG_MACRO_DIR): New.
(ACLOCAL, AUTOCONF, AUTOHEADER, MAINT): Substitute.
* Makefile.in: Update with maintainer mode rules.
* README: Update aclocal regeneration instructions.
* aclocal.m4, configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@87900 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libcpp/configure')
| -rwxr-xr-x | libcpp/configure | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/libcpp/configure b/libcpp/configure index bf26738eeaf..c23f2f9a2c3 100755 --- a/libcpp/configure +++ b/libcpp/configure @@ -1319,6 +1319,17 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +case ../config in + [\\/]* | ?:[\\/]* ) ac_macro_dir=../config ;; + *) ac_macro_dir=$srcdir/../config ;; +esac +if test -d "$ac_macro_dir"; then : +else + { { echo "$as_me:$LINENO: error: cannot find macro directory \`../config'" >&5 +echo "$as_me: error: cannot find macro directory \`../config'" >&2;} + { (exit 1); exit 1; }; } +fi + ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then @@ -6128,12 +6139,11 @@ else # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some GNU ld's only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in - *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break ;; - *) - test "$with_gnu_ld" != yes && break ;; - esac + if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then + test "$with_gnu_ld" != no && break + else + test "$with_gnu_ld" != yes && break + fi fi done IFS="$ac_save_ifs" @@ -6159,12 +6169,11 @@ if test "${acl_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else # I'd rather use --version here, but apparently some GNU ld's only accept -v. -case `$LD -v 2>&1 </dev/null` in -*GNU* | *'with BFD'*) - acl_cv_prog_gnu_ld=yes ;; -*) - acl_cv_prog_gnu_ld=no ;; -esac +if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then + acl_cv_prog_gnu_ld=yes +else + acl_cv_prog_gnu_ld=no +fi fi echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5 echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6 |