Mercurial > emacs

comparison configure.in @ 108623:6b62ba6da320

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify temacs build rule. * configure.in (NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): New output variable. (START_FILES): Set to empty if NS_IMPL_GNUSTEP. (GNUSTEP_SYSTEM_HEADERS, GNUSTEP_SYSTEM_LIBRARIES): Do not output, nothing uses. * configure: Regenerate. * src/Makefile.in (GNUSTEP_SYSTEM_LIBRARIES): Remove, unused. (NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): New, set by configure. (LD) [NS_IMPL_GNUSTEP]: Set to $(CC) -rdynamic. (temacs${EXEEXT}): Remove $LOCALCPP, never defined or referenced. Make most of the NS_IMPL_GNUSTEP case the same as the default case. * msdos/sed1v2.inp (GNUSTEP_SYSTEM_LIBRARIES): Remove. (NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): Edit to empty.
author Glenn Morris <rgm@gnu.org>
date Sun, 16 May 2010 10:58:27 -0700
parents 880007fe488b
children ecb7cdb525f0
comparison
equal deleted inserted replaced
108622:3191c35765a2 108623:6b62ba6da320
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 NS_IMPL_GNUSTEP_INC=
1456 NS_IMPL_GNUSTEP_TEMACS_LDFLAGS=
1456 tmp_CPPFLAGS="$CPPFLAGS" 1457 tmp_CPPFLAGS="$CPPFLAGS"
1457 tmp_CFLAGS="$CFLAGS" 1458 tmp_CFLAGS="$CFLAGS"
1458 CPPFLAGS="$CPPFLAGS -x objective-c" 1459 CPPFLAGS="$CPPFLAGS -x objective-c"
1459 CFLAGS="$CFLAGS -x objective-c" 1460 CFLAGS="$CFLAGS -x objective-c"
1460 if test "${with_ns}" != no; then 1461 if test "${with_ns}" != no; then
1479 GUI_LIB=gnu 1480 GUI_LIB=gnu
1480 include $GNUSTEP_MAKEFILES/Additional/base.make 1481 include $GNUSTEP_MAKEFILES/Additional/base.make
1481 include $GNUSTEP_MAKEFILES/Additional/gui.make 1482 include $GNUSTEP_MAKEFILES/Additional/gui.make
1482 shared=no 1483 shared=no
1483 " 1484 "
1485 dnl Presumably ${CONFIG_SYSTEM_LIBS} is defined by above includes.
1486 NS_IMPL_GNUSTEP_TEMACS_LDFLAGS="-L${GNUSTEP_SYSTEM_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc \${CONFIG_SYSTEM_LIBS} -lpthread"
1484 CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" 1487 CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
1485 CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" 1488 CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
1486 REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" 1489 REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
1487 LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}" 1490 LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}"
1488 LIB_STANDARD= 1491 LIB_STANDARD=
1492 START_FILES=
1489 fi 1493 fi
1490 AC_CHECK_HEADER([AppKit/AppKit.h], [HAVE_NS=yes], 1494 AC_CHECK_HEADER([AppKit/AppKit.h], [HAVE_NS=yes],
1491 [AC_MSG_ERROR([`--with-ns' was specified, but the include 1495 [AC_MSG_ERROR([`--with-ns' was specified, but the include
1492 files are missing or cannot be compiled.])]) 1496 files are missing or cannot be compiled.])])
1493 NS_HAVE_NSINTEGER=yes 1497 NS_HAVE_NSINTEGER=yes
1498 if test $ns_have_nsinteger = no; then 1502 if test $ns_have_nsinteger = no; then
1499 NS_HAVE_NSINTEGER=no 1503 NS_HAVE_NSINTEGER=no
1500 fi 1504 fi
1501 fi 1505 fi
1502 AC_SUBST(NS_IMPL_GNUSTEP_INC) 1506 AC_SUBST(NS_IMPL_GNUSTEP_INC)
1507 AC_SUBST(NS_IMPL_GNUSTEP_TEMACS_LDFLAGS)
1503 1508
1504 NS_OBJ= 1509 NS_OBJ=
1505 NS_SUPPORT= 1510 NS_SUPPORT=
1506 if test "${HAVE_NS}" = yes; then 1511 if test "${HAVE_NS}" = yes; then
1507 window_system=nextstep 1512 window_system=nextstep
3049 AC_SUBST(GETLOADAVG_LIBS) 3054 AC_SUBST(GETLOADAVG_LIBS)
3050 AC_SUBST(ns_appdir) 3055 AC_SUBST(ns_appdir)
3051 AC_SUBST(ns_appbindir) 3056 AC_SUBST(ns_appbindir)
3052 AC_SUBST(ns_appresdir) 3057 AC_SUBST(ns_appresdir)
3053 AC_SUBST(ns_appsrc) 3058 AC_SUBST(ns_appsrc)
3054 AC_SUBST(GNUSTEP_SYSTEM_HEADERS)
3055 AC_SUBST(GNUSTEP_SYSTEM_LIBRARIES)
3056 AC_SUBST(GNU_OBJC_CFLAGS) 3059 AC_SUBST(GNU_OBJC_CFLAGS)
3057 AC_SUBST(OTHER_FILES) 3060 AC_SUBST(OTHER_FILES)
3058 3061
3059 AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "${canonical}", 3062 AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "${canonical}",
3060 [Define to the canonical Emacs configuration name.]) 3063 [Define to the canonical Emacs configuration name.])