From 50d43ce0ea1d5d6ce559a97c25efff755310913c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se> Date: Wed, 19 Feb 2003 23:19:17 +0100 Subject: [PATCH] *** empty log message *** Rev: src/nettle/ChangeLog:1.181 Rev: src/nettle/acinclude.m4:1.3(DEAD) --- ChangeLog | 5 ++ acinclude.m4 | 179 --------------------------------------------------- 2 files changed, 5 insertions(+), 179 deletions(-) delete mode 100644 acinclude.m4 diff --git a/ChangeLog b/ChangeLog index 38734248..1d13b5cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-02-19 Niels Möller <nisse@cuckoo.hack.org> + + * acinclude.m4: Deleted file from cvs, use a link to lsh's + acinclude.m4 instead. + 2003-02-16 Niels Möller <nisse@cuckoo.hack.org> * Makefile.am (libnettleinclude_HEADERS): Added macros.h. diff --git a/acinclude.m4 b/acinclude.m4 deleted file mode 100644 index f75c287d..00000000 --- a/acinclude.m4 +++ /dev/null @@ -1,179 +0,0 @@ -## # 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 -]) -- GitLab