← Back to branch summary

~ubuntu-branches/ubuntu/hardy/expat/hardy-security

« back to all changes in this revision

Viewing changes to configure.in

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2007-12-05 17:37:50 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20071205173750-6doh0hsoxk55ykqj
Tags: 2.0.1-0ubuntu1
https://launchpad.net/bugs/133808
* New upstream version. LP: #133808.
* Remove the old libexpat.so.0 symlink; this bug predates Ubuntu (was
  fixed in version 1.95.5-1).
* Drop the extra build files in bcb5/.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.in
25
25
dnl GNU M4 to test it right now.
26
26
define([expat_version], ifdef([__gnu__],
27
27
                              [esyscmd(conftools/get-version.sh lib/expat.h)],
28
 
                              [1.95.x]))
29
 
AC_INIT(expat, expat_version, expat-bugs@mail.libexpat.org)
 
28
                              [2.0.x]))
 
29
AC_INIT(expat, expat_version, expat-bugs@libexpat.org)
30
30
undefine([expat_version])
31
31
 
32
32
AC_CONFIG_SRCDIR(Makefile.in)
44
44
dnl If the API changes incompatibly set LIBAGE back to 0
45
45
dnl
46
46
 
47
 
LIBCURRENT=1
48
 
LIBREVISION=0
49
 
LIBAGE=0
 
47
LIBCURRENT=6
 
48
LIBREVISION=2
 
49
LIBAGE=5
50
50
 
51
51
AC_CONFIG_HEADER(expat_config.h)
52
52
 
72
72
    dnl
73
73
    OLDCFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wstrict-prototypes"
74
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
77
                   AC_MSG_RESULT(yes),
78
78
                   AC_MSG_RESULT(no); CFLAGS="$OLDCFLAGS")
 
79
    CXXFLAGS=`echo "$CFLAGS" | sed 's/ -Wmissing-prototypes -Wstrict-prototypes//'`
79
80
fi
80
81
 
81
82
dnl Checks for header files.
103
104
fi
104
105
AC_SUBST(FILEMAP)
105
106
 
106
 
dnl Only needed for regression tests:
107
 
AC_SUBST(MINICHECK_OBJECT)
108
 
AC_SUBST(CHECK_LIBRARY)
109
 
AC_CHECK_HEADERS(check.h)
110
 
AC_CHECK_HEADER(check.h,
111
 
                CHECK_LIBRARY=-lcheck,
112
 
                MINICHECK_OBJECT=tests/minicheck.o)
 
107
dnl Needed for the test support code; this was found at
 
108
dnl http://lists.gnu.org/archive/html/bug-autoconf/2002-07/msg00028.html
 
109
 
 
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 "". 
 
115
AC_DEFUN([AC_CPP_FUNC],
 
116
[AC_REQUIRE([AC_PROG_CC_STDC])dnl
 
117
AC_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])])])
 
125
if test $ac_cv_cpp_func = __FUNCTION__; then
 
126
  AC_DEFINE(__func__,__FUNCTION__,
 
127
            [Define to __FUNCTION__ or "" if `__func__' does not conform to 
 
128
ANSI C.])
 
129
elif test $ac_cv_cpp_func = no; then
 
130
  AC_DEFINE(__func__,"",
 
131
            [Define to __FUNCTION__ or "" if `__func__' does not conform to 
 
132
ANSI C.])
 
133
fi
 
134
])# AC_CPP_FUNC
 
135
 
 
136
AC_CPP_FUNC
 
137
 
113
138
 
114
139
dnl Some basic configuration:
115
140
AC_DEFINE([XML_NS], 1,