diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-17 22:24:44 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-17 22:24:44 +0100 |
| commit | da133cad10885ca36be26b1b043c737e295a4cd4 (patch) | |
| tree | 3fb8e1189dce7188c4681144f96982d30c4511bd /package/openvpn/patches/patch-configure_ac | |
| parent | 638c9f989542642d52859a56913ae5c2ace93e69 (diff) | |
| parent | 642a45334676311b50bd2b45ae49c45f8b86c86d (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
TODO
Diffstat (limited to 'package/openvpn/patches/patch-configure_ac')
| -rw-r--r-- | package/openvpn/patches/patch-configure_ac | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/package/openvpn/patches/patch-configure_ac b/package/openvpn/patches/patch-configure_ac new file mode 100644 index 000000000..c0a43dae4 --- /dev/null +++ b/package/openvpn/patches/patch-configure_ac @@ -0,0 +1,31 @@ +--- openvpn-2.3.2.orig/configure.ac 2013-05-31 14:00:25.000000000 +0200 ++++ openvpn-2.3.2/configure.ac 2014-02-15 14:45:30.000000000 +0100 +@@ -353,19 +353,13 @@ AC_PROG_MAKE_SET + + AC_ARG_VAR([IFCONFIG], [full path to ipconfig utility]) + AC_ARG_VAR([ROUTE], [full path to route utility]) +-AC_ARG_VAR([IPROUTE], [full path to ip utility]) + AC_ARG_VAR([NETSTAT], [path to netstat utility]) # tests + AC_ARG_VAR([MAN2HTML], [path to man2html utility]) + AC_ARG_VAR([GIT], [path to git utility]) +-AC_PATH_PROGS([IFCONFIG], [ifconfig],, [$PATH:/usr/local/sbin:/usr/sbin:/sbin]) +-AC_PATH_PROGS([ROUTE], [route],, [$PATH:/usr/local/sbin:/usr/sbin:/sbin]) +-AC_PATH_PROGS([IPROUTE], [ip],, [$PATH:/usr/local/sbin:/usr/sbin:/sbin]) + AC_CHECK_PROGS([NETSTAT], [netstat], [netstat], [$PATH:/usr/local/sbin:/usr/sbin:/sbin:/etc]) # tests + AC_CHECK_PROGS([MAN2HTML], [man2html]) + AC_CHECK_PROGS([GIT], [git]) # optional +-AC_DEFINE_UNQUOTED([IFCONFIG_PATH], ["$IFCONFIG"], [Path to ifconfig tool]) +-AC_DEFINE_UNQUOTED([IPROUTE_PATH], ["$IPROUTE"], [Path to iproute tool]) +-AC_DEFINE_UNQUOTED([ROUTE_PATH], ["$ROUTE"], [Path to route tool]) ++AC_DEFINE_UNQUOTED([IPROUTE_PATH], ["/sbin"], [Path to iproute tool]) + + # + # Libtool +@@ -982,7 +976,6 @@ else + fi + + if test "${enable_iproute2}" = "yes"; then +- test -z "${IPROUTE}" && AC_MSG_ERROR([ip utility is required but missing]) + AC_DEFINE([ENABLE_IPROUTE], [1], [enable iproute2 support]) + else + if test "${WIN32}" != "yes"; then |