comparison configure @ 114:8619ce7e4c50 r20-1b9

Import from CVS: tag r20-1b9
author cvs
date Mon, 13 Aug 2007 09:21:54 +0200
parents 48d667d6f17f
children 9f59509498e1
comparison
equal deleted inserted replaced
113:2ec2fe4a4c89 114:8619ce7e4c50
3350 "${with_tooltalk}" != "no" -a \ 3350 "${with_tooltalk}" != "no" -a \
3351 "${with_tooltalk}" != "none" ; then 3351 "${with_tooltalk}" != "none" ; then
3352 with_tooltalk='yes' 3352 with_tooltalk='yes'
3353 fi 3353 fi
3354 3354
3355 # having CDE requires Motif
3356 if test "${with_cde}" = "yes" ; then
3357 motif_libs="-lXm -lXt"
3358 fi
3359
3355 # 3360 #
3356 # See if we can find OffiX. 3361 # See if we can find OffiX.
3357 # 3362 #
3358 if test "${window_system}" != "none" -a \ 3363 if test "${window_system}" != "none" -a \
3359 "${with_offix}" != "no" -a \ 3364 "${with_offix}" != "no" -a \
4459 4464
4460 # 4465 #
4461 # set defaults for finding WNN includes and libs 4466 # set defaults for finding WNN includes and libs
4462 # 4467 #
4463 if test "${with_wnn}" = "yes" ; then 4468 if test "${with_wnn}" = "yes" ; then
4464 for arg in "-I${wnn_includes}" "-I/usr/X11R6/include" 4469 for arg in "-I${wnn_includes}" "-I/usr/X11R6/include/wnn" "-I/usr/include/wnn"
4465 do 4470 do
4466 if test -f `echo "${arg}/wnnerror.h" | sed 's/^\-I//'` ; then 4471 if test -f `echo "${arg}/wnnerror.h" | sed 's/^\-I//'` ; then
4467 C_SWITCH_SITE="${C_SWITCH_SITE} ${arg}" 4472 C_SWITCH_SITE="${C_SWITCH_SITE} ${arg}"
4468 wnn_includes=${arg} 4473 wnn_includes=${arg}
4469 fi 4474 fi
4470 done 4475 done
4471 for arg in "-L${wnn_libraries}" "-I/usr/X11R6/lib" 4476 for arg in "-L${wnn_libraries}" "-L/usr/X11R6/lib" "-L/usr/lib"
4472 do 4477 do
4473 if test -f `echo "${arg}/libwnn.a" | sed 's/^\-L//'` ; then 4478 if test -f `echo "${arg}/libwnn.a" | sed 's/^\-L//'` ; then
4474 LD_SWITCH_SITE="${LD_SWITCH_SITE} ${arg}" 4479 LD_SWITCH_SITE="${LD_SWITCH_SITE} ${arg}"
4475 wnn_libraries=${arg} 4480 wnn_libraries=${arg}
4476 fi 4481 fi
4486 if test -f `echo "${arg}/canna/RK.h" | sed 's/^\-I//'` ; then 4491 if test -f `echo "${arg}/canna/RK.h" | sed 's/^\-I//'` ; then
4487 C_SWITCH_SITE="${C_SWITCH_SITE} ${arg}" 4492 C_SWITCH_SITE="${C_SWITCH_SITE} ${arg}"
4488 canna_includes=${arg} 4493 canna_includes=${arg}
4489 fi 4494 fi
4490 done 4495 done
4491 for arg in "-L${canna_libraries}" "-I/usr/X11R6/lib" 4496 for arg in "-L${canna_libraries}" "-L/usr/X11R6/lib"
4492 do 4497 do
4493 if test -f `echo "${arg}/libcanna.a" | sed 's/^\-L//'` ; then 4498 if test -f `echo "${arg}/libcanna.a" | sed 's/^\-L//'` ; then
4494 LD_SWITCH_SITE="${LD_SWITCH_SITE} ${arg}" 4499 LD_SWITCH_SITE="${LD_SWITCH_SITE} ${arg}"
4495 canna_libraries=${arg} 4500 canna_libraries=${arg}
4496 fi 4501 fi