Mercurial > emacs
comparison configure @ 108585:5846f66dc9a2
Regenerate configure.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Fri, 14 May 2010 18:58:36 -0700 |
parents | 58b814d12797 |
children | 786c4a4a3817 |
comparison
equal
deleted
inserted
replaced
108584:3c49e77f15b7 | 108585:5846f66dc9a2 |
---|---|
803 XMENU_OBJ | 803 XMENU_OBJ |
804 XOBJ | 804 XOBJ |
805 WIDGET_OBJ | 805 WIDGET_OBJ |
806 TOOLKIT_LIBW | 806 TOOLKIT_LIBW |
807 LIBXT_OTHER | 807 LIBXT_OTHER |
808 OLDXMENU_TARGET | |
808 OLDXMENU | 809 OLDXMENU |
809 LIBXMENU | 810 LIBXMENU |
810 LIBX_OTHER | 811 LIBX_OTHER |
811 CYGWIN_OBJ | 812 CYGWIN_OBJ |
812 PRE_ALLOC_OBJ | 813 PRE_ALLOC_OBJ |
26454 esac | 26455 esac |
26455 | 26456 |
26456 | 26457 |
26457 if test "$USE_X_TOOLKIT" = "none"; then | 26458 if test "$USE_X_TOOLKIT" = "none"; then |
26458 LIBXT_OTHER="\$(LIBXSM)" | 26459 LIBXT_OTHER="\$(LIBXSM)" |
26460 OLDXMENU_TARGET="really-oldXMenu" | |
26459 else | 26461 else |
26460 LIBXT_OTHER="\$(LIBXMU) -lXt \$(LIBXTR6) -lXext" | 26462 LIBXT_OTHER="\$(LIBXMU) -lXt \$(LIBXTR6) -lXext" |
26461 fi | 26463 OLDXMENU_TARGET="really-lwlib" |
26464 fi | |
26465 | |
26462 | 26466 |
26463 | 26467 |
26464 ## The X Menu stuff is present in the X10 distribution, but missing | 26468 ## The X Menu stuff is present in the X10 distribution, but missing |
26465 ## from X11. If we have X10, just use the installed library; | 26469 ## from X11. If we have X10, just use the installed library; |
26466 ## otherwise, use our own copy. | 26470 ## otherwise, use our own copy. |
26720 # or the ${configuration} value might, just might, happen to be an | 26724 # or the ${configuration} value might, just might, happen to be an |
26721 # identifier like `sun4' or `i386' or something, and be predefined by | 26725 # identifier like `sun4' or `i386' or something, and be predefined by |
26722 # the C preprocessor to some helpful value like 1, or maybe the empty | 26726 # the C preprocessor to some helpful value like 1, or maybe the empty |
26723 # string. Needless to say consequent macro substitutions are less | 26727 # string. Needless to say consequent macro substitutions are less |
26724 # than conducive to the makefile finding the correct directory. | 26728 # than conducive to the makefile finding the correct directory. |
26729 # src/Makefile.in used to treat X11 as equivalent to HAVE_X11. | |
26730 # But nothing in Emacs defines X11, and everywhere else uses HAVE_X11, | |
26731 # so that cannot have been doing anything. | |
26725 cpp_undefs="`echo $srcdir $configuration $canonical unix mktime register X11 | | 26732 cpp_undefs="`echo $srcdir $configuration $canonical unix mktime register X11 | |
26726 sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/^/ /' -e 's/ *$//' \ | 26733 sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/^/ /' -e 's/ *$//' \ |
26727 -e 's/ */ -U/g' -e 's/-U[0-9][^ ]*//g'`" | 26734 -e 's/ */ -U/g' -e 's/-U[0-9][^ ]*//g'`" |
26728 | 26735 |
26729 ## Check if the C preprocessor will convert `..' to `. .'. If so, set | 26736 ## Check if the C preprocessor will convert `..' to `. .'. If so, set |