Mercurial > emacs

comparison configure.in @ 108788:17428e70b5d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add GNUSTEP_LOCAL_HEADERS/LIBRARIES to build flags. * configure.in (CPPFLAGS, CFLAGS, REAL_CFLAGS): Add $GNUSTEP_LOCAL_HEADERS. (LDFLAGS, LD_SWITCH_SYSTEM_TEMACS): Add $GNUSTEP_LOCAL_LIBRARIES.
author Glenn Morris <rgm@gnu.org>
date Tue, 25 May 2010 20:50:16 -0700
parents b06e3f33ea78
children 1b3be6d705bd
comparison
equal deleted inserted replaced
108787:b06e3f33ea78 108788:17428e70b5d9
1490 ns_appresdir=${ns_appdir}Resources 1490 ns_appresdir=${ns_appdir}Resources
1491 ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base 1491 ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base
1492 dnl FIXME sourcing this several times in subshells seems inefficient. 1492 dnl FIXME sourcing this several times in subshells seems inefficient.
1493 GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)" 1493 GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)"
1494 GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)" 1494 GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)"
1495 CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" 1495 dnl I seemed to need these as well with GNUstep-startup 0.25.
1496 CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" 1496 GNUSTEP_LOCAL_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_LOCAL_HEADERS)"
1497 REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" 1497 GNUSTEP_LOCAL_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_LOCAL_LIBRARIES)"
1498 LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}" 1498 test "x${GNUSTEP_LOCAL_HEADERS}" != "x" && \
1499 GNUSTEP_LOCAL_HEADERS="-I${GNUSTEP_LOCAL_HEADERS}"
1500 test "x${GNUSTEP_LOCAL_LIBRARIES}" != "x" && \
1501 GNUSTEP_LOCAL_LIBRARIES="-L${GNUSTEP_LOCAL_LIBRARIES}"
1502 CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
1503 CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
1504 REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
1505 LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES}"
1499 LIB_STANDARD= 1506 LIB_STANDARD=
1500 START_FILES= 1507 START_FILES=
1501 TEMACS_LDFLAGS2= 1508 TEMACS_LDFLAGS2=
1502 fi 1509 fi
1503 AC_CHECK_HEADER([AppKit/AppKit.h], [HAVE_NS=yes], 1510 AC_CHECK_HEADER([AppKit/AppKit.h], [HAVE_NS=yes],
3296 3303
3297 *) LD_SWITCH_SYSTEM_TEMACS= ;; 3304 *) LD_SWITCH_SYSTEM_TEMACS= ;;
3298 esac 3305 esac
3299 3306
3300 if test "$NS_IMPL_GNUSTEP=yes"; then 3307 if test "$NS_IMPL_GNUSTEP=yes"; then
3301 LD_SWITCH_SYSTEM_TEMACS="${LD_SWITCH_SYSTEM_TEMACS} -L${GNUSTEP_SYSTEM_LIBRARIES} -L${GNUSTEP_LOCAL_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc -lpthread" 3308 LD_SWITCH_SYSTEM_TEMACS="${LD_SWITCH_SYSTEM_TEMACS} -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc -lpthread"
3302 fi 3309 fi
3303 3310
3304 AC_SUBST(LD_SWITCH_SYSTEM_TEMACS) 3311 AC_SUBST(LD_SWITCH_SYSTEM_TEMACS)
3305 3312
3306 3313