1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-17 10:06:13 +00:00
Commit Graph

985 Commits

Author SHA1 Message Date
Lars Magne Ingebrigtsen
2e6e11eb3a * configure.in (HAVE_GSETTINGS): Fix syntax for GSETTINGS tests, which made ./configure infloop. 2011-06-30 16:32:07 +02:00
Jan Djärv
9851bfc58d Add GSettings support (GConf is going away).
* configure.in (gsettings): New option and check for GSettings.

* src/Makefile.in (SETTINGS_CFLAGS, SETTINGS_LIBS): Renamed from
GCONF_CFLAGS/LIBS.

* src/xsettings.c: Include glib.h if HAVE_GSETTINGS.
Let HAVE_GSETTINGS override HAVE_GCONF.
(store_monospaced_changed): New function.
(EMACS_SETTINGS): A new type derived from GObject to handle
GSettings notifications.
(emacs_settings_constructor, emacs_settings_get_property)
(emacs_settings_set_property, emacs_settings_class_init):
New functions.
(gsettings_client, gsettings_obj): New variables.
(GSETTINGS_SCHEMA): New define.
(something_changedCB): Call store_monospaced_changed.
(init_gsettings): New function.
(xsettings_initialize): Call init_gsettings.
(syms_of_xsettings): Initialize gsettings_client, gsettings_obj
to NULL.
2011-06-30 16:00:26 +02:00
Glenn Morris
e9dfbb4a2c * configure.in: Do not override user crt-dir, even if faulty. 2011-06-28 20:47:07 -07:00
Glenn Morris
d34a9bb38f * configure.in: Tweak previous change. 2011-06-28 20:21:14 -07:00
Glenn Morris
adbc4ef4b5 * configure.in: Try to test for the required crt*.o files. 2011-06-28 22:50:32 -04:00
Paul Eggert
7a7ef42918 Use gnulib's dup2 module instead of rolling our own.
* Makefile.in (GNULIB_MODULES): Add dup2.
* configure.in: Do not check for dup2; gnulib does that now.
* lib/dup2.c, m4/dup2.m4: New files, from gnulib.
* src/sysdep.c (dup2) [!HAVE_DUP2]: Remove; gnulib now does this.
2011-06-25 01:40:38 -07:00
Paul Eggert
e92b6c8841 * configure.in: Port alloca to AIX 3. 2011-06-21 10:10:10 -07:00
Paul Eggert
fa23e171f4 Use gnulib's alloca-opt module.
* .bzrignore: Add lib/alloca.h.
* Makefile.in (GNULIB_MODULES): Add alloca-opt.
* configure.in (AC_FUNC_ALLOCA): Remove almost all the alloca stuff,
as gnulib now does that for us.  Put alloca check after gl_INIT.
* lib/gnulib.mk, m4/gl-comp.m4: Regenerate.
* lib/alloca.in.h, m4/alloca.m4: New files, from gnulib.
2011-06-21 09:15:07 -07:00
Glenn Morris
e9bc61b072 Fix previous change. 2011-06-17 13:32:58 -04:00
Glenn Morris
3a4725e11e Small configure.in fix.
Ref: http://lists.gnu.org/archive/html/emacs-buildstatus/2011-06/msg00007.html

* configure.in: Restore the behavior of checking crt-dir only
when the user specified it (not all platforms use it).
2011-06-17 13:29:50 -04:00
Miles Bader
0cca0a78a4 configure.in: Try to determine CRT_DIR automatically when using gcc 2011-06-17 02:50:21 +09:00
Jan Djärv
c195f2de12 Fix resize and change of scroll bar width for Gtk3.
* configure.in: Add emacsgtkfixed.o to GTK_OBJ if HAVE_GTK3.

* src/emacsgtkfixed.c, src/emacsgtkfixed.h: New files.

