Update autotools configuration
This commit is contained in:
parent
6cfc4c12fa
commit
fce7fdb91c
@ -1,3 +1,5 @@
|
|||||||
|
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
|
||||||
|
|
||||||
SUBDIRS = \
|
SUBDIRS = \
|
||||||
src \
|
src \
|
||||||
po \
|
po \
|
||||||
|
@ -5,7 +5,6 @@ srcdir=`dirname $0`
|
|||||||
test -z "$srcdir" && srcdir=.
|
test -z "$srcdir" && srcdir=.
|
||||||
|
|
||||||
PKG_NAME="zenity"
|
PKG_NAME="zenity"
|
||||||
REQUIRED_AUTOMAKE_VERSION=1.9
|
|
||||||
|
|
||||||
(test -f $srcdir/configure.in \
|
(test -f $srcdir/configure.in \
|
||||||
&& test -f $srcdir/ChangeLog \
|
&& test -f $srcdir/ChangeLog \
|
||||||
@ -17,7 +16,7 @@ REQUIRED_AUTOMAKE_VERSION=1.9
|
|||||||
|
|
||||||
|
|
||||||
which gnome-autogen.sh || {
|
which gnome-autogen.sh || {
|
||||||
echo "You need to install gnome-common from the GNOME CVS"
|
echo "You need to install gnome-common"
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
USE_GNOME2_MACROS=1 . gnome-autogen.sh
|
. gnome-autogen.sh
|
||||||
|
24
configure.in
24
configure.in
@ -1,21 +1,17 @@
|
|||||||
AC_INIT([Zenity],[2.91.5],[http://bugzilla.gnome.org/enter_bug.cgi?product=zenity],[zenity])
|
AC_INIT([Zenity],[2.91.5],[http://bugzilla.gnome.org/enter_bug.cgi?product=zenity],[zenity])
|
||||||
|
|
||||||
AC_PREREQ([2.59])
|
AC_PREREQ([2.63])
|
||||||
|
|
||||||
AC_CONFIG_HEADERS([config.h])
|
AC_CONFIG_HEADERS([config.h])
|
||||||
AC_CONFIG_SRCDIR([src])
|
AC_CONFIG_SRCDIR([src])
|
||||||
|
AC_CONFIG_MACRO_DIR([m4])
|
||||||
|
|
||||||
AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip])
|
AM_INIT_AUTOMAKE([1.10 foreign dist-bzip2 no-dist-gzip])
|
||||||
|
AM_MAINTAINER_MODE([enable])
|
||||||
|
|
||||||
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
|
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
|
||||||
|
|
||||||
GNOME_COMMON_INIT
|
# Check for programs
|
||||||
GNOME_DOC_INIT
|
|
||||||
|
|
||||||
AM_MAINTAINER_MODE
|
|
||||||
|
|
||||||
IT_PROG_INTLTOOL([0.40.0])
|
|
||||||
|
|
||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
|
|
||||||
GTK_REQUIRED=2.91.0
|
GTK_REQUIRED=2.91.0
|
||||||
@ -65,7 +61,9 @@ AC_PATH_PROG([PERL],[perl],)
|
|||||||
LIBNOTIFY_REQUIRED=0.6.1
|
LIBNOTIFY_REQUIRED=0.6.1
|
||||||
|
|
||||||
AC_ARG_ENABLE([libnotify],
|
AC_ARG_ENABLE([libnotify],
|
||||||
AC_HELP_STRING([--enable-libnotify], [enable libnotify support]),,
|
[AS_HELP_STRING([--enable-libnotify],
|
||||||
|
[Enable libnotify support])],
|
||||||
|
[],
|
||||||
[enable_libnotify=yes])
|
[enable_libnotify=yes])
|
||||||
|
|
||||||
if test x$enable_libnotify = xyes; then
|
if test x$enable_libnotify = xyes; then
|
||||||
@ -88,6 +86,7 @@ GNOME_COMPILE_WARNINGS([maximum])
|
|||||||
# *******************************
|
# *******************************
|
||||||
# Internationalization
|
# Internationalization
|
||||||
# *******************************
|
# *******************************
|
||||||
|
IT_PROG_INTLTOOL([0.40.0])
|
||||||
|
|
||||||
GETTEXT_PACKAGE=zenity
|
GETTEXT_PACKAGE=zenity
|
||||||
AC_SUBST([GETTEXT_PACKAGE])
|
AC_SUBST([GETTEXT_PACKAGE])
|
||||||
@ -95,6 +94,11 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext domain])
|
|||||||
|
|
||||||
AM_GLIB_GNU_GETTEXT
|
AM_GLIB_GNU_GETTEXT
|
||||||
|
|
||||||
|
# *******************************
|
||||||
|
# User manual
|
||||||
|
# *******************************
|
||||||
|
GNOME_DOC_INIT
|
||||||
|
|
||||||
# *******************************
|
# *******************************
|
||||||
|
|
||||||
AC_SUBST([AM_CPPFLAGS])
|
AC_SUBST([AM_CPPFLAGS])
|
||||||
|
2
m4/.gitignore
vendored
Normal file
2
m4/.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
gnome-doc-utils.m4
|
||||||
|
intltool.m4
|
Reference in New Issue
Block a user