Mercurial > emacs

comparison configure.in @ 108546:8039fa319d6b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor build simplification for NS. * configure.in (NS_IMPL_GNUSTEP_INC): New output variable. (GNUSTEP_MAKEFILES): Do not output. * src/Makefile.in (@NS_IMPL_GNUSTEP_INC@): Use in place of #ifdef. * msdos/sed1v2.inp (@NS_IMPL_GNUSTEP_INC@): Edit to nil.
author Glenn Morris <rgm@gnu.org>
date Thu, 13 May 2010 19:46:09 -0700
parents 7ed2fb419f40
children 2a91d2a1b873
comparison
equal deleted inserted replaced
108545:1d7fcf3cf1b2 108546:8039fa319d6b
1450 fi 1450 fi
1451 1451
1452 HAVE_NS=no 1452 HAVE_NS=no
1453 NS_IMPL_COCOA=no 1453 NS_IMPL_COCOA=no
1454 NS_IMPL_GNUSTEP=no 1454 NS_IMPL_GNUSTEP=no
1455 NS_IMPL_GNUSTEP_INC=
1455 tmp_CPPFLAGS="$CPPFLAGS" 1456 tmp_CPPFLAGS="$CPPFLAGS"
1456 tmp_CFLAGS="$CFLAGS" 1457 tmp_CFLAGS="$CFLAGS"
1457 CPPFLAGS="$CPPFLAGS -x objective-c" 1458 CPPFLAGS="$CPPFLAGS -x objective-c"
1458 CFLAGS="$CFLAGS -x objective-c" 1459 CFLAGS="$CFLAGS -x objective-c"
1459 if test "${with_ns}" != no; then 1460 if test "${with_ns}" != no; then
1471 ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base 1472 ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base
1472 dnl FIXME sourcing this 3 times in subshells seems inefficient. 1473 dnl FIXME sourcing this 3 times in subshells seems inefficient.
1473 GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)" 1474 GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)"
1474 GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)" 1475 GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)"
1475 GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)" 1476 GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)"
1477 ## Pull in stuff from GNUstep-make.
1478 NS_IMPL_GNUSTEP_INC="FOUNDATION_LIB=gnu
1479 GUI_LIB=gnu
1480 include $GNUSTEP_MAKEFILES/Additional/base.make
1481 include $GNUSTEP_MAKEFILES/Additional/gui.make
1482 shared=no
1483 "
1476 CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" 1484 CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
1477 CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" 1485 CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
1478 REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" 1486 REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
1479 LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}" 1487 LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}"
1480 LIB_STANDARD= 1488 LIB_STANDARD=
1489 ns_have_nsinteger=no) 1497 ns_have_nsinteger=no)
1490 if test $ns_have_nsinteger = no; then 1498 if test $ns_have_nsinteger = no; then
1491 NS_HAVE_NSINTEGER=no 1499 NS_HAVE_NSINTEGER=no
1492 fi 1500 fi
1493 fi 1501 fi
1502 AC_SUBST(NS_IMPL_GNUSTEP_INC)
1494 1503
1495 NS_OBJ= 1504 NS_OBJ=
1496 NS_SUPPORT= 1505 NS_SUPPORT=
1497 if test "${HAVE_NS}" = yes; then 1506 if test "${HAVE_NS}" = yes; then
1498 window_system=nextstep 1507 window_system=nextstep
3048 AC_SUBST(GETLOADAVG_LIBS) 3057 AC_SUBST(GETLOADAVG_LIBS)
3049 AC_SUBST(ns_appdir) 3058 AC_SUBST(ns_appdir)
3050 AC_SUBST(ns_appbindir) 3059 AC_SUBST(ns_appbindir)
3051 AC_SUBST(ns_appresdir) 3060 AC_SUBST(ns_appresdir)
3052 AC_SUBST(ns_appsrc) 3061 AC_SUBST(ns_appsrc)
3053 AC_SUBST(GNUSTEP_MAKEFILES)
3054 AC_SUBST(GNUSTEP_SYSTEM_HEADERS) 3062 AC_SUBST(GNUSTEP_SYSTEM_HEADERS)
3055 AC_SUBST(GNUSTEP_SYSTEM_LIBRARIES) 3063 AC_SUBST(GNUSTEP_SYSTEM_LIBRARIES)
3056 AC_SUBST(GNU_OBJC_CFLAGS) 3064 AC_SUBST(GNU_OBJC_CFLAGS)
3057 AC_SUBST(OTHER_FILES) 3065 AC_SUBST(OTHER_FILES)
3058 3066