diff options
author | Changyeon Lee <cyeon.lee@samsung.com> | 2014-04-17 14:39:58 +0900 |
---|---|---|
committer | Changyeon Lee <cyeon.lee@samsung.com> | 2014-04-17 14:46:42 +0900 |
commit | b94d0d98ecc1d1c54ea28807971e1e06031f1fd5 (patch) | |
tree | 69e70a677b936b3a86c9f73b01be30463943bfca /configure.ac | |
parent | 8af8be009664eb1fb5179833b8b22b8dea5ce4c8 (diff) | |
parent | d4ae73a746b08170c8337b997f6d87d051876b7d (diff) | |
download | xkbutils-submit/tizen/20140818.084211.tar.gz xkbutils-submit/tizen/20140818.084211.tar.bz2 xkbutils-submit/tizen/20140818.084211.zip |
Merge branch 'devel/upgrade' into tizenHEADtizen_3.0.2014.q3_common_releasesubmit/tizen_mobile/20141120.000000submit/tizen/20140819.234625submit/tizen/20140818.144456submit/tizen/20140818.084211submit/tizen/20140417.073530submit/devel/x11/20140718.035926accepted/tizen/mobile/20140519.083115tizen_3.0.2015.q2_commontizen_3.0.2015.q1_commontizen_3.0.2014.q4_commontizen_3.0.2014.q3_commontizendevel/x11accepted/tizen_wearableaccepted/tizen_tvaccepted/tizen_mobileaccepted/tizen_commonaccepted/tizen_3.0.2014.q3_common
Change-Id: I3f420dbf5face7fb158162acde8bf37fe377875c
Signed-off-by: Changyeon Lee <cyeon.lee@samsung.com>
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 4e7ee76..2908135 100644 --- a/configure.ac +++ b/configure.ac @@ -21,11 +21,17 @@ dnl PERFORMANCE OF THIS SOFTWARE. dnl dnl Process this file with autoconf to create configure. +# Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xkbutils], [1.0.3], +AC_INIT([xkbutils], [1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xkbutils]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) + +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +AM_PROG_CC_C_O # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], @@ -33,17 +39,18 @@ m4_ifndef([XORG_MACROS_VERSION], XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS -AM_CONFIG_HEADER(config.h) - -AM_PROG_CC_C_O +AC_CHECK_FUNCS([strcasecmp]) # xkbvleds checks -PKG_CHECK_MODULES(XKBVLEDS, xproto xaw7 xt x11) +PKG_CHECK_MODULES(XKBVLEDS, [xproto >= 7.0.17 xaw7 xt x11]) # xkbbell checks -PKG_CHECK_MODULES(XKBBELL, xproto inputproto x11) +PKG_CHECK_MODULES(XKBBELL, [xproto inputproto x11]) # xkbwatch checks -PKG_CHECK_MODULES(XKBWATCH, xproto xaw7 xt x11) +PKG_CHECK_MODULES(XKBWATCH, [xproto >= 7.0.17 xaw7 xt x11]) -AC_OUTPUT([Makefile]) +AC_CONFIG_FILES([ + Makefile + man/Makefile]) +AC_OUTPUT |