mirror of
https://github.com/aria2/aria2.git
synced 2024-11-27 20:14:48 +08:00
2009-10-10 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Removed unused m4 macros. * m4/intldir.m4 * m4/inttypes.m4 * m4/isc-posix.m4 * m4/libgnutls-extra.m4 * m4/ulonglong.m4
This commit is contained in:
Tatsuhiro Tsujikawa
parent
53bdc4918a
commit
e8b87bb1c2
@ -1,3 +1,12 @@
|
|||||||
|
2009-10-10 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
|
||||||
|
|
||||||
|
Removed unused m4 macros.
|
||||||
|
* m4/intldir.m4
|
||||||
|
* m4/inttypes.m4
|
||||||
|
* m4/isc-posix.m4
|
||||||
|
* m4/libgnutls-extra.m4
|
||||||
|
* m4/ulonglong.m4
|
||||||
|
|
||||||
2009-10-10 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
|
2009-10-10 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
|
||||||
|
|
||||||
Fixed the bug that causes segmentation fault if
|
Fixed the bug that causes segmentation fault if
|
||||||
|
|||||||
@ -1,19 +0,0 @@
|
|||||||
# intldir.m4 serial 1 (gettext-0.16)
|
|
||||||
dnl Copyright (C) 2006 Free Software Foundation, Inc.
|
|
||||||
dnl This file is free software; the Free Software Foundation
|
|
||||||
dnl gives unlimited permission to copy and/or distribute it,
|
|
||||||
dnl with or without modifications, as long as this notice is preserved.
|
|
||||||
dnl
|
|
||||||
dnl This file can can be used in projects which are not available under
|
|
||||||
dnl the GNU General Public License or the GNU Library General Public
|
|
||||||
dnl License but which still want to provide support for the GNU gettext
|
|
||||||
dnl functionality.
|
|
||||||
dnl Please note that the actual code of the GNU gettext library is covered
|
|
||||||
dnl by the GNU Library General Public License, and the rest of the GNU
|
|
||||||
dnl gettext package package is covered by the GNU General Public License.
|
|
||||||
dnl They are *not* in the public domain.
|
|
||||||
|
|
||||||
AC_PREREQ(2.52)
|
|
||||||
|
|
||||||
dnl Tells the AM_GNU_GETTEXT macro to consider an intl/ directory.
|
|
||||||
AC_DEFUN([AM_GNU_GETTEXT_INTL_SUBDIR], [])
|
|
||||||
@ -1,27 +0,0 @@
|
|||||||
# inttypes.m4 serial 1 (gettext-0.11.4)
|
|
||||||
dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
|
|
||||||
dnl This file is free software, distributed under the terms of the GNU
|
|
||||||
dnl General Public License. As a special exception to the GNU General
|
|
||||||
dnl Public License, this file may be distributed as part of a program
|
|
||||||
dnl that contains a configuration script generated by Autoconf, under
|
|
||||||
dnl the same distribution terms as the rest of that program.
|
|
||||||
|
|
||||||
dnl From Paul Eggert.
|
|
||||||
|
|
||||||
# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
|
|
||||||
# <sys/types.h>.
|
|
||||||
|
|
||||||
AC_DEFUN([gt_HEADER_INTTYPES_H],
|
|
||||||
[
|
|
||||||
AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
|
|
||||||
[
|
|
||||||
AC_TRY_COMPILE(
|
|
||||||
[#include <sys/types.h>
|
|
||||||
#include <inttypes.h>],
|
|
||||||
[], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
|
|
||||||
])
|
|
||||||
if test $gt_cv_header_inttypes_h = yes; then
|
|
||||||
AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
|
|
||||||
[Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
|
|
||||||
fi
|
|
||||||
])
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
# isc-posix.m4 serial 2 (gettext-0.11.2)
|
|
||||||
dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
|
|
||||||
dnl This file is free software, distributed under the terms of the GNU
|
|
||||||
dnl General Public License. As a special exception to the GNU General
|
|
||||||
dnl Public License, this file may be distributed as part of a program
|
|
||||||
dnl that contains a configuration script generated by Autoconf, under
|
|
||||||
dnl the same distribution terms as the rest of that program.
|
|
||||||
|
|
||||||
# This file is not needed with autoconf-2.53 and newer. Remove it in 2005.
|
|
||||||
|
|
||||||
# This test replaces the one in autoconf.
|
|
||||||
# Currently this macro should have the same name as the autoconf macro
|
|
||||||
# because gettext's gettext.m4 (distributed in the automake package)
|
|
||||||
# still uses it. Otherwise, the use in gettext.m4 makes autoheader
|
|
||||||
# give these diagnostics:
|
|
||||||
# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
|
|
||||||
# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
|
|
||||||
|
|
||||||
undefine([AC_ISC_POSIX])
|
|
||||||
|
|
||||||
AC_DEFUN([AC_ISC_POSIX],
|
|
||||||
[
|
|
||||||
dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
|
|
||||||
AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
|
|
||||||
]
|
|
||||||
)
|
|
||||||
@ -1,161 +0,0 @@
|
|||||||
dnl Autoconf macros for libgnutls-extra
|
|
||||||
dnl $id$
|
|
||||||
|
|
||||||
# Modified for LIBGNUTLS_EXTRA -- nmav
|
|
||||||
# Configure paths for LIBGCRYPT
|
|
||||||
# Shamelessly stolen from the one of XDELTA by Owen Taylor
|
|
||||||
# Werner Koch 99-12-09
|
|
||||||
|
|
||||||
dnl AM_PATH_LIBGNUTLS_EXTRA([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
|
|
||||||
dnl Test for libgnutls-extra, and define LIBGNUTLS_EXTRA_CFLAGS and LIBGNUTLS_EXTRA_LIBS
|
|
||||||
dnl
|
|
||||||
AC_DEFUN([AM_PATH_LIBGNUTLS_EXTRA],
|
|
||||||
[dnl
|
|
||||||
dnl Get the cflags and libraries from the libgnutls-extra-config script
|
|
||||||
dnl
|
|
||||||
AC_ARG_WITH(libgnutls-extra-prefix,
|
|
||||||
[ --with-libgnutls-extra-prefix=PFX Prefix where libgnutls-extra is installed (optional)],
|
|
||||||
libgnutls_extra_config_prefix="$withval", libgnutls_extra_config_prefix="")
|
|
||||||
|
|
||||||
if test x$libgnutls_extra_config_prefix != x ; then
|
|
||||||
if test x${LIBGNUTLS_EXTRA_CONFIG+set} != xset ; then
|
|
||||||
LIBGNUTLS_EXTRA_CONFIG=$libgnutls_extra_config_prefix/bin/libgnutls-extra-config
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_PATH_PROG(LIBGNUTLS_EXTRA_CONFIG, libgnutls-extra-config, no)
|
|
||||||
min_libgnutls_version=ifelse([$1], ,0.1.0,$1)
|
|
||||||
AC_MSG_CHECKING(for libgnutls - version >= $min_libgnutls_version)
|
|
||||||
no_libgnutls=""
|
|
||||||
if test "$LIBGNUTLS_EXTRA_CONFIG" = "no" ; then
|
|
||||||
no_libgnutls=yes
|
|
||||||
else
|
|
||||||
LIBGNUTLS_EXTRA_CFLAGS=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --cflags`
|
|
||||||
LIBGNUTLS_EXTRA_LIBS=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --libs`
|
|
||||||
libgnutls_extra_config_version=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --version`
|
|
||||||
|
|
||||||
|
|
||||||
ac_save_CFLAGS="$CFLAGS"
|
|
||||||
ac_save_LIBS="$LIBS"
|
|
||||||
CFLAGS="$CFLAGS $LIBGNUTLS_EXTRA_CFLAGS"
|
|
||||||
LIBS="$LIBS $LIBGNUTLS_EXTRA_LIBS"
|
|
||||||
dnl
|
|
||||||
dnl Now check if the installed libgnutls is sufficiently new. Also sanity
|
|
||||||
dnl checks the results of libgnutls-extra-config to some extent
|
|
||||||
dnl
|
|
||||||
rm -f conf.libgnutlstest
|
|
||||||
AC_TRY_RUN([
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <gnutls/extra.h>
|
|
||||||
|
|
||||||
int
|
|
||||||
main ()
|
|
||||||
{
|
|
||||||
system ("touch conf.libgnutlstest");
|
|
||||||
|
|
||||||
if( strcmp( gnutls_extra_check_version(NULL), "$libgnutls_extra_config_version" ) )
|
|
||||||
{
|
|
||||||
printf("\n*** 'libgnutls-extra-config --version' returned %s, but LIBGNUTLS_EXTRA (%s)\n",
|
|
||||||
"$libgnutls_extra_config_version", gnutls_extra_check_version(NULL) );
|
|
||||||
printf("*** was found! If libgnutls-extra-config was correct, then it is best\n");
|
|
||||||
printf("*** to remove the old version of LIBGNUTLS_EXTRA. You may also be able to fix the error\n");
|
|
||||||
printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
|
|
||||||
printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
|
|
||||||
printf("*** required on your system.\n");
|
|
||||||
printf("*** If libgnutls-extra-config was wrong, set the environment variable LIBGNUTLS_EXTRA_CONFIG\n");
|
|
||||||
printf("*** to point to the correct copy of libgnutls-extra-config, and remove the file config.cache\n");
|
|
||||||
printf("*** before re-running configure\n");
|
|
||||||
}
|
|
||||||
else if ( strcmp(gnutls_extra_check_version(NULL), LIBGNUTLS_EXTRA_VERSION ) )
|
|
||||||
{
|
|
||||||
printf("\n*** LIBGNUTLS_EXTRA header file (version %s) does not match\n", LIBGNUTLS_EXTRA_VERSION);
|
|
||||||
printf("*** library (version %s). This is may be due to a different version of gnutls\n", gnutls_extra_check_version(NULL) );
|
|
||||||
printf("*** and gnutls-extra.\n");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if ( gnutls_extra_check_version( "$min_libgnutls_version" ) )
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
printf("no\n*** An old version of LIBGNUTLS_EXTRA (%s) was found.\n",
|
|
||||||
gnutls_extra_check_version(NULL) );
|
|
||||||
printf("*** You need a version of LIBGNUTLS_EXTRA newer than %s. The latest version of\n",
|
|
||||||
"$min_libgnutls_version" );
|
|
||||||
printf("*** LIBGNUTLS_EXTRA is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n");
|
|
||||||
printf("*** \n");
|
|
||||||
printf("*** If you have already installed a sufficiently new version, this error\n");
|
|
||||||
printf("*** probably means that the wrong copy of the libgnutls-extra-config shell script is\n");
|
|
||||||
printf("*** being found. The easiest way to fix this is to remove the old version\n");
|
|
||||||
printf("*** of LIBGNUTLS_EXTRA, but you can also set the LIBGNUTLS_EXTRA_CONFIG environment to point to the\n");
|
|
||||||
printf("*** correct copy of libgnutls-extra-config. (In this case, you will have to\n");
|
|
||||||
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
|
|
||||||
printf("*** so that the correct libraries are found at run-time))\n");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
],, no_libgnutls=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
|
|
||||||
CFLAGS="$ac_save_CFLAGS"
|
|
||||||
LIBS="$ac_save_LIBS"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x$no_libgnutls" = x ; then
|
|
||||||
AC_MSG_RESULT(yes)
|
|
||||||
ifelse([$2], , :, [$2])
|
|
||||||
else
|
|
||||||
if test -f conf.libgnutlstest ; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
AC_MSG_RESULT(no)
|
|
||||||
fi
|
|
||||||
if test "$LIBGNUTLS_EXTRA_CONFIG" = "no" ; then
|
|
||||||
echo "*** The libgnutls-extra-config script installed by LIBGNUTLS_EXTRA could not be found"
|
|
||||||
echo "*** If LIBGNUTLS_EXTRA was installed in PREFIX, make sure PREFIX/bin is in"
|
|
||||||
echo "*** your path, or set the LIBGNUTLS_EXTRA_CONFIG environment variable to the"
|
|
||||||
echo "*** full path to libgnutls-extra-config."
|
|
||||||
else
|
|
||||||
if test -f conf.libgnutlstest ; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
echo "*** Could not run libgnutls test program, checking why..."
|
|
||||||
CFLAGS="$CFLAGS $LIBGNUTLS_EXTRA_CFLAGS"
|
|
||||||
LIBS="$LIBS $LIBGNUTLS_EXTRA_LIBS"
|
|
||||||
AC_TRY_LINK([
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <gnutls/extra.h>
|
|
||||||
], [ return !!gnutls_extra_check_version(NULL); ],
|
|
||||||
[ echo "*** The test program compiled, but did not run. This usually means"
|
|
||||||
echo "*** that the run-time linker is not finding LIBGNUTLS_EXTRA or finding the wrong"
|
|
||||||
echo "*** version of LIBGNUTLS_EXTRA. If it is not finding LIBGNUTLS_EXTRA, you'll need to set your"
|
|
||||||
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
|
|
||||||
echo "*** to the installed location Also, make sure you have run ldconfig if that"
|
|
||||||
echo "*** is required on your system"
|
|
||||||
echo "***"
|
|
||||||
echo "*** If you have an old version installed, it is best to remove it, although"
|
|
||||||
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
|
|
||||||
echo "***" ],
|
|
||||||
[ echo "*** The test program failed to compile or link. See the file config.log for the"
|
|
||||||
echo "*** exact error that occured. This usually means LIBGNUTLS_EXTRA was incorrectly installed"
|
|
||||||
echo "*** or that you have moved LIBGNUTLS_EXTRA since it was installed. In the latter case, you"
|
|
||||||
echo "*** may want to edit the libgnutls-extra-config script: $LIBGNUTLS_EXTRA_CONFIG" ])
|
|
||||||
CFLAGS="$ac_save_CFLAGS"
|
|
||||||
LIBS="$ac_save_LIBS"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
LIBGNUTLS_EXTRA_CFLAGS=""
|
|
||||||
LIBGNUTLS_EXTRA_LIBS=""
|
|
||||||
ifelse([$3], , :, [$3])
|
|
||||||
fi
|
|
||||||
rm -f conf.libgnutlstest
|
|
||||||
AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
|
|
||||||
AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
|
|
||||||
])
|
|
||||||
|
|
||||||
dnl *-*wedit:notab*-* Please keep this as the last line.
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
# ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40)
|
|
||||||
dnl Copyright (C) 1999-2002 Free Software Foundation, Inc.
|
|
||||||
dnl This file is free software, distributed under the terms of the GNU
|
|
||||||
dnl General Public License. As a special exception to the GNU General
|
|
||||||
dnl Public License, this file may be distributed as part of a program
|
|
||||||
dnl that contains a configuration script generated by Autoconf, under
|
|
||||||
dnl the same distribution terms as the rest of that program.
|
|
||||||
|
|
||||||
dnl From Paul Eggert.
|
|
||||||
|
|
||||||
AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
|
|
||||||
[
|
|
||||||
AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
|
|
||||||
[AC_TRY_LINK([unsigned long long ull = 1; int i = 63;],
|
|
||||||
[unsigned long long ullmax = (unsigned long long) -1;
|
|
||||||
return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
|
|
||||||
ac_cv_type_unsigned_long_long=yes,
|
|
||||||
ac_cv_type_unsigned_long_long=no)])
|
|
||||||
if test $ac_cv_type_unsigned_long_long = yes; then
|
|
||||||
AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
|
|
||||||
[Define if you have the unsigned long long type.])
|
|
||||||
fi
|
|
||||||
])
|
|
||||||
Loading…
Reference in New Issue
Block a user