86 lines
2.4 KiB
Plaintext
86 lines
2.4 KiB
Plaintext
$OpenBSD: patch-configure,v 1.2 2011/01/06 04:04:37 jeremy Exp $
|
|
|
|
Fix so name, checking for DOT and DOXYGEN, and use -pthread.
|
|
|
|
--- configure.orig Sat Dec 25 02:50:49 2010
|
|
+++ configure Sun Jan 2 17:26:32 2011
|
|
@@ -5823,7 +5823,7 @@ IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
-DOT=$ac_cv_prog_DOT
|
|
+DOT=""
|
|
if test -n "$DOT"; then
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOT" >&5
|
|
$as_echo "$DOT" >&6; }
|
|
@@ -5881,10 +5881,10 @@ yes:)
|
|
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
|
ac_tool_warned=yes ;;
|
|
esac
|
|
- DOT=$ac_ct_DOT
|
|
+ DOT=""
|
|
fi
|
|
else
|
|
- DOT="$ac_cv_prog_DOT"
|
|
+ DOT=""
|
|
fi
|
|
|
|
if test -n "$ac_tool_prefix"; then
|
|
@@ -5915,7 +5915,7 @@ IFS=$as_save_IFS
|
|
|
|
fi
|
|
fi
|
|
-DOXYGEN=$ac_cv_prog_DOXYGEN
|
|
+DOXYGEN=""
|
|
if test -n "$DOXYGEN"; then
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5
|
|
$as_echo "$DOXYGEN" >&6; }
|
|
@@ -5973,10 +5973,10 @@ yes:)
|
|
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
|
ac_tool_warned=yes ;;
|
|
esac
|
|
- DOXYGEN=$ac_ct_DOXYGEN
|
|
+ DOXYGEN=""
|
|
fi
|
|
else
|
|
- DOXYGEN="$ac_cv_prog_DOXYGEN"
|
|
+ DOXYGEN=""
|
|
fi
|
|
|
|
if test x"$DOXYGEN" = x; then
|
|
@@ -14777,13 +14777,13 @@ fi
|
|
if test x"$enable_pthread" = xyes; then
|
|
for pthread_lib in thr pthread pthreads c c_r root; do
|
|
as_ac_Lib=`$as_echo "ac_cv_lib_$pthread_lib''_pthread_kill" | $as_tr_sh`
|
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -l$pthread_lib" >&5
|
|
-$as_echo_n "checking for pthread_kill in -l$pthread_lib... " >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -$pthread_lib" >&5
|
|
+$as_echo_n "checking for pthread_kill in -$pthread_lib... " >&6; }
|
|
if eval \${$as_ac_Lib+:} false; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-l$pthread_lib $LIBS"
|
|
+LIBS="-$pthread_lib $LIBS"
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
@@ -14849,7 +14849,7 @@ done
|
|
c_r) :
|
|
MAINLIBS="-pthread $MAINLIBS" ;; #(
|
|
*) :
|
|
- LIBS="-l$pthread_lib $LIBS" ;;
|
|
+ LIBS="-pthread $LIBS" ;;
|
|
esac
|
|
else
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"Don't know how to find pthread library on your system -- thread support disabled\"" >&5
|
|
@@ -15697,7 +15697,7 @@ if test "$enable_shared" = 'yes'; then
|
|
openbsd*) :
|
|
|
|
SOLIBS='$(LIBS)'
|
|
- LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
|
|
+ LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.'${LIBruby19_VERSION}
|
|
;; #(
|
|
solaris*) :
|
|
|