| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 1 | lib and include path is hardcoded for use_libbind |
| 2 | |
| 3 | use libdir and includedir vars |
| 4 | |
| 5 | Upstream-Status: Pending |
| 6 | Signed-off-by: Armin Kuster <akuster808@gmail.com> |
| 7 | |
| 8 | Index: dhcp-4.4.1/configure.ac+lt |
| 9 | =================================================================== |
| 10 | --- dhcp-4.4.1.orig/configure.ac+lt |
| 11 | +++ dhcp-4.4.1/configure.ac+lt |
| 12 | @@ -801,22 +801,22 @@ no) |
| 13 | if test ! -d "$use_libbind"; then |
| 14 | AC_MSG_ERROR([Cannot find bind directory at $use_libbind]) |
| 15 | fi |
| 16 | - if test ! -d "$use_libbind/include" -o \ |
| 17 | - ! -f "$use_libbind/include/isc/buffer.h" |
| 18 | + if test ! -d "$use_libbind/$includedir" -o \ |
| 19 | + ! -f "$use_libbind/$includedir/isc/buffer.h" |
| 20 | then |
| 21 | - AC_MSG_ERROR([Cannot find bind includes at $use_libbind/include]) |
| 22 | + AC_MSG_ERROR([Cannot find bind includes at $use_libbind/$includedir]) |
| 23 | fi |
| 24 | - if test ! -d "$use_libbind/lib" -o \ |
| 25 | - \( ! -f "$use_libbind/lib/libisc.a" -a \ |
| 26 | - ! -f "$use_libbind/lib/libisc.la" \) |
| 27 | + if test ! -d "$use_libbind/$libdir" -o \ |
| 28 | + \( ! -f "$use_libbind/$libdir/libisc.a" -a \ |
| 29 | + ! -f "$use_libbind/$libdir/libisc.la" \) |
| 30 | then |
| 31 | - AC_MSG_ERROR([Cannot find bind libraries at $use_libbind/lib]) |
| 32 | + AC_MSG_ERROR([Cannot find bind libraries at $use_libbind/$libdir]) |
| 33 | fi |
| 34 | BINDDIR="$use_libbind" |
| 35 | - BINDLIBIRSDIR="$BINDDIR/lib" |
| 36 | - BINDLIBDNSDIR="$BINDDIR/lib" |
| 37 | - BINDLIBISCCFGDIR="$BINDDIR/lib" |
| 38 | - BINDLIBISCDIR="$BINDDIR/lib" |
| 39 | + BINDLIBIRSDIR="$BINDDIR/$libdir" |
| 40 | + BINDLIBDNSDIR="$BINDDIR/$libdir" |
| 41 | + BINDLIBISCCFGDIR="$BINDDIR/$libdir" |
| 42 | + BINDLIBISCDIR="$BINDDIR/$libdir" |
| 43 | DISTCHECK_LIBBIND_CONFIGURE_FLAG="--with-libbind=$use_libbind" |
| 44 | ;; |
| 45 | esac |
| 46 | @@ -856,14 +856,14 @@ AC_ARG_ENABLE(libtool, |
| 47 | |
| 48 | if test "$use_libbind" != "no"; then |
| 49 | if test "$want_libtool" = "yes" -a \ |
| 50 | - ! -f "$use_libbind/lib/libisc.la" |
| 51 | + ! -f "$use_libbind/$libdir/libisc.la" |
| 52 | then |
| 53 | - AC_MSG_ERROR([Cannot find dynamic libraries at $use_libbind/lib]) |
| 54 | + AC_MSG_ERROR([Cannot find dynamic libraries at $use_libbind/$libdir]) |
| 55 | fi |
| 56 | if test "$want_libtool" = "no" -a \ |
| 57 | - ! -f "$use_libbind/lib/libisc.a" |
| 58 | + ! -f "$use_libbind/$libdir/libisc.a" |
| 59 | then |
| 60 | - AC_MSG_ERROR([Cannot find static libraries at $use_libbind/lib]) |
| 61 | + AC_MSG_ERROR([Cannot find static libraries at $use_libbind/$libdir]) |
| 62 | fi |
| 63 | fi |
| 64 | |