Autotools update.

Fix building with automake-1.13.
Fix configure.ac.in as suggested in bug #6920.
This commit is contained in:
Harald Judt 2013-02-26 20:51:37 +01:00
parent 5ea3c5f63c
commit eba51dfe79
2 changed files with 10 additions and 9 deletions

View file

@ -14,16 +14,16 @@ m4_define([eyes_version], [eyes_version_major().eyes_version_minor().eyes_versio
dnl ***************************
dnl *** Initialize autoconf ***
dnl ***************************
AC_COPYRIGHT([Copyright (c) 2006-2007 The Xfce development team])
AC_COPYRIGHT([Copyright (c) 2006-2013 The Xfce development team])
AC_INIT([xfce4-eyes-plugin], [eyes_version], [http://bugzilla.xfce.org/], [xfce4-eyes-plugin])
AC_PREREQ([2.50])
AC_PREREQ([2.60])
AC_CANONICAL_TARGET()
dnl ***************************
dnl *** Initialize automake ***
dnl ***************************
AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
AM_CONFIG_HEADER([config.h])
AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar])
AC_CONFIG_HEADERS([config.h])
AM_MAINTAINER_MODE()
dnl ********************************
@ -32,8 +32,9 @@ dnl ********************************
AC_PROG_CC()
AC_PROG_LD()
AC_PROG_INSTALL()
AC_PROG_LIBTOOL()
LT_INIT([disable-static])
AC_PROG_INTLTOOL()
AM_PROG_CC_C_O()
dnl **********************************
dnl *** Check for standard headers ***
@ -54,8 +55,8 @@ XDT_I18N([@LINGUAS@])
dnl ***********************************
dnl *** Check for required packages ***
dnl ***********************************
XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0])
XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.20.0])
XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0])
XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0])
XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0])

View file

@ -1,4 +1,4 @@
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
-DTHEMESDIR=\"$(datadir)/xfce4/eyes/themes\"
@ -15,7 +15,7 @@ xfce4_eyes_plugin_SOURCES = \
xfce4_eyes_plugin_CFLAGS = \
$(LIBXFCE4UI_CFLAGS) \
$(LIBXFCE4PANEL_CFLAGS)
xfce4_eyes_plugin_LDADD = \
$(LIBXFCE4PANEL_LIBS) \
$(LIBXFCE4UI_LIBS)