I hit a random failure in elf2flt (not elf2flt's fault, I was screwing with

[uclinux-h8/elf2flt.git] / configure.in

diff --git a/configure.in b/configure.in
index b0335d7..d43b500 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -25,12 +25,24 @@ AC_ARG_WITH(binutils-include-dir,
        [ ac_binutils_include_dir=NONE ]
 )
 
+AC_ARG_WITH(binutils-ldscript-dir,
+       [ --with-binutils-ldscript-dir=<dir>  path to install elf2flt.ld ],
+       [ ac_binutils_ldscript_dir=$withval ],
+       [ ac_binutils_ldscript_dir=NONE ]
+)
+
 AC_ARG_ENABLE(got-check,
        [ --disable-got-check - disable check for GOT (needed on H8) ],
        [ got_check=$enableval ],
        [ got_check=yes ]
 )
 
+AC_ARG_ENABLE(emit_relocs,
+       [ --disable-emit-relocs - don't use the --emit-relocs (-q) linker option ],
+       [ emit_relocs=$enableval ],
+       [ emit_relocs=yes ]
+)
+
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
@@ -62,30 +74,36 @@ if test "$ac_binutils_include_dir" != "NONE"; then
   binutils_include_dir="-I$ac_binutils_include_dir"
 fi
 
+binutils_ldscript_dir=
+if test "$ac_binutils_ldscript_dir" = "NONE"; then
+  ac_binutils_ldscript_dir="\${TOOLDIR}/../${target_alias}/lib"
+fi
+binutils_ldscript_dir="$ac_binutils_ldscript_dir"
+
 if test "$ac_libbfd" = "NONE" -o "$ac_libiberty" = "NONE" ; then
-       echo
-       echo "You need to specify the location of the libfd.a and libiberty.a"
-       echo "host libraries from the binutils package."
-       echo
-       echo "Run configure again specifying these options:"
-       echo
-       echo "  ./configure --target=<ARCH> --with-bfd-include-dir=<dir> --with-libbfd=<libbfd.a> --with-libiberty=<libiberty.a>"
-       echo
-       exit 1
+       AC_MSG_ERROR([
+
+You need to specify the location of the libfd.a and libiberty.a
+host libraries from the binutils package.
+       
+Run configure again specifying these options:
+       
+  ./configure --target=<ARCH> --with-bfd-include-dir=<dir> --with-libbfd=<libbfd.a> --with-libiberty=<libiberty.a>
+])
 fi
 
 if test "$ac_bfd_include_dir" = "NONE" ; then
-       echo
-       echo "You need to specify the location of the bfd.h header from a"
-       echo "configured/compiled version of the binutils package for your target."
-       echo "Without this your elf2flt may crash as it will try to use the"
-       echo "systems bfd.h which may be from a different binutils package."
-       echo
-       echo "Run configure again specifying these options:"
-       echo
-       echo "  ./configure --target=<ARCH> --with-bfd-include-dir=<dir> --with-libbfd=<libbfd.a> --with-libiberty=<libiberty.a>"
-       echo
-       exit 1
+       AC_MSG_ERROR([
+
+You need to specify the location of the bfd.h header from a
+configured/compiled version of the binutils package for your target.
+Without this your elf2flt may crash as it will try to use the
+systems bfd.h which may be from a different binutils package.
+
+Run configure again specifying these options:
+
+  ./configure --target=<ARCH> --with-bfd-include-dir=<dir> --with-libbfd=<libbfd.a> --with-libiberty=<libiberty.a>
+])
 fi
 
 dnl Checks for header files.
@@ -98,7 +116,7 @@ AC_C_CONST
 dnl Checks for library functions.
 AC_FUNC_VPRINTF
 
-AC_CHECK_FUNCS(dcgettext)
+AC_CHECK_FUNCS(dcgettext libintl_dgettext)
 
 dnl Subsitute values
 AC_SUBST(target)
@@ -108,7 +126,9 @@ AC_SUBST(target_os)
 AC_SUBST(target_vendor)
 AC_SUBST(bfd_include_dir)
 AC_SUBST(binutils_include_dir)
+AC_SUBST(binutils_ldscript_dir)
 AC_SUBST(got_check)
+AC_SUBST(emit_relocs)
 
 AC_OUTPUT(Makefile ld-elf2flt)