* src/gtkutil.c: Include src/emacsgtkfixed.h if HAVE_GTK3.
(int_gtk_range_get_value): Move to the scroll bar part of the file.
(style_changed_cb): Call update_theme_scrollbar_width and call
x_set_scroll_bar_default_width and xg_frame_set_char_size for
all frames.
(xg_create_frame_widgets): Call emacs_fixed_new if HAVE_GTK3 (Bug#8505).
Call gtk_window_set_resizable if HAVE_GTK3.
(x_wm_set_size_hint): Call emacs_fixed_set_min_size with min width
and height if HAVE_GTK3 (Bug#8505).
(scroll_bar_width_for_theme): New variable.
(update_theme_scrollbar_width): New function.
(xg_get_default_scrollbar_width): Move code to
update_theme_scrollbar_width, just return scroll_bar_width_for_theme.
(xg_initialize): Call update_theme_scrollbar_width.

* src/gtkutil.h (xg_get_default_scrollbar_width): Remove argument.

* src/xfns.c (x_set_scroll_bar_default_width): Remove argument to
xg_get_default_scrollbar_width.
2011-06-14 23:08:20 +02:00
Paul Eggert
81eafe2977 [ChangeLog]
* configure.in: Add --with-wide-int.
* INSTALL: Mention this.
[etc/ChangeLog]
* NEWS: Mention new configure option --with-wide-int.
2011-06-06 21:16:37 -07:00
Paul Eggert
55d4c1b248 [ChangeLog]
Use 'inline', not 'INLINE'.
* configure.in, autogen/config.in (INLINE): Remove.
[lib-src/ChangeLog]
Use 'inline', not 'INLINE'.
* etags.c (hash): Now inline unconditionally.
* make-docfile.c (put_char): inline, not INLINE.
[nt/ChangeLog]
Use 'inline', not 'INLINE'.
* config.nt (INLINE): Remove.
[src/ChangeLog]
Use 'inline', not 'INLINE'.
* alloc.c, fontset.c (INLINE): Remove.
* alloc.c, bidi.c, charset.c, coding.c, dispnew.c, fns.c, image.c:
* intervals.c, keyboard.c, process.c, syntax.c, textprop.c, w32term.c:
* xdisp.c, xfaces.c, xterm.c: Replace all uses of INLINE with inline.
* gmalloc.c (register_heapinfo): Use inline unconditionally.
* lisp.h (LISP_MAKE_RVALUE): Use inline, not __inline__.
2011-05-28 15:39:39 -07:00
Glenn Morris
d0ff0c7d7a * configure.in: Comment fix. 2011-05-25 20:55:14 -04:00
Glenn Morris
bdd556a2b3 * configure.in: Avoid using variables inside AC_CONFIG_FILES. 2011-05-24 15:12:58 -04:00
Glenn Morris
70716b1dca Reimplement trunk 2011-05-24T08:02:58Z!rgm@gnu.org in a way visible to automake.
* configure.in (OPT_MAKEFILES_IN): Remove.
(SUBDIR_MAKEFILES): New variable, passed to AC_CONFIG_FILES.
(SUBDIR_MAKEFILES_IN): New output variable.
* Makefile.in (OPT_MAKEFILES_IN): Remove.
(SUBDIR_MAKEFILES_IN): Let configure set it.
2011-05-24 13:23:15 -04:00
Glenn Morris
5e48359541 Revert 2011-05-24T08:02:58Z!rgm@gnu.org, for now at least.
Some automakes don't seem to like it (?).
2011-05-24 12:30:13 -04:00
Glenn Morris
4ba4c54add Remove dead code in configure.in.
* configure.in: Remove test for already configured source directory.
AM_INIT_AUTOMAKE has already done a more stringent test.  (Bug#953)
2011-05-24 01:16:58 -07:00
Glenn Morris
e09e38a821 Define the list of subdir Makefiles only in configure.in.
* configure.in (OPT_MAKEFILES_IN): Remove.
(SUBDIR_MAKEFILES): New variable, passed to AC_CONFIG_FILES.
(SUBDIR_MAKEFILES_IN): New output variable.
* Makefile.in (OPT_MAKEFILES_IN): Remove.
(SUBDIR_MAKEFILES_IN): Let configure set it.
2011-05-24 01:02:58 -07:00
Glenn Morris
cee4acda70 Fix previous Makefile change.
* configure.in (OPT_MAKEFILES_IN): Use full path.
* Makefile.in (SUBDIR_MAKEFILES_IN): Use full path.
(SUBDIR_MAKEFILES): Use relative path.
2011-05-24 00:06:44 -07:00
Glenn Morris
6c7e099d06 Restore test/ to its non-distributed state (bug#8107)
* make-dist: Don't distribute test/.
* configure.in (OPT_MAKEFILES_IN): New output variable.
(AC_CONFIG_FILES): Conditionally include test/automated/Makefile.
* Makefile.in (OPT_MAKEFILES_IN): New, set by configure.
(SUBDIR_MAKEFILES_IN): Use $OPT_MAKEFILES_IN.
(check): Give an explicit error if test/ is not present.
2011-05-23 21:00:56 -07:00
Glenn Morris
b9704ad993 Remove $shortlisp from src/Makefile.in.
* configure.in (lisp_frag): New output file.

* src/lisp.mk: New file, split from Makefile.in, and inheriting its
  copyright years.
* src/Makefile.in (lisp): Move to separate file, inserted by @lisp_frag@.
(shortlisp): Remove.
($(etc)/DOC): Edit lisp.mk rather than using $shortlisp.

* lisp/loadup.el, doc/misc/Makefile.in: Comment changes.
2011-05-19 17:41:03 -07:00
Glenn Morris
4a72048482 Remove the SOME_MACHINE_LISP distinction in src/Makefile.in.
See discussion in http://debbugs.gnu.org/8302

* configure.in (NS_SUPPORT, MOUSE_SUPPORT, TOOLTIP_SUPPORT)
(WINDOW_SUPPORT): Remove output variables that are no longer used.

* lib-src/makefile.w32-in (echolisp): Remove rule that is no longer needed.
(clean): No more echolisp.tmp.

* .bzrignore: Remove lib-src/echolisp.tmp.

* lisp/emacs-lisp/autoload.el (batch-update-autoloads):
Set autoload-excludes by parsing lisp/loadup.el rather than Makefiles.

* lisp/loadup.el: Update commentary.

* msdos/sed1x.inp (TOOLTIP_SUPPORT, WINDOW_SUPPORT):
* msdos/sed1v2.inp (MSDOS_SUPPORT, NS_SUPPORT, MOUSE_SUPPORT)
(TOOLTIP_SUPPORT, WINDOW_SUPPORT): No need to edit these any more.

* src/Makefile.in (MSDOS_SUPPORT_REAL, MSDOS_SUPPORT, NS_SUPPORT)
(REAL_MOUSE_SUPPORT, GPM_MOUSE_SUPPORT, MOUSE_SUPPORT, TOOLTIP_SUPPORT)
(BASE_WINDOW_SUPPORT, X_WINDOW_SUPPORT, WINDOW_SUPPORT): Remove.
(lisp): Set the order to that of loadup.el.
(shortlisp): Make it a copy of $lisp.
(SOME_MACHINE_LISP): Remove.
($(etc)/DOC): Depend just on $lisp, not $SOME_MACHINE_LISP too.
Use just $shortlisp, not $SOME_MACHINE_LISP too.
2011-05-18 23:04:16 -07:00
Glenn Morris
d681f183cf Make configure.in give an error if no X-toolkit was detected.
* configure.in: Treat failure to find an X toolkit the same way we treat
failure to find X and image support.
2011-05-14 12:52:13 -07:00
Ted Zlatanov
5a7f0a3050 * configure.in: Require GnuTLS 2.6.x or higher. 2011-05-09 05:40:26 -05:00
Paul Eggert
d1a2ac5c05 * configure.in (BITS_PER_LONG_LONG): New macro. 2011-04-29 00:55:57 -07:00
Ben Key
40697cd9ed Fixed a bug that caused configure with --enable-checking=stringoverrun to have no effect. 2011-04-26 21:17:44 -05:00
Paul Eggert
671875dac1 Merge from mainline. 2011-04-25 23:17:52 -07:00
Ted Zlatanov
33630d5150 Add certificate verify callback check for GnuTLS.
* configure.in: Check for GnuTLS certificate verify callbacks.
2011-04-24 20:30:05 -05:00
Paul Eggert
c1e127f9f0 * configure.in: Suppress unnecessary checks for size_t.
(AC_TYPE_SIZE_T): Define an empty macro, to suppress obsolescent test.
(size_t): Do not check for this, and do not typedef.  This code
is never exercised now.
2011-04-22 00:36:41 -07:00
Ken Brown
fe0e7ad718 * configure.in (use_mmap_for_buffers): Set to yes on Cygwin. 2011-04-19 22:18:13 -04:00
Glenn Morris
f5b06c3546 ImageMagick fix for bug#7955.
* configure.in: Require ImageMagick >= 6.2.8.  (Bug#7955)

* etc/NEWS: Mention ImageMagick version.
2011-04-11 20:55:07 -07:00
Paul Eggert
aa18133456 * configure.in (ATTRIBUTE_FORMAT, ATTRIBUTE_FORMAT_PRINTF): New macros. 2011-04-05 12:59:08 -07:00
Glenn Morris
9af30bdf17 Remove (RET)SIGTYPE; it is identical to void on all supported systems.
Ref: http://lists.gnu.org/archive/html/emacs-devel/2011-03/msg01068.html

* configure.in (AC_TYPE_SIGNAL): Remove obsolete macro.
(AH_BOTTOM): Do not define SIGTYPE.

* lib-src/emacsclient.c: Replace SIGTYPE with void.

* nt/config.nt: Remove RETSIGTYPE, SIGTYPE (identical to void).

* src/syssignal.h: Replace RETSIGTYPE with void.

* src/atimer.c, src/data.c, src/dispnew.c, src/emacs.c, src/floatfns.c:
* src/keyboard.c, src/keyboard.h, src/lisp.h, src/process.c, src/sysdep.c:
* src/xterm.c: Replace SIGTYPE with void everywhere.

* src/s/template.h (SIGTYPE): Remove commented out definition.
* src/s/usg5-4-common.h (SIGTYPE): Remove definition.

* admin/CPP-DEFINES: Remove SIGTYPE.
2011-03-26 19:27:11 -07:00
Glenn Morris
181855e600 Replace some obsolete autoconf macros with their modern equivalents.
* configure.in: Replace obsolete macros AC_TRY_COMPILE, AC_TRY_LINK,
AC_TRY_RUN with AC_COMPILE_IFELSE, AC_LINK_IFELSE, AC_RUN_IFELSE.
2011-03-26 12:29:10 -07:00
Glenn Morris
8cc1d51933 Replace mkinstalldirs with `install-sh -d', as automake recommends.
* Makefile.in (mkdir): Use `install-sh -d' instead of mkinstalldirs.
(sync-from-gnulib): Don't sync mkinstalldirs.

* make-dist: Don't distribute mkinstalldirs.

* leim/Makefile.in (install): Use `install-sh -d' rather than mkinstalldirs.

* lib-src/Makefile.in ($(DESTDIR)${archlibdir}):
Use `install-sh -d' rather than mkinstalldirs.

* configure.in, doc/emacs/Makefile.in: Update comments.

* admin/notes/copyright: Remove mkinstalldirs.
2011-03-22 20:09:55 -07:00
Paul Eggert
6e5fa6bfce Merge from trunk and from gnulib stdio. 2011-03-20 22:34:48 -07:00
Glenn Morris
66b874939b (Re)move autotools generated files from the repository.
Ref: http://lists.gnu.org/archive/html/emacs-devel/2011-03/msg00225.html

* autogen/: New directory, to be excluded from releases.
* autogen/copy_autogen, autogen/update_autogen: New scripts.
* autogen/README: New file.
* autogen/aclocal.m4, autogen/config.in, autogen/configure:
* autogen/Makefile.in: Add auto-updated generated files.

* autogen.sh: No longer a no-op, now it tests for autotools
and runs them as necessary.

* configure.in: Defaule maintainer-mode to on.

* aclocal.m4, configure, lib/Makefile.in: Remove files.

* src/config.in: Remove file.

* INSTALL.BZR, admin/make-tarball.txt: Update instructions.
2011-03-20 16:58:23 -07:00
Chong Yidong
b14e3e21ec Merge changes from emacs-23 branch 2011-03-19 14:49:31 -04:00
Paul Eggert
401bf9b470 process.c: Use socklen_t, not int, for socket lengths. 2011-03-17 20:30:24 -07:00
Glenn Morris
46dcfee46c Backport 2011-03-06T01:42:13Z!rgm@gnu.org from trunk.
* configure.in (FREETYPE_LIBS): Actually set it to something.

* configure.in: Don't zero-out FONTCONFIG_CFLAGS and
FONTCONFIG_LIBS when building with XFT (doing so is incorrect, as
Emacs directly uses fontconfig, and breaks building when using a
strict linker).
2011-03-13 18:36:47 -04:00
Chong Yidong
5ef342304d Bump version to 23.3.50 2011-03-11 12:17:33 -05:00
Jan D
0afb4571a7 Updates for compiling with Gtk+ 3.0 (--with-x-toolkit=gtk3).
* configure.in: Require 3.0 for --with-gtk3.  Add HAVE_GTK3.

* doc/emacs/xresources.texi (GTK resources): ~/.emacs.d/gtkrc does not work
for Gtk+ 3.

* src/gtkutil.c: Include gtkx.h if HAVE_GTK3.  If ! HAVE_GTK3, define
gdk_window_get_screen, gdk_window_get_geometry,
gdk_x11_window_lookup_for_display and GDK_KEY_g.
(xg_set_screen): Use DEFAULT_GDK_DISPLAY.
(xg_get_pixbuf_from_pixmap): New function.
(xg_get_pixbuf_from_pix_and_mask): Change parameters from GdkPixmap
to Pixmap, take frame as parameter, remove GdkColormap parameter.
Call xg_get_pixbuf_from_pixmap instead of
gdk_pixbuf_get_from_drawable.
(xg_get_image_for_pixmap): Do not make GdkPixmaps, call
xg_get_pixbuf_from_pix_and_mask with Pixmap parameters instead.
(xg_check_special_colors): Use GtkStyleContext and its functions
for HAVE_GTK3.
(xg_prepare_tooltip, xg_hide_tooltip): Call gdk_window_get_screen.
(xg_prepare_tooltip, create_dialog, menubar_map_cb)
(xg_update_frame_menubar, xg_tool_bar_detach_callback)
(xg_tool_bar_attach_callback, xg_update_tool_bar_sizes): Call
gtk_widget_get_preferred_size.
(xg_frame_resized): gdk_window_get_geometry only takes 5
parameters.
(xg_win_to_widget, xg_event_is_for_menubar): Call
gdk_x11_window_lookup_for_display.
(xg_set_widget_bg): New function.
(delete_cb): New function.
(xg_create_frame_widgets): connect delete-event to delete_cb.
Call xg_set_widget_bg.  Only set backgrund pixmap for ! HAVE_GTK3
(xg_set_background_color): Call xg_set_widget_bg.
(xg_set_frame_icon): Call xg_get_pixbuf_from_pix_and_mask.
(xg_create_scroll_bar): vadj is a GtkAdjustment for HAVE_GTK3.
Only call gtk_range_set_update_policy if ! HAVE_GTK3.
(xg_make_tool_item): Only connect xg_tool_bar_item_expose_callback
if ! HAVE_GTK3.
(update_frame_tool_bar): Call gtk_widget_hide.
(xg_initialize): Use GDK_KEY_g.

* src/xmenu.c (menu_position_func): Call gtk_widget_get_preferred_size.

* src/xsmfns.c (gdk_set_sm_client_id): Define to gdk_set_sm_client_id
if ! HAVE_GTK3
(x_session_initialize): Call gdk_x11_set_sm_client_id.

* src/xterm.c (XFillRectangle): Use cairo routines for HAVE_GTK3.
(x_term_init): Disable Xinput(2) with GDK_CORE_DEVICE_EVENTS.
Load ~/emacs.d/gtkrc only for ! HAVE_GTK3.

* src/xterm.h (DEFAULT_GDK_DISPLAY): New define.
(GDK_WINDOW_XID, gtk_widget_get_preferred_size): New defines
for ! HAVE_GTK3.
(GTK_WIDGET_TO_X_WIN): Use GDK_WINDOW_XID.
2011-03-08 09:34:55 +01:00
Glenn Morris
870d9cf691 * configure.in (FREETYPE_LIBS): Actually set it to something.
This was needed for linking a lucid toolkit build on a recent
Debian testing system.  Without this, it failed with:
ftfont.o: undefined reference to symbol 'FT_New_Face'
2011-03-05 17:42:13 -08:00
Glenn Morris
b612ffc94d Reduce some of the many, many variant spellings of NeXTstep.
http://lists.gnu.org/archive/html/emacs-devel/2010-10/msg00986.html
2011-03-03 00:03:01 -08:00
Chong Yidong
22770c84d5 Release logs for 23.3 release.
Regenerate configure and other release files.
2011-02-28 22:29:00 -05:00
Paul Eggert
a07b892ff1 Merge from mainline. 2011-02-24 22:42:06 -08:00
Glenn Morris
1e8dbdc6e8 Replace some obsolete autoconf syntax.
* configure.in: Replace obsolete AC_OUTPUT() with AC_CONFIG_FILES(),
AC_CONFIG_COMMANDS(), and AC_OUTPUT sans arguments.
2011-02-23 20:28:17 -08:00
Paul Eggert
ae0d725005 [ChangeLog]
Work around some portability problems with symlinks.
* Makefile.in (GNULIB_MODULES): Add lstat, readlink, symlink.
* configure.in (lstat, HAVE_LSTAT): Remove special hack.
* lib/lstat.c, lib/readlink.c, lib/stat.c, lib/symlink.c:
* m4/dos.m4, m4/lstat.m4, m4/readlink.m4, m4/stat.m4, m4/symlink.m4:
New files, automatically generated from gnulib.
* aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk:
* lib/stdlib.in.h, m4/gl-comp.m4, m4/stdlib_h.m4: Regenerate.

2011-02-22  Paul Eggert  <eggert@cs.ucla.edu>
[src/ChangeLog]
Work around some portability problems with symlinks.
* fileio.c (Frename_file, Fmake_symbolic_link, Ffile_symlink_p):
Simplify the code by assuming that the readlink and symlink calls
exist, even if they always fail on this host.
(Ffile_readable_p): Likewise, for fifos.
* config.in: Regenerate.
2011-02-22 11:30:07 -08:00