diff --git a/ld/ChangeLog b/ld/ChangeLog
index 7138eda17d..3b2159b35b 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,12 @@
+2005-02-15  Mark Mitchell  <mark@codesourcery.com>
+
+	* configure.in (AC_CHECK_FUNCS): Add glob.
+	* configure: Regenerated.
+	* emultempl/elf32.em (<glob.h>): Do not include if HAVE_GLOB is
+	not defined.
+	(gld${EMULATION_NAME}_parse_ld_so_conf_include): Do not use glob
+	if HAVE_GLOB is not defined.
+	
 2005-02-16  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
 
 	* emultempl/elf32.em (gld${EMULATION_NAME}_after_open): Define
diff --git a/ld/configure b/ld/configure
index a79adf38a8..5ccd435d17 100755
--- a/ld/configure
+++ b/ld/configure
@@ -4635,7 +4635,7 @@ else
 fi
 done
 
-for ac_func in sbrk realpath
+for ac_func in sbrk realpath glob
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 echo "configure:4642: checking for $ac_func" >&5
diff --git a/ld/configure.in b/ld/configure.in
index 28665eac25..8b8354d1a1 100644
--- a/ld/configure.in
+++ b/ld/configure.in
@@ -119,7 +119,7 @@ AC_SUBST(HOSTING_LIBS)
 AC_SUBST(NATIVE_LIB_DIRS)
 
 AC_CHECK_HEADERS(string.h strings.h stdlib.h unistd.h)
-AC_CHECK_FUNCS(sbrk realpath)
+AC_CHECK_FUNCS(sbrk realpath glob)
 AC_HEADER_DIRENT
 
 BFD_BINARY_FOPEN
diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index 886c7a44a9..5337e1814e 100644
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -67,7 +67,9 @@ if [ "x${USE_LIBPATH}" = xyes ] ; then
   case ${target} in
     *-*-linux-gnu*)
   cat >>e${EMULATION_NAME}.c <<EOF
+#ifdef HAVE_GLOB
 #include <glob.h>
+#endif
 EOF
     ;;
   esac
@@ -539,7 +541,9 @@ gld${EMULATION_NAME}_parse_ld_so_conf_include
       const char *pattern)
 {
   char *newp = NULL;
+#ifdef HAVE_GLOB
   glob_t gl;
+#endif
 
   if (pattern[0] != '/')
     {
@@ -552,6 +556,7 @@ gld${EMULATION_NAME}_parse_ld_so_conf_include
       pattern = newp;
     }
 
+#ifdef HAVE_GLOB
   if (glob (pattern, 0, NULL, &gl) == 0)
     {
       size_t i;
@@ -560,6 +565,10 @@ gld${EMULATION_NAME}_parse_ld_so_conf_include
 	gld${EMULATION_NAME}_parse_ld_so_conf (info, gl.gl_pathv[i]);
       globfree (&gl);
     }
+#else
+  /* If we do not have glob, treat the pattern as a literal filename.  */
+  gld${EMULATION_NAME}_parse_ld_so_conf (info, pattern);
+#endif
 
   if (newp)
     free (newp);