[Xfce4-commits] <parole:master> Bump version number, prettify the configure file
Sean Davis
noreply at xfce.org
Fri Oct 11 11:52:07 CEST 2013
Updating branch refs/heads/master
to 87aec01f5e087534257f77f02670da9ea50e4f52 (commit)
from 4cc5176c0181893e64facb10260b7736e06f3f1a (commit)
commit 87aec01f5e087534257f77f02670da9ea50e4f52
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Wed Sep 11 07:35:34 2013 -0400
Bump version number, prettify the configure file
configure.ac.in | 88 +++++++++++++++++++++++++++----------------------------
1 file changed, 44 insertions(+), 44 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index 94c1279..0e8ef00 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -1,11 +1,11 @@
m4_define([intltool_minimum_version], [0.31])
-m4_define([parole_verinfo], [0:5:2])
-m4_define([parole_version_api], [0])
-m4_define([parole_version_major], [0])
-m4_define([parole_version_minor], [5])
-m4_define([parole_version_micro], [2])
-m4_define([parole_version_build], [])
-m4_define([parole_version_tag], [])
+m4_define([parole_verinfo], [0:6:0])
+m4_define([parole_version_api], [0])
+m4_define([parole_version_major], [0])
+m4_define([parole_version_minor], [6])
+m4_define([parole_version_micro], [0])
+m4_define([parole_version_build], [])
+m4_define([parole_version_tag], [])
m4_define([parole_version], [parole_version_major().parole_version_minor().parole_version_micro()ifelse(parole_version_tag(), [git], [parole_version_tag().parole_version_build()], [parole_version_tag()])])
AC_INIT([parole], [parole_version], [aliov at xfce.org])
@@ -17,13 +17,13 @@ AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
AM_CONFIG_HEADER([config.h])
if test x${enable_gtk_doc} = x"yes"; then
- AM_MAINTAINER_MODE([enable])
+ AM_MAINTAINER_MODE([enable])
else
- if test x${enable_debug} != x"no"; then
- AM_MAINTAINER_MODE([enable])
- else
- AM_MAINTAINER_MODE()
- fi
+ if test x${enable_debug} != x"no"; then
+ AM_MAINTAINER_MODE([enable])
+ else
+ AM_MAINTAINER_MODE()
+ fi
fi
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -41,14 +41,14 @@ AC_PROG_INSTALL()
AC_PROG_INTLTOOL([intltool_minimum_version], [no-xml])
# ===================================================== #
-# Initialize libtool #
+# Initialize libtool #
# ===================================================== #
LT_PREREQ([2.2.6])
LT_INIT([disable-static])
m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
# ===================================================== #
-# Version information #
+# Version information #
# ===================================================== #
PAROLE_VERINFO=parole_verinfo()
PAROLE_VERSION_API=parole_version_api()
@@ -61,23 +61,23 @@ AC_SUBST([PAROLE_VERSION_MAJOR])
AC_SUBST([PAROLE_VERSION_MINOR])
AC_SUBST([PAROLE_VERSION_MICRO])
-# ==================================================== #
-# Check for headers needed for standard interfaces #
-# ==================================================== #
+# ===================================================== #
+# Check for headers needed for standard interfaces #
+# ===================================================== #
AC_HEADER_STDC
AC_CHECK_HEADERS([errno.h signal.h stddef.h sys/ioctl.h fcntl.h\
string.h sys/stat.h sys/types.h sys/wait.h time.h \
unistd.h])
# ===================================================== #
-# Check for i18n support #
+# Check for i18n support #
# ===================================================== #
XDT_I18N([@LINGUAS@])
-#==================================================== #
-# Check for required packages #
-#=====================================================#
+# ===================================================== #
+# Check for required packages #
+# ===================================================== #
m4_define([gtk_minimum_version], [3.0.0])
m4_define([glib_minimum_version], [2.32.0])
@@ -150,9 +150,9 @@ fi
XDT_CHECK_LIBX11()
# Taken from Gnome system tools
-#=======================================================#
-# Pixmaps files #
-#=======================================================#
+# ===================================================== #
+# Pixmaps files #
+# ===================================================== #
if test "x${prefix}" = "xNONE"; then
AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps", [pixmaps directory])
pixmapsdir="${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
@@ -163,9 +163,9 @@ fi
AC_SUBST(pixmapsdir)
-#=======================================================#
-# Check XF86keysysm #
-#=======================================================#
+# ===================================================== #
+# Check XF86keysysm #
+# ===================================================== #
# Check for the AudioPlay sym other should exist
# if this one exists.
AC_CHECK_DECL(XF86XK_AudioPlay,have_XF86XK_AudioPlay=1,have_XF86XK_AudioPlay=0,[#include <X11/XF86keysym.h>])
@@ -173,9 +173,9 @@ if test "x${ac_cv_have_decl_XF86XK_AudioPlay}" != "xno"; then
AC_DEFINE(HAVE_XF86_KEYSYM, 1, [Define if XF86keysysm.h is available])
fi
-#=======================================================#
-# TagLib support #
-#=======================================================#
+# ===================================================== #
+# TagLib support #
+# ===================================================== #
TAGLIB_FOUND="no"
XDT_CHECK_OPTIONAL_PACKAGE([TAGLIB],
[taglib], [1.4],
@@ -189,17 +189,17 @@ AC_CHECK_LIB([tag_c], [taglib_file_new],
[
AC_CHECK_HEADER([taglib/tag_c.h],
[
- TAGLIBC_LIBS="-ltag_c"
- AC_DEFINE([HAVE_TAGLIBC], [1], [Define to 1 if tag_c is found])
+ TAGLIBC_LIBS="-ltag_c"
+ AC_DEFINE([HAVE_TAGLIBC], [1], [Define to 1 if tag_c is found])
])
], [-lm])
AC_SUBST([TAGLIBC_CFLAGS])
AC_SUBST([TAGLIBC_LIBS])
fi
-#=======================================================#
-# Check plugins to build #
-#=======================================================#
+# ===================================================== #
+# Check plugins to build #
+# ===================================================== #
# Notify plugin.
#--------------------------
@@ -211,8 +211,8 @@ AC_MSG_RESULT([$ac_notify_plugin])
# Depends on Libnotify - if not found cannot build
LIBNOTIFY_FOUND="no"
if test x"$ac_notify_plugin" = x"yes"; then
- XDT_CHECK_PACKAGE([LIBNOTIFY],
- [libnotify], [libnotify_minimum_version])
+ XDT_CHECK_PACKAGE([LIBNOTIFY],
+ [libnotify], [libnotify_minimum_version])
fi
# Tray plugin.
@@ -223,14 +223,14 @@ AC_MSG_CHECKING([whether to build the system tray plugin])
AM_CONDITIONAL([PAROLE_TRAY_PLUGIN], [test x"$ac_tray_plugin" = x"yes"])
AC_MSG_RESULT([$ac_tray_plugin])
-#=======================================================#
-# Check for debugging support #
-#=======================================================#
+# ===================================================== #
+# Check for debugging support #
+# ===================================================== #
XDT_FEATURE_DEBUG()
-#=======================================================#
-# Check for Gtk doc #
-#=======================================================#
+# ===================================================== #
+# Check for Gtk doc #
+# ===================================================== #
GTK_DOC_CHECK(1.9)
AC_OUTPUT([
More information about the Xfce4-commits
mailing list