diff --git a/ChangeLog b/ChangeLog
index b774beeda9d..aba3f81ea05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-2000-12-14  Tom Tromey  <tromey@redhat.com>
+2000-12-15  Andreas Jaeger  <aj@suse.de>
+
+	* configure.in: Handle lang_dirs.
+
+2000-12-14  Tom Tromey	<tromey@redhat.com>
 
 	* MAINTAINERS: Removed brads.
 
diff --git a/configure.in b/configure.in
index 20848893fc0..3e91a7e12aa 100644
--- a/configure.in
+++ b/configure.in
@@ -1006,6 +1006,7 @@ do
 	*)
 	  lang_alias=`sed -n -e 's,^language=['"'"'"'"]\(.*\)["'"'"'"'].*$,\1,p' -e 's,^language=\([^ 	]*\).*$,\1,p' $lang`
 	  this_lang_libs=`sed -n -e 's,^target_libs=['"'"'"'"]\(.*\)["'"'"'"'].*$,\1,p' -e 's,^target_libs=\([^ 	]*\).*$,\1,p' $lang`
+	  this_lang_dirs=`sed -n -e 's,^lang_dirs=['"'"'"'"]\(.*\)["'"'"'"'].*$,\1,p' -e 's,^lang_dirs=\([^ 	]*\).*$,\1,p' $lang`
 	  build_by_default=`sed -n -e 's,^build_by_default=['"'"'"'"]\(.*\)["'"'"'"'].*$,\1,p' -e 's,^build_by_default=\([^ 	]*\).*$,\1,p' $lang`
 	  if test "x$lang_alias" = x
 	  then
@@ -1021,7 +1022,7 @@ do
 	  if test x"${add_this_lang}" = xyes; then
 	      eval target_libs='"$target_libs "'\"$this_lang_libs\"
 	  else
-	      eval noconfigdirs='"$noconfigdirs "'\"$this_lang_libs\"
+	      eval noconfigdirs='"$noconfigdirs "'\"$this_lang_libs $this_lang_dirs\"
 	  fi
 	  ;;
 	esac