51 lines
2.4 KiB
Text
51 lines
2.4 KiB
Text
$NetBSD: patch-aa,v 1.6 2006/04/30 17:10:18 joerg Exp $
|
|
|
|
--- configure.orig 2005-12-07 17:56:07.000000000 +0000
|
|
+++ configure
|
|
@@ -465,8 +465,6 @@ ac_includes_default="\
|
|
# include <unistd.h>
|
|
#endif"
|
|
|
|
-ac_subdirs_all="$ac_subdirs_all src/libffi"
|
|
-ac_subdirs_all="$ac_subdirs_all src/libpopt"
|
|
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar LIBRELEASE RELEASE build build_cpu build_vendor build_os host host_cpu host_vendor host_os inlinability_testing JIKES FASTJAR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP LN_S EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL subdirs CONV_LIBFFI_TRUE CONV_LIBFFI_FALSE CONV_LIBPOPT_TRUE CONV_LIBPOPT_FALSE LIBSVMADD LIBSVMINCLUDE SVMADD SVMINCLUDE NO_UNDEFINED M4 LIBOBJS LTLIBOBJS'
|
|
ac_subst_files=''
|
|
|
|
@@ -19967,13 +19965,13 @@ case $host in
|
|
*-freebsd*)
|
|
;;
|
|
*)
|
|
- echo "$as_me:$LINENO: checking for pthread_self in -lpthread" >&5
|
|
-echo $ECHO_N "checking for pthread_self in -lpthread... $ECHO_C" >&6
|
|
+echo "$as_me:$LINENO: checking for pthread_self in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
|
|
+echo $ECHO_N "checking for pthread_self in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
|
|
if test "${ac_cv_lib_pthread_pthread_self+set}" = set; then
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lpthread $LIBS"
|
|
+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
/* confdefs.h. */
|
|
_ACEOF
|
|
@@ -20036,7 +20034,7 @@ else
|
|
echo ***ERROR: libpthread is missing; exit 1
|
|
fi
|
|
|
|
- LIBSVMADD="$LIBSVMADD -lpthread"
|
|
+ LIBSVMADD="$LIBSVMADD ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
|
|
;;
|
|
esac
|
|
|
|
@@ -20360,11 +20358,9 @@ esac
|
|
|
|
|
|
|
|
-subdirs="$subdirs src/libffi"
|
|
|
|
|
|
|
|
-subdirs="$subdirs src/libpopt"
|
|
|
|
|
|
|