pkgsrc/textproc/hyperestraier/patches/patch-aa
obache a27cc3a084 Remove setup of environment variables from configure script
to avoid unwanted detection of pre-installed tools.
2008-05-27 13:51:02 +00:00

50 lines
1.7 KiB
Text

$NetBSD: patch-aa,v 1.6 2008/05/27 13:51:02 obache Exp $
--- configure.orig 2007-12-25 01:47:49.000000000 +0000
+++ configure
@@ -1282,25 +1282,6 @@ MYAPPLIBS=""
MYRUNPATH=""
MYPOSTCMD="true"
-# Building paths
-pathtmp="$PATH"
-PATH="$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
-CPATH="$HOME/include:/usr/local/include:$CPATH"
-PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
-if type pkg-config > /dev/null 2>&1
-then
- PATH="$PATH:`pkg-config --variable=bindir qdbm`"
- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
- CPATH="$CPATH:`pkg-config --variable=includedir qdbm`"
- export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
-fi
-
-
#================================================================
# Options
@@ -2966,7 +2947,7 @@ if test "${ac_cv_lib_pthread_main+set}"
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
+LIBS="$PTHREAD_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -3019,7 +3000,9 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_main" >&5
echo "${ECHO_T}$ac_cv_lib_pthread_main" >&6
if test $ac_cv_lib_pthread_main = yes; then
- MYMTLIBS="-lpthread $MYMTLIBS"
+ MYMTLIBS="$PTHREAD_LIBS $MYMTLIBS"
+ MYCPPOPTS="$PTHREAD_CFLAGS $MYCPPOPTS"
+ MYLDOPTS="$PTHREAD_LDFLAGS $MYLDOPTS"
fi