started autotools usage overhaul with some configure.ac revision
Modernisation of libtool initialisation. Use of acinclude.m4 to load macro definition files.
This commit is contained in:
parent
6b0d52543f
commit
9fb802c7fc
8
expat/acinclude.m4
Normal file
8
expat/acinclude.m4
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
# acinclude.m4 --
|
||||||
|
#
|
||||||
|
|
||||||
|
m4_include(conftools/ac_c_bigendian_cross.m4)
|
||||||
|
dnl m4_include(meta/autoconf/ax-check-compile-flag.m4)
|
||||||
|
dnl m4_include(meta/autoconf/ax-gcc-version.m4)
|
||||||
|
|
||||||
|
### end of file
|
@ -1,2 +1,2 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
exec autoreconf -i -f
|
exec autoreconf --warnings=all --install --verbose "$@"
|
||||||
|
@ -29,10 +29,10 @@ define([expat_version], ifdef([__gnu__],
|
|||||||
AC_INIT(expat, expat_version, expat-bugs@libexpat.org)
|
AC_INIT(expat, expat_version, expat-bugs@libexpat.org)
|
||||||
undefine([expat_version])
|
undefine([expat_version])
|
||||||
|
|
||||||
AC_CONFIG_SRCDIR(Makefile.in)
|
AC_CONFIG_SRCDIR([Makefile.in])
|
||||||
AC_CONFIG_AUX_DIR(conftools)
|
AC_CONFIG_AUX_DIR([conftools])
|
||||||
AM_INIT_AUTOMAKE
|
|
||||||
AC_CONFIG_MACRO_DIR([m4])
|
AC_CONFIG_MACRO_DIR([m4])
|
||||||
|
AM_INIT_AUTOMAKE
|
||||||
|
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
@ -53,19 +53,21 @@ LIBAGE=6 # CMakeLists.txt!
|
|||||||
CPPFLAGS="${CPPFLAGS} -DHAVE_EXPAT_CONFIG_H"
|
CPPFLAGS="${CPPFLAGS} -DHAVE_EXPAT_CONFIG_H"
|
||||||
AC_CONFIG_HEADER(expat_config.h)
|
AC_CONFIG_HEADER(expat_config.h)
|
||||||
|
|
||||||
sinclude(conftools/ac_c_bigendian_cross.m4)
|
AM_PROG_AR
|
||||||
|
AC_PROG_INSTALL
|
||||||
|
AC_PROG_LN_S
|
||||||
|
AC_PROG_MAKE_SET
|
||||||
|
AC_PROG_MKDIR_P
|
||||||
|
|
||||||
AC_LIBTOOL_WIN32_DLL
|
LT_PREREQ([2.4])
|
||||||
AC_PROG_LIBTOOL
|
LT_INIT([win32-dll])
|
||||||
|
|
||||||
AC_SUBST(LIBCURRENT)
|
AC_SUBST(LIBCURRENT)
|
||||||
AC_SUBST(LIBREVISION)
|
AC_SUBST(LIBREVISION)
|
||||||
AC_SUBST(LIBAGE)
|
AC_SUBST(LIBAGE)
|
||||||
|
|
||||||
dnl Checks for programs.
|
|
||||||
AC_PROG_CC_C99
|
AC_PROG_CC_C99
|
||||||
AC_PROG_CXX
|
AC_PROG_CXX
|
||||||
AC_PROG_INSTALL
|
|
||||||
|
|
||||||
if test "$GCC" = yes ; then
|
if test "$GCC" = yes ; then
|
||||||
dnl
|
dnl
|
||||||
|
1
expat/conftools/.gitignore
vendored
1
expat/conftools/.gitignore
vendored
@ -8,3 +8,4 @@ ltconfig
|
|||||||
ltmain.sh
|
ltmain.sh
|
||||||
missing
|
missing
|
||||||
test-driver
|
test-driver
|
||||||
|
ar-lib
|
||||||
|
Loading…
Reference in New Issue
Block a user