From: Niels Möller Date: Thu, 18 Sep 2025 17:57:39 +0000 (+0200) Subject: Delete configure options --with-lib-path and --with-include-path. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=81711828bff761e839ffc39eb85d0344e694d0b0;p=thirdparty%2Fnettle.git Delete configure options --with-lib-path and --with-include-path. --- diff --git a/ChangeLog b/ChangeLog index b3fbaa80..bb616761 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2025-09-18 Niels Möller + + * configure.ac: Delete unusual configure options --with-lib-path + and --with-lib-path. + * aclocal.m4 (LSH_PATH_ADD, LSH_RPATH_ADD, LSH_RPATH_INIT) + (LSH_RPATH_FIX): Deleted now unused macros. + 2025-09-15 Niels Möller * slh-dsa-sha2-128f.c (slh_dsa_sha2_128f_root) diff --git a/aclocal.m4 b/aclocal.m4 index de7f2331..73bf0cfb 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -38,112 +38,6 @@ AC_CACHE_VAL(lsh_cv_sys_ccpic,[ CCPIC="$lsh_cv_sys_ccpic" AC_MSG_RESULT($CCPIC)]) -dnl 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 -]) - -dnl LSH_RPATH_ADD(dir) -AC_DEFUN([LSH_RPATH_ADD], [LSH_PATH_ADD(RPATH_CANDIDATE, $1)]) - -dnl LSH_RPATH_INIT(candidates) -AC_DEFUN([LSH_RPATH_INIT], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_MSG_CHECKING([for -R flag]) -RPATHFLAG='' -case "$host_os" in - osf1*) RPATHFLAG="-rpath " ;; - irix6.*|irix5.*) RPATHFLAG="-rpath " ;; - solaris*) - if test "$TCC" = "yes"; then - # tcc doesn't know about -R - RPATHFLAG="-Wl,-R," - else - RPATHFLAG=-R - fi - ;; - linux*|freebsd*) RPATHFLAG="-Wl,-rpath," ;; - *) RPATHFLAG="" ;; -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 -]) - -dnl Try to execute a main program, and if it fails, try adding some -dnl -R flag. -dnl LSH_RPATH_FIX -AC_DEFUN([LSH_RPATH_FIX], -[if test $cross_compiling = no -a "x$RPATHFLAG" != x ; then - ac_success=no - AC_RUN_IFELSE([AC_LANG_SOURCE([[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_RUN_IFELSE([AC_LANG_SOURCE([[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 -]) - dnl LSH_GCC_ATTRIBUTES dnl Check for gcc's __attribute__ construction diff --git a/configure.ac b/configure.ac index 53e9013c..c49a23dd 100644 --- a/configure.ac +++ b/configure.ac @@ -25,22 +25,6 @@ AC_SUBST([MINOR_VERSION]) AC_CANONICAL_HOST # Command line options -AC_ARG_WITH(include-path, - AS_HELP_STRING([--with-include-path], [A colon-separated list of directories to search for include files]),, - [with_include_path='']) - -if test x$with_include_path != x ; then - CPPFLAGS="$CPPFLAGS -I`echo $with_include_path | sed 's/:/ -I/g'`" -fi - -AC_ARG_WITH(lib-path, - AS_HELP_STRING([--with-lib-path], [A colon-separated list of directories to search for libraries]),, - [with_lib_path='']) - -if test x$with_lib_path != x ; then - LDFLAGS="$LDFLAGS -L`echo $with_lib_path | sed 's/:/ -L/g'`" -fi - AC_ARG_ENABLE(public-key, AS_HELP_STRING([--disable-public-key], [Disable public key algorithms]),, [enable_public_key=yes]) @@ -141,11 +125,6 @@ if test "$enable_extra_asserts" = yes ; then AC_DEFINE(WITH_EXTRA_ASSERTS) fi -LSH_RPATH_INIT([`echo $with_lib_path | sed 's/:/ /g'` \ - `echo $exec_prefix | sed "s@^NONE@$prefix/lib@g" | sed "s@^NONE@$ac_default_prefix/lib@g"` \ - /usr/local/lib /sw/local/lib /sw/lib \ - /usr/gnu/lib /opt/gnu/lib /sw/gnu/lib /usr/freeware/lib /usr/pkg/lib]) - # Checks for programs. AC_PROG_CC @@ -270,9 +249,6 @@ if test "x$enable_public_key" = "xyes" ; then [GNU MP not found, or too old. GMP-6.1.0 or later is needed, see https://gmplib.org/. Support for public key algorithms will be unavailable.])] enable_public_key=no) - - # Add -R flags needed to run programs linked with gmp - LSH_RPATH_FIX fi fi