Skip to content

GitLab

Commit 8b12c531 authored by Niels Möller's avatar Niels Möller
Browse files

*** empty log message *** 

Rev: ChangeLog:1.631
Rev: src/nettle/ChangeLog:1.181
Rev: src/nettle/acinclude.m4:1.3(DEAD)
Rev: src/spki/ChangeLog:1.48
Rev: src/spki/acinclude.m4:1.2(DEAD)
parent 79b88985
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 294 deletions
ChangeLog
View file @ 8b12c531
2003-02-19 Niels Mller <nisse@cuckoo.hack.org>
* src/nettle/acinclude.m4, src/spki/acinclude.m4: Deleted files,
let .bootstrap make links to the top-level acinclude.m4 instead.
* acinclude.m4: Renamed macros to start with the LSH_-prfix.
Deleted unused code. Updated configure.ac to match.
(LSH_TYPE_SOCKLEN_T): Moved AH_TEMPLATE into the macro body.
* .bootstrap: Link acinclude.m4 into the src/nettle and src/spki
directories. Added command line option "links", that skips the
autoconf and automake bootstrap.
* misc/Makefile.am (EXTRA_DIST): Removed bootstrap.sh. Added
make-am.
......
src/nettle/ChangeLog
View file @ 8b12c531
2003-02-19 Niels Mller <nisse@cuckoo.hack.org>
* acinclude.m4: Deleted file from cvs, use a link to lsh's
acinclude.m4 instead.
2003-02-16 Niels Mller <nisse@cuckoo.hack.org>
* Makefile.am (libnettleinclude_HEADERS): Added macros.h.
......
src/nettle/acinclude.m4 deleted 100644 → 0
View file @ 79b88985
## # checks for gmp version 3 or later.
## # AC_CHECK_LIBGMP(library, [, if-found [, if-not-found]])
## AC_DEFUN([AC_CHECK_LIBGMP],
## [AC_CACHE_CHECK([for mpz_getlimbn in -l$1], ac_cv_lib_$1_mpz_getlimbn,
## [ac_save_libs="$LIBS"
## LIBS="-l$1 $LIBS"
## AC_TRY_LINK(dnl
## [#if HAVE_GMP_H
## #include <gmp.h>
## #elif HAVE_GMP2_GMP_H
## #include <gmp2/gmp.h>
## #endif
## ],
## [mpz_getlimbn(NULL, 0);],
## ac_cv_lib_$1_mpz_getlimbn=yes,
## ac_cv_lib_$1_mpz_getlimbn=no)
## LIBS="$ac_save_LIBS"
## ])
## if test x$ac_cv_lib_$1_mpz_getlimbn = xyes ; then
## ifelse([$2], ,
## [AC_DEFINE(HAVE_LIBGMP)
## LIBS="-l$1 $LIBS"
## ], [$2])
## ifelse([$3], , ,
## [else
## $3
## ])dnl
## fi
## ])
##
## # checks for gmp version 3 or later.
## # AC_SEARCH_LIBGMP(libraries, [, if-found [, if-not-found]])
## AC_DEFUN([AC_SEARCH_LIBGMP],
## [AC_CACHE_CHECK([for library containing mpz_getlimbn], ac_cv_search_mpz_getlimbn,
## [ac_search_save_LIBS="$LIBS"
## ac_cv_search_mpz_getlimbn="no"
## for i in $1; do
## LIBS="-l$i $ac_search_save_LIBS"
## AC_TRY_LINK(dnl
## [#if HAVE_GMP_H
## #include <gmp.h>
## #elif HAVE_GMP2_GMP_H
## #include <gmp2/gmp.h>
## #endif
## ],
## [mpz_getlimbn(0);],
## [ac_cv_search_mpz_getlimbn=-l$i
## break
## ])
## done
## LIBS="$ac_search_save_LIBS"
## ])
## if test "x$ac_cv_search_mpz_getlimbn" != xno ; then
## LIBS="$ac_cv_search_mpz_getlimbn $LIBS"
## ifelse([$2], ,
## [AC_DEFINE(HAVE_LIBGMP)
## ], [$2])
## ifelse([$3], , ,
## [else
## $3
## ])dnl
## fi
## ])
# LSH_PATH_ADD(path-id, directory)
AC_DEFUN([LSH_PATH_ADD],
[AC_MSG_CHECKING($2)
ac_exists=no
if test -d "$2/." ; then
ac_real_dir=`cd $2 && pwd`
if test -n "$ac_real_dir" ; then
ac_exists=yes
for old in $1_REAL_DIRS ; do
ac_found=no
if test x$ac_real_dir = x$old ; then
ac_found=yes;
break;
fi
done
if test $ac_found = yes ; then
AC_MSG_RESULT(already added)
else
AC_MSG_RESULT(added)
# LDFLAGS="$LDFLAGS -L $2"
$1_REAL_DIRS="$ac_real_dir [$]$1_REAL_DIRS"
$1_DIRS="$2 [$]$1_DIRS"
fi
fi
fi
if test $ac_exists = no ; then
AC_MSG_RESULT(not found)
fi
])
# LSH_RPATH_ADD(dir)
AC_DEFUN([LSH_RPATH_ADD], [LSH_PATH_ADD(RPATH_CANDIDATE, $1)])
# LSH_RPATH_INIT(candidates)
AC_DEFUN([LSH_RPATH_INIT],
[AC_MSG_CHECKING([for -R flag])
RPATHFLAG=''
case `uname -sr` in
OSF1\ V4.*)
RPATHFLAG="-rpath "
;;
IRIX\ 6.*)
RPATHFLAG="-rpath "
;;
IRIX\ 5.*)
RPATHFLAG="-rpath "
;;
SunOS\ 5.*)
if test "$TCC" = "yes"; then
# tcc doesn't know about -R
RPATHFLAG="-Wl,-R,"
else
RPATHFLAG=-R
fi
;;
Linux\ 2.*)
RPATHFLAG="-Wl,-rpath,"
;;
*)
:
;;
esac
if test x$RPATHFLAG = x ; then
AC_MSG_RESULT(none)
else
AC_MSG_RESULT([using $RPATHFLAG])
fi
RPATH_CANDIDATE_REAL_DIRS=''
RPATH_CANDIDATE_DIRS=''
AC_MSG_RESULT([Searching for libraries])
for d in $1 ; do
LSH_RPATH_ADD($d)
done
])
# Try to execute a main program, and if it fails, try adding some
# -R flag.
# LSH_RPATH_FIX
AC_DEFUN([LSH_RPATH_FIX],
[if test $cross_compiling = no -a "x$RPATHFLAG" != x ; then
ac_success=no
AC_TRY_RUN([int main(int argc, char **argv) { return 0; }],
ac_success=yes, ac_success=no, :)
if test $ac_success = no ; then
AC_MSG_CHECKING([Running simple test program failed. Trying -R flags])
dnl echo RPATH_CANDIDATE_DIRS = $RPATH_CANDIDATE_DIRS
ac_remaining_dirs=''
ac_rpath_save_LDFLAGS="$LDFLAGS"
for d in $RPATH_CANDIDATE_DIRS ; do
if test $ac_success = yes ; then
ac_remaining_dirs="$ac_remaining_dirs $d"
else
LDFLAGS="$RPATHFLAG$d $LDFLAGS"
dnl echo LDFLAGS = $LDFLAGS
AC_TRY_RUN([int main(int argc, char **argv) { return 0; }],
[ac_success=yes
ac_rpath_save_LDFLAGS="$LDFLAGS"
AC_MSG_RESULT([adding $RPATHFLAG$d])
],
[ac_remaining_dirs="$ac_remaining_dirs $d"], :)
LDFLAGS="$ac_rpath_save_LDFLAGS"
fi
done
RPATH_CANDIDATE_DIRS=$ac_remaining_dirs
fi
if test $ac_success = no ; then
AC_MSG_RESULT(failed)
fi
fi
])
src/spki/ChangeLog
View file @ 8b12c531
2003-02-19 Niels Mller <nisse@cuckoo.hack.org>
* acinclude.m4: Deleted file from cvs, use a link to lsh's
acinclude.m4 instead.
2003-02-17 Niels Mller <nisse@cuckoo.hack.org>
* tools/Makefile.am (EXTRA_DIST): Added getopt.c and getopt1.c.
......
src/spki/acinclude.m4 deleted 100644 → 0
View file @ 79b88985
# LSH_PATH_ADD(path-id, directory)
AC_DEFUN([LSH_PATH_ADD],
[AC_MSG_CHECKING($2)
ac_exists=no
if test -d "$2/." ; then
ac_real_dir=`cd $2 && pwd`
if test -n "$ac_real_dir" ; then
ac_exists=yes
for old in $1_REAL_DIRS ; do
ac_found=no
if test x$ac_real_dir = x$old ; then
ac_found=yes;
break;
fi
done
if test $ac_found = yes ; then
AC_MSG_RESULT(already added)
else
AC_MSG_RESULT(added)
# LDFLAGS="$LDFLAGS -L $2"
$1_REAL_DIRS="$ac_real_dir [$]$1_REAL_DIRS"
$1_DIRS="$2 [$]$1_DIRS"
fi
fi
fi
if test $ac_exists = no ; then
AC_MSG_RESULT(not found)
fi
])
# LSH_RPATH_ADD(dir)
AC_DEFUN([LSH_RPATH_ADD], [LSH_PATH_ADD(RPATH_CANDIDATE, $1)])
# LSH_RPATH_INIT(candidates)
AC_DEFUN([LSH_RPATH_INIT],
[AC_MSG_CHECKING([for -R flag])
RPATHFLAG=''
case `uname -sr` in
OSF1\ V4.*)
RPATHFLAG="-rpath "
;;
IRIX\ 6.*)
RPATHFLAG="-rpath "
;;
IRIX\ 5.*)
RPATHFLAG="-rpath "
;;
SunOS\ 5.*)
if test "$TCC" = "yes"; then
# tcc doesn't know about -R
RPATHFLAG="-Wl,-R,"
else
RPATHFLAG=-R
fi
;;
Linux\ 2.*)
RPATHFLAG="-Wl,-rpath,"
;;
*)
:
;;
esac
if test x$RPATHFLAG = x ; then
AC_MSG_RESULT(none)
else
AC_MSG_RESULT([using $RPATHFLAG])
fi
RPATH_CANDIDATE_REAL_DIRS=''
RPATH_CANDIDATE_DIRS=''
AC_MSG_RESULT([Searching for libraries])
for d in $1 ; do
LSH_RPATH_ADD($d)
done
])
# Try to execute a main program, and if it fails, try adding some
# -R flag.
# LSH_RPATH_FIX
AC_DEFUN([LSH_RPATH_FIX],
[if test $cross_compiling = no -a "x$RPATHFLAG" != x ; then
ac_success=no
AC_TRY_RUN([int main(int argc, char **argv) { return 0; }],
ac_success=yes, ac_success=no, :)
if test $ac_success = no ; then
AC_MSG_CHECKING([Running simple test program failed. Trying -R flags])
dnl echo RPATH_CANDIDATE_DIRS = $RPATH_CANDIDATE_DIRS
ac_remaining_dirs=''
ac_rpath_save_LDFLAGS="$LDFLAGS"
for d in $RPATH_CANDIDATE_DIRS ; do
if test $ac_success = yes ; then
ac_remaining_dirs="$ac_remaining_dirs $d"
else
LDFLAGS="$RPATHFLAG$d $LDFLAGS"
dnl echo LDFLAGS = $LDFLAGS
AC_TRY_RUN([int main(int argc, char **argv) { return 0; }],
[ac_success=yes
ac_rpath_save_LDFLAGS="$LDFLAGS"
AC_MSG_RESULT([adding $RPATHFLAG$d])
],
[ac_remaining_dirs="$ac_remaining_dirs $d"], :)
LDFLAGS="$ac_rpath_save_LDFLAGS"
fi
done
RPATH_CANDIDATE_DIRS=$ac_remaining_dirs
fi
if test $ac_success = no ; then
AC_MSG_RESULT(failed)
fi
fi
])
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment