Mercurial > emacs

comparison configure.in @ 96759:1e2f7aab70ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Makefile.in: Undef LIB_STANDARD before defining it to silence warning in case it was defined already. USE @GNUSTEP_MAKEFILES@ rather than envvars. * nsterm.m (ns_term_init): Pass Qt and Qnil rather than YES/NO to ns_default. (applicationShouldTerminate, setValuesFromPanel): Use EQ to compare Lisp_Objects. * nsterm.h (Fx_display_grayscale_p, Fx_display_planes) (ns_defined_color, ns_color_to_lisp): Declare. * nsselect.m (ns_handle_selection_request, ns_handle_selection_clear) (Fns_own_selection_internal): Make the big ugly hack more explicit, so it's accepted even with USE_LISP_UNION_TYPE. * nsmenu.m (ns_update_menubar): Use EQ to compare Lisp_Objects. (update_frame_tool_bar): Remove apparently obsolete tests for non-integerness of f->tool_bar_lines. (windowShouldClose, addButton, clicked, runDialogAt): Make the big ugly hack more explicit, so it's accepted even with USE_LISP_UNION_TYPE. * nsfont.m (nsfont_driver): Use just 0 rather than an invalid cast. (nsfont_open): Don't confuse NULL for Qnil. * nsfns.m (ns_implicitly_set_icon_type): Use EQ to compare Lisp_Objects. * menu.h (find_and_call_menu_selection): * menu.c (find_and_call_menu_selection): Use just int for vector size. (find_and_return_menu_selection): Always return something. * frame.h: Include dispextern.h for Display_Info. (display_x_get_resource): Declare. * configure.in: Extract and substitute GNUSTEP_MAKEFILES.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Thu, 17 Jul 2008 03:33:59 +0000
parents 9697a5f0281d
children 2b46fd076f88
comparison
equal deleted inserted replaced
96758:4962b860277b 96759:1e2f7aab70ba
1232 NS_IMPL_COCOA=yes 1232 NS_IMPL_COCOA=yes
1233 elif test -f /etc/GNUstep/GNUstep.conf; then 1233 elif test -f /etc/GNUstep/GNUstep.conf; then
1234 NS_IMPL_GNUSTEP=yes 1234 NS_IMPL_GNUSTEP=yes
1235 GNUSTEP_SYSTEM_HEADERS="$(source /etc/GNUstep/GNUstep.conf; echo $GNUSTEP_SYSTEM_HEADERS)" 1235 GNUSTEP_SYSTEM_HEADERS="$(source /etc/GNUstep/GNUstep.conf; echo $GNUSTEP_SYSTEM_HEADERS)"
1236 GNUSTEP_SYSTEM_LIBRARIES="$(source /etc/GNUstep/GNUstep.conf; echo $GNUSTEP_SYSTEM_LIBRARIES)" 1236 GNUSTEP_SYSTEM_LIBRARIES="$(source /etc/GNUstep/GNUstep.conf; echo $GNUSTEP_SYSTEM_LIBRARIES)"
1237 GNUSTEP_MAKEFILES="$(source /etc/GNUstep/GNUstep.conf; echo $GNUSTEP_MAKEFILES)"
1237 CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" 1238 CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
1238 CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" 1239 CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
1239 REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" 1240 REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
1240 LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}" 1241 LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}"
1241 fi 1242 fi
2469 AC_SUBST(machfile) 2470 AC_SUBST(machfile)
2470 AC_SUBST(opsysfile) 2471 AC_SUBST(opsysfile)
2471 AC_SUBST(GETLOADAVG_LIBS) 2472 AC_SUBST(GETLOADAVG_LIBS)
2472 AC_SUBST(carbon_appdir) 2473 AC_SUBST(carbon_appdir)
2473 AC_SUBST(ns_appdir) 2474 AC_SUBST(ns_appdir)
2475 AC_SUBST(GNUSTEP_MAKEFILES)
2474 2476
2475 AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "${canonical}", 2477 AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "${canonical}",
2476 [Define to the canonical Emacs configuration name.]) 2478 [Define to the canonical Emacs configuration name.])
2477 AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${ac_configure_args}", 2479 AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${ac_configure_args}",
2478 [Define to the options passed to configure.]) 2480 [Define to the options passed to configure.])