Allow multiple directories in --with-add-fonts, by default add only

scalable fonts from X directory

configure.in

@@ -215,45 +215,61 @@ esac
 AC_SUBST(FC_DEFAULT_FONTS)
 
 #
-# Add X fonts if available
+# Add more fonts if available.  By default, add only the directories
+# with outline fonts; those with bitmaps can be added as desired in
+# local.conf or ~/.fonts.conf
 #
-AC_ARG_WITH(x_fonts,           [  --with-x-fonts=DIR            Find X fonts in DIR ], x_fonts="$withval", x_fonts=yes)
+AC_ARG_WITH(add_fonts,        [  --with-add-fonts=DIR1,DIR2,...Find additional fonts in DIR1,DIR2,... ], add_fonts="$withval", add_fonts=yes)
 
-case "$x_fonts" in
+case "$add_fonts" in
 yes)
-	FC_X_FONTS=""
+	FC_ADD_FONTS=""
 	for dir in /usr/X11R6/lib/X11 /usr/X11/lib/X11 /usr/lib/X11; do
-		case x"$FC_X_FONTS" in
+		case x"$FC_ADD_FONTS" in
 		x)
 			if test -d "$dir/fonts"; then
-				FC_X_FONTS="$dir/fonts"
+				for sub in "$dir"/fonts/*; do
+					if ls "$sub" | grep -q -i '\.pf\|\.tt\|.ot'; then
+						case x$FC_ADD_FONTS in
+						x)
+							FC_ADD_FONTS="$sub"
+							;;
+						*)
+							FC_ADD_FONTS="$FC_ADD_FONTS,$sub"
+							;;
+						esac
+					fi
+				done
 			fi
 			;;
 		esac
 	done
-	AC_DEFINE_UNQUOTED(FC_X_FONTS,"$x_fonts",[X font directory])
+	AC_DEFINE_UNQUOTED(FC_ADD_FONTS,"$add_fonts",[Additional font directories])
 	;;
 no)
-	FC_X_FONTS=""
+	FC_ADD_FONTS=""
 	;;
 *)
-	FC_X_FONTS="$x_fonts"
-	AC_DEFINE_UNQUOTED(FC_X_FONTS,"$x_fonts",[X font directory])
+	FC_ADD_FONTS="$add_fonts"
+	AC_DEFINE_UNQUOTED(FC_ADD_FONTS,"$add_fonts",[Additional font directories])
 	;;
 esac
 
-AC_SUBST(FC_X_FONTS)
+AC_SUBST(FC_ADD_FONTS)
 
 FC_FONTPATH=""
 
-case "$FC_X_FONTS" in
+case "$FC_ADD_FONTS" in
 "")
 	;;
 *)
-	FC_FONTPATH="<dir>$FC_X_FONTS</dir>"
+	FC_FONTPATH=`echo $FC_ADD_FONTS | 
+			sed -e 's/^/<dir>/' -e 's/$/<\/dir>/' -e 's/,/<\/dir> <dir>/g'`
 	;;
 esac
 
+echo FC_FONTPATH is "$FC_FONTPATH"
+
 AC_SUBST(FC_FONTPATH)
 
 FC_FONTDATE=`date`