Deleted Added
full compact
configure.in (104349) configure.in (178848)
1dnl configuration script for expat
2dnl Process this file with autoconf to produce a configure script.
3dnl
4dnl Copyright 2000 Clark Cooper
5dnl
6dnl This file is part of EXPAT.
7dnl
8dnl EXPAT is free software; you can redistribute it and/or modify it

--- 11 unchanged lines hidden (view full) ---

20dnl all this must happen as part of m4, not as part of the shell code
21dnl contained in ./configure.
22dnl
23dnl NOTE: esyscmd() is a GNU M4 extension. Thus, we wrap it in an appropriate
24dnl test. I believe this test will work, but I don't have a place with non-
25dnl GNU M4 to test it right now.
26define([expat_version], ifdef([__gnu__],
27 [esyscmd(conftools/get-version.sh lib/expat.h)],
1dnl configuration script for expat
2dnl Process this file with autoconf to produce a configure script.
3dnl
4dnl Copyright 2000 Clark Cooper
5dnl
6dnl This file is part of EXPAT.
7dnl
8dnl EXPAT is free software; you can redistribute it and/or modify it

--- 11 unchanged lines hidden (view full) ---

20dnl all this must happen as part of m4, not as part of the shell code
21dnl contained in ./configure.
22dnl
23dnl NOTE: esyscmd() is a GNU M4 extension. Thus, we wrap it in an appropriate
24dnl test. I believe this test will work, but I don't have a place with non-
25dnl GNU M4 to test it right now.
26define([expat_version], ifdef([__gnu__],
27 [esyscmd(conftools/get-version.sh lib/expat.h)],
28 [1.95.x]))
29AC_INIT(expat, expat_version, expat-bugs@mail.libexpat.org)
28 [2.0.x]))
29AC_INIT(expat, expat_version, expat-bugs@libexpat.org)
30undefine([expat_version])
31
32AC_CONFIG_SRCDIR(Makefile.in)
33AC_CONFIG_AUX_DIR(conftools)
34
35
36dnl
37dnl Increment LIBREVISION if source code has changed at all
38dnl
39dnl If the API has changed, increment LIBCURRENT and set LIBREVISION to 0
40dnl
41dnl If the API changes compatibly (i.e. simply adding a new function
42dnl without changing or removing earlier interfaces), then increment LIBAGE.
43dnl
44dnl If the API changes incompatibly set LIBAGE back to 0
45dnl
46
30undefine([expat_version])
31
32AC_CONFIG_SRCDIR(Makefile.in)
33AC_CONFIG_AUX_DIR(conftools)
34
35
36dnl
37dnl Increment LIBREVISION if source code has changed at all
38dnl
39dnl If the API has changed, increment LIBCURRENT and set LIBREVISION to 0
40dnl
41dnl If the API changes compatibly (i.e. simply adding a new function
42dnl without changing or removing earlier interfaces), then increment LIBAGE.
43dnl
44dnl If the API changes incompatibly set LIBAGE back to 0
45dnl
46
47LIBCURRENT=4
48LIBREVISION=0
49LIBAGE=4
47LIBCURRENT=6
48LIBREVISION=2
49LIBAGE=5
50
51AC_CONFIG_HEADER(expat_config.h)
52
53sinclude(conftools/libtool.m4)
54sinclude(conftools/ac_c_bigendian_cross.m4)
55
56AC_LIBTOOL_WIN32_DLL
57AC_PROG_LIBTOOL

--- 9 unchanged lines hidden (view full) ---

67if test "$GCC" = yes ; then
68 dnl
69 dnl Be careful about adding the -fexceptions option; some versions of
70 dnl GCC don't support it and it causes extra warnings that are only
71 dnl distracting; avoid.
72 dnl
73 OLDCFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wstrict-prototypes"
74 CFLAGS="$OLDCFLAGS -fexceptions"
50
51AC_CONFIG_HEADER(expat_config.h)
52
53sinclude(conftools/libtool.m4)
54sinclude(conftools/ac_c_bigendian_cross.m4)
55
56AC_LIBTOOL_WIN32_DLL
57AC_PROG_LIBTOOL

--- 9 unchanged lines hidden (view full) ---

