diff options
| author | Steve Zesch <[email protected]> | 2012-11-24 20:44:45 -0500 |
|---|---|---|
| committer | Steve Zesch <[email protected]> | 2012-11-24 20:44:45 -0500 |
| commit | 6b24c91d3aa81fdb99500c8c2c12f830fabaefb6 (patch) | |
| tree | 6a0038ecfaa77e156ee2cc9059220685091217d7 /configure.ac | |
| parent | a10375c2851e8569353c0da9921b8d0d9cbea2e6 (diff) | |
| download | mate-calc-6b24c91d3aa81fdb99500c8c2c12f830fabaefb6.tar.bz2 mate-calc-6b24c91d3aa81fdb99500c8c2c12f830fabaefb6.tar.xz | |
Update codebase.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 80 |
1 files changed, 34 insertions, 46 deletions
diff --git a/configure.ac b/configure.ac index 615e4fb..684a5d9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(configure.ac) -AM_INIT_AUTOMAKE(mate-calc, 1.5.0) +AM_INIT_AUTOMAKE(mate-calc, 1.5.1) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE MATE_MAINTAINER_MODE_DEFINES -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) AC_ISC_POSIX AC_PROG_CC @@ -19,59 +19,47 @@ dnl ########################################################################### dnl Dependencies dnl ########################################################################### -GTK_REQUIRED=2.18 +GLIB_REQUIRED=2.31 GIO_REQUIRED=2.25.10 +GTK_REQUIRED=2.18.0 AC_MSG_CHECKING([which gtk+ version to compile against]) -AC_ARG_WITH([gtk], - [AS_HELP_STRING([--with-gtk=2.0|3.0], [which gtk+ version to compile against (default: 2.0)])], - [case "$with_gtk" in - 2.0|3.0) ;; - *) AC_MSG_ERROR([invalid gtk version specified]) ;; - esac], - [with_gtk=2.0]) +AC_ARG_WITH([gtk+], + [AS_HELP_STRING([--with-gtk=2.0|3.0], [which gtk+ version to compile against (default: 2.0)])], + [case "$with_gtk" in + 2.0|3.0) ;; + *) AC_MSG_ERROR([invalid gtk version specified]) ;; + esac], + [with_gtk=2.0]) AC_MSG_RESULT([$with_gtk]) case "$with_gtk" in - 2.0) GTK_API_VERSION=2.0 - GTK_REQUIRED=2.18.0 - ;; - 3.0) GTK_API_VERSION=3.0 - GTK_REQUIRED=2.90.4 - ;; + 2.0) GTK_API_VERSION=2.0 + GTK_REQUIRED=2.18.0 + ;; + 3.0) GTK_API_VERSION=3.0 + GTK_REQUIRED=2.90.4 + ;; esac PKG_CHECK_MODULES(MATE_CALC, [ - gtk+-$GTK_API_VERSION >= $GTK_REQUIRED - gio-2.0 >= $GIO_REQUIRED - libxml-2.0 - gmodule-export-2.0 + gtk+-$GTK_API_VERSION >= $GTK_REQUIRED + glib-2.0 >= $GLIB_REQUIRED + gio-2.0 >= $GIO_REQUIRED + libxml-2.0 + gmodule-export-2.0 ]) PKG_CHECK_MODULES(MATE_CALC_CMD, [ - glib-2.0 + glib-2.0 >= $GLIB_REQUIRED + gio-2.0 >= $GIO_REQUIRED + libxml-2.0 ]) -AC_CHECK_LIB(m, log) - -dnl ########################################################################### -dnl Determine if a usable lex is available on this system -dnl ########################################################################### - -AM_PROG_LEX -if [[ "$LEX" != "flex" ]]; then - AC_MSG_ERROR(flex is required to create the mate-calc scanners) -fi +GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` +AC_SUBST(GLIB_MKENUMS) -dnl ########################################################################### -dnl Determine if a usable yacc is available on this system -dnl ########################################################################### - -AC_PROG_YACC -AC_CHECK_PROG(HAVE_YACC, $YACC, yes, no) -if [[ "$HAVE_YACC" = "no" ]]; then - AC_MSG_ERROR($YACC is not usable as yacc - consider using bison) -fi +AC_CHECK_LIB(m, log) dnl ########################################################################### dnl Internationalization @@ -84,16 +72,16 @@ dnl ########################################################################### dnl Documentation dnl ########################################################################### -MATE_DOC_INIT +YELP_HELP_INIT dnl ########################################################################### dnl Files to generate dnl ########################################################################### AC_OUTPUT([ - Makefile - src/Makefile - po/Makefile.in - data/Makefile - help/Makefile +Makefile +src/Makefile +po/Makefile.in +data/Makefile +help/Makefile ]) |