Sebastian Freundt [Wed, 4 Jan 2012 13:33:18 +0000 (13:33 +0000)]
Summary: chore, refactor nested function construct in event-Xt.c
Keywords: build clang
This changeset replaces the nested function thing used for modifier
mappings by ordinary function calls and a closure structure.
* src/ui/X11/event-Xt.c (x_reset_modifier_mapping): auto inline foo ->
Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
Sebastian Freundt [Wed, 4 Jan 2012 10:33:55 +0000 (10:33 +0000)]
Summary: chore, replace nested function construct by cpp equivalent
Keywords: build clang
This changeset replaces a nested function left-over, introduced to
provide closure (over the compile stack), by a more portable
pre-processor construct.
* src/regex.c (regex_compile): auto inline foo -> #define
Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
Steve Youngs [Tue, 3 Jan 2012 21:35:26 +0000 (07:35 +1000)]
Merge branch 'trivial'
* trivial:
fix my conflict fix
Steve Youngs [Tue, 3 Jan 2012 21:34:57 +0000 (07:34 +1000)]
fix my conflict fix
Signed-off-by: Steve Youngs <steve@sxemacs.org>
Steve Youngs [Tue, 3 Jan 2012 21:12:38 +0000 (07:12 +1000)]
Buildchain fixes and updates from Sebastian
* merges: (21 commits)
Summary: fix to fix, do not blank EMACSPACKAGEPATH when finding ... Keywords: bldchn
Summary: minor, also massage sxemacs calls in tests/ with batch env Keywords: bldchn
Summary: minor, put XCCLDFLAGS in libtool built binaries and libs Keywords: build icc
Summary: minor, provide XCCLDFLAGS to be passed on through libtool to the CC Keywords: build icc
Summary: minor, tweak SXE_CHECK_LINKER_FLAGS Keywords: bldchn
Summary: fix to fix, do not treat compiler flags as linker flags Keywords: bldchn
Summary: minor, specifically check for all optimisation flags Keywords: bldchn
Summary: fix, check for special diagnostic 10237 if CC=icc Keywords: bldchn
Summary: fix, use all CFLAGS for linker flag check Keywords: bldchn
Summary: minor, provide SXE_CHECK_COMPILER_XFLAG Keywords: bldchn
Summary: cosmetics, add meself to sppm.texi Keywords: boasting
Summary: minor, always pass on SXE_DYLD_PATH with pointers to the lwlibdir Keywords: bldchn
Summary: minor, call the linker (or the compiler front-end) when ... Keywords: bldchn
Summary: fix, carefully quote esd lib prepending Keywords: bldchn
Summary: minor, rewrite linker checks to use the compiler front-end and XFLAG Keywords: bldchn
Summary: cosmetics, add ar-lib wrapper script to git ignore file Keywords: bldchn
Summary: fix to cosmetics, add AM_PROG_AR conditionally Keywords: bldchn
Summary: cosmetics, add AM_PROG_AR like autoreconf suggests Keywords: bldchn
Summary: minor, check certain compiler flags regardless of CC flavour Keywords: bldchn
Summary: minor, provide C11 check for anonymous structs Keywords: bldchn
...
Conflicts:
src/Makefile.am -- trivial conflict resolved
Signed-off-by: Steve Youngs <steve@sxemacs.org>
Sebastian Freundt [Tue, 3 Jan 2012 11:54:04 +0000 (11:54 +0000)]
Merge branch 'bldchn' into next
* bldchn:
Summary: fix to fix, do not blank EMACSPACKAGEPATH when finding ... Keywords: bldchn
Summary: minor, also massage sxemacs calls in tests/ with batch env Keywords: bldchn
Sebastian Freundt [Tue, 3 Jan 2012 11:33:24 +0000 (11:33 +0000)]
Summary: fix to fix, do not blank EMACSPACKAGEPATH when finding ...
Keywords: bldchn
... load path shadows.
* src/Makefile.am (sxemacs.dmp): use BATCHENV in target so load paths
contain the current user's package paths
Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
Sebastian Freundt [Tue, 3 Jan 2012 10:52:29 +0000 (10:52 +0000)]
Summary: minor, also massage sxemacs calls in tests/ with batch env
Keywords: bldchn
Again, due to a libtool inconsistency, this changeset adds the location
of the newly built lwlib libary to the environment before calling
sxemacs, this time in tests/ so make check will work.
* tests/Makefile.am: add batch environment to sxemacs binary calls
Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
Sebastian Freundt [Tue, 3 Jan 2012 10:29:10 +0000 (10:29 +0000)]
Merge branch 'bld/icc' into next
* bld/icc:
Summary: minor, put XCCLDFLAGS in libtool built binaries and libs Keywords: build icc
Summary: minor, provide XCCLDFLAGS to be passed on through libtool to the CC Keywords: build icc
Sebastian Freundt [Tue, 3 Jan 2012 09:51:06 +0000 (09:51 +0000)]
Summary: minor, put XCCLDFLAGS in libtool built binaries and libs
Keywords: build icc
This changeset adds XCCLDFLAGS to all libs and binaries touched by
libtool, in general whenever there's a foo_la_bar foo_la_LDFLAGS or
AM_LDFLAGS should contain $(XCCLDFLAGS).
* modules/ase/Makefile.am: add XCCLDFLAGS
* modules/cl/Makefile.am: add XCCLDFLAGS
* modules/dbus/Makefile.am: add XCCLDFLAGS
* modules/ldap/Makefile.am: add XCCLDFLAGS
* src/Makefile.am: add XCCLDFLAGS
* src/ui/lwlib/Makefile.am: add XCCLDFLAGS
Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
Sebastian Freundt [Tue, 3 Jan 2012 09:23:44 +0000 (09:23 +0000)]
Summary: minor, provide XCCLDFLAGS to be passed on through libtool to the CC
Keywords: build icc
* m4/sxe-compiler.m4: put -static-foo into XCCLDFLAGS and AC_SUBST them
* m4/sxe-libtool.m4: prepend XCCFLAG (-XCClinker) to XCCLDFLAGS entries
Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
Steve Youngs [Tue, 3 Jan 2012 03:36:06 +0000 (13:36 +1000)]
MacOS libpng detection fixes from Nelson
* merges:
Fix detection of MacOS X native provided libpng
Overcome differences in order of CFLAGS vs argument list. In the process, make the libpng used in Mac OS be the one detected, not a difference between compile and runtime.
Sebastian Freundt [Mon, 2 Jan 2012 23:36:44 +0000 (23:36 +0000)]
Merge branch 'bldchn' into next
* bldchn:
Summary: minor, tweak SXE_CHECK_LINKER_FLAGS Keywords: bldchn
Summary: fix to fix, do not treat compiler flags as linker flags Keywords: bldchn
Summary: minor, specifically check for all optimisation flags Keywords: bldchn
Summary: fix, check for special diagnostic 10237 if CC=icc Keywords: bldchn
Summary: fix, use all CFLAGS for linker flag check Keywords: bldchn
Summary: minor, provide SXE_CHECK_COMPILER_XFLAG Keywords: bldchn
Sebastian Freundt [Mon, 2 Jan 2012 23:14:59 +0000 (23:14 +0000)]
Summary: minor, tweak SXE_CHECK_LINKER_FLAGS
Keywords: bldchn
Just to be symmetric provide a 4 argument version for macro
SXE_CHECK_LINKER_FLAGS, where the 4th argument is a list of additional
flags to pass to the linker, in analogy to the 4-arg version of
SXE_CHECK_COMPILER_FLAGS.
* m4/sxe-linker.m4: provide 4 argument SXE_CHECK_LINKER_FLAGS for
analogy reasons
Signed-off-by: Sebastian Freundt <hroptatyr@fresse.org>
Sebastian Freundt [Mon, 2 Jan 2012 23:11:06 +0000 (23:11 +0000)]
Summary: fix to fix, do not treat compiler flags as linker flags
Keywords: bldchn
This changeset reverts some checks for falsely dubbed linker flags which
are in fact compiler flags, namely -static-intel and -static-libgcc.
Because these flags need to be checked against the fully expanded
CFLAGS, the CFLAGS are generated beforehand and the checks themselves go
to FEATFLAGS.
* m4/sxe-linker.m4: fix, remove checks for -static-intel and
-static-libgcc
* m4/sxe-compiler.m4: check for -static-intel and -static-libgcc in the
context of FEATFLAGS
Signed-off-by: Sebastian Freundt <hroptatyr@fresse.org>
Nelson Ferreira [Mon, 2 Jan 2012 22:45:22 +0000 (17:45 -0500)]
Fix detection of MacOS X native provided libpng
* m4/sxe-mm.m4 (_SXE_MM_CHECK_PNG_VERSION): Use the previously
detected PNG LDFLAGS, CFLAGS and LIBS when determining version.
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
Sebastian Freundt [Mon, 2 Jan 2012 22:35:42 +0000 (22:35 +0000)]
Summary: minor, specifically check for all optimisation flags
Keywords: bldchn
* m4/sxe-compiler.m4: if --with-ridiculously-aggressive-optimisations is
not given perform a moderate check for optimisation flags instead of
just setting them
Signed-off-by: Sebastian Freundt <hroptatyr@fresse.org>
Sebastian Freundt [Mon, 2 Jan 2012 22:09:07 +0000 (22:09 +0000)]
Summary: fix, check for special diagnostic 10237 if CC=icc
Keywords: bldchn
* m4/sxe-compiler.m4: if CC=icc check for special diagnostic 10237 to
facilitate -static-intel
Signed-off-by: Sebastian Freundt <hroptatyr@fresse.org>
Sebastian Freundt [Mon, 2 Jan 2012 22:08:16 +0000 (22:08 +0000)]
Summary: fix, use all CFLAGS for linker flag check
Keywords: bldchn
* m4/sxe-linker.m4: actuaclly use the CFLAGS agreed upon so far to check
linker flags
Signed-off-by: Sebastian Freundt <hroptatyr@fresse.org>
Sebastian Freundt [Mon, 2 Jan 2012 21:41:43 +0000 (21:41 +0000)]
Summary: minor, provide SXE_CHECK_COMPILER_XFLAG
Keywords: bldchn
This changeset provides a convenience macro, SXE_CHECK_COMPILER_XFLAG,
to test how to pass on linker flags through the C compiler.
* m4/sxe-compiler.m4: new, SXE_CHECK_COMPILER_XFLAG
* m4/sxe-linker.m4: require SXE_CHECK_COMPILER_XFLAG
Signed-off-by: Sebastian Freundt <hroptatyr@fresse.org>
Sebastian Freundt [Mon, 2 Jan 2012 19:54:54 +0000 (19:54 +0000)]
Summary: cosmetics, add meself to sppm.texi
Keywords: boasting
* info/sppm.texi: add my git repo
Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
Sebastian Freundt [Mon, 2 Jan 2012 19:47:04 +0000 (19:47 +0000)]
Merge branch 'bldchn' into next
* bldchn:
Summary: minor, always pass on SXE_DYLD_PATH with pointers to the lwlibdir Keywords: bldchn
Summary: minor, call the linker (or the compiler front-end) when ... Keywords: bldchn
Summary: fix, carefully quote esd lib prepending Keywords: bldchn
Summary: minor, rewrite linker checks to use the compiler front-end and XFLAG Keywords: bldchn
Summary: cosmetics, add ar-lib wrapper script to git ignore file Keywords: bldchn
Summary: fix to cosmetics, add AM_PROG_AR conditionally Keywords: bldchn
Summary: cosmetics, add AM_PROG_AR like autoreconf suggests Keywords: bldchn
Summary: minor, check certain compiler flags regardless of CC flavour Keywords: bldchn
Summary: minor, provide C11 check for anonymous structs Keywords: bldchn
Summary: fix, use our compiler flag check macros to check for pthread{,s} Keywords: bldchn
Sebastian Freundt [Mon, 2 Jan 2012 19:45:44 +0000 (19:45 +0000)]
Summary: minor, always pass on SXE_DYLD_PATH with pointers to the lwlibdir
Keywords: bldchn
This changeset prepends calls to the undumped or dumped sxe binary with
BATCHENV which holds paths to the newly built lwlib libs. This fixes
builds that switch from say the athena widget kit to the lucid kit, as
the installed lwlib library will certainly not provide some symbols
needed with the new widget kit.
* lisp/Makefile.am: prepend all calls to sxe with BATCHENV
* modules/Makefile.am: prepend all calls to sxe with BATCHENV
* src/Makefile.am: prepend all calls to sxe with BATCHENV
Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
Sebastian Freundt [Mon, 2 Jan 2012 14:26:58 +0000 (14:26 +0000)]
Summary: minor, call the linker (or the compiler front-end) when ...
Keywords: bldchn
... checking for LD_ZFLAGs. This facilitates sparse and clang builds.
* m4/sxe-linker.m4 (SXE_CHECK_LD_ZFLAG): be a wrapper for
SXE_CHECK_LINKER_FLAGS
Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
Sebastian Freundt [Mon, 2 Jan 2012 14:23:33 +0000 (14:23 +0000)]
Summary: fix, carefully quote esd lib prepending
Keywords: bldchn
* configure.ac: fix, both esd-config and MM_LIBS quoted properly
Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
Sebastian Freundt [Mon, 2 Jan 2012 12:39:13 +0000 (12:39 +0000)]
Summary: minor, rewrite linker checks to use the compiler front-end and XFLAG
Keywords: bldchn
* configure.ac (SXE_CHECK_LINKER_FLAGS -> SXE_CHECK_LDFLAGS): rename, in
accordance to SXE_CHECK_CFLAGS
use new SXE_CHECK_LINKER_FLAGS macro to check for nocombreloc
* sxe-compiler.m4 (SXE_FEATFLAGS): move linker specific stuff to
SXE_CHECK_LDFLAGS in sxe-linker.m4
* sxe-linker.m4 (SXE_CHECK_LINKER_FLAGS): new, macro to check for flags
passed down to the linker via the compiler front-end, just as in
real-life
(SXE_CHECK_LDFLAGS): also check for compiler+linker specifics like
static-intel and static-libgcc
Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
Sebastian Freundt [Mon, 2 Jan 2012 10:39:25 +0000 (10:39 +0000)]
Summary: cosmetics, add ar-lib wrapper script to git ignore file
Keywords: bldchn
* .gitignore: add `ar-lib'
Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
Sebastian Freundt [Mon, 2 Jan 2012 10:38:18 +0000 (10:38 +0000)]
Summary: fix to cosmetics, add AM_PROG_AR conditionally
Keywords: bldchn
* configure.ac: add AM_PROG_AR conditionally
Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
Sebastian Freundt [Mon, 2 Jan 2012 10:37:02 +0000 (10:37 +0000)]
Summary: cosmetics, add AM_PROG_AR like autoreconf suggests
Keywords: bldchn
* configure.ac: add AM_PROG_AR
Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
Nelson Ferreira [Mon, 2 Jan 2012 04:40:14 +0000 (23:40 -0500)]
Overcome differences in order of CFLAGS vs argument list. In the process, make the libpng
used in Mac OS be the one detected, not a difference between compile and runtime.
* m4/sxe-summary.m4 (SXE_SUMMARY): Add output of c_switch_system,
ld_switch_general and ld_libs_system to the summary.
* src/Makefile.am (libsxecore_a_CPPFLAGS): Remove X_CFLAGS since
they are not (and should not be) needed.
* src/Makefile.am (libcruft_a_CPPFLAGS): Ditto.
* src/ui/TTY/Makefile.am (libsxeuiTTY_a_CPPFLAGS): Ditto.
* src/Makefile.am (AM_CPPFLAGS): Use c_switch_general instead of c_switch_system
* src/database/Makefile.am (AM_CPPFLAGS): Ditto.
* src/ent/Makefile.am (AM_CPPFLAGS): Ditto.
* src/events/Makefile.am (AM_CPPFLAGS): Ditto.
* src/media/Makefile.am (AM_CPPFLAGS): Ditto.
* src/media/Makefile.am (libmm_a_CPPFLAGS): Ditto.
* src/mem/Makefile.am (AM_CPPFLAGS): Ditto.
* src/mule/Makefile.am (AM_CPPFLAGS): Ditto.
* src/ui/Gtk/Makefile.am (AM_CPPFLAGS): Ditto.
* src/ui/Gtk/Makefile.am (libsxeuiGtk_a_CPPFLAGS): Ditto.
* src/ui/Makefile.am (AM_CPPFLAGS): Ditto.
* src/ui/Makefile.am (libsxeui_a_CPPFLAGS): Ditto.
* src/ui/TTY/Makefile.am (AM_CPPFLAGS): Ditto.
* src/ui/TTY/Makefile.am (libsxeuiTTY_a_CPPFLAGS): Ditto.
* src/ui/X11/Makefile.am (AM_CPPFLAGS): Ditto.
* src/ui/X11/Makefile.am (libsxeuiX11_a_CPPFLAGS): Ditto.
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
Sebastian Freundt [Sun, 1 Jan 2012 21:04:29 +0000 (21:04 +0000)]
Summary: minor, check certain compiler flags regardless of CC flavour
Keywords: bldchn
This changeset, in preparation to upcoming clang support, checks for
certain compiler flags (warnings at the moment) regardless of flavour.
It seems many compilers actually support a lot more gcc flags than gcc
itself, so check for them without checking for the flavour first.
This might break Sun studio build but Sun isn't shining anymore, is it?
* m4/sxe-compiler.m4: check for warning flags irrespective of CC flavour
Signed-off-by: Sebastian Freundt <hroptatyr@fresse.org>
Sebastian Freundt [Sun, 1 Jan 2012 20:56:47 +0000 (20:56 +0000)]
Summary: minor, provide C11 check for anonymous structs
Keywords: bldchn
This changeset provides a check for anon structs, an on-and-off feature
of gcc, and mandatory for C11 support.
* m4/sxe-compiler.m4 (SXE_CHECK_ANON_STRUCTS): simply check if anon
structs are possible, they ought to be when -std=gnu1x is selected but
that's only possible in gcc 4.6.1 it seems.
Signed-off-by: Sebastian Freundt <hroptatyr@fresse.org>
Sebastian Freundt [Sun, 1 Jan 2012 19:00:13 +0000 (19:00 +0000)]
Summary: fix, use our compiler flag check macros to check for pthread{,s}
Keywords: bldchn
This changeset properly checks for the flags -pthread and -pthreads.
The old case based system could not cope with new gcc's and clang's
error messages.
* configure.ac: fix, use SXE_CHECK_COMPILER_FLAGS, a macro defined in
m4/sxe-compiler.m4
Signed-off-by: Sebastian Freundt <hroptatyr@fresse.org>
Steve Youngs [Sun, 18 Dec 2011 03:41:16 +0000 (13:41 +1000)]
contrib updates from Nelson
* merges:
Add check for user email and name setup
Nelson Ferreira [Sat, 17 Dec 2011 04:51:26 +0000 (23:51 -0500)]
Add check for user email and name setup
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
Steve Youngs [Sat, 17 Dec 2011 03:30:44 +0000 (13:30 +1000)]
stress testing git workflow
* merges:
ensure we track origin/master
Added contrib script to help people setup their contributing branches
Steve Youngs [Sat, 17 Dec 2011 03:30:23 +0000 (13:30 +1000)]
ensure we track origin/master
Signed-off-by: Steve Youngs <steve@sxemacs.org>
Nelson Ferreira [Sat, 17 Dec 2011 03:08:30 +0000 (22:08 -0500)]
Added contrib script to help people setup their contributing branches
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
Steve Youngs [Sat, 17 Dec 2011 02:47:36 +0000 (12:47 +1000)]
stress testing git workflow
* merges:
Add copyright to autogen.sh
Nelson Ferreira [Sat, 17 Dec 2011 02:43:21 +0000 (21:43 -0500)]
Add copyright to autogen.sh
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
Steve Youngs [Fri, 16 Dec 2011 00:24:53 +0000 (10:24 +1000)]
contrib updates
* merges:
Add triggers to action to update contrib scripts
More remove tla hook references in contrib
Remove tla hook references in contrib
Warn that cl emod is not being built due to missing bison
Revert "Add copyright and license to autogen.sh"
Add copyright and license to autogen.sh
Add the directory for the dbus module
Add my copyright to configure.ac
Nelson Ferreira [Thu, 15 Dec 2011 05:07:25 +0000 (00:07 -0500)]
Add triggers to action to update contrib scripts
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
Nelson Ferreira [Thu, 15 Dec 2011 05:03:03 +0000 (00:03 -0500)]
More remove tla hook references in contrib
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
Nelson Ferreira [Thu, 15 Dec 2011 05:00:41 +0000 (00:00 -0500)]
Remove tla hook references in contrib
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
Nelson Ferreira [Thu, 15 Dec 2011 04:08:41 +0000 (23:08 -0500)]
Warn that cl emod is not being built due to missing bison
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
Nelson Ferreira [Thu, 15 Dec 2011 03:52:40 +0000 (22:52 -0500)]
Revert "Add copyright and license to autogen.sh"
This reverts commit
141c2bb87dad80dd319fe76517ec2429a10bebe6.
Nelson Ferreira [Thu, 15 Dec 2011 03:42:14 +0000 (22:42 -0500)]
Add copyright and license to autogen.sh
Nelson Ferreira [Thu, 15 Dec 2011 03:10:59 +0000 (22:10 -0500)]
Add the directory for the dbus module
Nelson Ferreira [Thu, 15 Dec 2011 02:36:21 +0000 (21:36 -0500)]
Add my copyright to configure.ac
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
Steve Youngs [Fri, 9 Dec 2011 23:34:12 +0000 (09:34 +1000)]
Autoconf/buildchain fixes/improvements from Nelson
* merges:
Enhance realpath and dirname checking.
Remove unneeded SXE_SHLIB_STUFF
Stop configure if there is no makeinfo
Nelson Ferreira [Fri, 9 Dec 2011 19:20:15 +0000 (14:20 -0500)]
Enhance realpath and dirname checking.
* m4/sxe-fs-funs.m4 (_SXE_CHECK_REALPATH_RETVAL): Do the checking
in a function so that any core will show which test cored.
* m4/sxe-fs-funs.m4 (_SXE_CHECK_REALPATH_RETVAL_OWNER): Ditto.
* m4/sxe-fs-funs.m4 (_SXE_CHECK_REALPATH_ON_PROTECTED_MEMORY): Ditto.
* m4/sxe-fs-funs.m4 (_SXE_CHECK_REALPATH_SANE_ON_NON_EXISTENT): Ditto.
* m4/sxe-fs-funs.m4 (_SXE_CHECK_DIRNAME_SIDE_EFFECT): Ditto.
* m4/sxe-fs-funs.m4 (_SXE_CHECK_DIRNAME_RETVAL_OWNER): Ditto.
* m4/sxe-fs-funs.m4 (_SXE_CHECK_DIRNAME_RETVAL_OWNER): Avoid a
core in MacOS X by pre-choosing sys as the result.
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
Nelson Ferreira [Fri, 9 Dec 2011 19:11:13 +0000 (14:11 -0500)]
Remove unneeded SXE_SHLIB_STUFF
* m4/sxe-linker.m4: As the title says. This is not called anywhere, so better to
take this ugly piece out. We have this logic already spreadout elsewhere anyway,
both in our own stuff and libtool...
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
Nelson Ferreira [Fri, 9 Dec 2011 16:04:10 +0000 (11:04 -0500)]
Stop configure if there is no makeinfo
* m4/sxe-bldchain-progs.m4 (SXE_PROG_MAKEINFO): Detection of
makeinfo. Since autoconf will actually define one using missing,
we kinda need to execute --version to make sure it is actually
real.
* m4/sxe-bldchain-progs.m4 (SXE_CHECK_BUILDCHAIN): Add call to
SXE_PROG_MAKEINFO
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
Steve Youngs [Tue, 6 Dec 2011 23:02:21 +0000 (09:02 +1000)]
Configure fix for Solaris
* merges:
Fix configure in solaris
Nelson Ferreira [Tue, 6 Dec 2011 20:58:09 +0000 (15:58 -0500)]
Fix configure in solaris
* m4/sxe-aux.m4 (SXE_CONSECUTIVE_UNDUP): Try use detected awk which will allow for better results. On solaris this should be either the xpg4 one, or gawk.
* m4/sxe-aux.m4 (SXE_UNDUP): Ditto
* m4/sxe-summary.m4 (SXE_SUMMARY): Ditto
* m4/sxe-crypto.m4 (SXE_OPENSSL_VERSION): Try to use detected grep which will allow for -q. On solaris this should be either gnu grep or the xpg4 one.
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
Steve Youngs [Mon, 5 Dec 2011 00:17:52 +0000 (10:17 +1000)]
INSTALL/PROBLEMS updates
* merges:
Give a little more detail about crash reporting on MacOS X
Add resolution to missing makeinfo while building
Update link to mpc library. Warn of texinfo needed to build from git. Small typo fix
Nelson Ferreira [Sun, 4 Dec 2011 04:09:59 +0000 (23:09 -0500)]
Give a little more detail about crash reporting on MacOS X
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
Nelson Ferreira [Sun, 4 Dec 2011 03:34:50 +0000 (22:34 -0500)]
Merge branch 'master' of git.sxemacs.org/sxemacs
Nelson Ferreira [Sun, 4 Dec 2011 02:35:41 +0000 (21:35 -0500)]
Add resolution to missing makeinfo while building
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
Nelson Ferreira [Sun, 4 Dec 2011 02:32:35 +0000 (21:32 -0500)]
Update link to mpc library. Warn of texinfo needed to build from git. Small typo fix
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
Steve Youngs [Sat, 3 Dec 2011 22:23:38 +0000 (08:23 +1000)]
Fix mpc detection
* merges:
Fix detection and usage of mpc in newer versions (like mpc 0.9)
Nelson Ferreira [Sat, 3 Dec 2011 08:02:40 +0000 (03:02 -0500)]
Fix detection and usage of mpc in newer versions (like mpc 0.9)
* m4/sxe-maths.m4 (_SXE_CHECK_MPC): check for mpc_init and
mpc_set_ui_fr which were recently removed so that they can be
emulated for now. Also determine if mpc can be inited (and thus
used) by making sure one of mpc_init or mpc_init2 is available.
* m4/sxe-maths.m4 (SXE_CHECK_MPC_LIBS): check for mpc_init2 and
mpc_set_ui_fr too.
* src/ent/ent-mpc.h (bigc_init): conditional definition on whether
mpc_init or mpc_init2 is available.
* src/ent/ent-mpc.c: define mpc_set_ui_fr based on the MPC_SET_X_Y
macro if available. Abort compile if not available.
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
Steve Youngs [Sat, 3 Dec 2011 00:33:27 +0000 (10:33 +1000)]
Change mod/pkg load path (user dirs)
* merges:
Also make sxemacs packages of user home be looked up before xemacs ones, not just the system
Nelson Ferreira [Fri, 2 Dec 2011 14:55:18 +0000 (09:55 -0500)]
Also make sxemacs packages of user home be looked up before xemacs ones, not just the system
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
Nelson Ferreira [Fri, 2 Dec 2011 14:49:18 +0000 (09:49 -0500)]
Merge branch 'master' of git.sxemacs.org/sxemacs
Steve Youngs [Fri, 2 Dec 2011 06:57:21 +0000 (16:57 +1000)]
Change mod/pkg load path
* merges:
Revert order changer for module paths
Enhance the module and package lookup paths
Nelson Ferreira [Fri, 2 Dec 2011 06:05:32 +0000 (01:05 -0500)]
Merge branch 'master' of git.sxemacs.org/sxemacs
Nelson Ferreira [Fri, 2 Dec 2011 06:04:33 +0000 (01:04 -0500)]
Revert order changer for module paths
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
Nelson Ferreira [Fri, 2 Dec 2011 03:06:31 +0000 (22:06 -0500)]
Enhance the module and package lookup paths
* configure.ac: lookup sxemacs-<version>/<configuration> before sxemacs/<configuration> for modules
* configure.ac: looup sxemacs-packages before xemacs-packages
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
Steve Youngs [Fri, 2 Dec 2011 02:46:08 +0000 (12:46 +1000)]
Configure summary clean up
* merges:
[ Replace this line with a one-line summary of the changes ]
Nelson Ferreira [Fri, 2 Dec 2011 01:34:28 +0000 (20:34 -0500)]
[ Replace this line with a one-line summary of the changes ]
* configure.ac: Properly quote eval so that ~ does not get expanded
* configure.ac: Remove double ':' on package path
* m4/sxe-summary.m4 (SXE_SUMMARY): Use awk instead of SED so that newlines are properly introduced in all cases
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
Steve Youngs [Thu, 1 Dec 2011 22:16:00 +0000 (08:16 +1000)]
Fix pdump on Mac OS Lion from Nelson
* merges:
Disable PIE in MacOS X Lion, thus pdump works again...
Cosmetic fixes to the configuration summary (ie Installation)
Nelson Ferreira [Thu, 1 Dec 2011 17:37:29 +0000 (12:37 -0500)]
Disable PIE in MacOS X Lion, thus pdump works again...
* configure.ac: If darwin linker supports -no_pie, add it
* m4/sxe-bldenv.m4 (SXE_LD_NO_PIE): New function to check if the
linker supports -no_pie.
* m4/sxe-compiler.m4 (SXE_CHECK_CC_CHAR): Invoke the linker check for -no_pie
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
Nelson Ferreira [Thu, 1 Dec 2011 16:10:21 +0000 (11:10 -0500)]
Cosmetic fixes to the configuration summary (ie Installation)
* m4/sxe-summary.m4 (SXE_SUMMARY): Fix the Runtime behavior prefix output. Properly indent the search paths
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
Steve Youngs [Thu, 1 Dec 2011 13:28:40 +0000 (23:28 +1000)]
configure cleanup from Nelson
* merges:
Deduplicate options to compiler and linker, as well as consecutive LIBS
Nelson Ferreira [Thu, 1 Dec 2011 08:32:47 +0000 (03:32 -0500)]
Deduplicate options to compiler and linker, as well as consecutive LIBS
* configure.ac: Use SXE_{APPEND,PREPEND}_UNDUP do add to c_switch_site and ld_switch_site
* configure.ac: Ditto for adding to c_switch_gtk
* configure.ac: Ditto for adding to X_CFLAGS
* configure.ac: Ditto for adding to MM_CFLAGS, MM_LDFLAGS and MM_CPPFLAGS
* configure.ac: Use SXE_CONSECUTIVE_UNDUP instead of SXE_SPACE to remove consecutive dups on libs_xauth
* configure.ac: Ditto for ld_libs_general, ld_libs_window_system and ld_libs_all
* configure.ac: Use SXE_UNDUP to remove dups from {c,ld}_switch_{general,window_system,all}
* configure.ac: Remove extra verbose output of the switches, since this was moved to sxe-summary.m4
* m4/sxe-summary.m4 (SXE_SUMMARY): Provide output of {c,ld}_switch_{general,window_system,all}
* m4/sxe-summary.m4 (SXE_SUMMARY): Don't use -e on echo, since not all shells honor it
* m4/sxe-bldenv.m4: Use SXE_{APPEND,PREPEND}_UNDUP do add to LD_FLAGS, CPPFLAGS, ld_switch_{run,system,site}
* m4/sxe-compiler.m4: Use SXE_{APPEND,PREPEND}_UNDUP do add to c_switch_{site,system}, CFLAGS
* m4/sxe-crypto.m4: Use SXE_{APPEND,PREPEND}_UNDUP do add to CPPFLAGS, LDFLAGS
* m4/sxe-libtool.m4: Use SXE_{APPEND,PREPEND}_UNDUP do add to LDFLAGS
* m4/sxe-mm.m4: Use SXE_{APPEND,PREPEND}_UNDUP do add to {c,ld}_switch_site
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
Steve Youngs [Mon, 28 Nov 2011 03:03:43 +0000 (13:03 +1000)]
typo fix
Signed-off-by: Steve Youngs <steve@sxemacs.org>
Steve Youngs [Mon, 28 Nov 2011 02:51:50 +0000 (12:51 +1000)]
Close EMchat bug #129
* merges:
Bug 129 - Bad conversion to snprintf
Nelson Ferreira [Mon, 28 Nov 2011 02:28:18 +0000 (21:28 -0500)]
Bug 129 - Bad conversion to snprintf
* src/filelock.c (lock_file): Compute size of malloc and use it assert
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
Steve Youngs [Sun, 27 Nov 2011 21:07:16 +0000 (07:07 +1000)]
Wand updates from Evgeny
* merges:
[add] command: M-x Wand-list-patterns RET
lg [Sun, 27 Nov 2011 19:00:52 +0000 (22:00 +0300)]
[add] command: M-x Wand-list-patterns RET
[add] command: M-x Wand-list-composite-ops RET
[add] operation: preview-op, powerful shit to preview some operations
with different params
[add] operation: posterize
[add] operation: pattern
[enh] Wand-redisplay: image-wand can be changed during operation
[enh] make a use of (window-displayed-text-pixel-height)
Signed-off-by: lg <lg@lg-desktop.(none)>
Steve Youngs [Wed, 16 Nov 2011 04:33:50 +0000 (14:33 +1000)]
OpenSSL build fixes from Nelson
* merges:
Prevent inexistence of openssl ssl_verify_cert_chain from breaking the build
Nelson Ferreira [Wed, 16 Nov 2011 01:55:54 +0000 (20:55 -0500)]
Prevent inexistence of openssl ssl_verify_cert_chain from breaking the build
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
Steve Youngs [Tue, 15 Nov 2011 11:33:59 +0000 (21:33 +1000)]
OpenSSL build fixes from Nelson
* merges:
Prevent inexistence of openssl server/client methods from breaking the build
Nelson Ferreira [Tue, 15 Nov 2011 08:59:38 +0000 (03:59 -0500)]
Prevent inexistence of openssl server/client methods from breaking the build
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
Steve Youngs [Fri, 11 Nov 2011 01:36:47 +0000 (11:36 +1000)]
Add prompt stack for recursive minibuffer
* merges:
[add] minibuffer prompt stack for use with recursive minibuffers
Nelson Ferreira [Thu, 10 Nov 2011 22:54:04 +0000 (17:54 -0500)]
Merge branch 'master' of git.sxemacs.org/sxemacs
Zajcev Evgeny [Thu, 10 Nov 2011 10:57:11 +0000 (13:57 +0300)]
[add] minibuffer prompt stack for use with recursive minibuffers
Signed-off-by: Zajcev Evgeny <zevlg@yandex.ru>
Nelson Ferreira [Fri, 4 Nov 2011 04:14:36 +0000 (00:14 -0400)]
Merge branch 'master' of git.sxemacs.org/sxemacs
Steve Youngs [Tue, 25 Oct 2011 00:11:33 +0000 (10:11 +1000)]
Merge branch 'emailed-patches'
JD Horelick [Mon, 24 Oct 2011 10:16:12 +0000 (06:16 -0400)]
Fix compilation when MULE is disabled, due to a missing ifdef.
Signed-off-by: Steve Youngs <steve@sxemacs.org>
Nelson Ferreira [Wed, 19 Oct 2011 15:45:36 +0000 (11:45 -0400)]
Merge branch 'master' of git.sxemacs.org/sxemacs
Steve Youngs [Wed, 12 Oct 2011 00:21:12 +0000 (10:21 +1000)]
Coverity fixes from Nelson
* merges:
Remove unused variable
Fix compile of previous commit
Coverity fix CID:92 NEGATIVE_RETURNS
Coverity fix. CID:135 NULL_RETURNS
More binary files...
Coverity fix CID:202 REVERSE_INULL
Coverity fix CI:203 REVERSE_INULL
Coverity fixes CID:45 FORWARD_NULL
Nelson Ferreira [Tue, 11 Oct 2011 21:19:36 +0000 (17:19 -0400)]
Merge branch 'master' of git.sxemacs.org/sxemacs
Nelson Ferreira [Tue, 11 Oct 2011 01:29:16 +0000 (21:29 -0400)]
Remove unused variable
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
Nelson Ferreira [Tue, 11 Oct 2011 01:28:41 +0000 (21:28 -0400)]
Fix compile of previous commit
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
Nelson Ferreira [Tue, 11 Oct 2011 01:14:35 +0000 (21:14 -0400)]
Coverity fix CID:92 NEGATIVE_RETURNS
* lib-src/movemail.c (main): Make sure read was successful before
trying to write..
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
Nelson Ferreira [Tue, 11 Oct 2011 00:36:35 +0000 (20:36 -0400)]
Coverity fix. CID:135 NULL_RETURNS
* src/ui/X11/event-Xt.c (x_to_emacs_keysym): make fure there is a
frame before dereferencing to get the XIC.
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
Nelson Ferreira [Tue, 11 Oct 2011 00:29:54 +0000 (20:29 -0400)]
More binary files...
* lisp/files.el (binary-file-regexps): Following the lead from a
recent XEmacs commit, enhance the list of known binary files.
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
Nelson Ferreira [Mon, 10 Oct 2011 23:56:12 +0000 (19:56 -0400)]
Coverity fix CID:202 REVERSE_INULL
* src/mem/ralloc.c (update_heap_bloc_correspondence): Make sure heap is not NULL before dereference
Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>