diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-09-24 21:57:52 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-09-24 21:57:52 +0000 |
| commit | 196dbce3d2109ce24d30bcd154a0a6273666345f (patch) | |
| tree | d10a21d186f1cd253904d9793e10e4d48715a298 | |
| parent | 3f16280e9b23f0f31cf336740f3d1054b6dcebb3 (diff) | |
| download | wireshark-196dbce3d2109ce24d30bcd154a0a6273666345f.tar.gz wireshark-196dbce3d2109ce24d30bcd154a0a6273666345f.tar.bz2 wireshark-196dbce3d2109ce24d30bcd154a0a6273666345f.zip | |
Add back extra packaging information if it's present.
svn path=/trunk/; revision=45112
| -rw-r--r-- | configure.ac | 11 | ||||
| -rwxr-xr-x | make-version.pl | 14 |
2 files changed, 14 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 2c2ca82ba7..24ff24c681 100644 --- a/configure.ac +++ b/configure.ac @@ -2,12 +2,13 @@ # AC_PREREQ(2.60) -m4_define(version_major, 1) -m4_define(version_minor, 9) -m4_define(version_micro, 0) -# XXX version_extra ? +m4_define([version_major], [1]) +m4_define([version_minor], [9]) +m4_define([version_micro], [0]) +m4_define([version_micro_extra], version_micro) +m4_append([version_micro_extra], []) -AC_INIT(wireshark, [version_major.version_minor.version_micro], http://bugs.wireshark.org/, , http://www.wireshark.org/) +AC_INIT(wireshark, [version_major.version_minor.version_micro_extra], http://bugs.wireshark.org/, , http://www.wireshark.org/) dnl Check for CPU / vendor / OS dnl The user is encouraged to use either `AC_CANONICAL_BUILD', or diff --git a/make-version.pl b/make-version.pl index d28866e90f..5de69de5f4 100755 --- a/make-version.pl +++ b/make-version.pl @@ -311,12 +311,14 @@ sub update_configure_ac open(CFGIN, "< $filepath") || die "Can't read $filepath!"; while ($line = <CFGIN>) { - if ($line =~ /^m4_define\(version_major *,.*([\r\n]+)$/) { - $line = sprintf("m4_define(version_major, %d)$1", $version_pref{"version_major"}); - } elsif ($line =~ /^m4_define\(version_minor *,.*([\r\n]+)$/) { - $line = sprintf("m4_define(version_minor, %d)$1", $version_pref{"version_minor"}); - } elsif ($line =~ /^m4_define\(version_micro *,.*([\r\n]+)$/) { - $line = sprintf("m4_define(version_micro, %d)$1", $version_pref{"version_micro"}); + if ($line =~ /^m4_define\( *\[?version_major\]? *,.*([\r\n]+)$/) { + $line = sprintf("m4_define([version_major], [%d])$1", $version_pref{"version_major"}); + } elsif ($line =~ /^m4_define\( *\[?version_minor\]? *,.*([\r\n]+)$/) { + $line = sprintf("m4_define([version_minor], [%d])$1", $version_pref{"version_minor"}); + } elsif ($line =~ /^m4_define\( *\[?version_micro\]? *,.*([\r\n]+)$/) { + $line = sprintf("m4_define([version_micro], [%d])$1", $version_pref{"version_micro"}); + } elsif ($line =~ /^m4_append\( *\[?version_micro_extra\]? *,.*([\r\n]+)$/) { + $line = sprintf("m4_append([version_micro_extra], [%s])$1", $package_string); } $contents .= $line } |