2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 32beefa2934..9a5e1a7cd10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1999-11-11  Erik Naggum  <erik@naggum.no>
+
+        * configure.in (bitmapdir): Allow for both "bitmaps" directories.
+
 1999-11-08  Dave Love  <fx@gnu.org>
 
         * configure.in: Fix change for --with-pop default.
diff --git a/configure.in b/configure.in
index 956d5dc2ed6..ea62ad40ad8 100644
--- a/configure.in
+++ b/configure.in
@@ -1218,7 +1218,8 @@ else
   for bmd in `echo ${x_includes} | sed -e "s/:/ /g"`; do
     if test -d "${bmd}/X11/bitmaps"; then
       bmd_acc="${bmd_acc}:${bmd}/X11/bitmaps"
-    elif test -d "${bmd}/bitmaps"; then
+    fi
+    if test -d "${bmd}/bitmaps"; then
       bmd_acc="${bmd_acc}:${bmd}/bitmaps"
     fi
   done