diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2011-10-18 00:31:00 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-10-18 00:31:00 +0000 |
| commit | 9c082ca86eb4262078f359850ae4466856f156a1 (patch) | |
| tree | 51ce30ef5e761557106790125d91a26d78eb6352 /sim/bfin/configure | |
| parent | f7c5b166f66958163526aa5688d8a7e3d0686694 (diff) | |
| download | gdb-9c082ca86eb4262078f359850ae4466856f156a1.zip gdb-9c082ca86eb4262078f359850ae4466856f156a1.tar.gz gdb-9c082ca86eb4262078f359850ae4466856f156a1.tar.bz2 | |
sim: rename common/aclocal.m4 to common/acinclude.m4
Automake likes to dump macros automatically used into the aclocal.m4
file, but the common/aclocal.m4 naming prevents that. So rename it
to the more normal "acinclude.m4" so the aclocal tool can work.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'sim/bfin/configure')
| -rwxr-xr-x | sim/bfin/configure | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sim/bfin/configure b/sim/bfin/configure index af68b3b..0f6ad86 100755 --- a/sim/bfin/configure +++ b/sim/bfin/configure @@ -5190,6 +5190,7 @@ BFIN_SIM_EXTRA_OBJS=${BFIN_SIM_EXTRA_OBJS} + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -5318,6 +5319,7 @@ if test -n "$SDL_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -5334,6 +5336,7 @@ if test -n "$SDL_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -5353,9 +5356,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sdl" 2>&1` + SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sdl" 2>&1` else - SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors "sdl" 2>&1` + SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$SDL_PKG_ERRORS" >&5 |