summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac45
1 files changed, 23 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac
index a5974e372..25ac38f7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -285,10 +285,11 @@ AC_ARG_WITH([rpath],
285 [ --without-rpath Disable auto-added -R linker paths], 285 [ --without-rpath Disable auto-added -R linker paths],
286 [ 286 [
287 if test "x$withval" = "xno" ; then 287 if test "x$withval" = "xno" ; then
288 need_dash_r="" 288 rpath_opt=""
289 fi 289 elif test "x$withval" = "xyes" ; then
290 if test "x$withval" = "xyes" ; then 290 rpath_opt="-R"
291 need_dash_r=1 291 else
292 rpath_opt="$withval"
292 fi 293 fi
293 ] 294 ]
294) 295)
@@ -911,7 +912,7 @@ mips-sony-bsd|mips-sony-newsos4)
911*-*-netbsd*) 912*-*-netbsd*)
912 check_for_libcrypt_before=1 913 check_for_libcrypt_before=1
913 if test "x$withval" != "xno" ; then 914 if test "x$withval" != "xno" ; then
914 need_dash_r=1 915 rpath_opt="-R"
915 fi 916 fi
916 CPPFLAGS="$CPPFLAGS -D_OPENBSD_SOURCE" 917 CPPFLAGS="$CPPFLAGS -D_OPENBSD_SOURCE"
917 AC_DEFINE([SSH_TUN_FREEBSD], [1], [Open tunnel devices the FreeBSD way]) 918 AC_DEFINE([SSH_TUN_FREEBSD], [1], [Open tunnel devices the FreeBSD way])
@@ -962,7 +963,7 @@ mips-sony-bsd|mips-sony-newsos4)
962 ;; 963 ;;
963*-*-solaris*) 964*-*-solaris*)
964 if test "x$withval" != "xno" ; then 965 if test "x$withval" != "xno" ; then
965 need_dash_r=1 966 rpath_opt="-R"
966 fi 967 fi
967 AC_DEFINE([PAM_SUN_CODEBASE]) 968 AC_DEFINE([PAM_SUN_CODEBASE])
968 AC_DEFINE([LOGIN_NEEDS_UTMPX]) 969 AC_DEFINE([LOGIN_NEEDS_UTMPX])
@@ -1263,14 +1264,14 @@ AC_ARG_WITH([zlib],
1263 AC_MSG_ERROR([*** zlib is required ***]) 1264 AC_MSG_ERROR([*** zlib is required ***])
1264 elif test "x$withval" != "xyes"; then 1265 elif test "x$withval" != "xyes"; then
1265 if test -d "$withval/lib"; then 1266 if test -d "$withval/lib"; then
1266 if test -n "${need_dash_r}"; then 1267 if test -n "${rpath_opt}"; then
1267 LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}" 1268 LDFLAGS="-L${withval}/lib ${rpath_opt}${withval}/lib ${LDFLAGS}"
1268 else 1269 else
1269 LDFLAGS="-L${withval}/lib ${LDFLAGS}" 1270 LDFLAGS="-L${withval}/lib ${LDFLAGS}"
1270 fi 1271 fi
1271 else 1272 else
1272 if test -n "${need_dash_r}"; then 1273 if test -n "${rpath_opt}"; then
1273 LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}" 1274 LDFLAGS="-L${withval} ${rpath_opt}${withval} ${LDFLAGS}"
1274 else 1275 else
1275 LDFLAGS="-L${withval} ${LDFLAGS}" 1276 LDFLAGS="-L${withval} ${LDFLAGS}"
1276 fi 1277 fi
@@ -1290,8 +1291,8 @@ AC_CHECK_LIB([z], [deflate], ,
1290 saved_LDFLAGS="$LDFLAGS" 1291 saved_LDFLAGS="$LDFLAGS"
1291 save_LIBS="$LIBS" 1292 save_LIBS="$LIBS"
1292 dnl Check default zlib install dir 1293 dnl Check default zlib install dir
1293 if test -n "${need_dash_r}"; then 1294 if test -n "${rpath_opt}"; then
1294 LDFLAGS="-L/usr/local/lib -R/usr/local/lib ${saved_LDFLAGS}" 1295 LDFLAGS="-L/usr/local/lib ${rpath_opt}/usr/local/lib ${saved_LDFLAGS}"
1295 else 1296 else
1296 LDFLAGS="-L/usr/local/lib ${saved_LDFLAGS}" 1297 LDFLAGS="-L/usr/local/lib ${saved_LDFLAGS}"
1297 fi 1298 fi
@@ -1558,8 +1559,8 @@ AC_ARG_WITH([libedit],
1558 fi 1559 fi
1559 else 1560 else
1560 CPPFLAGS="$CPPFLAGS -I${withval}/include" 1561 CPPFLAGS="$CPPFLAGS -I${withval}/include"
1561 if test -n "${need_dash_r}"; then 1562 if test -n "${rpath_opt}"; then
1562 LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}" 1563 LDFLAGS="-L${withval}/lib ${rpath_opt}${withval}/lib ${LDFLAGS}"
1563 else 1564 else
1564 LDFLAGS="-L${withval}/lib ${LDFLAGS}" 1565 LDFLAGS="-L${withval}/lib ${LDFLAGS}"
1565 fi 1566 fi
@@ -2479,20 +2480,20 @@ AC_ARG_WITH([ssl-dir],
2479 ./*|../*) withval="`pwd`/$withval" 2480 ./*|../*) withval="`pwd`/$withval"
2480 esac 2481 esac
2481 if test -d "$withval/lib"; then 2482 if test -d "$withval/lib"; then
2482 if test -n "${need_dash_r}"; then 2483 if test -n "${rpath_opt}"; then
2483 LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}" 2484 LDFLAGS="-L${withval}/lib ${rpath_opt}${withval}/lib ${LDFLAGS}"
2484 else 2485 else
2485 LDFLAGS="-L${withval}/lib ${LDFLAGS}" 2486 LDFLAGS="-L${withval}/lib ${LDFLAGS}"
2486 fi 2487 fi
2487 elif test -d "$withval/lib64"; then 2488 elif test -d "$withval/lib64"; then
2488 if test -n "${need_dash_r}"; then 2489 if test -n "${rpath_opt}"; then
2489 LDFLAGS="-L${withval}/lib64 -R${withval}/lib64 ${LDFLAGS}" 2490 LDFLAGS="-L${withval}/lib64 ${rpath_opt}${withval}/lib64 ${LDFLAGS}"
2490 else 2491 else
2491 LDFLAGS="-L${withval}/lib64 ${LDFLAGS}" 2492 LDFLAGS="-L${withval}/lib64 ${LDFLAGS}"
2492 fi 2493 fi
2493 else 2494 else
2494 if test -n "${need_dash_r}"; then 2495 if test -n "${rpath_opt}"; then
2495 LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}" 2496 LDFLAGS="-L${withval} ${rpath_opt}${withval} ${LDFLAGS}"
2496 else 2497 else
2497 LDFLAGS="-L${withval} ${LDFLAGS}" 2498 LDFLAGS="-L${withval} ${LDFLAGS}"
2498 fi 2499 fi
@@ -4406,8 +4407,8 @@ AC_ARG_WITH([kerberos5],
4406 [ CPPFLAGS="$oldCPP" ]) 4407 [ CPPFLAGS="$oldCPP" ])
4407 4408
4408 fi 4409 fi
4409 if test ! -z "$need_dash_r" ; then 4410 if test -n "${rpath_opt}" ; then
4410 LDFLAGS="$LDFLAGS -R${KRB5ROOT}/lib" 4411 LDFLAGS="$LDFLAGS ${rpath_opt}${KRB5ROOT}/lib"
4411 fi 4412 fi
4412 if test ! -z "$blibpath" ; then 4413 if test ! -z "$blibpath" ; then
4413 blibpath="$blibpath:${KRB5ROOT}/lib" 4414 blibpath="$blibpath:${KRB5ROOT}/lib"