Fix -DVERSION_EXTRA="foo"

It was broken since 58a34fa5adea8ffc519f03b30ec9c2f377bab9cd (since ZNC 1.2)

diff --git a/include/znc/version.h b/include/znc/version.h
index 0603b401f1b6ac69d0693180f7810614ce2f47cd..14d7bf16e8e9147f89dfb209a0b8f44090ba6b61 100644 (file)
--- a/include/znc/version.h
+++ b/include/znc/version.h
@@ -11,6 +11,9 @@
 #define VERSION        (VERSION_MAJOR + VERSION_MINOR / 10.0)
 
 // You can add -DVERSION_EXTRA="stuff" to your CXXFLAGS!
+#ifndef VERSION_EXTRA
+# define VERSION_EXTRA ""
+#endif
 extern const char* ZNC_VERSION_EXTRA;
 
 #endif

diff --git a/make-tarball.sh b/make-tarball.sh
index 29d0382322357c7b8d72c0c0cfd45faf2de288f0..2cc8c520d14a19a31f39bf038733d6d0b539c0e4 100755 (executable)
--- a/make-tarball.sh
+++ b/make-tarball.sh
@@ -54,7 +54,7 @@ sed -e 's:#include "defines.h":#include <znc/defines.h>:' third_party/Csocket/Cs
        rm make-tarball.sh
        sed -e "s/THIS_IS_NOT_TARBALL//" -i Makefile.in
        echo '#include <znc/version.h>' > src/version.cpp
-       echo "const char* ZNC_VERSION_EXTRA = \"$DESC\";" >> src/version.cpp
+       echo "const char* ZNC_VERSION_EXTRA = VERSION_EXTRA \"$DESC\";" >> src/version.cpp
 )
 (
        cd $TMPDIR

diff --git a/version.sh b/version.sh
index aab81116d5ae8695cfac04c20740712963846494..9b8daeba23ab38f45191ada617310ba33c9b478c 100755 (executable)
--- a/version.sh
+++ b/version.sh
@@ -53,7 +53,7 @@ fi
 if [ "x$WRITE_OUTPUT" = "xyes" ]
 then
        echo '#include <znc/version.h>' > src/version.cpp
-       echo "const char* ZNC_VERSION_EXTRA = \"$EXTRA\";" >> src/version.cpp
+       echo "const char* ZNC_VERSION_EXTRA = VERSION_EXTRA \"$EXTRA\";" >> src/version.cpp
 fi
 
 echo "$EXTRA"