b549864bc8
As usual with major version bump, do not forget to run the upgrade script corresponding to your DB. A new README is provided in the package. Tested by sthen@ and myself. "Don't wait on me" merdely@ (maintainer) ok sthen@
84 lines
2.7 KiB
Plaintext
84 lines
2.7 KiB
Plaintext
$OpenBSD: patch-configure,v 1.8 2011/11/17 23:45:56 ajacoutot Exp $
|
|
--- configure.orig Sun Oct 30 13:03:42 2011
|
|
+++ configure Mon Nov 14 17:12:31 2011
|
|
@@ -4764,7 +4764,7 @@ $as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
-if test ! -e $CXX; then
|
|
+if test ! -e `which $CXX`; then
|
|
as_fn_error "Unable to find C++ compiler" "$LINENO" 5
|
|
fi
|
|
|
|
@@ -16356,7 +16356,7 @@ if test x$use_libtool != xno; then
|
|
LIBTOOL_INSTALL_TARGET="libtool-install"
|
|
LIBTOOL_UNINSTALL_TARGET="libtool-uninstall"
|
|
LIBTOOL_CLEAN_TARGET="libtool-clean"
|
|
- QMAKE_LIBTOOL="${BUILD_DIR}/libtool"
|
|
+ QMAKE_LIBTOOL="${LIBTOOL}"
|
|
FD_PLUGIN_DIR="src/plugins/fd"
|
|
have_plugins=yes
|
|
else
|
|
@@ -22038,7 +22038,7 @@ eval as_val=\$$as_ac_Header
|
|
|
|
$as_echo "#define HAVE_READLINE 1" >>confdefs.h
|
|
|
|
- CONS_LIBS="-lreadline -lhistory $TERM_LIB"
|
|
+ CONS_LIBS="-lreadline $TERM_LIB"
|
|
got_readline="yes"
|
|
|
|
else
|
|
@@ -22078,7 +22078,7 @@ $as_echo "#define HAVE_READLINE 1" >>confdefs.h
|
|
|
|
got_readline="yes"
|
|
CONS_INC="-I${TOP_DIR}/depkgs/readline"
|
|
- CONS_LIBS="-lreadline -lhistory $TERM_LIB"
|
|
+ CONS_LIBS="-lreadline $TERM_LIB"
|
|
CONS_LDFLAGS="-L${TOP_DIR}/depkgs/readline"
|
|
PRTREADLINE_SRC="${TOP_DIR}/depkgs/readline"
|
|
|
|
@@ -29782,13 +29782,13 @@ $as_echo "#define HAVE_XATTR 1" >>confdefs.h
|
|
fi
|
|
|
|
PTHREAD_LIB=""
|
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
|
|
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -pthread" >&5
|
|
+$as_echo_n "checking for pthread_create in -pthread... " >&6; }
|
|
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lpthread $LIBS"
|
|
+LIBS="-pthread $LIBS"
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
@@ -29819,7 +29819,7 @@ fi
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
|
|
$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
|
|
if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then :
|
|
- PTHREAD_LIB="-lpthread"
|
|
+ PTHREAD_LIB="-pthread"
|
|
else
|
|
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthreads" >&5
|
|
@@ -30189,7 +30189,8 @@ openbsd)
|
|
DISTVER=`uname -a |awk '{print $3}'`
|
|
lld="qd"
|
|
llu="qu"
|
|
- TAPEDRIVE="/dev/nrst0"
|
|
+ COMPRESS_MANPAGES=
|
|
+ TAPEDRIVE="/dev/rst0"
|
|
PSCMD="ps -ax -o pid,command"
|
|
PTHREAD_LIB="-pthread"
|
|
CFLAGS="${CFLAGS} -pthread"
|
|
@@ -30198,6 +30199,7 @@ openbsd)
|
|
platforms/openbsd/bacula-fd \
|
|
platforms/openbsd/bacula-sd \
|
|
platforms/openbsd/bacula-dir"
|
|
+ largefile_support="yes"
|
|
;;
|
|
redhat)
|
|
if test -f /etc/whitebox-release ; then
|