Mercurial > emacs

comparison configure.in @ 110956:07776ed6876f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove trailing / from directory names. * configure (ns_appdir, OLDXMENU, TOOLTIP_SUPPORT): Remove trailing / from directory names.
author Dan Nicolaescu <dann@ics.uci.edu>
date Tue, 12 Oct 2010 14:03:09 -0700
parents 158de1f7d257
children 25f363b1aa1f
comparison
equal deleted inserted replaced
110955:c84f553cca36 110956:07776ed6876f
1489 dnl (now the only user of ns_appdir) used to go to the trouble of adding a 1489 dnl (now the only user of ns_appdir) used to go to the trouble of adding a
1490 dnl trailing "/" to it, so now we do it here. 1490 dnl trailing "/" to it, so now we do it here.
1491 if test "${with_ns}" != no; then 1491 if test "${with_ns}" != no; then
1492 if test "${opsys}" = darwin; then 1492 if test "${opsys}" = darwin; then
1493 NS_IMPL_COCOA=yes 1493 NS_IMPL_COCOA=yes
1494 ns_appdir=`pwd`/nextstep/Emacs.app/ 1494 ns_appdir=`pwd`/nextstep/Emacs.app
1495 ns_appbindir=${ns_appdir}Contents/MacOS/ 1495 ns_appbindir=${ns_appdir}/Contents/MacOS/
1496 ns_appresdir=${ns_appdir}Contents/Resources 1496 ns_appresdir=${ns_appdir}/Contents/Resources
1497 ns_appsrc=${srcdir}/nextstep/Cocoa/Emacs.base 1497 ns_appsrc=${srcdir}/nextstep/Cocoa/Emacs.base
1498 elif test -f $GNUSTEP_CONFIG_FILE; then 1498 elif test -f $GNUSTEP_CONFIG_FILE; then
1499 NS_IMPL_GNUSTEP=yes 1499 NS_IMPL_GNUSTEP=yes
1500 ns_appdir=`pwd`/nextstep/Emacs.app/ 1500 ns_appdir=`pwd`/nextstep/Emacs.app
1501 ns_appbindir=${ns_appdir} 1501 ns_appbindir=${ns_appdir}
1502 ns_appresdir=${ns_appdir}Resources 1502 ns_appresdir=${ns_appdir}/Resources
1503 ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base 1503 ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base
1504 dnl FIXME sourcing this several times in subshells seems inefficient. 1504 dnl FIXME sourcing this several times in subshells seems inefficient.
1505 GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)" 1505 GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)"
1506 GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)" 1506 GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)"
1507 dnl I seemed to need these as well with GNUstep-startup 0.25. 1507 dnl I seemed to need these as well with GNUstep-startup 0.25.
1544 if test "${EN_NS_SELF_CONTAINED}" = yes; then 1544 if test "${EN_NS_SELF_CONTAINED}" = yes; then
1545 prefix=${ns_appresdir} 1545 prefix=${ns_appresdir}
1546 fi 1546 fi
1547 ns_frag=$srcdir/src/ns.mk 1547 ns_frag=$srcdir/src/ns.mk
1548 NS_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o fontset.o fringe.o image.o" 1548 NS_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o fontset.o fringe.o image.o"
1549 NS_SUPPORT="\${lispsource}emacs-lisp/easymenu.elc \${lispsource}term/ns-win.elc" 1549 NS_SUPPORT="\${lispsource}/emacs-lisp/easymenu.elc \${lispsource}/term/ns-win.elc"
1550 fi 1550 fi
1551 CFLAGS="$tmp_CFLAGS" 1551 CFLAGS="$tmp_CFLAGS"
1552 CPPFLAGS="$tmp_CPPFLAGS" 1552 CPPFLAGS="$tmp_CPPFLAGS"
1553 AC_SUBST(NS_OBJ) 1553 AC_SUBST(NS_OBJ)
1554 AC_SUBST(NS_SUPPORT) 1554 AC_SUBST(NS_SUPPORT)
3258 AC_DEFINE(HAVE_X11, 1, 3258 AC_DEFINE(HAVE_X11, 1,
3259 [Define to 1 if you want to use version 11 of X windows. 3259 [Define to 1 if you want to use version 11 of X windows.
3260 Otherwise, Emacs expects to use version 10.]) 3260 Otherwise, Emacs expects to use version 10.])
3261 3261
3262 if test "$USE_X_TOOLKIT" = "none"; then 3262 if test "$USE_X_TOOLKIT" = "none"; then
3263 OLDXMENU="\${oldXMenudir}libXMenu11.a" 3263 OLDXMENU="\${oldXMenudir}/libXMenu11.a"
3264 else 3264 else
3265 OLDXMENU="\${lwlibdir}liblw.a" 3265 OLDXMENU="\${lwlibdir}/liblw.a"
3266 fi 3266 fi
3267 LIBXMENU="\$(OLDXMENU)" 3267 LIBXMENU="\$(OLDXMENU)"
3268 LIBX_OTHER="\$(LIBXT) \$(LIBX_EXTRA)" 3268 LIBX_OTHER="\$(LIBXT) \$(LIBX_EXTRA)"
3269 OLDXMENU_DEPS="\${OLDXMENU} ../src/\${OLDXMENU}" 3269 OLDXMENU_DEPS="\${OLDXMENU} ../src/\${OLDXMENU}"
3270 else 3270 else
3466 ## If we're using X11/GNUstep, define some consequences. 3466 ## If we're using X11/GNUstep, define some consequences.
3467 if test "$HAVE_X_WINDOWS" = "yes" || test "$HAVE_NS" = "yes"; then 3467 if test "$HAVE_X_WINDOWS" = "yes" || test "$HAVE_NS" = "yes"; then
3468 AC_DEFINE(HAVE_WINDOW_SYSTEM, 1, [Define if you have a window system.]) 3468 AC_DEFINE(HAVE_WINDOW_SYSTEM, 1, [Define if you have a window system.])
3469 AC_DEFINE(HAVE_MOUSE, 1, [Define if you have mouse support.]) 3469 AC_DEFINE(HAVE_MOUSE, 1, [Define if you have mouse support.])
3470 MOUSE_SUPPORT="\$(REAL_MOUSE_SUPPORT)" 3470 MOUSE_SUPPORT="\$(REAL_MOUSE_SUPPORT)"
3471 TOOLTIP_SUPPORT="\${lispsource}mouse.elc" 3471 TOOLTIP_SUPPORT="\${lispsource}/mouse.elc"
3472 3472
3473 WINDOW_SUPPORT="\$(BASE_WINDOW_SUPPORT)" 3473 WINDOW_SUPPORT="\$(BASE_WINDOW_SUPPORT)"
3474 test "$HAVE_X_WINDOWS" = "yes" && \ 3474 test "$HAVE_X_WINDOWS" = "yes" && \
3475 WINDOW_SUPPORT="$WINDOW_SUPPORT \$(X_WINDOW_SUPPORT)" 3475 WINDOW_SUPPORT="$WINDOW_SUPPORT \$(X_WINDOW_SUPPORT)"
3476 3476