Mercurial > hg > xemacs-beta

comparison configure.in @ 1454:38d0f093d818

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2003-05-04 01:04:36 by youngs] 2003-05-04 Steve Youngs <youngs@xemacs.org> * configure: Regenerate. 2003-05-04 Martin Buchholz <martin@xemacs.org> * configure.in: Don't look for Motif if it's already present in $x_includes and $x_libraries.
author youngs
date Sun, 04 May 2003 01:04:41 +0000
parents dd63b61df78c
children c5da5c66fea7
comparison
equal deleted inserted replaced
1453:908cd1ff6104 1454:38d0f093d818
2837 if test "$with_x11" = "yes"; then 2837 if test "$with_x11" = "yes"; then
2838 AC_DEFINE(HAVE_X_WINDOWS) 2838 AC_DEFINE(HAVE_X_WINDOWS)
2839 XE_APPEND(lwlib, MAKE_SUBDIR) 2839 XE_APPEND(lwlib, MAKE_SUBDIR)
2840 XE_APPEND(lwlib, SRC_SUBDIR_DEPS) 2840 XE_APPEND(lwlib, SRC_SUBDIR_DEPS)
2841 2841
2842 dnl Try to find Motif/CDE/Tooltalk dirs 2842
2843 dnl These take precedence over other X libs/includes, so PRE-pend 2843 dnl Look for Motif, but only if not found in $x_includes and $x_libraries
2844 for lib_dir in "/usr/dt/lib" "/usr/lib/Motif2.1" "/usr/lib/Motif1.2" "/usr/lib/Motif1.1"; do 2844 AC_CHECK_HEADER(Xm/Xm.h, [AC_CHECK_LIB(Xm, XmStringFree, got_motif=yes)])
2845 inc_dir=`echo $lib_dir | sed -e 's/lib/include/'` 2845
2846 if test -d "$lib_dir" -a -d "$inc_dir"; then 2846 if test "$got_motif" != "yes"; then
2847 case "$x_libraries" in *"$lib_dir"* ) ;; *) 2847 dnl Try to find Motif/CDE/Tooltalk dirs
2848 x_libraries="$lib_dir $x_libraries" 2848 dnl These take precedence over other X libs/includes, so PRE-pend
2849 XE_PREPEND(-L${lib_dir}, X_LIBS) ;; 2849 for lib_dir in "/usr/dt/lib" "/usr/lib/Motif2.1" \
2850 esac 2850 "/usr/lib/Motif1.2" "/usr/lib/Motif1.1"; do
2851 case "$x_includes" in "$inc_dir"* ) ;; *) 2851 inc_dir=`echo $lib_dir | sed -e 's/lib/include/'`
2852 x_includes="$inc_dir $x_includes" 2852 if test -d "$lib_dir" -a -d "$inc_dir"; then
2853 XE_PREPEND(-I${inc_dir}, X_CFLAGS) ;; 2853 case "$x_libraries" in *"$lib_dir"* ) ;; *)
2854 esac 2854 x_libraries="$lib_dir $x_libraries"
2855 break; dnl only need ONE Motif implementation! 2855 XE_PREPEND(-L${lib_dir}, X_LIBS) ;;
2856 fi 2856 esac
2857 done 2857 case "$x_includes" in "$inc_dir"* ) ;; *)
2858 x_includes="$inc_dir $x_includes"
2859 XE_PREPEND(-I${inc_dir}, X_CFLAGS) ;;
2860 esac
2861 break; dnl only need ONE Motif implementation!
2862 fi
2863 done
2864 fi
2858 2865
2859 dnl Contrib X libs/includes do NOT take precedence, so AP-pend 2866 dnl Contrib X libs/includes do NOT take precedence, so AP-pend
2860 for rel in "X11R6" "X11R5" "X11R4"; do 2867 for rel in "X11R6" "X11R5" "X11R4"; do
2861 lib_dir="/usr/contrib/$rel/lib" inc_dir="/usr/contrib/$rel/include" 2868 lib_dir="/usr/contrib/$rel/lib" inc_dir="/usr/contrib/$rel/include"
2862 if test -d "$lib_dir" -a -d "$inc_dir"; then 2869 if test -d "$lib_dir" -a -d "$inc_dir"; then