From 6ba79afc2327fded754b6694c5802f34e5fe609d Mon Sep 17 00:00:00 2001
From: Bjørn Forsman <bjorn.forsman@gmail.com>
Date: Sun, 18 Feb 2018 18:45:09 +0100
Subject: autogen.sh: /bin/rm -> rm

For portability, don't assume that /bin/rm exists, rely on $PATH lookup
instead.

This fixes building in sandboxed Nix(pkgs) builds.
---
 autogen.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'autogen.sh')

diff --git a/autogen.sh b/autogen.sh
index 18fcf4731..0b6dbfc43 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,7 +5,7 @@ NDPI_MINOR="3"
 NDPI_PATCH="0"
 NDPI_VERSION_SHORT="$NDPI_MAJOR.$NDPI_MINOR.$NDPI_PATCH"
 
-/bin/rm -f configure config.h config.h.in src/lib/Makefile.in
+rm -f configure config.h config.h.in src/lib/Makefile.in
 
 AUTOCONF=$(which autoconf)
 AUTOMAKE=$(which automake)
-- 
cgit v1.2.3


From be38c3d90e143b2998e41c3b9880405d1733b3b9 Mon Sep 17 00:00:00 2001
From: Bjørn Forsman <bjorn.forsman@gmail.com>
Date: Sun, 18 Feb 2018 18:46:04 +0100
Subject: autogen.sh: which -> command -v

command -v is a POSIX standard, available in all POSIX sh. which is not.
Prefer command -v for portability.
---
 autogen.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'autogen.sh')

diff --git a/autogen.sh b/autogen.sh
index 0b6dbfc43..b6c256bda 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,11 +7,11 @@ NDPI_VERSION_SHORT="$NDPI_MAJOR.$NDPI_MINOR.$NDPI_PATCH"
 
 rm -f configure config.h config.h.in src/lib/Makefile.in
 
-AUTOCONF=$(which autoconf)
-AUTOMAKE=$(which automake)
-LIBTOOL=$(which libtool)
-LIBTOOLIZE=$(which libtoolize)
-AUTORECONF=$(which autoreconf)
+AUTOCONF=$(command -v autoconf)
+AUTOMAKE=$(command -v automake)
+LIBTOOL=$(command -v libtool)
+LIBTOOLIZE=$(command -v libtoolize)
+AUTORECONF=$(command -v autoreconf)
 
 if test -z $AUTOCONF; then
     echo "autoconf is missing: please install it and try again"
-- 
cgit v1.2.3


From 9fa6119f142669e389cc5c1685942e999dbf3353 Mon Sep 17 00:00:00 2001
From: Bjørn Forsman <bjorn.forsman@gmail.com>
Date: Sun, 18 Feb 2018 18:47:42 +0100
Subject: autogen.sh: break overlong sed line

---
 autogen.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'autogen.sh')

diff --git a/autogen.sh b/autogen.sh
index b6c256bda..9e46d4b64 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -33,6 +33,12 @@ if test -z $AUTORECONF; then
     exit
 fi
 
-cat configure.seed | sed "s/@NDPI_MAJOR@/$NDPI_MAJOR/g" | sed "s/@NDPI_MINOR@/$NDPI_MINOR/g" | sed "s/@NDPI_PATCH@/$NDPI_PATCH/g" | sed "s/@NDPI_VERSION_SHORT@/$NDPI_VERSION_SHORT/g" > configure.ac
+cat configure.seed | sed \
+    -e "s/@NDPI_MAJOR@/$NDPI_MAJOR/g" \
+    -e "s/@NDPI_MINOR@/$NDPI_MINOR/g" \
+    -e "s/@NDPI_PATCH@/$NDPI_PATCH/g" \
+    -e "s/@NDPI_VERSION_SHORT@/$NDPI_VERSION_SHORT/g" \
+    > configure.ac
+
 autoreconf -ivf
 ./configure $*
-- 
cgit v1.2.3