]> git.pld-linux.org Git - packages/bacula.git/blame - x32.patch
projects / packages / bacula.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
Release 2 (by relup.sh)
[packages/bacula.git] / x32.patch
CommitLineData
032c586f
MK		 1diff -ur bacula-11.0.6.orig/autoconf/bacula-macros/db.m4 bacula-11.0.6/autoconf/bacula-macros/db.m4
2--- bacula-11.0.6.orig/autoconf/bacula-macros/db.m4 2022-04-03 11:32:50.796476244 +0000
3+++ bacula-11.0.6/autoconf/bacula-macros/db.m4 2022-04-03 11:33:40.061588489 +0000
61a46f05
JR		 4@@ -12,24 +12,24 @@
5 if test "$withval" = "yes"; then
6 if test -f /usr/local/include/dbi/dbi.h; then
7 DBI_INCDIR=/usr/local/dbi/include
8- if test -d /usr/local/lib64; then
9- DBI_LIBDIR=/usr/local/lib64
10+ if test -d /usr/local/libx32; then
11+ DBI_LIBDIR=/usr/local/libx32
12 else
13 DBI_LIBDIR=/usr/local/lib
14 fi
15 DBI_BINDIR=/usr/local/bin
16 elif test -f /usr/include/dbi/dbi.h; then
17 DBI_INCDIR=/usr/include
18- if test -d /usr/lib64; then
19- DBI_LIBDIR=/usr/lib64
20+ if test -d /usr/libx32; then
21+ DBI_LIBDIR=/usr/libx32
22 else
23 DBI_LIBDIR=/usr/lib
24 fi
25 DBI_BINDIR=/usr/bin
26 elif test -f $prefix/include/dbi/dbi.h; then
27 DBI_INCDIR=$prefix/include
28- if test -d $prefix/lib64; then
29- DBI_LIBDIR=$prefix/lib64
30+ if test -d $prefix/libx32; then
31+ DBI_LIBDIR=$prefix/libx32
32 else
33 DBI_LIBDIR=$prefix/lib
34 fi
35@@ -40,30 +40,30 @@
36 fi
37 if test -d /usr/local/lib/dbd; then
38 DRIVERDIR=/usr/local/lib/dbd
39- if test -d /usr/local/lib64/dbd; then
40- DRIVERDIR=/usr/local/lib64/dbd
41+ if test -d /usr/local/libx32/dbd; then
42+ DRIVERDIR=/usr/local/libx32/dbd
43 else
44 DRIVERDIR=/usr/local/lib/dbd
45 fi
46 elif test -d /usr/lib/dbd; then
47 DRIVERDIR=/usr/lib/dbd
48- if test -d /usr/lib64/dbd; then
49- DRIVERDIR=/usr/lib64/dbd
50+ if test -d /usr/libx32/dbd; then
51+ DRIVERDIR=/usr/libx32/dbd
52 else
53 DRIVERDIR=/usr/lib/dbd
54 fi
55 elif test -d $prefix/lib/dbd; then
56- if test -d $prefix/lib64/dbd; then
57- DRIVERDIR=$prefix/lib64/dbd
58+ if test -d $prefix/libx32/dbd; then
59+ DRIVERDIR=$prefix/libx32/dbd
60 else
61 DRIVERDIR=$prefix/lib/dbd
62 fi
63- elif test -d /usr/local/lib64/dbd; then
64- DRIVERDIR=/usr/local/lib64/dbd
65- elif test -d /usr/lib64/dbd; then
66- DRIVERDIR=/usr/lib64/dbd
67- elif test -d $prefix/lib64/dbd; then
68- DRIVERDIR=$prefix/lib64/dbd
69+ elif test -d /usr/local/libx32/dbd; then
70+ DRIVERDIR=/usr/local/libx32/dbd
71+ elif test -d /usr/libx32/dbd; then
72+ DRIVERDIR=/usr/libx32/dbd
73+ elif test -d $prefix/libx32/dbd; then
74+ DRIVERDIR=$prefix/libx32/dbd
75 else
76 AC_MSG_RESULT(no)
77 AC_MSG_ERROR(Unable to find DBD drivers in standard locations)
78@@ -75,8 +75,8 @@
79 DBI_BINDIR=$withval
80 elif test -f $withval/include/dbi/dbi.h; then
81 DBI_INCDIR=$withval/include
82- if test -d $withval/lib64; then
83- DBI_LIBDIR=$withval/lib64
84+ if test -d $withval/libx32; then
85+ DBI_LIBDIR=$withval/libx32
86 else
87 DBI_LIBDIR=$withval/lib
88 fi
89@@ -88,13 +88,13 @@
90 if test -d $withval/dbd; then
91 DRIVERDIR=$withval/dbd
92 elif test -d $withval/lib/; then
93- if test -d $withval/lib64/dbd; then
94- DRIVERDIR=$withval/lib64/dbd
95+ if test -d $withval/libx32/dbd; then
96+ DRIVERDIR=$withval/libx32/dbd
97 else
98 DRIVERDIR=$withval/lib/dbd
99 fi
100- elif test -d $withval/lib64/dbd; then
101- DRIVERDIR=$withval/lib64/dbd
102+ elif test -d $withval/libx32/dbd; then
103+ DRIVERDIR=$withval/libx32/dbd
104 else
105 AC_MSG_RESULT(no)
106 AC_MSG_ERROR(Invalid DBD driver directory $withval - unable to find DBD drivers under $withval)
107@@ -171,17 +171,17 @@
108 db_prog="mysql"
109 if test -f /usr/local/mysql/bin/mysql; then
110 MYSQL_BINDIR=/usr/local/mysql/bin
111- if test -f /usr/local/mysql/lib64/mysql/libmysqlclient_r.a \
112- -o -f /usr/local/mysql/lib64/mysql/libmysqlclient_r.so; then
113- MYSQL_LIBDIR=/usr/local/mysql/lib64/mysql
114+ if test -f /usr/local/mysql/libx32/mysql/libmysqlclient_r.a \
115+ -o -f /usr/local/mysql/libx32/mysql/libmysqlclient_r.so; then
116+ MYSQL_LIBDIR=/usr/local/mysql/libx32/mysql
117 else
118 MYSQL_LIBDIR=/usr/local/mysql/lib/mysql
119 fi
120 elif test -f /usr/bin/mysql; then
121 MYSQL_BINDIR=/usr/bin
122- if test -f /usr/lib64/mysql/libmysqlclient_r.a \
123- -o -f /usr/lib64/mysql/libmysqlclient_r.so; then
124- MYSQL_LIBDIR=/usr/lib64/mysql
125+ if test -f /usr/libx32/mysql/libmysqlclient_r.a \
126+ -o -f /usr/libx32/mysql/libmysqlclient_r.so; then
127+ MYSQL_LIBDIR=/usr/libx32/mysql
128 elif test -f /usr/lib/mysql/libmysqlclient_r.a \
129 -o -f /usr/lib/mysql/libmysqlclient_r.so; then
130 MYSQL_LIBDIR=/usr/lib/mysql
131@@ -190,9 +190,9 @@
132 fi
133 elif test -f /usr/local/bin/mysql; then
134 MYSQL_BINDIR=/usr/local/bin
135- if test -f /usr/local/lib64/mysql/libmysqlclient_r.a \
136- -o -f /usr/local/lib64/mysql/libmysqlclient_r.so; then
137- MYSQL_LIBDIR=/usr/local/lib64/mysql
138+ if test -f /usr/local/libx32/mysql/libmysqlclient_r.a \
139+ -o -f /usr/local/libx32/mysql/libmysqlclient_r.so; then
140+ MYSQL_LIBDIR=/usr/local/libx32/mysql
141 elif test -f /usr/local/lib/mysql/libmysqlclient_r.a \
142 -o -f /usr/local/lib/mysql/libmysqlclient_r.so; then
143 MYSQL_LIBDIR=/usr/local/lib/mysql
144@@ -201,12 +201,12 @@
145 fi
146 elif test -f $withval/bin/mysql; then
147 MYSQL_BINDIR=$withval/bin
148- if test -f $withval/lib64/mysql/libmysqlclient_r.a \
149- -o -f $withval/lib64/mysql/libmysqlclient_r.so; then
150- MYSQL_LIBDIR=$withval/lib64/mysql
151- elif test -f $withval/lib64/libmysqlclient_r.a \
152- -o -f $withval/lib64/libmysqlclient_r.so; then
153- MYSQL_LIBDIR=$withval/lib64
154+ if test -f $withval/libx32/mysql/libmysqlclient_r.a \
155+ -o -f $withval/libx32/mysql/libmysqlclient_r.so; then
156+ MYSQL_LIBDIR=$withval/libx32/mysql
157+ elif test -f $withval/libx32/libmysqlclient_r.a \
158+ -o -f $withval/libx32/libmysqlclient_r.so; then
159+ MYSQL_LIBDIR=$withval/libx32
160 elif test -f $withval/lib/libmysqlclient_r.a \
161 -o -f $withval/lib/libmysqlclient_r.so; then
162 MYSQL_LIBDIR=$withval/lib/
163@@ -243,26 +243,26 @@
164 POSTGRESQL_LIBDIR=`"$PG_CONFIG" --libdir`
165 elif test -f /usr/local/bin/psql; then
166 POSTGRESQL_BINDIR=/usr/local/bin
167- if test -d /usr/local/lib64; then
168- POSTGRESQL_LIBDIR=/usr/local/lib64
169+ if test -d /usr/local/libx32; then
170+ POSTGRESQL_LIBDIR=/usr/local/libx32
171 else
172 POSTGRESQL_LIBDIR=/usr/local/lib
173 fi
174 elif test -f /usr/bin/psql; then
175 POSTGRESQL_BINDIR=/usr/local/bin
176- if test -d /usr/lib64/postgresql; then
177- POSTGRESQL_LIBDIR=/usr/lib64/postgresql
178+ if test -d /usr/libx32/postgresql; then
179+ POSTGRESQL_LIBDIR=/usr/libx32/postgresql
180 elif test -d /usr/lib/postgresql; then
181 POSTGRESQL_LIBDIR=/usr/lib/postgresql
182- elif test -d /usr/lib64; then
183- POSTGRESQL_LIBDIR=/usr/lib64
184+ elif test -d /usr/libx32; then
185+ POSTGRESQL_LIBDIR=/usr/libx32
186 else
187 POSTGRESQL_LIBDIR=/usr/lib
188 fi
189 elif test -f $withval/bin/psql; then
190 POSTGRESQL_BINDIR=$withval/bin
191- if test -d $withval/lib64; then
192- POSTGRESQL_LIBDIR=$withval/lib64
193+ if test -d $withval/libx32; then
194+ POSTGRESQL_LIBDIR=$withval/libx32
195 else
196 POSTGRESQL_LIBDIR=$withval/lib
197 fi
198@@ -280,22 +280,22 @@
199 db_prog="sqlite3"
200 if test -f /usr/local/bin/sqlite3; then
201 SQLITE_BINDIR=/usr/local/bin
202- if test -d /usr/local/lib64; then
203- SQLITE_LIBDIR=/usr/local/lib64
204+ if test -d /usr/local/libx32; then
205+ SQLITE_LIBDIR=/usr/local/libx32
206 else
207 SQLITE_LIBDIR=/usr/local/lib
208 fi
209 elif test -f /usr/bin/sqlite3; then
210 SQLITE_BINDIR=/usr/bin
211- if test -d /usr/lib64; then
212- SQLITE_LIBDIR=/usr/lib64
213+ if test -d /usr/libx32; then
214+ SQLITE_LIBDIR=/usr/libx32
215 else
216 SQLITE_LIBDIR=/usr/lib
217 fi
218 elif test -f $withval/bin/sqlite3; then
219 SQLITE_BINDIR=$withval/bin
220- if test -d $withval/lib64; then
221- SQLITE_LIBDIR=$withval/lib64
222+ if test -d $withval/libx32; then
223+ SQLITE_LIBDIR=$withval/libx32
224 else
225 SQLITE_LIBDIR=$withval/lib
226 fi
227@@ -362,21 +362,21 @@
228 if test "x${MYSQL_LIBDIR}" = x -o "x${MYSQL_INCDIR}" = x ; then
229 if test -f /usr/local/mysql/include/mysql/mysql.h; then
230 MYSQL_INCDIR=/usr/local/mysql/include/mysql
231- if test -f /usr/local/mysql/lib64/mysql/libmysqlclient_r.a \
232- -o -f /usr/local/mysql/lib64/mysql/libmysqlclient_r.so; then
233- MYSQL_LIBDIR=/usr/local/mysql/lib64/mysql
234+ if test -f /usr/local/mysql/libx32/mysql/libmysqlclient_r.a \
235+ -o -f /usr/local/mysql/libx32/mysql/libmysqlclient_r.so; then
236+ MYSQL_LIBDIR=/usr/local/mysql/libx32/mysql
237 else
238 MYSQL_LIBDIR=/usr/local/mysql/lib/mysql
239 fi
240 MYSQL_BINDIR=/usr/local/mysql/bin
241 elif test -f /usr/include/mysql/mysql.h; then
242 MYSQL_INCDIR=/usr/include/mysql
243- if test -f /usr/lib64/mysql/libmysqlclient_r.a \
244- -o -f /usr/lib64/mysql/libmysqlclient_r.so; then
245- MYSQL_LIBDIR=/usr/lib64/mysql
246- elif test -f /usr/lib64/libmysqlclient_r.a \
247- -o -f /usr/lib64/libmysqlclient_r.so; then
248- MYSQL_LIBDIR=/usr/lib64
249+ if test -f /usr/libx32/mysql/libmysqlclient_r.a \
250+ -o -f /usr/libx32/mysql/libmysqlclient_r.so; then
251+ MYSQL_LIBDIR=/usr/libx32/mysql
252+ elif test -f /usr/libx32/libmysqlclient_r.a \
253+ -o -f /usr/libx32/libmysqlclient_r.so; then
254+ MYSQL_LIBDIR=/usr/libx32
255 elif test -f /usr/lib/x86_64-linux-gnu/libmysqlclient_r.a \
256 -o -f /usr/lib/x86_64-linux-gnu/libmysqlclient_r.so; then
257 MYSQL_LIBDIR=/usr/lib/x86_64-linux-gnu
258@@ -389,27 +389,27 @@
259 MYSQL_BINDIR=/usr/bin
260 elif test -f /usr/include/mysql.h; then
261 MYSQL_INCDIR=/usr/include
262- if test -f /usr/lib64/libmysqlclient_r.a \
263- -o -f /usr/lib64/libmysqlclient_r.so; then
264- MYSQL_LIBDIR=/usr/lib64
265+ if test -f /usr/libx32/libmysqlclient_r.a \
266+ -o -f /usr/libx32/libmysqlclient_r.so; then
267+ MYSQL_LIBDIR=/usr/libx32
268 else
269 MYSQL_LIBDIR=/usr/lib
270 fi
271 MYSQL_BINDIR=/usr/bin
272 elif test -f /usr/local/include/mysql/mysql.h; then
273 MYSQL_INCDIR=/usr/local/include/mysql
274- if test -f /usr/local/lib64/mysql/libmysqlclient_r.a \
275- -o -f /usr/local/lib64/mysql/libmysqlclient_r.so; then
276- MYSQL_LIBDIR=/usr/local/lib64/mysql
277+ if test -f /usr/local/libx32/mysql/libmysqlclient_r.a \
278+ -o -f /usr/local/libx32/mysql/libmysqlclient_r.so; then
279+ MYSQL_LIBDIR=/usr/local/libx32/mysql
280 else
281 MYSQL_LIBDIR=/usr/local/lib/mysql
282 fi
283 MYSQL_BINDIR=/usr/local/bin
284 elif test -f /usr/local/include/mysql.h; then
285 MYSQL_INCDIR=/usr/local/include
286- if test -f /usr/local/lib64/libmysqlclient_r.a \
287- -o -f /usr/local/lib64/libmysqlclient_r.so; then
288- MYSQL_LIBDIR=/usr/local/lib64
289+ if test -f /usr/local/libx32/libmysqlclient_r.a \
290+ -o -f /usr/local/libx32/libmysqlclient_r.so; then
291+ MYSQL_LIBDIR=/usr/local/libx32
292 else
293 MYSQL_LIBDIR=/usr/local/lib
294 fi
295@@ -422,12 +422,12 @@
296 else
297 if test -f $withval/include/mysql/mysql.h; then
298 MYSQL_INCDIR=$withval/include/mysql
299- if test -f $withval/lib64/mysql/libmysqlclient_r.a \
300- -o -f $withval/lib64/mysql/libmysqlclient_r.so; then
301- MYSQL_LIBDIR=$withval/lib64/mysql
302- elif test -f $withval/lib64/libmysqlclient_r.a \
303- -o -f $withval/lib64/libmysqlclient_r.so; then
304- MYSQL_LIBDIR=$withval/lib64
305+ if test -f $withval/libx32/mysql/libmysqlclient_r.a \
306+ -o -f $withval/libx32/mysql/libmysqlclient_r.so; then
307+ MYSQL_LIBDIR=$withval/libx32/mysql
308+ elif test -f $withval/libx32/libmysqlclient_r.a \
309+ -o -f $withval/libx32/libmysqlclient_r.so; then
310+ MYSQL_LIBDIR=$withval/libx32
311 elif test -f $withval/lib/libmysqlclient_r.a \
312 -o -f $withval/lib/libmysqlclient_r.so; then
313 MYSQL_LIBDIR=$withval/lib
314@@ -437,9 +437,9 @@
315 MYSQL_BINDIR=$withval/bin
316 elif test -f $withval/include/mysql.h; then
317 MYSQL_INCDIR=$withval/include
318- if test -f $withval/lib64/libmysqlclient_r.a \
319- -o -f $withval/lib64/libmysqlclient_r.so; then
320- MYSQL_LIBDIR=$withval/lib64
321+ if test -f $withval/libx32/libmysqlclient_r.a \
322+ -o -f $withval/libx32/libmysqlclient_r.so; then
323+ MYSQL_LIBDIR=$withval/libx32
324 else
325 MYSQL_LIBDIR=$withval/lib
326 fi
327@@ -559,40 +559,40 @@
328 if test "$withval" = "yes"; then
329 if test -f /usr/local/mysql/include/mysql/mysql.h; then
330 MYSQL_INCDIR=/usr/local/mysql/include/mysql
331- if test -d /usr/local/mysql/lib64/mysql; then
332- MYSQL_LIBDIR=/usr/local/mysql/lib64/mysql
333+ if test -d /usr/local/mysql/libx32/mysql; then
334+ MYSQL_LIBDIR=/usr/local/mysql/libx32/mysql
335 else
336 MYSQL_LIBDIR=/usr/local/mysql/lib/mysql
337 fi
338 MYSQL_BINDIR=/usr/local/mysql/bin
339 elif test -f /usr/include/mysql/mysql.h; then
340 MYSQL_INCDIR=/usr/include/mysql
341- if test -d /usr/lib64/mysql; then
342- MYSQL_LIBDIR=/usr/lib64/mysql
343+ if test -d /usr/libx32/mysql; then
344+ MYSQL_LIBDIR=/usr/libx32/mysql
345 else
346 MYSQL_LIBDIR=/usr/lib/mysql
347 fi
348 MYSQL_BINDIR=/usr/bin
349 elif test -f /usr/include/mysql.h; then
350 MYSQL_INCDIR=/usr/include
351- if test -d /usr/lib64; then
352- MYSQL_LIBDIR=/usr/lib64
353+ if test -d /usr/libx32; then
354+ MYSQL_LIBDIR=/usr/libx32
355 else
356 MYSQL_LIBDIR=/usr/lib
357 fi
358 MYSQL_BINDIR=/usr/bin
359 elif test -f /usr/local/include/mysql/mysql.h; then
360 MYSQL_INCDIR=/usr/local/include/mysql
361- if test -d /usr/local/lib64/mysql; then
362- MYSQL_LIBDIR=/usr/local/lib64/mysql
363+ if test -d /usr/local/libx32/mysql; then
364+ MYSQL_LIBDIR=/usr/local/libx32/mysql
365 else
366 MYSQL_LIBDIR=/usr/local/lib/mysql
367 fi
368 MYSQL_BINDIR=/usr/local/bin
369 elif test -f /usr/local/include/mysql.h; then
370 MYSQL_INCDIR=/usr/local/include
371- if test -d /usr/local/lib64; then
372- MYSQL_LIBDIR=/usr/local/lib64
373+ if test -d /usr/local/libx32; then
374+ MYSQL_LIBDIR=/usr/local/libx32
375 else
376 MYSQL_LIBDIR=/usr/local/lib
377 fi
378@@ -604,16 +604,16 @@
379 else
380 if test -f $withval/include/mysql/mysql.h; then
381 MYSQL_INCDIR=$withval/include/mysql
382- if test -d $withval/lib64/mysql; then
383- MYSQL_LIBDIR=$withval/lib64/mysql
384+ if test -d $withval/libx32/mysql; then
385+ MYSQL_LIBDIR=$withval/libx32/mysql
386 else
387 MYSQL_LIBDIR=$withval/lib/mysql
388 fi
389 MYSQL_BINDIR=$withval/bin
390 elif test -f $withval/include/mysql.h; then
391 MYSQL_INCDIR=$withval/include
392- if test -d $withval/lib64; then
393- MYSQL_LIBDIR=$withval/lib64
394+ if test -d $withval/libx32; then
395+ MYSQL_LIBDIR=$withval/libx32
396 else
397 MYSQL_LIBDIR=$withval/lib
398 fi
8b0a6401 399@@ -755,8 +755,8 @@
61a46f05
JR		 400 if test "$withval" = "yes"; then
401 if test -f /usr/local/include/sqlite3.h; then
402 SQLITE_INCDIR=/usr/local/include
403- if test -d /usr/local/lib64; then
404- SQLITE_LIBDIR=/usr/local/lib64
405+ if test -d /usr/local/libx32; then
406+ SQLITE_LIBDIR=/usr/local/libx32
407 else
408 SQLITE_LIBDIR=/usr/local/lib
409 fi
8b0a6401 410@@ -765,16 +765,16 @@
61a46f05 411 SQLITE_INCDIR=/usr/include
8b0a6401
JK		 412 if test -n $multiarch -a -d /usr/lib/$multiarch; then
413 SQLITE_LIBDIR=/usr/lib/$multiarch
414- elif test -d /usr/lib64; then
61a46f05 415- SQLITE_LIBDIR=/usr/lib64
8b0a6401 416+ elif test -d /usr/libx32; then
61a46f05
JR		 417+ SQLITE_LIBDIR=/usr/libx32
418 else
419 SQLITE_LIBDIR=/usr/lib
420 fi
421 SQLITE_BINDIR=/usr/bin
422 elif test -f $prefix/include/sqlite3.h; then
423 SQLITE_INCDIR=$prefix/include
424- if test -d $prefix/lib64; then
425- SQLITE_LIBDIR=$prefix/lib64
426+ if test -d $prefix/libx32; then
427+ SQLITE_LIBDIR=$prefix/libx32
428 else
429 SQLITE_LIBDIR=$prefix/lib
430 fi
8b0a6401 431@@ -790,8 +790,8 @@
61a46f05
JR		 432 SQLITE_BINDIR=$withval
433 elif test -f $withval/include/sqlite3.h; then
434 SQLITE_INCDIR=$withval/include
435- if test -d $withval/lib64; then
436- SQLITE_LIBDIR=$withval/lib64
437+ if test -d $withval/libx32; then
438+ SQLITE_LIBDIR=$withval/libx32
439 else
440 SQLITE_LIBDIR=$withval/lib
441 fi
8b0a6401 442@@ -872,32 +872,32 @@
61a46f05
JR		 443 POSTGRESQL_BINDIR=`"$PG_CONFIG" --bindir`
444 elif test -f /usr/local/include/libpq-fe.h; then
445 POSTGRESQL_INCDIR=/usr/local/include
446- if test -d /usr/local/lib64; then
447- POSTGRESQL_LIBDIR=/usr/local/lib64
448+ if test -d /usr/local/libx32; then
449+ POSTGRESQL_LIBDIR=/usr/local/libx32
450 else
451 POSTGRESQL_LIBDIR=/usr/local/lib
452 fi
453 POSTGRESQL_BINDIR=/usr/local/bin
454 elif test -f /usr/include/libpq-fe.h; then
455 POSTGRESQL_INCDIR=/usr/include
456- if test -d /usr/lib64; then
457- POSTGRESQL_LIBDIR=/usr/lib64
458+ if test -d /usr/libx32; then
459+ POSTGRESQL_LIBDIR=/usr/libx32
460 else
461 POSTGRESQL_LIBDIR=/usr/lib
462 fi
463 POSTGRESQL_BINDIR=/usr/bin
464 elif test -f /usr/include/pgsql/libpq-fe.h; then
465 POSTGRESQL_INCDIR=/usr/include/pgsql
466- if test -d /usr/lib64/pgsql; then
467- POSTGRESQL_LIBDIR=/usr/lib64/pgsql
468+ if test -d /usr/libx32/pgsql; then
469+ POSTGRESQL_LIBDIR=/usr/libx32/pgsql
470 else
471 POSTGRESQL_LIBDIR=/usr/lib/pgsql
472 fi
473 POSTGRESQL_BINDIR=/usr/bin
474 elif test -f /usr/include/postgresql/libpq-fe.h; then
475 POSTGRESQL_INCDIR=/usr/include/postgresql
476- if test -d /usr/lib64/postgresql; then
477- POSTGRESQL_LIBDIR=/usr/lib64/postgresql
478+ if test -d /usr/libx32/postgresql; then
479+ POSTGRESQL_LIBDIR=/usr/libx32/postgresql
480 else
481 POSTGRESQL_LIBDIR=/usr/lib/postgresql
482 fi
8b0a6401 483@@ -912,8 +912,8 @@
61a46f05
JR		 484 POSTGRESQL_BINDIR=$withval/bin
485 elif test -f $withval/include/postgresql/libpq-fe.h; then
486 POSTGRESQL_INCDIR=$withval/include/postgresql
487- if test -d $withval/lib64; then
488- POSTGRESQL_LIBDIR=$withval/lib64
489+ if test -d $withval/libx32; then
490+ POSTGRESQL_LIBDIR=$withval/libx32
491 else
492 POSTGRESQL_LIBDIR=$withval/lib
493 fi
032c586f
MK		 494diff -ur bacula-11.0.6.orig/autoconf/configure.in bacula-11.0.6/autoconf/configure.in
495--- bacula-11.0.6.orig/autoconf/configure.in 2022-04-03 11:32:50.796476244 +0000
496+++ bacula-11.0.6/autoconf/configure.in 2022-04-03 11:33:40.062588492 +0000
497@@ -301,7 +301,7 @@
61a46f05
JR		 498 os_processor=`uname -p 2>/dev/null`
499 case ${os_processor} in
500 x86_64)
501- libdir=/usr/lib64
502+ libdir=/usr/libx32
503 ;;
504 *)
505 libdir=/usr/lib
032c586f 506@@ -2669,9 +2669,9 @@
61a46f05
JR		 507 for dir in ${with_afsdir}/lib \
508 ${with_afsdir}/lib/afs \
509 ${with_afsdir}/lib/openafs \
510- ${with_afsdir}/lib64 \
511- ${with_afsdir}/lib64/afs \
512- ${with_afsdir}/lib64/openafs
513+ ${with_afsdir}/libx32 \
514+ ${with_afsdir}/libx32/afs \
515+ ${with_afsdir}/libx32/openafs
516 do
517 for arch_type in .a .so
518 do
032c586f 519@@ -2839,8 +2839,8 @@
f05466bd
AM		 520 dnl
521 dnl Because of possible naming conflict with AFS libacl make sure we use the one in /usr/lib64 or /usr/lib !!!
522 dnl
523- if test -d /usr/lib64/; then
524- FDLIBS="-L/usr/lib64 -lacl $FDLIBS"
525+ if test -d /usr/libx32/; then
526+ FDLIBS="-L/usr/libx32 -lacl $FDLIBS"
527 else
528 FDLIBS="-L/usr/lib -lacl $FDLIBS"
529 fi
Bacula - The Network Backup Solution
This page took 0.176926 seconds and 4 git commands to generate.