diff options
| author | Campus <campus@ntop.org> | 2018-02-18 19:49:27 +0100 |
|---|---|---|
| committer | Campus <campus@ntop.org> | 2018-02-18 19:49:27 +0100 |
| commit | 76d058360ebac11f11f39c9984f753ceaddc31d8 (patch) | |
| tree | 093db680deef028f73f8c2243ec490db9c119510 | |
| parent | 12a1b0d7a3e6cfaa1bb77b0f36d00004ddf0690d (diff) | |
| parent | 9fa6119f142669e389cc5c1685942e999dbf3353 (diff) | |
Merge branch 'bjornfor-for-upstream' into dev
| -rwxr-xr-x | autogen.sh | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/autogen.sh b/autogen.sh index 18fcf4731..9e46d4b64 100755 --- a/autogen.sh +++ b/autogen.sh @@ -5,13 +5,13 @@ 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) -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" @@ -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 $* |