diff options
| author | Mike Hommey <mh@glandium.org> | 2004-09-10 05:26:00 +0000 |
|---|---|---|
| committer | Mike Hommey <mh@glandium.org> | 2004-09-10 05:26:00 +0000 |
| commit | 09deb06614c3408ec0816a3c88920138bae2083c (patch) | |
| tree | a1b841a7dc28eecb98ca361c9371ecd1449a1908 /configure.in | |
| parent | c14c53a3645d81281058d4bb4cff24fa8d6faf33 (diff) | |
| download | libxml2-09deb06614c3408ec0816a3c88920138bae2083c.tar.gz | |
Load /tmp/tmp.BmUFjT/libxml2-2.6.13 intoupstream/2.6.13
packages/libxml2/branches/upstream/current.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 52f0af2..7f4e7f4 100644 --- a/configure.in +++ b/configure.in @@ -1,24 +1,32 @@ dnl Process this file with autoconf to produce a configure script. -AC_PREREQ(2.2) AC_INIT(entities.c) AM_CONFIG_HEADER(config.h) AC_CANONICAL_HOST LIBXML_MAJOR_VERSION=2 LIBXML_MINOR_VERSION=6 -LIBXML_MICRO_VERSION=11 +LIBXML_MICRO_VERSION=13 LIBXML_MICRO_VERSION_SUFFIX= LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION$LIBXML_MICRO_VERSION_SUFFIX LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION LIBXML_VERSION_NUMBER=`expr $LIBXML_MAJOR_VERSION \* 10000 + $LIBXML_MINOR_VERSION \* 100 + $LIBXML_MICRO_VERSION` +if test -f CVS/Entries; then + extra=`grep ChangeLog CVS/Entries | grep -v LIBXML | sed -e s\%/ChangeLog/1\.%% -e s\%/.*$%%` + echo extra=$extra + if test "$extra" != "" + then + LIBXML_VERSION_EXTRA="-CVS$extra" + fi +fi AC_SUBST(LIBXML_MAJOR_VERSION) AC_SUBST(LIBXML_MINOR_VERSION) AC_SUBST(LIBXML_MICRO_VERSION) AC_SUBST(LIBXML_VERSION) AC_SUBST(LIBXML_VERSION_INFO) AC_SUBST(LIBXML_VERSION_NUMBER) +AC_SUBST(LIBXML_VERSION_EXTRA) VERSION=${LIBXML_VERSION} @@ -31,6 +39,7 @@ AC_PROG_CPP AC_PATH_PROG(RM, rm, /bin/rm) AC_PATH_PROG(MV, mv, /bin/mv) AC_PATH_PROG(TAR, tar, /bin/tar) +AC_PATH_PROG(PERL, perl, /usr/bin/perl) dnl Make sure we have an ANSI compiler AM_C_PROTOTYPES @@ -298,7 +307,7 @@ else CFLAGS="${CFLAGS} -fexceptions" fi - CFLAGS="${CFLAGS} -Wall" + CFLAGS="${CFLAGS} -pedantic -W -Wunused -Wimplicit -Wreturn-type -Wswitch -Wcomment -Wtrigraphs -Wformat -Wchar-subscripts -Wuninitialized -Wparentheses -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wredundant-decls" case "${host}" in alpha*-*-linux* ) CFLAGS="${CFLAGS} -mieee" @@ -1032,9 +1041,15 @@ case "$host" in AC_DEFINE([snprintf],[_snprintf],[Win32 Std C name mangling work-around]) AC_DEFINE([vsnprintf],[_vsnprintf],[Win32 Std C name mangling work-around]) ;; + *-*-cygwin*) + CYGWIN_EXTRA_LDFLAGS="-no-undefined" + CYGWIN_EXTRA_PYTHON_LIBADD="-L/usr/lib/python2.3/config -lpython2.3" + ;; esac AC_SUBST(WIN32_EXTRA_LIBADD) AC_SUBST(WIN32_EXTRA_LDFLAGS) +AC_SUBST(CYGWIN_EXTRA_LDFLAGS) +AC_SUBST(CYGWIN_EXTRA_PYTHON_LIBADD) AC_SUBST(CPPFLAGS) AC_SUBST(CFLAGS) |