Mercurial > emacs
comparison configure @ 90127:30ad2795fdab
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-28
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 180-191)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 39-44)
- Merge from emacs--cvs-trunk--0
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 19 Mar 2005 02:42:17 +0000 |
parents | e330fedc9152 25e9a2bb0d17 |
children | e1fbb019c538 |
comparison
equal
deleted
inserted
replaced
90126:8ee106ee2dc8 | 90127:30ad2795fdab |
---|---|
10678 | 10678 |
10679 fi | 10679 fi |
10680 fi | 10680 fi |
10681 | 10681 |
10682 if test "${USE_X_TOOLKIT}" = "MOTIF"; then | 10682 if test "${USE_X_TOOLKIT}" = "MOTIF"; then |
10683 echo "$as_me:$LINENO: checking for LessTif where some systems put it" >&5 | |
10684 echo $ECHO_N "checking for LessTif where some systems put it... $ECHO_C" >&6 | |
10685 if test "${emacs_cv_lesstif+set}" = set; then | |
10686 echo $ECHO_N "(cached) $ECHO_C" >&6 | |
10687 else | |
10688 # We put this in CFLAGS temporarily to precede other -I options | |
10689 # that might be in CFLAGS temporarily. | |
10690 # We put this in CPPFLAGS where it precedes the other -I options. | |
10691 OLD_CPPFLAGS=$CPPFLAGS | |
10692 OLD_CFLAGS=$CFLAGS | |
10693 CPPFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $CPPFLAGS" | |
10694 CFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $CFLAGS" | |
10695 cat >conftest.$ac_ext <<_ACEOF | |
10696 /* confdefs.h. */ | |
10697 _ACEOF | |
10698 cat confdefs.h >>conftest.$ac_ext | |
10699 cat >>conftest.$ac_ext <<_ACEOF | |
10700 /* end confdefs.h. */ | |
10701 #include </usr/X11R6/LessTif/Motif1.2/include/Xm/Xm.h> | |
10702 int | |
10703 main () | |
10704 { | |
10705 int x = 5; | |
10706 ; | |
10707 return 0; | |
10708 } | |
10709 _ACEOF | |
10710 rm -f conftest.$ac_objext | |
10711 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
10712 (eval $ac_compile) 2>conftest.er1 | |
10713 ac_status=$? | |
10714 grep -v '^ *+' conftest.er1 >conftest.err | |
10715 rm -f conftest.er1 | |
10716 cat conftest.err >&5 | |
10717 echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
10718 (exit $ac_status); } && | |
10719 { ac_try='test -z "$ac_c_werror_flag" | |
10720 || test ! -s conftest.err' | |
10721 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
10722 (eval $ac_try) 2>&5 | |
10723 ac_status=$? | |
10724 echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
10725 (exit $ac_status); }; } && | |
10726 { ac_try='test -s conftest.$ac_objext' | |
10727 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
10728 (eval $ac_try) 2>&5 | |
10729 ac_status=$? | |
10730 echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
10731 (exit $ac_status); }; }; then | |
10732 emacs_cv_lesstif=yes | |
10733 else | |
10734 echo "$as_me: failed program was:" >&5 | |
10735 sed 's/^/| /' conftest.$ac_ext >&5 | |
10736 | |
10737 emacs_cv_lesstif=no | |
10738 fi | |
10739 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
10740 fi | |
10741 echo "$as_me:$LINENO: result: $emacs_cv_lesstif" >&5 | |
10742 echo "${ECHO_T}$emacs_cv_lesstif" >&6 | |
10743 if test $emacs_cv_lesstif = yes; then | |
10744 # Make sure this -I option remains in CPPFLAGS after it is set | |
10745 # back to REAL_CPPFLAGS. | |
10746 # There is no need to change REAL_CFLAGS, because REAL_CFLAGS does not | |
10747 # have those other -I options anyway. Ultimately, having this | |
10748 # directory ultimately in CPPFLAGS will be enough. | |
10749 REAL_CPPFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $REAL_CPPFLAGS" | |
10750 LDFLAGS="-L/usr/X11R6/LessTif/Motif1.2/lib $LDFLAGS" | |
10751 else | |
10752 CFLAGS=$OLD_CFLAGS | |
10753 CPPFLAGS=$OLD_CPPFLAGS | |
10754 fi | |
10755 echo "$as_me:$LINENO: checking for Motif version 2.1" >&5 | 10683 echo "$as_me:$LINENO: checking for Motif version 2.1" >&5 |
10756 echo $ECHO_N "checking for Motif version 2.1... $ECHO_C" >&6 | 10684 echo $ECHO_N "checking for Motif version 2.1... $ECHO_C" >&6 |
10757 if test "${emacs_cv_motif_version_2_1+set}" = set; then | 10685 if test "${emacs_cv_motif_version_2_1+set}" = set; then |
10758 echo $ECHO_N "(cached) $ECHO_C" >&6 | 10686 echo $ECHO_N "(cached) $ECHO_C" >&6 |
10759 else | 10687 else |
10889 | 10817 |
10890 cat >>confdefs.h <<\_ACEOF | 10818 cat >>confdefs.h <<\_ACEOF |
10891 #define HAVE_LIBXP 1 | 10819 #define HAVE_LIBXP 1 |
10892 _ACEOF | 10820 _ACEOF |
10893 | 10821 |
10822 fi | |
10823 else | |
10824 echo "$as_me:$LINENO: checking for LessTif where some systems put it" >&5 | |
10825 echo $ECHO_N "checking for LessTif where some systems put it... $ECHO_C" >&6 | |
10826 if test "${emacs_cv_lesstif+set}" = set; then | |
10827 echo $ECHO_N "(cached) $ECHO_C" >&6 | |
10828 else | |
10829 # We put this in CFLAGS temporarily to precede other -I options | |
10830 # that might be in CFLAGS temporarily. | |
10831 # We put this in CPPFLAGS where it precedes the other -I options. | |
10832 OLD_CPPFLAGS=$CPPFLAGS | |
10833 OLD_CFLAGS=$CFLAGS | |
10834 CPPFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $CPPFLAGS" | |
10835 CFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $CFLAGS" | |
10836 cat >conftest.$ac_ext <<_ACEOF | |
10837 /* confdefs.h. */ | |
10838 _ACEOF | |
10839 cat confdefs.h >>conftest.$ac_ext | |
10840 cat >>conftest.$ac_ext <<_ACEOF | |
10841 /* end confdefs.h. */ | |
10842 #include </usr/X11R6/LessTif/Motif1.2/include/Xm/Xm.h> | |
10843 int | |
10844 main () | |
10845 { | |
10846 int x = 5; | |
10847 ; | |
10848 return 0; | |
10849 } | |
10850 _ACEOF | |
10851 rm -f conftest.$ac_objext | |
10852 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
10853 (eval $ac_compile) 2>conftest.er1 | |
10854 ac_status=$? | |
10855 grep -v '^ *+' conftest.er1 >conftest.err | |
10856 rm -f conftest.er1 | |
10857 cat conftest.err >&5 | |
10858 echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
10859 (exit $ac_status); } && | |
10860 { ac_try='test -z "$ac_c_werror_flag" | |
10861 || test ! -s conftest.err' | |
10862 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
10863 (eval $ac_try) 2>&5 | |
10864 ac_status=$? | |
10865 echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
10866 (exit $ac_status); }; } && | |
10867 { ac_try='test -s conftest.$ac_objext' | |
10868 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
10869 (eval $ac_try) 2>&5 | |
10870 ac_status=$? | |
10871 echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
10872 (exit $ac_status); }; }; then | |
10873 emacs_cv_lesstif=yes | |
10874 else | |
10875 echo "$as_me: failed program was:" >&5 | |
10876 sed 's/^/| /' conftest.$ac_ext >&5 | |
10877 | |
10878 emacs_cv_lesstif=no | |
10879 fi | |
10880 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
10881 fi | |
10882 echo "$as_me:$LINENO: result: $emacs_cv_lesstif" >&5 | |
10883 echo "${ECHO_T}$emacs_cv_lesstif" >&6 | |
10884 if test $emacs_cv_lesstif = yes; then | |
10885 # Make sure this -I option remains in CPPFLAGS after it is set | |
10886 # back to REAL_CPPFLAGS. | |
10887 # There is no need to change REAL_CFLAGS, because REAL_CFLAGS does not | |
10888 # have those other -I options anyway. Ultimately, having this | |
10889 # directory ultimately in CPPFLAGS will be enough. | |
10890 REAL_CPPFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $REAL_CPPFLAGS" | |
10891 LDFLAGS="-L/usr/X11R6/LessTif/Motif1.2/lib $LDFLAGS" | |
10892 else | |
10893 CFLAGS=$OLD_CFLAGS | |
10894 CPPFLAGS=$OLD_CPPFLAGS | |
10894 fi | 10895 fi |
10895 fi | 10896 fi |
10896 fi | 10897 fi |
10897 | 10898 |
10898 ### Is -lXaw3d available? | 10899 ### Is -lXaw3d available? |