diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-03-24 10:28:43 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-03-24 10:28:43 +0100 |
| commit | b9c520f9b36fd97ae11c91f2bec394d684ac6749 (patch) | |
| tree | e312d0d70579eafa9e1fdc9c9c3daaf5a21f03fe /openbsc/src/vty | |
| parent | 8a7ca57d3eec7376169661ea3cfcca4c3c2f33cf (diff) | |
| parent | f99f0930fd02a5ef164c54fe8926a7e0b11acbdb (diff) | |
Merge remote branch 'origin/master' into on-waves/bsc-master
Keep a static version as the shell script is not dealing well
with branch tags/names containing text.
Resolve merge conflict in the Makefile.am by adding both sides
to the list of sources for the libbsc.a
Conflicts:
openbsc/configure.in
openbsc/src/Makefile.am
Diffstat (limited to 'openbsc/src/vty')
| -rw-r--r-- | openbsc/src/vty/cardshell.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/openbsc/src/vty/cardshell.h b/openbsc/src/vty/cardshell.h index d963a3810..85164d2bd 100644 --- a/openbsc/src/vty/cardshell.h +++ b/openbsc/src/vty/cardshell.h @@ -1,5 +1,6 @@ -#define QUAGGA_PROGNAME "OpenBSC" -#define QUAGGA_VERSION "0.01" +#include "../../bscconfig.h" +#define QUAGGA_PROGNAME PACKAGE_NAME +#define QUAGGA_VERSION PACKAGE_VERSION #define QUAGGA_COPYRIGHT "Harald Welte <laforge@gnumonks.org>" #define CONFIGFILE_MASK 022 #define SYSCONFDIR "/usr/local/etc" |