- Apply fix for scheduler for missing unlock_jobs().
- Clean out autoconf caches before rebuilding configure
- Fix the FreeBSD pthreads lib define updated by Dan.
- Add missing semicolon in src/console/console.c
- Add Robert's enhanced version of build-win32-cross-tools
as well as his patch file.
- Note, the new gcc options are likely to break building of
wx-console or the tray-monitor ...
24Jun06
- Implement Robert's suggestion to suppress printing compile lines.
- Detect GCC correctly (I hope)
- If using GCC (actually g++) add the following compiler flags
-fno-strict-aliasing -fno-exceptions -fno-rtti
- Turn on new bsnprintf() code.
- Fix crypto when not using openssl. I previously overlooked this.
- Eliminate crypto type punning problems by eliminating void * and
using uint8_t * instead.
- Harden authentication failure in FD by single threading errors
and forcing a 6 second wait.
git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3074
91ce42f0-d328-0410-95d8-
f526ca767f89
17 files changed:
configure: autoconf/configure.in autoconf/aclocal.m4 autoconf/acconfig.h autoconf/config.h.in
cd $(srcdir);
${RMF} -f config.cache config.log config.out config.status src/config.h
configure: autoconf/configure.in autoconf/aclocal.m4 autoconf/acconfig.h autoconf/config.h.in
cd $(srcdir);
${RMF} -f config.cache config.log config.out config.status src/config.h
+ ${RMF} -rf autoconf/autom4te.cache autom4te.cache
autoconf --prepend-include=$(srcdir)/autoconf \
autoconf/configure.in > configure
chmod 755 configure
autoconf --prepend-include=$(srcdir)/autoconf \
autoconf/configure.in > configure
chmod 755 configure
mandir = @mandir@/man8
manext = 8
mandir = @mandir@/man8
manext = 8
# Tools & program stuff
CC = @CC@
CPP = @CPP@
# Tools & program stuff
CC = @CC@
CPP = @CPP@
], bash_cv_signal_vintage="posix",
[
AC_TRY_LINK([#include <signal.h>], [
], bash_cv_signal_vintage="posix",
[
AC_TRY_LINK([#include <signal.h>], [
- int mask = sigmask(SIGINT);
- sigsetmask(mask); sigblock(mask); sigpause(mask);
+ int mask = sigmask(SIGINT);
+ sigsetmask(mask); sigblock(mask); sigpause(mask);
], bash_cv_signal_vintage="4.2bsd",
[
], bash_cv_signal_vintage="4.2bsd",
[
- AC_TRY_LINK([
- #include <signal.h>
- RETSIGTYPE foo() { }], [
- int mask = sigmask(SIGINT);
- sigset(SIGINT, foo); sigrelse(SIGINT);
- sighold(SIGINT); sigpause(SIGINT);
+ AC_TRY_LINK([
+ #include <signal.h>
+ RETSIGTYPE foo() { }], [
+ int mask = sigmask(SIGINT);
+ sigset(SIGINT, foo); sigrelse(SIGINT);
+ sighold(SIGINT); sigpause(SIGINT);
], bash_cv_signal_vintage="svr3", bash_cv_signal_vintage="v7"
], bash_cv_signal_vintage="svr3", bash_cv_signal_vintage="v7"
AC_CYGWIN
if test $HAVE_UNAME=yes -a x`uname -s` = xSunOS
then
AC_CYGWIN
if test $HAVE_UNAME=yes -a x`uname -s` = xSunOS
then
- BA_CONDITIONAL(HAVE_SUN_OS, $TRUEPRG)
- AC_DEFINE(HAVE_SUN_OS)
+ BA_CONDITIONAL(HAVE_SUN_OS, $TRUEPRG)
+ AC_DEFINE(HAVE_SUN_OS)
- BA_CONDITIONAL(HAVE_SUN_OS, $FALSEPRG)
+ BA_CONDITIONAL(HAVE_SUN_OS, $FALSEPRG)
fi
if test $HAVE_UNAME=yes -a x`uname -s` = xOSF1
then
fi
if test $HAVE_UNAME=yes -a x`uname -s` = xOSF1
then
- BA_CONDITIONAL(HAVE_OSF1_OS, $TRUEPRG)
- AC_DEFINE(HAVE_OSF1_OS)
+ BA_CONDITIONAL(HAVE_OSF1_OS, $TRUEPRG)
+ AC_DEFINE(HAVE_OSF1_OS)
- BA_CONDITIONAL(HAVE_OSF1_OS, $FALSEPRG)
+ BA_CONDITIONAL(HAVE_OSF1_OS, $FALSEPRG)
fi
if test $HAVE_UNAME=yes -a x`uname -s` = xAIX
then
fi
if test $HAVE_UNAME=yes -a x`uname -s` = xAIX
then
- BA_CONDITIONAL(HAVE_AIX_OS, $TRUEPRG)
- AC_DEFINE(HAVE_AIX_OS)
+ BA_CONDITIONAL(HAVE_AIX_OS, $TRUEPRG)
+ AC_DEFINE(HAVE_AIX_OS)
- BA_CONDITIONAL(HAVE_AIX_OS, $FALSEPRG)
+ BA_CONDITIONAL(HAVE_AIX_OS, $FALSEPRG)
fi
if test $HAVE_UNAME=yes -a x`uname -s` = xHP-UX
then
fi
if test $HAVE_UNAME=yes -a x`uname -s` = xHP-UX
then
- BA_CONDITIONAL(HAVE_HPUX_OS, $TRUEPRG)
- AC_DEFINE(HAVE_HPUX_OS)
+ BA_CONDITIONAL(HAVE_HPUX_OS, $TRUEPRG)
+ AC_DEFINE(HAVE_HPUX_OS)
- BA_CONDITIONAL(HAVE_HPUX_OS, $FALSEPRG)
+ BA_CONDITIONAL(HAVE_HPUX_OS, $FALSEPRG)
fi
if test $HAVE_UNAME=yes -a x`uname -s` = xLinux
then
fi
if test $HAVE_UNAME=yes -a x`uname -s` = xLinux
then
- BA_CONDITIONAL(HAVE_LINUX_OS, $TRUEPRG)
- AC_DEFINE(HAVE_LINUX_OS)
+ BA_CONDITIONAL(HAVE_LINUX_OS, $TRUEPRG)
+ AC_DEFINE(HAVE_LINUX_OS)
- BA_CONDITIONAL(HAVE_LINUX_OS, $FALSEPRG)
+ BA_CONDITIONAL(HAVE_LINUX_OS, $FALSEPRG)
fi
if test $HAVE_UNAME=yes -a x`uname -s` = xFreeBSD
then
fi
if test $HAVE_UNAME=yes -a x`uname -s` = xFreeBSD
then
- BA_CONDITIONAL(HAVE_FREEBSD_OS, $TRUEPRG)
- AC_DEFINE(HAVE_FREEBSD_OS)
+ BA_CONDITIONAL(HAVE_FREEBSD_OS, $TRUEPRG)
+ AC_DEFINE(HAVE_FREEBSD_OS)
- BA_CONDITIONAL(HAVE_FREEBSD_OS, $FALSEPRG)
+ BA_CONDITIONAL(HAVE_FREEBSD_OS, $FALSEPRG)
fi
if test $HAVE_UNAME=yes -a x`uname -s` = xNetBSD
then
fi
if test $HAVE_UNAME=yes -a x`uname -s` = xNetBSD
then
- BA_CONDITIONAL(HAVE_NETBSD_OS, $TRUEPRG)
- AC_DEFINE(HAVE_NETBSD_OS)
+ BA_CONDITIONAL(HAVE_NETBSD_OS, $TRUEPRG)
+ AC_DEFINE(HAVE_NETBSD_OS)
- BA_CONDITIONAL(HAVE_NETBSD_OS, $FALSEPRG)
+ BA_CONDITIONAL(HAVE_NETBSD_OS, $FALSEPRG)
fi
if test $HAVE_UNAME=yes -a x`uname -s` = xOpenBSD
then
fi
if test $HAVE_UNAME=yes -a x`uname -s` = xOpenBSD
then
- BA_CONDITIONAL(HAVE_OPENBSD_OS, $TRUEPRG)
- AC_DEFINE(HAVE_OPENBSD_OS)
+ BA_CONDITIONAL(HAVE_OPENBSD_OS, $TRUEPRG)
+ AC_DEFINE(HAVE_OPENBSD_OS)
- BA_CONDITIONAL(HAVE_OPENBSD_OS, $FALSEPRG)
+ BA_CONDITIONAL(HAVE_OPENBSD_OS, $FALSEPRG)
fi
if test $HAVE_UNAME=yes -a x`uname -s` = xBSD/OS
then
fi
if test $HAVE_UNAME=yes -a x`uname -s` = xBSD/OS
then
- BA_CONDITIONAL(HAVE_BSDI_OS, $TRUEPRG)
- AC_DEFINE(HAVE_BSDI_OS)
+ BA_CONDITIONAL(HAVE_BSDI_OS, $TRUEPRG)
+ AC_DEFINE(HAVE_BSDI_OS)
- BA_CONDITIONAL(HAVE_BSDI_OS, $FALSEPRG)
+ BA_CONDITIONAL(HAVE_BSDI_OS, $FALSEPRG)
fi
if test $HAVE_UNAME=yes -a x`uname -s` = xSGI
then
fi
if test $HAVE_UNAME=yes -a x`uname -s` = xSGI
then
- BA_CONDITIONAL(HAVE_SGI_OS, $TRUEPRG)
- AC_DEFINE(HAVE_SGI_OS)
+ BA_CONDITIONAL(HAVE_SGI_OS, $TRUEPRG)
+ AC_DEFINE(HAVE_SGI_OS)
- BA_CONDITIONAL(HAVE_SGI_OS, $FALSEPRG)
+ BA_CONDITIONAL(HAVE_SGI_OS, $FALSEPRG)
fi
if test $HAVE_UNAME=yes -a x`uname -s` = xIRIX -o x`uname -s` = xIRIX64
then
fi
if test $HAVE_UNAME=yes -a x`uname -s` = xIRIX -o x`uname -s` = xIRIX64
then
- BA_CONDITIONAL(HAVE_IRIX_OS, $TRUEPRG)
- AC_DEFINE(HAVE_IRIX_OS)
+ BA_CONDITIONAL(HAVE_IRIX_OS, $TRUEPRG)
+ AC_DEFINE(HAVE_IRIX_OS)
- BA_CONDITIONAL(HAVE_IRIX_OS, $FALSEPRG)
+ BA_CONDITIONAL(HAVE_IRIX_OS, $FALSEPRG)
fi
if test $HAVE_UNAME=yes -a x`uname -s` = xDarwin
fi
if test $HAVE_UNAME=yes -a x`uname -s` = xDarwin
echo "distname set to $DISTNAME"
elif test $HAVE_UNAME=yes -a x`uname -s` = xOSF1
then
echo "distname set to $DISTNAME"
elif test $HAVE_UNAME=yes -a x`uname -s` = xOSF1
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xAIX
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xAIX
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xHP-UX
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xHP-UX
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xSunOS
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xSunOS
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xFreeBSD
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xFreeBSD
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xNetBSD
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xNetBSD
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xOpenBSD
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xOpenBSD
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xIRIX
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xIRIX
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xBSD/OS
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xBSD/OS
then
elif test -f /etc/SuSE-release
then
elif test -f /etc/SuSE-release
then
elif test -d /etc/SuSEconfig
then
elif test -d /etc/SuSEconfig
then
elif test -f /etc/mandrake-release
then
elif test -f /etc/mandrake-release
then
elif test -f /etc/whitebox-release
then
DISTNAME=redhat
elif test -f /etc/redhat-release
then
elif test -f /etc/whitebox-release
then
DISTNAME=redhat
elif test -f /etc/redhat-release
then
elif test -f /etc/gentoo-release
then
elif test -f /etc/gentoo-release
then
elif test -f /etc/debian_version
then
elif test -f /etc/debian_version
then
elif test -f /etc/slackware-version
then
elif test -f /etc/slackware-version
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xDarwin
then
DISTNAME=darwin
elif test -f /etc/engarde-version
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xDarwin
then
DISTNAME=darwin
elif test -f /etc/engarde-version
then
elif test "$CYGWIN" = yes
then
elif test "$CYGWIN" = yes
then
- DISTNAME=cygwin
- AC_DEFINE(HAVE_CYGWIN)
+ DISTNAME=cygwin
+ AC_DEFINE(HAVE_CYGWIN)
fi
AC_MSG_RESULT(done)
])
fi
AC_MSG_RESULT(done)
])
AC_PROG_CC_C_O dnl Determine if C compiler support -c -o.
AC_PROG_GCC_TRADITIONAL dnl Determine if ioctl() need -traditional.
AC_PROG_CC_C_O dnl Determine if C compiler support -c -o.
AC_PROG_GCC_TRADITIONAL dnl Determine if ioctl() need -traditional.
-if test "x$CC" = xgcc; then
+BASECC=`basename $CC`
+have_gcc=no
+if test "x$BASECC" = xgcc; then
fi
AC_PATH_PROG(CXX, $CXX, $CXX)
if test ! -e $CXX; then
fi
AC_PATH_PROG(CXX, $CXX, $CXX)
if test ! -e $CXX; then
+
+if test x$have_gcc = xyes ; then
+ CPPFLAGS="$CPPFLAGS -fno-strict-aliasing -fno-exceptions -fno-rtti"
+ CFLAGS="$CFLAGS -fno-strict-aliasing -fno-exceptions -fno-rtti"
+fi
LDFLAGS=${LDFLAGS--O}
DB_LIBS="${SQL_LFLAGS}"
LDFLAGS=${LDFLAGS--O}
DB_LIBS="${SQL_LFLAGS}"
AC_SUBST(DEBUG)
AC_SUBST(DINCLUDE)
AC_SUBST(CFLAGS)
AC_SUBST(DEBUG)
AC_SUBST(DINCLUDE)
AC_SUBST(CFLAGS)
DISTVER=`uname -a |awk '{print $3}'`
VER=`echo $DISTVER | cut -c 1`
if test x$VER = x4 ; then
DISTVER=`uname -a |awk '{print $3}'`
VER=`echo $DISTVER | cut -c 1`
if test x$VER = x4 ; then
- PTHREAD_LIB=""${PTHREAD_LIBS}"
+ PTHREAD_LIB="${PTHREAD_LIBS}"
CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
fi
lld="qd"
CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
fi
lld="qd"
-if test "x$CC" = xgcc; then
+BASECC=`basename $CC`
+have_gcc=no
+if test "x$BASECC" = xgcc; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_GCC 1
_ACEOF
cat >>confdefs.h <<\_ACEOF
#define HAVE_GCC 1
_ACEOF
fi
# Extract the first word of "$CXX", so it can be a program name with args.
set dummy $CXX; ac_word=$2
fi
# Extract the first word of "$CXX", so it can be a program name with args.
set dummy $CXX; ac_word=$2
HAVE_SUN_OS_TRUE='#'
HAVE_SUN_OS_FALSE=
fi
HAVE_SUN_OS_TRUE='#'
HAVE_SUN_OS_FALSE=
fi
- cat >>confdefs.h <<\_ACEOF
+ cat >>confdefs.h <<\_ACEOF
#define HAVE_SUN_OS 1
_ACEOF
#define HAVE_SUN_OS 1
_ACEOF
HAVE_OSF1_OS_TRUE='#'
HAVE_OSF1_OS_FALSE=
fi
HAVE_OSF1_OS_TRUE='#'
HAVE_OSF1_OS_FALSE=
fi
- cat >>confdefs.h <<\_ACEOF
+ cat >>confdefs.h <<\_ACEOF
#define HAVE_OSF1_OS 1
_ACEOF
#define HAVE_OSF1_OS 1
_ACEOF
HAVE_AIX_OS_TRUE='#'
HAVE_AIX_OS_FALSE=
fi
HAVE_AIX_OS_TRUE='#'
HAVE_AIX_OS_FALSE=
fi
- cat >>confdefs.h <<\_ACEOF
+ cat >>confdefs.h <<\_ACEOF
#define HAVE_AIX_OS 1
_ACEOF
#define HAVE_AIX_OS 1
_ACEOF
HAVE_HPUX_OS_TRUE='#'
HAVE_HPUX_OS_FALSE=
fi
HAVE_HPUX_OS_TRUE='#'
HAVE_HPUX_OS_FALSE=
fi
- cat >>confdefs.h <<\_ACEOF
+ cat >>confdefs.h <<\_ACEOF
#define HAVE_HPUX_OS 1
_ACEOF
#define HAVE_HPUX_OS 1
_ACEOF
HAVE_LINUX_OS_TRUE='#'
HAVE_LINUX_OS_FALSE=
fi
HAVE_LINUX_OS_TRUE='#'
HAVE_LINUX_OS_FALSE=
fi
- cat >>confdefs.h <<\_ACEOF
+ cat >>confdefs.h <<\_ACEOF
#define HAVE_LINUX_OS 1
_ACEOF
#define HAVE_LINUX_OS 1
_ACEOF
HAVE_FREEBSD_OS_TRUE='#'
HAVE_FREEBSD_OS_FALSE=
fi
HAVE_FREEBSD_OS_TRUE='#'
HAVE_FREEBSD_OS_FALSE=
fi
- cat >>confdefs.h <<\_ACEOF
+ cat >>confdefs.h <<\_ACEOF
#define HAVE_FREEBSD_OS 1
_ACEOF
#define HAVE_FREEBSD_OS 1
_ACEOF
HAVE_NETBSD_OS_TRUE='#'
HAVE_NETBSD_OS_FALSE=
fi
HAVE_NETBSD_OS_TRUE='#'
HAVE_NETBSD_OS_FALSE=
fi
- cat >>confdefs.h <<\_ACEOF
+ cat >>confdefs.h <<\_ACEOF
#define HAVE_NETBSD_OS 1
_ACEOF
#define HAVE_NETBSD_OS 1
_ACEOF
HAVE_OPENBSD_OS_TRUE='#'
HAVE_OPENBSD_OS_FALSE=
fi
HAVE_OPENBSD_OS_TRUE='#'
HAVE_OPENBSD_OS_FALSE=
fi
- cat >>confdefs.h <<\_ACEOF
+ cat >>confdefs.h <<\_ACEOF
#define HAVE_OPENBSD_OS 1
_ACEOF
#define HAVE_OPENBSD_OS 1
_ACEOF
HAVE_BSDI_OS_TRUE='#'
HAVE_BSDI_OS_FALSE=
fi
HAVE_BSDI_OS_TRUE='#'
HAVE_BSDI_OS_FALSE=
fi
- cat >>confdefs.h <<\_ACEOF
+ cat >>confdefs.h <<\_ACEOF
#define HAVE_BSDI_OS 1
_ACEOF
#define HAVE_BSDI_OS 1
_ACEOF
HAVE_SGI_OS_TRUE='#'
HAVE_SGI_OS_FALSE=
fi
HAVE_SGI_OS_TRUE='#'
HAVE_SGI_OS_FALSE=
fi
- cat >>confdefs.h <<\_ACEOF
+ cat >>confdefs.h <<\_ACEOF
#define HAVE_SGI_OS 1
_ACEOF
#define HAVE_SGI_OS 1
_ACEOF
-if test $HAVE_UNAME=yes -a x`uname -s` = xIRIX
+if test $HAVE_UNAME=yes -a x`uname -s` = xIRIX -o x`uname -s` = xIRIX64
HAVE_IRIX_OS_TRUE='#'
HAVE_IRIX_OS_FALSE=
fi
HAVE_IRIX_OS_TRUE='#'
HAVE_IRIX_OS_FALSE=
fi
- cat >>confdefs.h <<\_ACEOF
+ cat >>confdefs.h <<\_ACEOF
#define HAVE_IRIX_OS 1
_ACEOF
#define HAVE_IRIX_OS 1
_ACEOF
echo "distname set to $DISTNAME"
elif test $HAVE_UNAME=yes -a x`uname -s` = xOSF1
then
echo "distname set to $DISTNAME"
elif test $HAVE_UNAME=yes -a x`uname -s` = xOSF1
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xAIX
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xAIX
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xHP-UX
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xHP-UX
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xSunOS
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xSunOS
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xFreeBSD
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xFreeBSD
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xNetBSD
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xNetBSD
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xOpenBSD
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xOpenBSD
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xIRIX
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xIRIX
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xBSD/OS
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xBSD/OS
then
elif test -f /etc/SuSE-release
then
elif test -f /etc/SuSE-release
then
elif test -d /etc/SuSEconfig
then
elif test -d /etc/SuSEconfig
then
elif test -f /etc/mandrake-release
then
elif test -f /etc/mandrake-release
then
elif test -f /etc/whitebox-release
then
DISTNAME=redhat
elif test -f /etc/redhat-release
then
elif test -f /etc/whitebox-release
then
DISTNAME=redhat
elif test -f /etc/redhat-release
then
elif test -f /etc/gentoo-release
then
elif test -f /etc/gentoo-release
then
elif test -f /etc/debian_version
then
elif test -f /etc/debian_version
then
elif test -f /etc/slackware-version
then
elif test -f /etc/slackware-version
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xDarwin
then
DISTNAME=darwin
elif test -f /etc/engarde-version
then
elif test $HAVE_UNAME=yes -a x`uname -s` = xDarwin
then
DISTNAME=darwin
elif test -f /etc/engarde-version
then
elif test "$CYGWIN" = yes
then
elif test "$CYGWIN" = yes
then
- DISTNAME=cygwin
- cat >>confdefs.h <<\_ACEOF
+ DISTNAME=cygwin
+ cat >>confdefs.h <<\_ACEOF
#define HAVE_CYGWIN 1
_ACEOF
else
#define HAVE_CYGWIN 1
_ACEOF
else
fi
echo "$as_me:$LINENO: result: done" >&5
echo "${ECHO_T}done" >&6
fi
echo "$as_me:$LINENO: result: done" >&5
echo "${ECHO_T}done" >&6
- int mask = sigmask(SIGINT);
- sigsetmask(mask); sigblock(mask); sigpause(mask);
+ int mask = sigmask(SIGINT);
+ sigsetmask(mask); sigblock(mask); sigpause(mask);
sed 's/^/| /' conftest.$ac_ext >&5
sed 's/^/| /' conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
- #include <signal.h>
- RETSIGTYPE foo() { }
+ #include <signal.h>
+ RETSIGTYPE foo() { }
- int mask = sigmask(SIGINT);
- sigset(SIGINT, foo); sigrelse(SIGINT);
- sighold(SIGINT); sigpause(SIGINT);
+ int mask = sigmask(SIGINT);
+ sigset(SIGINT, foo); sigrelse(SIGINT);
+ sighold(SIGINT); sigpause(SIGINT);
+
+if test x$have_gcc = xyes ; then
+ CPPFLAGS="$CPPFLAGS -fno-strict-aliasing -fno-exceptions -fno-rtti"
+ CFLAGS="$CFLAGS -fno-strict-aliasing -fno-exceptions -fno-rtti"
+fi
LDFLAGS=${LDFLAGS--O}
DB_LIBS="${SQL_LFLAGS}"
LDFLAGS=${LDFLAGS--O}
DB_LIBS="${SQL_LFLAGS}"
DISTVER=`uname -a |awk '{print $3}'`
VER=`echo $DISTVER | cut -c 1`
if test x$VER = x4 ; then
DISTVER=`uname -a |awk '{print $3}'`
VER=`echo $DISTVER | cut -c 1`
if test x$VER = x4 ; then
- PTHREAD_LIB="-pthread"
- CFLAGS="${CFLAGS} -pthread"
+ PTHREAD_LIB="${PTHREAD_LIBS}"
+ CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
+25Jun06
+- Apply fix for scheduler for missing unlock_jobs().
+- Clean out autoconf caches before rebuilding configure
+- Fix the FreeBSD pthreads lib define updated by Dan.
+- Add missing semicolon in src/console/console.c
+- Add Robert's enhanced version of build-win32-cross-tools
+ as well as his patch file.
+- Note, the new gcc options are likely to break building of
+ wx-console or the tray-monitor ...
+- Implement Robert's suggestion to suppress printing compile lines.
+- Detect GCC correctly (I hope)
+- If using GCC (actually g++) add the following compiler flags
+ -fno-strict-aliasing -fno-exceptions -fno-rtti
- Turn on new bsnprintf() code.
- Fix crypto when not using openssl. I previously overlooked this.
- Eliminate crypto type punning problems by eliminating void * and
- Turn on new bsnprintf() code.
- Fix crypto when not using openssl. I previously overlooked this.
- Eliminate crypto type punning problems by eliminating void * and
- $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(SQL_INC) $(DINCLUDE) $(CFLAGS) $<
+ @echo "Compiling $<"
+ $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(SQL_INC) $(DINCLUDE) $(CFLAGS) $<
#-------------------------------------------------------------------------
all: Makefile libsql.a
@echo "==== Make of cats is good ===="
@echo " "
libsql.a: $(LIBOBJS)
#-------------------------------------------------------------------------
all: Makefile libsql.a
@echo "==== Make of cats is good ===="
@echo " "
libsql.a: $(LIBOBJS)
$(AR) rc $@ $(LIBOBJS)
$(RANLIB) $@
$(AR) rc $@ $(LIBOBJS)
$(RANLIB) $@
- $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(CONS_INC) $(OPENSSL_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+ echo "Compiling $<"
+ $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(CONS_INC) $(OPENSSL_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
#-------------------------------------------------------------------------
all: Makefile bconsole @STATIC_CONS@
@echo "==== Make of console is good ===="
#-------------------------------------------------------------------------
all: Makefile bconsole @STATIC_CONS@
@echo "==== Make of console is good ===="
#ifdef HAVE_TLS
# ifdef HAVE_MINGW
const char *prompt = (const char *)userdata;
#ifdef HAVE_TLS
# ifdef HAVE_MINGW
const char *prompt = (const char *)userdata;
if (win32_cgets(buf, size) == NULL) {
buf[0] = 0;
return 0;
if (win32_cgets(buf, size) == NULL) {
buf[0] = 0;
return 0;
- $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(PYTHON_INC) $(OPENSSL_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+ @echo "Compiling $<"
+ $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(PYTHON_INC) $(OPENSSL_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
#-------------------------------------------------------------------------
all: Makefile bacula-dir @STATIC_DIR@
@echo "==== Make of dird is good ===="
@echo " "
bacula-dir: $(SVROBJS) ../lib/libbac.a ../cats/libsql.a ../findlib/libfind.a
#-------------------------------------------------------------------------
all: Makefile bacula-dir @STATIC_DIR@
@echo "==== Make of dird is good ===="
@echo " "
bacula-dir: $(SVROBJS) ../lib/libbac.a ../cats/libsql.a ../findlib/libfind.a
$(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
-lsql -lfind -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
$(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
$(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
-lsql -lfind -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
$(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
free(next_job);
}
schedules_invalidated = false;
free(next_job);
}
schedules_invalidated = false;
goto again;
}
unlock_jobs();
goto again;
}
unlock_jobs();
- $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(PYTHON_INC) $(OPENSSL_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+ @echo "Compiling $<"
+ $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(PYTHON_INC) $(OPENSSL_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
#-------------------------------------------------------------------------
all: Makefile @WIN32@ bacula-fd @STATIC_FD@
@echo "==== Make of filed is good ===="
#-------------------------------------------------------------------------
all: Makefile @WIN32@ bacula-fd @STATIC_FD@
@echo "==== Make of filed is good ===="
@rm -f bacula-fd.exe
bacula-fd: $(SVROBJS) ../findlib/libfind.a ../lib/libbac.a @WIN32@
@rm -f bacula-fd.exe
bacula-fd: $(SVROBJS) ../findlib/libfind.a ../lib/libbac.a @WIN32@
$(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
$(WIN32LIBS) $(FDLIBS) -lfind -lbac -lm $(PYTHON_LIBS) $(LIBS) \
$(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
$(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
$(WIN32LIBS) $(FDLIBS) -lfind -lbac -lm $(PYTHON_LIBS) $(LIBS) \
$(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(OPENSSL_INC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+ @echo "Compiling $<"
+ $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(OPENSSL_INC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
#-------------------------------------------------------------------------
all: Makefile libfind.a ../lib/libbac.a
@echo "==== Make of findlib is good ===="
@echo " "
libfind.a: $(LIBOBJS)
#-------------------------------------------------------------------------
all: Makefile libfind.a ../lib/libbac.a
@echo "==== Make of findlib is good ===="
@echo " "
libfind.a: $(LIBOBJS)
+ @echo "Making $@ ..."
+ @$(RMF) $@
$(AR) cr $@ $(LIBOBJS)
$(RANLIB) $@
$(AR) cr $@ $(LIBOBJS)
$(RANLIB) $@
- $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(OPENSSL_INC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+ @echo "Compiling $<"
+ $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(OPENSSL_INC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
- $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(OPENSSL_INC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+ @echo "Compiling $<"
+ $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(OPENSSL_INC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
#-------------------------------------------------------------------------
all: Makefile libbac.a
#-------------------------------------------------------------------------
all: Makefile libbac.a
@echo " "
libbac.a: $(LIBOBJS)
@echo " "
libbac.a: $(LIBOBJS)
$(AR) rc $@ $(LIBOBJS)
$(RANLIB) $@
$(AR) rc $@ $(LIBOBJS)
$(RANLIB) $@
&& CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
pythonlib.o: pythonlib.c
&& CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
pythonlib.o: pythonlib.c
- $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(OPENSSL_INC) $(python) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+ @echo "Compiling $<"
+ $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(OPENSSL_INC) $(python) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
rwlock_test:
rm -f rwlock.o
rwlock_test:
rm -f rwlock.o
* Returns: true on success
* false on failure
*/
* Returns: true on success
* false on failure
*/
-bool crypto_cipher_finalize (CIPHER_CONTEXT *cipher_ctx, void *dest, size_t *written) {
- if (!EVP_CipherFinal_ex(&cipher_ctx->ctx, (unsigned char *) dest, (int *) written)) {
+bool crypto_cipher_finalize (CIPHER_CONTEXT *cipher_ctx, uint8_t *dest, uint32_t *written)
+{
+ if (!EVP_CipherFinal_ex(&cipher_ctx->ctx, (unsigned char *)dest, (int *) written)) {
/* This really shouldn't fail */
return false;
} else {
/* This really shouldn't fail */
return false;
} else {
- $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(PYTHON_INC) $(OPENSSL_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+ @echo "Compiling $<"
+ $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(PYTHON_INC) $(OPENSSL_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
#-------------------------------------------------------------------------
all: Makefile bacula-sd @STATIC_SD@ bls bextract bscan btape bcopy
#-------------------------------------------------------------------------
all: Makefile bacula-sd @STATIC_SD@ bls bextract bscan btape bcopy
@echo " "
bacula-sd: $(SDOBJS) ../lib/libbac.a
@echo " "
bacula-sd: $(SDOBJS) ../lib/libbac.a
$(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(SDOBJS) $(FDLIBS) \
-lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
$(GETTEXT_LIBS) $(OPENSSL_LIBS)
$(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(SDOBJS) $(FDLIBS) \
-lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
$(GETTEXT_LIBS) $(OPENSSL_LIBS)
strip $@
btape.o: btape.c
strip $@
btape.o: btape.c
- $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) \
+ echo "Compiling $<"
+ $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) \
-I$(basedir) $(OPENSSL_INC) $(DINCLUDE) $(CFLAGS) $<
btape: $(TAPEOBJS) ../lib/libbac.a ../cats/libsql.a
-I$(basedir) $(OPENSSL_INC) $(DINCLUDE) $(CFLAGS) $<
btape: $(TAPEOBJS) ../lib/libbac.a ../cats/libsql.a
-lsql $(DLIB) -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
bls.o: bls.c
-lsql $(DLIB) -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
bls.o: bls.c
- $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) \
+ echo "Compiling $<"
+ $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) \
-I$(basedir) $(OPENSSL_INC) $(DINCLUDE) $(CFLAGS) $<
bls: ../findlib/libfind.a $(BLSOBJS) ../lib/libbac.a
-I$(basedir) $(OPENSSL_INC) $(DINCLUDE) $(CFLAGS) $<
bls: ../findlib/libfind.a $(BLSOBJS) ../lib/libbac.a
- $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) -lfind \
+ echo "Compiling $<"
+ $(NO_ECHO)$(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) -lfind \
-lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
bextract.o: bextract.c
-lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
bextract.o: bextract.c
- $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) \
+ echo "Compiling $<"
+ $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) \
-I$(basedir) $(OPENSSL_INC) $(DINCLUDE) $(CFLAGS) $<
bextract: ../findlib/libfind.a $(BEXTOBJS) ../lib/libbac.a
-I$(basedir) $(OPENSSL_INC) $(DINCLUDE) $(CFLAGS) $<
bextract: ../findlib/libfind.a $(BEXTOBJS) ../lib/libbac.a
- $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(FDLIBS) \
+ echo "Compiling $<"
+ $(NO_ECHO)$(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(FDLIBS) \
-lfind -lbac -lm $(PYTHON_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
bscan.o: bscan.c
-lfind -lbac -lm $(PYTHON_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
bscan.o: bscan.c
- $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) \
+ echo "Compiling $<"
+ $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) \
-I$(basedir) $(OPENSSL_INC) $(DINCLUDE) $(CFLAGS) $<
bscan: ../findlib/libfind.a $(SCNOBJS) ../cats/libsql.a
-I$(basedir) $(OPENSSL_INC) $(DINCLUDE) $(CFLAGS) $<
bscan: ../findlib/libfind.a $(SCNOBJS) ../cats/libsql.a
-lsql $(DB_LIBS) $(FDLIBS) -lfind -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
bcopy.o: bcopy.c
-lsql $(DB_LIBS) $(FDLIBS) -lfind -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
bcopy.o: bcopy.c
- $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) \
+ echo "Compiling $<"
+ $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) \
-I$(basedir) $(OPENSSL_INC) $(DINCLUDE) $(CFLAGS) $<
bcopy: $(COPYOBJS) ../findlib/libfind.a ../lib/libbac.a
-I$(basedir) $(OPENSSL_INC) $(DINCLUDE) $(CFLAGS) $<
bcopy: $(COPYOBJS) ../findlib/libfind.a ../lib/libbac.a
- $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+ echo "Compiling $<"
+ $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
#-------------------------------------------------------------------------
all: Makefile $(TOOLS)
@echo "==== Make of tools is good ===="
#-------------------------------------------------------------------------
all: Makefile $(TOOLS)
@echo "==== Make of tools is good ===="