diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 84544b2..917bab5 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -6,25 +6,25 @@ | |||
6 | # the Free Software Foundation; either version 3, or (at your option) | 6 | # the Free Software Foundation; either version 3, or (at your option) |
7 | # any later version. | 7 | # any later version. |
8 | # | 8 | # |
9 | # Varnish-mib is distributed in the hope that it will be useful, | 9 | # Varnish-mib is distributed in the hope that it will be useful, |
10 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
11 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
12 | # GNU General Public License for more details. | 12 | # GNU General Public License for more details. |
13 | # | 13 | # |
14 | # You should have received a copy of the GNU General Public License | 14 | # You should have received a copy of the GNU General Public License |
15 | # along with Varnish-mib. If not, see <http://www.gnu.org/licenses/>. | 15 | # along with Varnish-mib. If not, see <http://www.gnu.org/licenses/>. |
16 | 16 | ||
17 | AC_PREREQ(2.69) | 17 | AC_PREREQ(2.69) |
18 | AC_INIT([varnish-mib], 1.1.90, [gray@gnu.org]) | 18 | AC_INIT([varnish-mib], 2.0, [gray@gnu.org]) |
19 | AC_CONFIG_SRCDIR(src/varnish_mib.mib2c) | 19 | AC_CONFIG_SRCDIR(src/varnish_mib.mib2c) |
20 | AM_CONFIG_HEADER(config.h) | 20 | AM_CONFIG_HEADER(config.h) |
21 | AC_CONFIG_AUX_DIR([build-aux]) | 21 | AC_CONFIG_AUX_DIR([build-aux]) |
22 | AC_CONFIG_MACRO_DIR([m4]) | 22 | AC_CONFIG_MACRO_DIR([m4]) |
23 | 23 | ||
24 | AC_CANONICAL_SYSTEM | 24 | AC_CANONICAL_SYSTEM |
25 | AC_LANG(C) | 25 | AC_LANG(C) |
26 | AM_INIT_AUTOMAKE([gnu tar-ustar silent-rules]) | 26 | AM_INIT_AUTOMAKE([gnu tar-ustar silent-rules]) |
27 | AM_SILENT_RULES([yes]) | 27 | AM_SILENT_RULES([yes]) |
28 | 28 | ||
29 | AC_GNU_SOURCE | 29 | AC_GNU_SOURCE |
30 | AC_PROG_CC | 30 | AC_PROG_CC |
@@ -36,35 +36,35 @@ AC_PROG_CPP | |||
36 | AM_PROG_LEX | 36 | AM_PROG_LEX |
37 | 37 | ||
38 | AC_PROG_INSTALL | 38 | AC_PROG_INSTALL |
39 | AC_PROG_LIBTOOL | 39 | AC_PROG_LIBTOOL |
40 | AC_PROG_MAKE_SET | 40 | AC_PROG_MAKE_SET |
41 | 41 | ||
42 | # Check for pkg-config | 42 | # Check for pkg-config |
43 | PKG_PROG_PKG_CONFIG | 43 | PKG_PROG_PKG_CONFIG |
44 | 44 | ||
45 | # Checks for Varnish | 45 | # Checks for Varnish |
46 | PKG_CHECK_MODULES([VARNISHAPI], [varnishapi >= 5.0]) | 46 | PKG_CHECK_MODULES([VARNISHAPI], [varnishapi >= 5.0]) |
47 | 47 | ||
48 | varnishapi_version() { | 48 | check_minor_number() { |
49 | AC_DEFINE_UNQUOTED([VARNISHAPI_MAJOR],[$1],[Varnish API major version number]) | 49 | if [ "$2" -gt 1 ]; then |
50 | AC_DEFINE_UNQUOTED([VARNISHAPI_MINOR],[$2],[Varnish API minor version number]) | 50 | AC_MSG_ERROR([Unsupported Varnish API version; please try varnish_mib 3.0 or newer]) |
51 | AC_DEFINE_UNQUOTED([VARNISHAPI_PATCH],[$3],[Varnish API patchlevel]) | 51 | fi |
52 | } | 52 | } |
53 | 53 | ||
54 | v=$($PKG_CONFIG --modversion varnishapi) | 54 | v=$($PKG_CONFIG --modversion varnishapi) |
55 | if test -n "$v"; then | 55 | if test -n "$v"; then |
56 | save_IFS=$IFS | 56 | save_IFS=$IFS |
57 | IFS='.' | 57 | IFS='.' |
58 | varnishapi_version $v | 58 | check_minor_number $v |
59 | IFS=$save_IFS | 59 | IFS=$save_IFS |
60 | fi | 60 | fi |
61 | 61 | ||
62 | # Check for Net-SNMP | 62 | # Check for Net-SNMP |
63 | AC_PATH_PROG([NET_SNMP_CONFIG], net-snmp-config, none, $PATH) | 63 | AC_PATH_PROG([NET_SNMP_CONFIG], net-snmp-config, none, $PATH) |
64 | if test "$NET_SNMP_CONFIG" = "none"; then | 64 | if test "$NET_SNMP_CONFIG" = "none"; then |
65 | AC_MSG_ERROR([cannot find Net-SNMP (net-snmp-config not found)]) | 65 | AC_MSG_ERROR([cannot find Net-SNMP (net-snmp-config not found)]) |
66 | fi | 66 | fi |
67 | AC_SUBST(NET_SNMP_CONFIG) | 67 | AC_SUBST(NET_SNMP_CONFIG) |
68 | 68 | ||
69 | # Checks for header files. | 69 | # Checks for header files. |
70 | AC_HEADER_STDC | 70 | AC_HEADER_STDC |