Source: openfortivpn
Version: 1.8.0-2
Severity: wishlist
Tags: patch upstream
User: helm...@debian.org
Usertags: rebootstrap
Thank you for including my patch. The package in unstable now cross
builds given sufficient cache variables. The required variables include
ac_cv_file__usr_sbin_pppd and ac_cv_file__usr_sbin_ppp. Even though
configure requires them, they end up not being used as the packaging
gives --with-pppd. Their values don't matter and still the build fails
in their absence. This is a little inconvenience (thus wishlist).
The attached patch changes the logic to only require them when neither
--with-pppd nor --with-ppp is given. The semantics remain unchanged even
though the implementation is quite a bit shorter. What do you think
about the patch?
Helmut
--- openfortivpn-1.8.0.orig/configure.ac
+++ openfortivpn-1.8.0/configure.ac
@@ -260,35 +260,21 @@
])
])
-AC_CHECK_FILE(/usr/sbin/ppp,[
- AS_IF([test "x$PPP_PATH" = "x" ], [
- PPP_PATH="/usr/sbin/ppp"
- ])
- AS_IF([test "x$with_ppp" = "x" ], [
- with_ppp="yes"
- ])
-],[])
-AC_CHECK_FILE(/usr/sbin/pppd,[
- AS_IF([test "x$PPP_PATH" = "x" ], [
+# when both are available, give pppd the higher priority (we can only use one of them)
+AS_IF([test "x$with_pppd" = x],[
+ AC_CHECK_FILE([/usr/sbin/pppd],[
PPP_PATH="/usr/sbin/pppd"
- ])
- AS_IF([test "x$with_pppd" = "x" ], [
with_pppd="yes"
])
-],[])
-
-
-# when neither ppp nor pppd are enabled, assume the previous behavior (for travis)
-AS_IF([test "x$with_ppp" = "xno" -a "x$with_pppd" = "xno" ], [
- with_pppd="yes"
-])
-AS_IF([test "x$with_ppp" = "x" -a "x$with_pppd" = "x" ], [
- with_pppd="yes"
-])
-
-# when both are enabled, give pppd the higher priority (we can only use one of them)
-AS_IF([test "x$with_ppp" = "xyes" -a "x$with_pppd" = "xyes"], [
- with_ppp="no"
+],[test "x$with_ppp" = x],[
+ AC_CHECK_FILE([/usr/sbin/ppp],[
+ PPP_PATH="/usr/sbin/ppp"
+ with_ppp="yes"
+ ])
+],[
+ # when neither ppp nor pppd are enabled, assume the previous behavior (for travis)
+ with_pppd="yes"
+ PPP_PATH="/usr/sbin/pppd"
])
AS_IF([test "x$with_ppp" = "xyes"], [
