| 1 |
diff -up bacula-5.0.2/autoconf/configure.in.orig bacula-5.0.2/autoconf/configure.in |
| 2 |
--- bacula-5.0.2/autoconf/configure.in.orig 2010-04-27 21:58:29.000000000 +0200 |
| 3 |
+++ bacula-5.0.2/autoconf/configure.in 2010-05-20 13:17:24.000000000 +0200 |
| 4 |
@@ -128,7 +128,7 @@ AC_PATH_PROG(GROWISOFS, growisofs, growi |
| 5 |
AC_PATH_PROG(DVDRWMEDIAINFO, dvd+rw-mediainfo, dvd+rw-mediainfo) |
| 6 |
AC_PATH_PROG(DVDRWFORMAT, dvd+rw-format, dvd+rw-format) |
| 7 |
AC_PATH_PROG(PKGCONFIG, pkg-config, pkg-config) |
| 8 |
-AC_PATH_PROG(QMAKE, qmake, none) |
| 9 |
+AC_PATH_PROG(QMAKE, qmake, none, /usr/bin:$QTDIR/bin) |
| 10 |
AC_PATH_PROG(GMAKE, gmake, none) |
| 11 |
AC_ARG_VAR(WXCONFIG, [wx-config command. On some systems, you must set it to wx-config-2.6 to use wxWidgets 2.6.]) |
| 12 |
if test "x$WXCONFIG" = x; then |
| 13 |
@@ -1118,7 +1118,7 @@ AC_ARG_WITH(openssl, |
| 14 |
) |
| 15 |
|
| 16 |
if test "x$with_openssl_directory" != "xno"; then |
| 17 |
- OPENSSL_LIBS="-lssl -lcrypto" |
| 18 |
+ OPENSSL_LIBS="`pkg-config --libs openssl` -lresolv" |
| 19 |
OPENSSL_INC="" |
| 20 |
|
| 21 |
if test "x$with_openssl_directory" != "xyes" && test x"${with_openssl_directory}" != "x"; then |
| 22 |
@@ -2679,14 +2679,13 @@ PSCMD="ps -e" |
| 23 |
WIN32= |
| 24 |
MACOSX= |
| 25 |
|
| 26 |
-hostname=`uname -n | cut -d '.' -f 1` |
| 27 |
if test x${hostname} = x ; then |
| 28 |
- hostname="localhost" |
| 29 |
+ hostname="XXX_HOSTNAME_XXX" |
| 30 |
fi |
| 31 |
dnl Make sure hostname is resolved |
| 32 |
ping -c 1 $hostname 2>/dev/null 1>/dev/null |
| 33 |
if test ! $? = 0; then |
| 34 |
- hostname="localhost" |
| 35 |
+ hostname="XXX_HOSTNAME_XXX" |
| 36 |
fi |
| 37 |
|
| 38 |
case "$DISTNAME" in |
| 39 |
@@ -3094,13 +3093,13 @@ if test "${support_bat}" = "yes" ; then |
| 40 |
AC_MSG_ERROR([Could not find qmake $PATH. Check your Qt installation]) |
| 41 |
fi |
| 42 |
|
| 43 |
- QMAKEBIN="qmake" |
| 44 |
+ QMAKEBIN="${QMAKE:-qmake}" |
| 45 |
cd src/qt-console |
| 46 |
echo "Creating bat Makefile" |
| 47 |
touch bat |
| 48 |
chmod 755 bat |
| 49 |
rm -f Makefile |
| 50 |
- $QMAKEBIN |
| 51 |
+ $QMAKEBIN QMAKE_CXXFLAGS="${CFLAGS}" |
| 52 |
${MAKE:-make} clean |
| 53 |
cd ${BUILD_DIR} |
| 54 |
fi |
| 55 |
diff -up bacula-5.0.2/configure.orig bacula-5.0.2/configure |
| 56 |
--- bacula-5.0.2/configure.orig 2010-04-27 21:58:29.000000000 +0200 |
| 57 |
+++ bacula-5.0.2/configure 2010-05-20 13:27:19.000000000 +0200 |
| 58 |
@@ -5062,9 +5062,9 @@ else |
| 59 |
ac_cv_path_QMAKE="$QMAKE" # Let the user override the test with a path. |
| 60 |
;; |
| 61 |
*) |
| 62 |
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 63 |
-for as_dir in $PATH |
| 64 |
+for as_dir in $PATH $QTDIR/bin |
| 65 |
do |
| 66 |
IFS=$as_save_IFS |
| 67 |
test -z "$as_dir" && as_dir=. |
| 68 |
for ac_exec_ext in '' $ac_executable_extensions; do |
| 69 |
@@ -27044,7 +27044,7 @@ fi |
| 70 |
|
| 71 |
|
| 72 |
if test "x$with_openssl_directory" != "xno"; then |
| 73 |
- OPENSSL_LIBS="-lssl -lcrypto" |
| 74 |
+ OPENSSL_LIBS="`pkg-config --libs openssl` -lresolv" |
| 75 |
OPENSSL_INC="" |
| 76 |
|
| 77 |
if test "x$with_openssl_directory" != "xyes" && test x"${with_openssl_directory}" != "x"; then |
| 78 |
@@ -43881,7 +43881,7 @@ if test "${ac_cv_lib_cap_cap_set_proc+se |
| 79 |
echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 80 |
else |
| 81 |
ac_check_lib_save_LIBS=$LIBS |
| 82 |
-LIBS="-lcap $LIBS" |
| 83 |
+LIBS="-L/lib64 -L/lib -lcap $LIBS" |
| 84 |
cat >conftest.$ac_ext <<_ACEOF |
| 85 |
/* confdefs.h. */ |
| 86 |
_ACEOF |
| 87 |
@@ -43937,17 +43937,12 @@ fi |
| 88 |
{ echo "$as_me:$LINENO: result: $ac_cv_lib_cap_cap_set_proc" >&5 |
| 89 |
echo "${ECHO_T}$ac_cv_lib_cap_cap_set_proc" >&6; } |
| 90 |
if test $ac_cv_lib_cap_cap_set_proc = yes; then |
| 91 |
- CAP_LIBS="-lcap" |
| 92 |
-else |
| 93 |
- CAP_LIBS= |
| 94 |
-fi |
| 95 |
- |
| 96 |
-if test x$CAP_LIBS = x-lcap; then |
| 97 |
- |
| 98 |
-cat >>confdefs.h <<\_ACEOF |
| 99 |
+ CAP_LIBS="-L/lib64 -L/lib -lcap" |
| 100 |
+ cat >>confdefs.h <<\_ACEOF |
| 101 |
#define HAVE_LIBCAP 1 |
| 102 |
_ACEOF |
| 103 |
- |
| 104 |
+else |
| 105 |
+ CAP_LIBS= |
| 106 |
fi |
| 107 |
|
| 108 |
|
| 109 |
@@ -43997,13 +43992,12 @@ PSCMD="ps -e" |
| 110 |
WIN32= |
| 111 |
MACOSX= |
| 112 |
|
| 113 |
-hostname=`uname -n | cut -d '.' -f 1` |
| 114 |
if test x${hostname} = x ; then |
| 115 |
- hostname="localhost" |
| 116 |
+ hostname="XXX_HOSTNAME_XXX" |
| 117 |
fi |
| 118 |
ping -c 1 $hostname 2>/dev/null 1>/dev/null |
| 119 |
if test ! $? = 0; then |
| 120 |
- hostname="localhost" |
| 121 |
+ hostname="XXX_HOSTNAME_XXX" |
| 122 |
fi |
| 123 |
|
| 124 |
case "$DISTNAME" in |
| 125 |
@@ -47193,13 +47187,13 @@ echo "$as_me: error: Could not find qmak |
| 126 |
{ (exit 1); exit 1; }; } |
| 127 |
fi |
| 128 |
|
| 129 |
- QMAKEBIN="qmake" |
| 130 |
+ QMAKEBIN="${QMAKE:-qmake}" |
| 131 |
cd src/qt-console |
| 132 |
echo "Creating bat Makefile" |
| 133 |
touch bat |
| 134 |
chmod 755 bat |
| 135 |
rm -f Makefile |
| 136 |
- $QMAKEBIN |
| 137 |
+ $QMAKEBIN QMAKE_CXXFLAGS="${CFLAGS}" |
| 138 |
${MAKE:-make} clean |
| 139 |
cd ${BUILD_DIR} |
| 140 |
fi |
| 141 |
diff -up bacula-5.0.3/src/cats/Makefile.in.orig bacula-5.0.3/src/cats/Makefile.in |
| 142 |
--- bacula-5.0.3/src/cats/Makefile.in.orig 2010-08-05 16:29:51.000000000 +0200 |
| 143 |
+++ bacula-5.0.3/src/cats/Makefile.in 2010-09-27 14:15:12.000000000 +0200 |
| 144 |
@@ -68,6 +68,8 @@ libbacsql.a: $(LIBBACSQL_OBJS) |
| 145 |
libbacsql.la: Makefile $(LIBBACSQL_LOBJS) |
| 146 |
@echo "Making $@ ..." |
| 147 |
$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACSQL_LT_RELEASE) $(DB_LIBS) |
| 148 |
+ # Prevent linking programs against database libraries, only libbacsql.so needs them |
| 149 |
+ $(SED) -i -e "s/\(dependency_libs\)=.*/\1=''/g" $@ |
| 150 |
|
| 151 |
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status |
| 152 |
cd $(topdir) \ |
| 153 |
diff -up bacula-5.0.1/src/dird/Makefile.in.orig bacula-5.0.1/src/dird/Makefile.in |
| 154 |
--- bacula-5.0.1/src/dird/Makefile.in.orig 2010-02-24 16:33:48.000000000 +0100 |
| 155 |
+++ bacula-5.0.1/src/dird/Makefile.in 2010-03-01 14:45:55.000000000 +0100 |
| 156 |
@@ -64,12 +64,12 @@ all: Makefile bacula-dir @STATIC_DIR@ |
| 157 |
bacula-dir: Makefile $(SVROBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) |
| 158 |
@echo "Linking $@ ..." |
| 159 |
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \ |
| 160 |
- -lbacfind -lbacsql -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \ |
| 161 |
+ -lbacfind -lbacsql -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) \ |
| 162 |
$(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) |
| 163 |
|
| 164 |
static-bacula-dir: Makefile $(SVROBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) |
| 165 |
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \ |
| 166 |
- -lbacfind -lbacsql -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \ |
| 167 |
+ -lbacfind -lbacsql -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) \ |
| 168 |
$(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) |
| 169 |
strip $@ |
| 170 |
|
| 171 |
diff -up bacula-5.0.1/src/stored/Makefile.in.orig bacula-5.0.1/src/stored/Makefile.in |
| 172 |
--- bacula-5.0.1/src/stored/Makefile.in.orig 2010-02-24 16:33:48.000000000 +0100 |
| 173 |
+++ bacula-5.0.1/src/stored/Makefile.in 2010-03-01 14:47:20.000000000 +0100 |
| 174 |
@@ -107,7 +107,7 @@ btape.o: btape.c |
| 175 |
|
| 176 |
btape: Makefile $(TAPEOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) |
| 177 |
$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -o $@ $(TAPEOBJS) \ |
| 178 |
- -lbacsql -lbaccfg -lbac $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) |
| 179 |
+ -lbaccfg -lbac $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) |
| 180 |
|
| 181 |
bls.o: bls.c |
| 182 |
@echo "Compiling $<" |
| 183 |
@@ -136,7 +136,7 @@ bscan.o: bscan.c |
| 184 |
|
| 185 |
bscan: Makefile $(SCNOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) |
| 186 |
$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \ |
| 187 |
- -lbacsql $(DB_LIBS) $(FDLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) |
| 188 |
+ -lbacsql $(FDLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) |
| 189 |
|
| 190 |
bcopy.o: bcopy.c |
| 191 |
@echo "Compiling $<" |
| 192 |
diff -up bacula-5.0.1/src/tools/Makefile.in.orig bacula-5.0.1/src/tools/Makefile.in |
| 193 |
--- bacula-5.0.1/src/tools/Makefile.in.orig 2010-02-24 16:33:48.000000000 +0100 |
| 194 |
+++ bacula-5.0.1/src/tools/Makefile.in 2010-03-01 14:48:53.000000000 +0100 |
| 195 |
@@ -64,7 +64,7 @@ bregtest: Makefile bregtest.o ../lib/lib |
| 196 |
|
| 197 |
dbcheck: Makefile dbcheck.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) $(DIRCONFOBJS) |
| 198 |
$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../cats -o $@ dbcheck.o $(DIRCONFOBJS) \ |
| 199 |
- -lbacsql -lbaccfg -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) |
| 200 |
+ -lbacsql -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) |
| 201 |
|
| 202 |
fstype: Makefile fstype.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) |
| 203 |
$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ fstype.o -lbacfind -lbac -lm \ |
| 204 |
@@ -101,15 +101,15 @@ bwild: Makefile ../lib/libbac$(DEFAULT_A |
| 205 |
|
| 206 |
bbatch: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) bbatch.o |
| 207 |
$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -o $@ bbatch.o \ |
| 208 |
- -lbacsql -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) |
| 209 |
+ -lbacsql -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) |
| 210 |
|
| 211 |
bvfs_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) bvfs_test.o |
| 212 |
$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ bvfs_test.o \ |
| 213 |
- -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) |
| 214 |
+ -lbacsql -lbacfind -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) |
| 215 |
|
| 216 |
ing_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ing_test.o |
| 217 |
$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ ing_test.o \ |
| 218 |
- -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) |
| 219 |
+ -lbacsql -lbacfind -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) |
| 220 |
|
| 221 |
gigaslam.o: gigaslam.c |
| 222 |
$(CXX) $(CFLAGS) -c $< |
Parent Directory
| 
Revision Log
| 
Revision Graph
