diff options
| author | Changyeon Lee <cyeon.lee@samsung.com> | 2014-04-17 14:39:53 +0900 |
|---|---|---|
| committer | Changyeon Lee <cyeon.lee@samsung.com> | 2014-04-17 14:46:23 +0900 |
| commit | 062ccfe1d8b185769f7fba8592a847534ddcd20f (patch) | |
| tree | 3c835328760e4ff97c51f8299f9e8e1f023a7d41 /configure.ac | |
| parent | 58f5b6fa650fec45dc1550c9c8f53d5be6e04891 (diff) | |
| parent | bf7133e53f270b44a263e4f364642c2cae384496 (diff) | |
| download | xconsole-accepted/tizen_wearable.tar.gz xconsole-accepted/tizen_wearable.tar.bz2 xconsole-accepted/tizen_wearable.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.082720tizen_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: Ied4732bb27f4d8a89f7ba0e596231a81bf70ab93
Signed-off-by: Changyeon Lee <cyeon.lee@samsung.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 0454cd1..362c840 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Copyright 2005 Red Hat, Inc. -dnl +dnl dnl Permission to use, copy, modify, distribute, and sell this software and its dnl documentation for any purpose is hereby granted without fee, provided that dnl the above copyright notice appear in all copies and that both that @@ -10,7 +10,7 @@ dnl advertising or publicity pertaining to distribution of the software without dnl specific, written prior permission. Red Hat makes no dnl representations about the suitability of this software for any purpose. It dnl is provided "as is" without express or implied warranty. -dnl +dnl dnl RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO dnl EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR @@ -21,11 +21,16 @@ dnl PERFORMANCE OF THIS SOFTWARE. dnl dnl Process this file with autoconf to create configure. +# Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xconsole], - [1.0.4], + [1.0.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xconsole]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) + +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE @@ -35,15 +40,13 @@ m4_ifndef([XORG_MACROS_VERSION], XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS -AM_CONFIG_HEADER(config.h) - # Checks for pkg-config packages -PKG_CHECK_MODULES(XCONSOLE, xaw7 xmu xt x11) +PKG_CHECK_MODULES(XCONSOLE, xaw7 xmu xt >= 1.0 x11 xproto >= 7.0.17) PKG_CHECK_MODULES(APPDEFS, xt) xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt` AC_ARG_WITH(appdefaultdir, - AC_HELP_STRING([--with-appdefaultdir=<pathname>], + AS_HELP_STRING([--with-appdefaultdir=<pathname>], [specify directory for app-defaults files (default is autodetected)]), [appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"]) AC_SUBST(appdefaultdir) @@ -51,10 +54,13 @@ AC_SUBST(appdefaultdir) AC_SEARCH_LIBS(openpty, [util]) AC_CHECK_FUNC(openpty, [HAS_OPENPTY="yes"]) if test "x$HAS_OPENPTY" = "xyes" ; then - AC_DEFINE([HAS_OPENPTY], 1, + AC_DEFINE([HAS_OPENPTY], 1, [Define to 1 if you have the 'openpty' function.]) - AC_CHECK_HEADERS([util.h pty.h], [break]) + AC_CHECK_HEADERS([util.h libutil.h pty.h], [break]) fi -AC_OUTPUT([Makefile]) +AC_CONFIG_FILES([ + Makefile + man/Makefile]) +AC_OUTPUT |