diff options
author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2014-12-17 07:27:01 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2014-12-17 07:27:01 +0100 |
commit | a07e197d7552bed16d7c9bf428d4a43a3f458a23 (patch) | |
tree | da39ede4c33e62e1124ffd15d27c41cbe1c1f64c /package/openvpn/patches/patch-configure_ac | |
parent | 753383bdf29033a1c7244e31c42c2f5d9906010f (diff) | |
parent | f91c0a6d288596bf002df4f750ab77e0c241e924 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/openvpn/patches/patch-configure_ac')
-rw-r--r-- | package/openvpn/patches/patch-configure_ac | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/package/openvpn/patches/patch-configure_ac b/package/openvpn/patches/patch-configure_ac deleted file mode 100644 index c0a43dae4..000000000 --- a/package/openvpn/patches/patch-configure_ac +++ /dev/null @@ -1,31 +0,0 @@ ---- 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 |