Mercurial > hg > xemacs-beta
comparison configure.in @ 2367:ecf1ebac70d8
[xemacs-hg @ 2004-11-04 23:05:23 by ben]
commit mega-patch
configure.in: Turn off -Winline and -Wchar-subscripts.
Use the right set of cflags when compiling modules.
Rewrite ldap configuration to separate the inclusion of lber
(needed in recent Cygwin) from the basic checks for the
needed libraries.
add a function for MAKE_JUNK_C; initially code was added to
generate xemacs.def using this, but it will need to be rewritten.
add an rm -f for junk.c to avoid weird Cygwin bug with cp -f onto
an existing file.
Sort list of auto-detected functions and eliminate unused checks for
stpcpy, setlocale and getwd.
Add autodetection of Cygwin scanf problems
BETA: Rewrite section on configure to indicate what flags are important
and what not.
digest-doc.c, make-dump-id.c, profile.c, sorted-doc.c: Add proper decls for main().
make-msgfile.c: Document that this is old junk.
Move proposal to text.c.
make-msgfile.lex: Move proposal to text.c.
make-mswin-unicode.pl: Convert error-generating code so that the entire message will
be seen as a single unrecognized token.
mule/mule-ccl.el: Update docs.
lispref/mule.texi: Update CCL docs.
ldap/eldap.c: Mule-ize.
Use EXTERNAL_LIST_LOOP_2 instead of deleted EXTERNAL_LIST_LOOP.
* XEmacs 21.5.18 "chestnut" is released.
---------------------------------------------------------------
MULE-RELATED WORK:
---------------------------------------------------------------
---------------------------
byte-char conversion
---------------------------
buffer.c, buffer.h, insdel.c, text.c: Port FSF algorithm for byte-char conversion, replacing broken
previous version. Track the char position of the gap. Add
functions to do char-byte conversion downwards as well as upwards.
Move comments about algorithm workings to internals manual.
---------------------------
work on types
---------------------------
alloc.c, console-x-impl.h, dump-data.c, dump-data.h, dumper.c, dialog-msw.c, dired-msw.c, doc.c, editfns.c, esd.c, event-gtk.h, event-msw.c, events.c, file-coding.c, file-coding.h, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-x.c, glyphs.c, glyphs.h, gui.c, hpplay.c, imgproc.c, intl-win32.c, lrecord.h, lstream.c, keymap.c, lisp.h, libsst.c, linuxplay.c, miscplay.c, miscplay.h, mule-coding.c, nas.c, nt.c, ntheap.c, ntplay.c, objects-msw.c, objects-tty.c, objects-x.c, print.c, process-nt.c, process.c, redisplay.h, select-common.h, select-gtk.c, select-x.c, sgiplay.c, sound.c, sound.h, sunplay.c, sysfile.h, sysdep.c, syswindows.h, text.c, unexnt.c, win32.c, xgccache.c: Further work on types. This creates a full set of types for all
the basic semantics of `char' that I have so far identified, so that
its semantics can always be identified for the purposes of proper
Mule-safe code, and the raw use of `char' always avoided.
(1) More type renaming, for consistency of naming.
Char_ASCII -> Ascbyte
UChar_ASCII -> UAscbyte
Char_Binary -> CBinbyte
UChar_Binary -> Binbyte
SChar_Binary -> SBinbyte
(2) Introduce Rawbyte, CRawbyte, Boolbyte, Chbyte, UChbyte, and
Bitbyte and use them.
(3) New types Itext, Wexttext and Textcount for separating out
the concepts of bytes and textual units (different under UTF-16
and UTF-32, which are potential internal encodings).
(4) qxestr*_c -> qxestr*_ascii.
lisp.h: New; goes with other qxe() functions. #### Maybe goes in a
different section.
lisp.h: Group generic int-type defs together with EMACS_INT defs.
lisp.h: * lisp.h (WEXTTEXT_IS_WIDE)
New defns.
lisp.h: New type to replace places where int occurs as a boolean.
It's signed because occasionally people may want to use -1 as
an error value, and because unsigned ints are viral -- see comments
in the internals manual against using them.
dynarr.c: int -> Bytecount.
---------------------------
Mule-izing
---------------------------
device-x.c: Partially Mule-ize.
dumper.c, dumper.h: Mule-ize. Use Rawbyte. Use stderr_out not printf. Use wext_*().
sysdep.c, syswindows.h, text.c: New Wexttext API for manipulation of external text that may be
Unicode (e.g. startup code under Windows).
emacs.c: Mule-ize. Properly deal with argv in external encoding.
Use wext_*() and Wexttext. Use Rawbyte.
#if 0 some old junk on SCO that is unlikely to be correct.
Rewrite allocation code in run-temacs.
emacs.c, symsinit.h, win32.c: Rename win32 init function and call it even earlier, to
initialize mswindows_9x_p even earlier, for use in startup code
(XEUNICODE_P).
process.c: Use _wenviron not environ under Windows, to get Unicode environment
variables.
event-Xt.c: Mule-ize drag-n-drop related stuff.
dragdrop.c, dragdrop.h, frame-x.c: Mule-ize.
text.h: Add some more stand-in defines for particular kinds of conversion;
use in Mule-ization work in frame-x.c etc.
---------------------------
Freshening
---------------------------
intl-auto-encap-win32.c, intl-auto-encap-win32.h: Regenerate.
---------------------------
Unicode-work
---------------------------
intl-win32.c, syswindows.h: Factor out common options to MultiByteToWideChar and
WideCharToMultiByte. Add convert_unicode_to_multibyte_malloc()
and convert_unicode_to_multibyte_dynarr() and use. Add stuff for
alloca() conversion of multibyte/unicode.
alloc.c: Use dfc_external_data_len() in case of unicode coding system.
alloc.c, mule-charset.c: Don't zero out and reinit charset Unicode tables. This fucks up
dump-time loading. Anyway, either we load them at dump time or
run time, never both.
unicode.c: Dump the blank tables as well.
---------------------------------------------------------------
DOCUMENTATION, MOSTLY MULE-RELATED:
---------------------------------------------------------------
EmacsFrame.c, emodules.c, event-Xt.c, fileio.c, input-method-xlib.c, mule-wnnfns.c, redisplay-gtk.c, redisplay-tty.c, redisplay-x.c, regex.c, sysdep.c: Add comment about Mule work needed.
text.h: Add more documentation describing why DFC routines were not written
to return their value. Add some other DFC documentation.
console-msw.c, console-msw.h: Add pointer to docs in win32.c.
emacs.c: Add comments on sources of doc info.
text.c, charset.h, unicode.c, intl-win32.c, intl-encap-win32.c, text.h, file-coding.c, mule-coding.c: Collect background comments and related to text matters and
internationalization, and proposals for work to be done, in text.c
or Internals manual, stuff related to specific textual API's in
text.h, and stuff related to internal implementation of Unicode
conversion in unicode.c. Put lots of pointers to the comments to
make them easier to find.
s/mingw32.h, s/win32-common.h, s/win32-native.h, s/windowsnt.h, win32.c: Add bunches of new documentation on the different kinds of
builds and environments under Windows and how they work.
Collect this info in win32.c. Add pointers to these docs in
the relevant s/* files.
emacs.c: Document places with long comments.
Remove comment about exiting, move to internals manual, put
in pointer.
event-stream.c: Move docs about event queues and focus to internals manual, put
in pointer.
events.h: Move docs about event stream callbacks to internals manual, put
in pointer.
profile.c, redisplay.c, signal.c: Move documentation to the Internals manual.
process-nt.c: Add pointer to comment in win32-native.el.
lisp.h: Add comments about some comment conventions.
lisp.h: Add comment about the second argument.
device-msw.c, redisplay-msw.c: @@#### comments are out-of-date.
---------------------------------------------------------------
PDUMP WORK (MOTIVATED BY UNICODE CHANGES)
---------------------------------------------------------------
alloc.c, buffer.c, bytecode.c, console-impl.h, console.c, device.c, dumper.c, lrecord.h, elhash.c, emodules.h, events.c, extents.c, frame.c, glyphs.c, glyphs.h, mule-charset.c, mule-coding.c, objects.c, profile.c, rangetab.c, redisplay.c, specifier.c, specifier.h, window.c, lstream.c, file-coding.h, file-coding.c: PDUMP:
Properly implement dump_add_root_block(), which never worked before,
and is necessary for dumping Unicode tables.
Pdump name changes for accuracy:
XD_STRUCT_PTR -> XD_BLOCK_PTR.
XD_STRUCT_ARRAY -> XD_BLOCK_ARRAY.
XD_C_STRING -> XD_ASCII_STRING.
*_structure_* -> *_block_*.
lrecord.h: some comments added about
dump_add_root_block() vs dump_add_root_block_ptr().
extents.c: remove incorrect comment about pdump problems with gap array.
---------------------------------------------------------------
ALLOCATION
---------------------------------------------------------------
abbrev.c, alloc.c, bytecode.c, casefiddle.c, device-msw.c, device-x.c, dired-msw.c, doc.c, doprnt.c, dragdrop.c, editfns.c, emodules.c, file-coding.c, fileio.c, filelock.c, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-x.c, gui-msw.c, gui-x.c, imgproc.c, intl-win32.c, lread.c, menubar-gtk.c, menubar.c, nt.c, objects-msw.c, objects-x.c, print.c, process-nt.c, process-unix.c, process.c, realpath.c, redisplay.c, search.c, select-common.c, symbols.c, sysdep.c, syswindows.h, text.c, text.h, ui-byhand.c: New macros {alloca,xnew}_{itext,{i,ext,raw,bin,asc}bytes} for
more convenient allocation of these commonly requested items.
Modify functions to use alloca_ibytes, alloca_array, alloca_extbytes,
xnew_ibytes, etc. also XREALLOC_ARRAY, xnew.
alloc.c: Rewrite the allocation functions to factor out repeated code.
Add assertions for freeing dumped data.
lisp.h: Moved down and consolidated with other allocation stuff.
lisp.h, dynarr.c: New functions for allocation that's very efficient when mostly in
LIFO order.
lisp.h, text.c, text.h: Factor out some stuff for general use by alloca()-conversion funs.
text.h, lisp.h: Fill out convenience routines for allocating various kinds of
bytes and put them in lisp.h. Use them in place of xmalloc(),
ALLOCA().
text.h: Fill out the convenience functions so the _MALLOC() kinds match
the alloca() kinds.
---------------------------------------------------------------
ERROR-CHECKING
---------------------------------------------------------------
text.h: Create ASSERT_ASCTEXT_ASCII() and ASSERT_ASCTEXT_ASCII_LEN()
from similar Eistring checkers and change the Eistring checkers to
use them instead.
---------------------------------------------------------------
MACROS IN LISP.H
---------------------------------------------------------------
lisp.h: Redo GCPRO declarations. Create a "base" set of functions that can
be used to generate any kind of gcpro sets -- regular, ngcpro,
nngcpro, private ones used in GC_EXTERNAL_LIST_LOOP_2.
buffer.c, callint.c, chartab.c, console-msw.c, device-x.c, dialog-msw.c, dired.c, extents.c, ui-gtk.c, rangetab.c, nt.c, mule-coding.c, minibuf.c, menubar-msw.c, menubar.c, menubar-gtk.c, lread.c, lisp.h, gutter.c, glyphs.c, glyphs-widget.c, fns.c, fileio.c, file-coding.c, specifier.c: Eliminate EXTERNAL_LIST_LOOP, which does not check for circularities.
Use EXTERNAL_LIST_LOOP_2 instead or EXTERNAL_LIST_LOOP_3
or EXTERNAL_PROPERTY_LIST_LOOP_3 or GC_EXTERNAL_LIST_LOOP_2
(new macro). Removed/redid comments on EXTERNAL_LIST_LOOP.
---------------------------------------------------------------
SPACING FIXES
---------------------------------------------------------------
callint.c, hftctl.c, number-gmp.c, process-unix.c: Spacing fixes.
---------------------------------------------------------------
FIX FOR GEOMETRY PROBLEM IN FIRST FRAME
---------------------------------------------------------------
unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by
release 1.5.12 of Cygwin].
toolbar.c: bug fix for problem of initial frame being 77 chars wide on Windows.
will be overridden by my other ws.
---------------------------------------------------------------
FIX FOR LEAKING PROCESS HANDLES:
---------------------------------------------------------------
process-nt.c: Fixes for leaking handles. Inspired by work done by Adrian Aichner
<adrian@xemacs.org>.
---------------------------------------------------------------
FIX FOR CYGWIN BUG (Unicode-related):
---------------------------------------------------------------
unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by
release 1.5.12 of Cygwin].
---------------------------------------------------------------
WARNING FIXES:
---------------------------------------------------------------
console-stream.c: `reinit' is unused.
compiler.h, event-msw.c, frame-msw.c, intl-encap-win32.c, text.h: Add stuff to deal with ANSI-aliasing warnings I got.
regex.c: Gather includes together to avoid warning.
---------------------------------------------------------------
CHANGES TO INITIALIZATION ROUTINES:
---------------------------------------------------------------
buffer.c, emacs.c, console.c, debug.c, device-x.c, device.c, dragdrop.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, font-lock.c, frame-msw.c, glyphs-widget.c, glyphs.c, gui-x.c, insdel.c, lread.c, lstream.c, menubar-gtk.c, menubar-x.c, minibuf.c, mule-wnnfns.c, objects-msw.c, objects.c, print.c, scrollbar-x.c, search.c, select-x.c, text.c, undo.c, unicode.c, window.c, symsinit.h: Call reinit_*() functions directly from emacs.c, for clarity.
Factor out some redundant init code. Move disallowed stuff
that had crept into vars_of_glyphs() into complex_vars_of_glyphs().
Call init_eval_semi_early() from eval.c not in the middle of
vars_of_() in emacs.c since there should be no order dependency
in the latter calls.
---------------------------------------------------------------
ARMAGEDDON:
---------------------------------------------------------------
alloc.c, emacs.c, lisp.h, print.c: Rename inhibit_non_essential_printing_operations to
inhibit_non_essential_conversion_operations.
text.c: Assert on !inhibit_non_essential_conversion_operations.
console-msw.c, print.c: Don't do conversion in SetConsoleTitle or FindWindow to avoid
problems during armageddon. Put #errors for NON_ASCII_INTERNAL_FORMAT
in places where problems would arise.
---------------------------------------------------------------
CHANGES TO THE BUILD PROCEDURE:
---------------------------------------------------------------
config.h.in, s/cxux.h, s/usg5-4-2.h, m/powerpc.h: Add comment about correct ordering of this file.
Rearrange everything to follow this -- put all #undefs together
and before the s&m files. Add undefs for HAVE_ALLOCA, C_ALLOCA,
BROKEN_ALLOCA_IN_FUNCTION_CALLS, STACK_DIRECTION. Remove unused
HAVE_STPCPY, HAVE_GETWD, HAVE_SETLOCALE.
m/gec63.h: Deleted; totally broken, not used at all, not in FSF.
m/7300.h, m/acorn.h, m/alliant-2800.h, m/alliant.h, m/altos.h, m/amdahl.h, m/apollo.h, m/att3b.h, m/aviion.h, m/celerity.h, m/clipper.h, m/cnvrgnt.h, m/convex.h, m/cydra5.h, m/delta.h, m/delta88k.h, m/dpx2.h, m/elxsi.h, m/ews4800r.h, m/gould.h, m/hp300bsd.h, m/hp800.h, m/hp9000s300.h, m/i860.h, m/ibmps2-aix.h, m/ibmrs6000.h, m/ibmrt-aix.h, m/ibmrt.h, m/intel386.h, m/iris4d.h, m/iris5d.h, m/iris6d.h, m/irist.h, m/isi-ov.h, m/luna88k.h, m/m68k.h, m/masscomp.h, m/mg1.h, m/mips-nec.h, m/mips-siemens.h, m/mips.h, m/news.h, m/nh3000.h, m/nh4000.h, m/ns32000.h, m/orion105.h, m/pfa50.h, m/plexus.h, m/pmax.h, m/powerpc.h, m/pyrmips.h, m/sequent-ptx.h, m/sequent.h, m/sgi-challenge.h, m/symmetry.h, m/tad68k.h, m/tahoe.h, m/targon31.h, m/tekxd88.h, m/template.h, m/tower32.h, m/tower32v3.h, m/ustation.h, m/vax.h, m/wicat.h, m/xps100.h: Delete C_ALLOCA, HAVE_ALLOCA, STACK_DIRECTION,
BROKEN_ALLOCA_IN_FUNCTION_CALLS. All of this is auto-detected.
When in doubt, I followed recent FSF sources, which also have
these things deleted.
author | ben |
---|---|
date | Thu, 04 Nov 2004 23:08:28 +0000 |
parents | e219f63b9c24 |
children | df0455455d17 |
comparison
equal
deleted
inserted
replaced
2366:2a392e0c390a | 2367:ecf1ebac70d8 |
---|---|
4 #### Guess values for system-dependent variables and create Makefiles. | 4 #### Guess values for system-dependent variables and create Makefiles. |
5 #### Generated automatically using autoconf version] AC_ACVERSION [ | 5 #### Generated automatically using autoconf version] AC_ACVERSION [ |
6 #### Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. | 6 #### Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. |
7 #### Copyright (C) 1993-1995 Board of Trustees, University of Illinois. | 7 #### Copyright (C) 1993-1995 Board of Trustees, University of Illinois. |
8 #### Copyright (C) 1996, 1997 Sun Microsystems, Inc. | 8 #### Copyright (C) 1996, 1997 Sun Microsystems, Inc. |
9 #### Copyright (C) 1995, 1996, 2002, 2003 Ben Wing. | 9 #### Copyright (C) 1995, 1996, 2002, 2003, 2004 Ben Wing. |
10 #### Copyright (C) 2000, 2001 Martin Buchholz. | 10 #### Copyright (C) 2000, 2001 Martin Buchholz. |
11 #### Copyright (C) 1998, 1999 J. Kean Johnston. | 11 #### Copyright (C) 1998, 1999 J. Kean Johnston. |
12 | 12 |
13 ### Don't edit this script! | 13 ### Don't edit this script! |
14 ### This script was automatically generated by the `autoconf' program | 14 ### This script was automatically generated by the `autoconf' program |
2052 sol2 ) cflags_warning="-v" ;; | 2052 sol2 ) cflags_warning="-v" ;; |
2053 esac | 2053 esac |
2054 elif test "$CC" = "xlc"; then | 2054 elif test "$CC" = "xlc"; then |
2055 cflags_warning="-qinfo" | 2055 cflags_warning="-qinfo" |
2056 elif test "$GCC" = "yes"; then | 2056 elif test "$GCC" = "yes"; then |
2057 cflags_warning="-Wall -Wno-switch -Winline -Wmissing-prototypes" | 2057 cflags_warning="-Wall -Wno-switch -Wmissing-prototypes" |
2058 dnl This is not very useful, as it issues warnings that may appear | |
2059 dnl or disappear rather randomly, cannot easily be fixed, and are | |
2060 dnl not a big deal. If you want it, add it yourself. | |
2061 dnl cflags_warning="$cflags_warning -Winline" | |
2058 | 2062 |
2059 dnl Yuck, bad compares have been worth at least 3 crashes! | 2063 dnl Yuck, bad compares have been worth at least 3 crashes! |
2060 cflags_warning="$cflags_warning -Wsign-compare" | 2064 dnl Warnings about char subscripts are pretty pointless, though, |
2065 dnl and we use them in various places. | |
2066 cflags_warning="$cflags_warning -Wsign-compare -Wno-char-subscripts" | |
2061 cflags_warning="$cflags_warning -Wundef -Wstrict-prototypes" | 2067 cflags_warning="$cflags_warning -Wundef -Wstrict-prototypes" |
2062 test "$__GCC3" = "yes" && cflags_warning="$cflags_warning -Wpacked" | 2068 test "$__GCC3" = "yes" && cflags_warning="$cflags_warning -Wpacked" |
2063 dnl glibc is intentionally not `-Wpointer-arith'-clean. | 2069 dnl glibc is intentionally not `-Wpointer-arith'-clean. |
2064 dnl Ulrich Drepper has rejected patches to fix the glibc header files. | 2070 dnl Ulrich Drepper has rejected patches to fix the glibc header files. |
2065 test "$have_glibc" != "yes" && \ | 2071 test "$have_glibc" != "yes" && \ |
3457 with_modules=no | 3463 with_modules=no |
3458 fi | 3464 fi |
3459 fi | 3465 fi |
3460 if test "$with_modules" != "yes"; then | 3466 if test "$with_modules" != "yes"; then |
3461 MOD_CC="$XEMACS_CC" | 3467 MOD_CC="$XEMACS_CC" |
3462 MODCFLAGS="\$(CFLAGS) -I../../src -I\$(srcdir)/../../src" | 3468 MODCFLAGS="\$(XE_CFLAGS) -I../../src -I\$(srcdir)/../../src" |
3463 INSTALLPATH="" | 3469 INSTALLPATH="" |
3464 MOD_INSTALL_PROGRAM="true" | 3470 MOD_INSTALL_PROGRAM="true" |
3465 OBJECT_TO_BUILD="\$(MODNAME).o" | 3471 OBJECT_TO_BUILD="\$(MODNAME).o" |
3466 fi | 3472 fi |
3467 MODARCHDIR= | 3473 MODARCHDIR= |
3579 AC_CHECKING(for LDAP) | 3585 AC_CHECKING(for LDAP) |
3580 ldap_libs= | 3586 ldap_libs= |
3581 test -z "$with_ldap" && { AC_CHECK_HEADER(ldap.h, ,with_ldap=no) } | 3587 test -z "$with_ldap" && { AC_CHECK_HEADER(ldap.h, ,with_ldap=no) } |
3582 test -z "$with_ldap" && { AC_CHECK_HEADER(lber.h, ,with_ldap=no) } | 3588 test -z "$with_ldap" && { AC_CHECK_HEADER(lber.h, ,with_ldap=no) } |
3583 if test "$with_ldap" != "no"; then | 3589 if test "$with_ldap" != "no"; then |
3584 AC_CHECK_LIB(ldap, ldap_search, with_ldap_nolber=yes, with_ldap_nolber=no) | 3590 AC_CHECK_LIB(ldap, ldap_search, with_ldap=yes) |
3585 test "$with_ldap_nolber" = "no" && { AC_CHECK_LIB(ldap, ldap_open, with_ldap_lber=yes, with_ldap_lber=no, -llber) } | 3591 dnl Check for other libraries we need to link with to get the main routines. |
3586 test "$with_ldap_nolber" = "no" -a "$with_ldap_lber" = "no" && { AC_CHECK_LIB(ldap, ldap_open, with_ldap_krb=yes, with_ldap_krb=no, -llber -lkrb) } | 3592 test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes], , -llber) } |
3587 test "$with_ldap_nolber" = "no" -a "$with_ldap_lber" = "no" -a "$with_ldap_krb" = "no" && { AC_CHECK_LIB(ldap, ldap_open, with_ldap_krbdes=yes, with_ldap_krbdes=no, -llber -lkrb -ldes) } | 3593 test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes], , -llber -lkrb) } |
3588 test -z "$with_ldap" -a \( "$with_ldap_lber" = "yes" -o "$with_ldap_nolber" = "yes" -o "$with_ldap_krb" = "yes" -o "$with_ldap_krbdes" = "yes" \) && with_ldap=yes | 3594 test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes with_ldap_des=yes], , -llber -lkrb -ldes) } |
3595 dnl Recently, we need -lber even though the main routines are elsewhere, | |
3596 dnl because otherwise be get link errors w.r.t. ber_pvt_opt_on. So just | |
3597 dnl check for that (it's a variable not a fun but that doesn't seem to | |
3598 dnl matter in these checks) and stick in -lber if so. Can't hurt (even to | |
3599 dnl stick it in always shouldn't hurt, I don't think) ... #### Someone who | |
3600 dnl #### understands LDAP needs to fix this properly. | |
3601 test "$with_ldap_lber" != "yes" && { AC_CHECK_LIB(lber, ber_pvt_opt_on, with_ldap_lber=yes) } | |
3589 fi | 3602 fi |
3590 if test "$with_ldap" = "yes"; then | 3603 if test "$with_ldap" = "yes"; then |
3591 AC_DEFINE(HAVE_LDAP) | 3604 AC_DEFINE(HAVE_LDAP) |
3592 if test "$with_ldap_nolber" = "yes" ; then | 3605 if test "$with_ldap_des" = "yes" ; then |
3593 XE_PREPEND(-lldap, ldap_libs) | 3606 XE_PREPEND(-ldes, ldap_libs) |
3594 else | 3607 fi |
3595 if test "$with_ldap_krb" = "yes" ; then | 3608 if test "$with_ldap_krb" = "yes" ; then |
3596 XE_PREPEND(-lkrb, ldap_libs) | 3609 XE_PREPEND(-lkrb, ldap_libs) |
3597 fi | 3610 fi |
3598 if test "$with_ldap_krbdes" = "yes" ; then | 3611 if test "$with_ldap_lber" = "yes" ; then |
3599 XE_PREPEND(-ldes, ldap_libs) | |
3600 XE_PREPEND(-lkrb, ldap_libs) | |
3601 fi | |
3602 XE_PREPEND(-llber, ldap_libs) | 3612 XE_PREPEND(-llber, ldap_libs) |
3603 XE_PREPEND(-lldap, ldap_libs) | 3613 fi |
3604 fi | 3614 XE_PREPEND(-lldap, ldap_libs) |
3605 save_LIBS="$LIBS" LIBS="$LIBS $ldap_libs" | 3615 save_LIBS="$LIBS" LIBS="$LIBS $ldap_libs" |
3606 AC_CHECK_FUNCS(ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result) | 3616 AC_CHECK_FUNCS(ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result) |
3607 LIBS="$save_LIBS" | 3617 LIBS="$save_LIBS" |
3608 XE_APPEND(modules/ldap, MAKE_SUBDIR) | 3618 XE_APPEND(modules/ldap, MAKE_SUBDIR) |
3609 need_modules_common=yes | 3619 need_modules_common=yes |
4224 | 4234 |
4225 dnl ---------------------------------------------------------------- | 4235 dnl ---------------------------------------------------------------- |
4226 dnl Check for POSIX functions. | 4236 dnl Check for POSIX functions. |
4227 dnl ---------------------------------------------------------------- | 4237 dnl ---------------------------------------------------------------- |
4228 | 4238 |
4229 AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd getwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror strlwr strupr symlink tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask wcslen wcscmp vlimit) | 4239 AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen) |
4230 | 4240 |
4231 dnl getaddrinfo() is borked under hpux11 | 4241 dnl getaddrinfo() is borked under hpux11 |
4232 if test "$ac_cv_func_getaddrinfo" != "no" ; then | 4242 if test "$ac_cv_func_getaddrinfo" != "no" ; then |
4233 case "$opsys" in | 4243 case "$opsys" in |
4234 hpux11 ) | 4244 hpux11 ) |
4462 ], working_alloca_in_function_calls=yes, working_alloca_in_function_calls=no) | 4472 ], working_alloca_in_function_calls=yes, working_alloca_in_function_calls=no) |
4463 AC_MSG_RESULT($working_alloca_in_function_calls) | 4473 AC_MSG_RESULT($working_alloca_in_function_calls) |
4464 test "$working_alloca_in_function_calls" != "yes" && \ | 4474 test "$working_alloca_in_function_calls" != "yes" && \ |
4465 AC_DEFINE(BROKEN_ALLOCA_IN_FUNCTION_CALLS) | 4475 AC_DEFINE(BROKEN_ALLOCA_IN_FUNCTION_CALLS) |
4466 | 4476 |
4477 AC_MSG_CHECKING(for working scanf) | |
4478 AC_TRY_RUN([ | |
4479 int | |
4480 main (int argc, char **argv) | |
4481 { | |
4482 int ret, cp1, cp2, endcount; | |
4483 char *p = "0x7d 0x000E "; | |
4484 ret = sscanf (p, "%i %i%n", &cp1, &cp2, &endcount); | |
4485 /* endcount should be 13 but it's 11 in Cygwin newlib after 6/04; | |
4486 this breaks unicode.c */ | |
4487 return endcount != 13; | |
4488 } | |
4489 ], working_scanf=yes, working_scanf=no) | |
4490 AC_MSG_RESULT($working_scanf) | |
4491 test "$working_scanf" != "yes" && \ | |
4492 AC_DEFINE(CYGWIN_SCANF_BUG) | |
4493 | |
4467 dnl Check whether strcoll exists and works correctly. (This does more | 4494 dnl Check whether strcoll exists and works correctly. (This does more |
4468 dnl than just check for its existence.) If so, it defines HAVE_STRCOLL. | 4495 dnl than just check for its existence.) If so, it defines HAVE_STRCOLL. |
4469 AC_FUNC_STRCOLL | 4496 AC_FUNC_STRCOLL |
4470 | 4497 |
4471 dnl If `getpgrp' takes no argument (the POSIX.1 version), define | 4498 dnl If `getpgrp' takes no argument (the POSIX.1 version), define |
5636 | 5663 |
5637 AC_OUTPUT($ac_output_files, | 5664 AC_OUTPUT($ac_output_files, |
5638 [for dir in . $MAKE_SUBDIR; do | 5665 [for dir in . $MAKE_SUBDIR; do |
5639 ( | 5666 ( |
5640 cd $dir | 5667 cd $dir |
5668 | |
5669 dnl Normally []'s are used for quoting but this will cause problems | |
5670 dnl since we use brackets in sed. When not inside of a macro definition, | |
5671 dnl two brackets become one, but inside of a macro definition you need | |
5672 dnl more, or something -- I don't understand, but Martin probably does. | |
5673 dnl We put the brackets back later. | |
5674 dnl [ben] | |
5675 changequote(<<,>>)dnl | |
5676 | |
5677 dnl MAKE_JUNK_C(filename): | |
5678 dnl Copy a .in file to junk.c in preparation for passing through the | |
5679 dnl C preprocessor. Delete comment lines, pass lines that will be | |
5680 dnl interpreted by cpp through directly, and put quotes around remaining | |
5681 dnl lines, to avoid problems from overly helpful preprocessors that | |
5682 dnl "helpfully" put extra quotes in various places for later use by the | |
5683 dnl compiler. Later, the quotes will be removed. | |
5684 | |
5685 define(<<MAKE_JUNK_C>>, | |
5641 rm -f junk.c | 5686 rm -f junk.c |
5642 < Makefile.in \ | 5687 < <<$1>> \ |
5643 sed -e '/^# Generated/d' \ | 5688 sed -e '/^# Generated/d' \ |
5644 -e 's%/\*\*/#.*%%' \ | 5689 -e 's%/\*\*/#.*%%' \ |
5645 -e 's/^ *# */#/' \ | 5690 -e 's/^ *# */#/' \ |
5646 dnl Delete Makefile.in.in comment lines | 5691 dnl Delete Makefile.in.in comment lines |
5647 -e '/^##/d' \ | 5692 -e '/^##/d' \ |
5650 p | 5695 p |
5651 d | 5696 d |
5652 }' \ | 5697 }' \ |
5653 dnl Quote other lines to protect from CPP substitution | 5698 dnl Quote other lines to protect from CPP substitution |
5654 -e '/./ { | 5699 -e '/./ { |
5655 s/\([[\"]]\)/\\\1/g | 5700 s/\([\"]\)/\\\1/g |
5656 s/^/"/ | 5701 s/^/"/ |
5657 s/$/"/ | 5702 s/$/"/ |
5658 }' > junk.c; | 5703 }' > junk.c; |
5659 | 5704 )dnl MAKE_JUNK_C |
5660 dnl Create a GNUmakefile and Makefile from Makefile.in. | 5705 |
5661 | 5706 dnl CPP_MAKEFILE(CPPFLAGS,filename): |
5662 changequote(<<,>>)dnl | 5707 dnl Pass junk.c through the preprocessor and put the result in FILENAME. |
5663 dnl CPP_MAKEFILE(CPPFLAGS,filename) | 5708 |
5664 define(<<CPP_MAKEFILE>>, | 5709 define(<<CPP_MAKEFILE>>, |
5665 echo creating $dir/<<$2>> | 5710 echo creating $dir/<<$2>> |
5666 $CPP -I. -I${top_srcdir}/src <<$1>> junk.c \ | 5711 $CPP -I. -I${top_srcdir}/src <<$1>> junk.c \ |
5667 dnl Delete line directives inserted by $CPP | 5712 dnl Delete line directives inserted by $CPP |
5668 | sed -e 's/^\#.*//' \ | 5713 | sed -e 's/^\#.*//' \ |
5679 }' > Makefile.new | 5724 }' > Makefile.new |
5680 chmod 444 Makefile.new | 5725 chmod 444 Makefile.new |
5681 mv -f Makefile.new <<$2>> | 5726 mv -f Makefile.new <<$2>> |
5682 )dnl CPP_MAKEFILE | 5727 )dnl CPP_MAKEFILE |
5683 | 5728 |
5729 dnl Create a GNUmakefile and Makefile from Makefile.in. | |
5730 dnl Create xemacs.def from xemacs.def.in in the same fashion, | |
5731 dnl if it exists (i.e. in the src/ directory). | |
5732 MAKE_JUNK_C(Makefile.in) | |
5684 CPP_MAKEFILE(,Makefile) | 5733 CPP_MAKEFILE(,Makefile) |
5685 CPP_MAKEFILE(-DUSE_GNU_MAKE,GNUmakefile) | 5734 CPP_MAKEFILE(-DUSE_GNU_MAKE,GNUmakefile) |
5686 if test -r "xemacs.def.in"; then | 5735 if test -r "xemacs.def.in"; then |
5687 cp -f xemacs.def.in junk.c | 5736 dnl #### We should be using MAKE_JUNK_C instead of the next two lines. |
5737 dnl #### But the comments in xemacs.def.in need to be converted from C-style | |
5738 dnl #### to lines beginning with ##. | |
5739 rm -f junk.c | |
5740 cp xemacs.def.in junk.c | |
5688 CPP_MAKEFILE(,xemacs.def) | 5741 CPP_MAKEFILE(,xemacs.def) |
5689 fi | 5742 fi |
5690 changequote([,])dnl | 5743 changequote([,])dnl |
5691 rm -f junk.c | 5744 rm -f junk.c |
5692 ) | 5745 ) |