summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-11-13 03:12:25 -0800
committerStefano Karapetsas <[email protected]>2013-11-13 03:12:25 -0800
commit7f1f76b01f97024b00813c6d27d46104b5867088 (patch)
tree85465c98e1a3089b37d8ccd1125a997743d32a36
parentfbcb18d4b1f57694006eb4760b6ebfeaf7de8fb1 (diff)
parentb157c86f2bb370fb449d8640eed9fb544f0d4f62 (diff)
downloadmate-screensaver-7f1f76b01f97024b00813c6d27d46104b5867088.tar.bz2
mate-screensaver-7f1f76b01f97024b00813c6d27d46104b5867088.tar.xz
Merge pull request #35 from infirit/1.6
Various fixes from master
-rw-r--r--Makefile.am1
-rw-r--r--configure.ac11
-rw-r--r--po/POTFILES.in1
3 files changed, 8 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index f400a13..a6e8ebc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
# This file will be processed with automake-1.7 to create Makefile.in
AUTOMAKE_OPTIONS = 1.7
+ACLOCAL_AMFLAGS = -I m4
NULL =
diff --git a/configure.ac b/configure.ac
index 71ae024..4133c11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,6 +6,7 @@ AC_INIT([mate-screensaver],
[http://www.mate-desktop.org/])
AC_CONFIG_SRCDIR(src/mate-screensaver.c)
+AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -224,7 +225,7 @@ dnl ---------------------------------------------------------------------------
# Like AC_CHECK_HEADER, but it uses the already-computed -I directories.
#
-AC_DEFUN(AC_CHECK_X_HEADER, [
+AC_DEFUN([AC_CHECK_X_HEADER], [
ac_save_CPPFLAGS="$CPPFLAGS"
if test \! -z "$includedir" ; then
CPPFLAGS="$CPPFLAGS -I$includedir"
@@ -235,7 +236,7 @@ AC_DEFUN(AC_CHECK_X_HEADER, [
# Like AC_TRY_COMPILE, but it uses the already-computed -I directories.
#
-AC_DEFUN(AC_TRY_X_COMPILE, [
+AC_DEFUN([AC_TRY_X_COMPILE], [
ac_save_CPPFLAGS="$CPPFLAGS"
if test \! -z "$includedir" ; then
CPPFLAGS="$CPPFLAGS -I$includedir"
@@ -248,7 +249,7 @@ AC_DEFUN(AC_TRY_X_COMPILE, [
# Like AC_CHECK_LIB, but it uses the already-computed -I and -L directories.
# Use this sparingly; it probably doesn't work very well on X programs.
#
-AC_DEFUN(AC_CHECK_X_LIB, [
+AC_DEFUN([AC_CHECK_X_LIB], [
ac_save_CPPFLAGS="$CPPFLAGS"
ac_save_LDFLAGS="$LDFLAGS"
# ac_save_LIBS="$LIBS"
@@ -287,7 +288,7 @@ AC_DEFUN(AC_CHECK_X_LIB, [
# /DIR/include and /DIR/lib exist, and adds them to $X_CFLAGS and $X_LIBS
# as appropriate.
#
-AC_DEFUN(HANDLE_X_PATH_ARG, [
+AC_DEFUN([HANDLE_X_PATH_ARG], [
case "$[$1]" in
yes) ;;
no) ;;
@@ -547,7 +548,7 @@ dnl ---------------------------------------------------------------------------
dnl - Check for GL
dnl ---------------------------------------------------------------------------
-AC_ARG_WITH(gl, [ --with-libgl build with GL support])
+AC_ARG_WITH(libgl, [ --with-libgl build with GL support])
have_libgl=no
GL_LIBS=""
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0b3fc6a..89688e0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,6 +5,7 @@ data/mate-screensaver-preferences.desktop.in
data/mate-screensaver.directory.in
data/images/cosmos/cosmos.xml.in.in
[type: gettext/glade]data/lock-dialog-default.ui
+data/lock-dialog-default.ui
data/org.mate.screensaver.gschema.xml.in
savers/cosmos-slideshow.desktop.in.in
savers/footlogo-floaters.desktop.in.in