67if test "$GCC" = yes ; then
68 dnl
69 dnl Be careful about adding the -fexceptions option; some versions of
70 dnl GCC don't support it and it causes extra warnings that are only
71 dnl distracting; avoid.
72 dnl
73 OLDCFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wstrict-prototypes"
74 CFLAGS="$OLDCFLAGS -fexceptions"
75 AC_MSG_CHECKING(whether gcc accepts -fexceptions)
76 AC_TRY_COMPILE(,(void)1,
75 AC_MSG_CHECKING(whether $CC accepts -fexceptions)
76 AC_TRY_LINK( , ,
77 AC_MSG_RESULT(yes),
78 AC_MSG_RESULT(no); CFLAGS="$OLDCFLAGS")
77 AC_MSG_RESULT(yes),
78 AC_MSG_RESULT(no); CFLAGS="$OLDCFLAGS")
79 CXXFLAGS=`echo "$CFLAGS" | sed 's/ -Wmissing-prototypes -Wstrict-prototypes//'`
79fi
80
81dnl Checks for header files.
82AC_HEADER_STDC
80fi
81
82dnl Checks for header files.
83AC_HEADER_STDC
83AC_CHECK_HEADERS(fcntl.h unistd.h)
84
85dnl Checks for typedefs, structures, and compiler characteristics.
86
87dnl Note: Avoid using AC_C_BIGENDIAN because it does not
88dnl work in a cross compile.
89AC_C_BIGENDIAN_CROSS
90
91AC_C_CONST
84
85dnl Checks for typedefs, structures, and compiler characteristics.
86
87dnl Note: Avoid using AC_C_BIGENDIAN because it does not
88dnl work in a cross compile.
89AC_C_BIGENDIAN_CROSS
90
91AC_C_CONST
92AC_TYPE_OFF_T
93AC_TYPE_SIZE_T
92AC_TYPE_SIZE_T
93AC_CHECK_FUNCS(memmove bcopy)
94
94
95dnl Checks for library functions.
96
97AC_FUNC_MEMCMP
95dnl Only needed for xmlwf:
96AC_CHECK_HEADERS(fcntl.h unistd.h)
97AC_TYPE_OFF_T
98AC_FUNC_MMAP
99
100if test "$ac_cv_func_mmap_fixed_mapped" = "yes"; then
101 FILEMAP=unixfilemap
102else
103 FILEMAP=readfilemap
104fi
105AC_SUBST(FILEMAP)
106
98AC_FUNC_MMAP
99
100if test "$ac_cv_func_mmap_fixed_mapped" = "yes"; then
101 FILEMAP=unixfilemap
102else
103 FILEMAP=readfilemap
104fi
105AC_SUBST(FILEMAP)
106
107AC_CHECK_FUNCS(memmove bcopy)
107dnl Needed for the test support code; this was found at
108dnl http://lists.gnu.org/archive/html/bug-autoconf/2002-07/msg00028.html
108
109
109dnl some basic configuration
110# AC_CPP_FUNC
111# ------------------ #
112# Checks to see if ANSI C99 CPP variable __func__ works.
113# If not, perhaps __FUNCTION__ works instead.
114# If not, we'll just define __func__ to "".
115AC_DEFUN([AC_CPP_FUNC],
116[AC_REQUIRE([AC_PROG_CC_STDC])dnl
117AC_CACHE_CHECK([for an ANSI C99-conforming __func__], ac_cv_cpp_func,
118[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
119[[char *foo = __func__;]])],
120 [ac_cv_cpp_func=yes],
121 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
122[[char *foo = __FUNCTION__;]])],
123 [ac_cv_cpp_func=__FUNCTION__],
124 [ac_cv_cpp_func=no])])])
125if test $ac_cv_cpp_func = __FUNCTION__; then
126 AC_DEFINE(__func__,__FUNCTION__,
127 [Define to __FUNCTION__ or "" if `__func__' does not conform to
128ANSI C.])
129elif test $ac_cv_cpp_func = no; then
130 AC_DEFINE(__func__,"",
131 [Define to __FUNCTION__ or "" if `__func__' does not conform to
132ANSI C.])
133fi
134])# AC_CPP_FUNC
135
136AC_CPP_FUNC
137
138
139dnl Some basic configuration:
110AC_DEFINE([XML_NS], 1,
111 [Define to make XML Namespaces functionality available.])
112AC_DEFINE([XML_DTD], 1,
113 [Define to make parameter entity parsing functionality available.])
114AC_DEFINE([XML_CONTEXT_BYTES], 1024,
115 [Define to specify how much context to retain around the current parse point.])
116
117AC_CONFIG_FILES(Makefile)
118AC_OUTPUT
119
120abs_srcdir="`cd $srcdir && pwd`"
121abs_builddir="`pwd`"
122if test "$abs_srcdir" != "$abs_builddir"; then
123 make mkdir-init
124fi
140AC_DEFINE([XML_NS], 1,
141 [Define to make XML Namespaces functionality available.])
142AC_DEFINE([XML_DTD], 1,
143 [Define to make parameter entity parsing functionality available.])
144AC_DEFINE([XML_CONTEXT_BYTES], 1024,
145 [Define to specify how much context to retain around the current parse point.])
146
147AC_CONFIG_FILES(Makefile)
148AC_OUTPUT
149
150abs_srcdir="`cd $srcdir && pwd`"
151abs_builddir="`pwd`"
152if test "$abs_srcdir" != "$abs_builddir"; then
153 make mkdir-init
154fi