comparison configure.in @ 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
2302 # having CDE implies Tooltalk 2302 # having CDE implies Tooltalk
2303 if test "${with_cde}" = "yes" -a \ 2303 if test "${with_cde}" = "yes" -a \
2304 "${with_tooltalk}" != "no" -a \ 2304 "${with_tooltalk}" != "no" -a \
2305 "${with_tooltalk}" != "none" ; then 2305 "${with_tooltalk}" != "none" ; then
2306 with_tooltalk='yes' 2306 with_tooltalk='yes'
2307 fi
2308
2309 # having CDE requires Motif
2310 if test "${with_cde}" = "yes" ; then
2311 motif_libs="-lXm -lXt"
2307 fi 2312 fi
2308 2313
2309 # 2314 #
2310 # See if we can find OffiX. 2315 # See if we can find OffiX.
2311 # 2316 #
2675 2680
2676 # 2681 #
2677 # set defaults for finding WNN includes and libs 2682 # set defaults for finding WNN includes and libs
2678 # 2683 #
2679 if test "${with_wnn}" = "yes" ; then 2684 if test "${with_wnn}" = "yes" ; then
2680 for arg in "-I${wnn_includes}" "-I/usr/X11R6/include" 2685 for arg in "-I${wnn_includes}" "-I/usr/X11R6/include/wnn" "-I/usr/include/wnn"
2681 do 2686 do
2682 if test -f `echo "${arg}/wnnerror.h" | sed 's/^\-I//'` ; then 2687 if test -f `echo "${arg}/wnnerror.h" | sed 's/^\-I//'` ; then
2683 C_SWITCH_SITE="${C_SWITCH_SITE} ${arg}" 2688 C_SWITCH_SITE="${C_SWITCH_SITE} ${arg}"
2684 wnn_includes=${arg} 2689 wnn_includes=${arg}
2685 fi 2690 fi
2686 done 2691 done
2687 for arg in "-L${wnn_libraries}" "-I/usr/X11R6/lib" 2692 for arg in "-L${wnn_libraries}" "-L/usr/X11R6/lib" "-L/usr/lib"
2688 do 2693 do
2689 if test -f `echo "${arg}/libwnn.a" | sed 's/^\-L//'` ; then 2694 if test -f `echo "${arg}/libwnn.a" | sed 's/^\-L//'` ; then
2690 LD_SWITCH_SITE="${LD_SWITCH_SITE} ${arg}" 2695 LD_SWITCH_SITE="${LD_SWITCH_SITE} ${arg}"
2691 wnn_libraries=${arg} 2696 wnn_libraries=${arg}
2692 fi 2697 fi
2702 if test -f `echo "${arg}/canna/RK.h" | sed 's/^\-I//'` ; then 2707 if test -f `echo "${arg}/canna/RK.h" | sed 's/^\-I//'` ; then
2703 C_SWITCH_SITE="${C_SWITCH_SITE} ${arg}" 2708 C_SWITCH_SITE="${C_SWITCH_SITE} ${arg}"
2704 canna_includes=${arg} 2709 canna_includes=${arg}
2705 fi 2710 fi
2706 done 2711 done
2707 for arg in "-L${canna_libraries}" "-I/usr/X11R6/lib" 2712 for arg in "-L${canna_libraries}" "-L/usr/X11R6/lib"
2708 do 2713 do
2709 if test -f `echo "${arg}/libcanna.a" | sed 's/^\-L//'` ; then 2714 if test -f `echo "${arg}/libcanna.a" | sed 's/^\-L//'` ; then
2710 LD_SWITCH_SITE="${LD_SWITCH_SITE} ${arg}" 2715 LD_SWITCH_SITE="${LD_SWITCH_SITE} ${arg}"
2711 canna_libraries=${arg} 2716 canna_libraries=${arg}
2712 fi 2717 fi