x32.patch

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