Commit cc6476f6 authored by Karl Heuer's avatar Karl Heuer
Browse files

Use x_includes, not x_libraries, for -I.

Make bitmapdir a colon-separated list.
parent e241c09b
......@@ -940,15 +940,24 @@ if test "${x_libraries}" != NONE && test -n "${x_libraries}"; then
LD_SWITCH_X_SITE_AUX=-R`echo ${x_libraries} | sed -e "s/:/ -R/g"`
fi
if test "${x_includes}" != NONE && test -n "${x_includes}"; then
C_SWITCH_X_SITE=-I`echo ${x_libraries} | sed -e "s/:/ -I/g"`
C_SWITCH_X_SITE=-I`echo ${x_includes} | sed -e "s/:/ -I/g"`
fi
if test x"${x_includes}" = x; then
bitmapdir=/usr/include/X11/bitmaps
elif test -d "${x_includes}/X11/bitmaps"; then
bitmapdir="${x_includes}/X11/bitmaps"
else
bitmapdir="${x_includes}/bitmaps"
# accumulate include directories that have X11 bitmap sudirectories
bmd_acc="dummyval"
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
bmd_acc="${bmd_acc}:${bmd}/bitmaps"
fi
done
if test ${bmd_acc} != "dummyval"; then
bitmapdir=`echo ${bmd_acc} | sed -e "s/^dummyval://"`
fi
fi
case "${window_system}" in
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment