[Xfce4-commits] <thunar:migration-to-gio> Use new xdt-autogen features. Drop the LINGUAS file and THUNAR_VERINFO.
Jannis Pohlmann
jannis at xfce.org
Fri Aug 21 05:10:01 CEST 2009
Updating branch refs/heads/migration-to-gio
to d2dd00573f2900af759f312d9d963d2b975d2839 (commit)
from c8af60f515e4b293d47f5a5ccd0ebe3b916f9cfd (commit)
commit d2dd00573f2900af759f312d9d963d2b975d2839
Author: Jannis Pohlmann <jannis at xfce.org>
Date: Fri Aug 21 05:05:22 2009 +0200
Use new xdt-autogen features. Drop the LINGUAS file and THUNAR_VERINFO.
autogen.sh | 39 ++++++--------
configure.in.in | 150 ++++++++++++++++++++++++++++---------------------------
po/LINGUAS | 2 -
3 files changed, 93 insertions(+), 98 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 9bbd678..c1ce7d7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,12 +1,23 @@
#!/bin/sh
#
-# $Id$
+# vi:set et ai sw=2 sts=2 ts=2: */
+#-
+# Copyright (c) 2009 Jannis Pohlmann <jannis at xfce.org>
#
-# Copyright (c) 2002-2006
-# The Thunar development team. All rights reserved.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
#
-# Written for Thunar by Benedikt Meurer <benny at xfce.org>.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
(type xdt-autogen) >/dev/null 2>&1 || {
cat >&2 <<EOF
@@ -18,22 +29,4 @@ EOF
exit 1
}
-# verify that po/LINGUAS is present
-(test -f po/LINGUAS) >/dev/null 2>&1 || {
- cat >&2 <<EOF
-autogen.sh: The file po/LINGUAS could not be found. Please check your snapshot
- or try to checkout again.
-EOF
- exit 1
-}
-
-# substitute revision and linguas
-linguas=`sed -e '/^#/d' po/LINGUAS`
-revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'`
-sed -e "s/@LINGUAS@/${linguas}/g" \
- -e "s/@REVISION@/${revision}/g" \
- < "configure.in.in" > "configure.in"
-
-exec xdt-autogen $@
-
-# vi:set ts=2 sw=2 et ai:
+XDT_AUTOGEN_REQUIRED_VERSION="4.7.0" exec xdt-autogen $@
diff --git a/configure.in.in b/configure.in.in
index 1b6f183..c44d033 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -1,38 +1,45 @@
-dnl $Id$
-dnl
-dnl Copyright (c) 2004-2007
-dnl The Thunar development team. All rights reserved.
-dnl
-dnl Written for Thunar by Benedikt Meurer <benny at xfce.org>.
-dnl
+# vi:set et ai sw=2 sts=2 ts=2: */
+#-
+# Copyright (c) 2004-2007 Benedikt Meurer <benny at xfce.org>
+# Copyright (c) 2009 Jannis Pohlmann <jannis at xfce.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
dnl ***************************
dnl *** Version information ***
dnl ***************************
-m4_define([thunar_verinfo], [5:1:3])
-m4_define([thunar_version_api], [1])
m4_define([thunarx_verinfo], [0:0:0])
m4_define([thunarx_version_api], [2])
m4_define([thunar_version_major], [1])
m4_define([thunar_version_minor], [0])
m4_define([thunar_version_micro], [1])
m4_define([thunar_version_nano], [])
-m4_define([thunar_version_build], [r at REVISION@])
-m4_define([thunar_version_tag], [svn])
-m4_define([thunar_version], [thunar_version_major().thunar_version_minor().thunar_version_micro()ifelse(thunar_version_nano(), [], [], [.thunar_version_nano()])ifelse(thunar_version_tag(), [svn], [thunar_version_tag()-thunar_version_build()], [thunar_version_tag()])])
+m4_define([thunar_version_build], [@REVISION@])
+m4_define([thunar_version_tag], [git])
+m4_define([thunar_version], [thunar_version_major().thunar_version_minor().thunar_version_micro()ifelse(thunar_version_nano(), [], [], [.thunar_version_nano()])ifelse(thunar_version_tag(), [git], [thunar_version_tag()-thunar_version_build()], [thunar_version_tag()])])
dnl *******************************************
dnl *** Debugging support for SVN snapshots ***
dnl *******************************************
-m4_define([thunar_debug_default], [ifelse(thunar_version_tag(), [svn], [yes], [minimum])])
+m4_define([thunar_debug_default], [ifelse(thunar_version_tag(), [git], [yes], [minimum])])
dnl ***************************
dnl *** Initialize autoconf ***
dnl ***************************
-AC_COPYRIGHT([Copyright (c) 2004-2009
- The Thunar development team. All rights reserved.
-
-Written for Thunar by Benedikt Meurer <benny at xfce.org>.])
+AC_COPYRIGHT([Copyright (c) 2004-2009 The Thunar development team. All rights reserved.])
AC_INIT([Thunar], [thunar_version], [http://bugzilla.xfce.org/], [Thunar])
AC_PREREQ([2.50])
AC_CANONICAL_TARGET()
@@ -75,16 +82,12 @@ AC_PROG_LIBTOOL()
dnl **************************************
dnl *** Substitute version information ***
dnl **************************************
-THUNAR_VERINFO=thunar_verinfo()
THUNARX_VERINFO=thunarx_verinfo()
-THUNAR_VERSION_API=thunar_version_api()
THUNARX_VERSION_API=thunarx_version_api()
THUNAR_VERSION_MAJOR=thunar_version_major()
THUNAR_VERSION_MINOR=thunar_version_minor()
THUNAR_VERSION_MICRO=thunar_version_micro()
-AC_SUBST([THUNAR_VERINFO])
AC_SUBST([THUNARX_VERINFO])
-AC_SUBST([THUNAR_VERSION_API])
AC_SUBST([THUNARX_VERSION_API])
AC_SUBST([THUNAR_VERSION_MAJOR])
AC_SUBST([THUNAR_VERSION_MINOR])
@@ -200,58 +203,59 @@ AM_CONDITIONAL([ENABLE_XML2PO], [test x"$enable_xml2po" = x"yes"])
dnl ***********************************
dnl *** Check for debugging support ***
dnl ***********************************
-AC_ARG_ENABLE([debug],
-AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes/full@:>@], [Turn on debugging @<:@default=thunar_debug_default@:>@]),
- [], [enable_debug=thunar_debug_default])
-AC_MSG_CHECKING([whether to enable debugging support])
-if test x"$enable_debug" = x"full" -o x"$enable_debug" = x"yes"; then
- dnl Print the result
- AC_MSG_RESULT([$enable_debug])
-
- dnl Make sure we detect possible errors (if supported)
- save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -Wall -Werror"
- AC_MSG_CHECKING([whether $CC accepts -Wall -Werror])
- AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [
- AC_MSG_RESULT([yes])
- PLATFORM_CFLAGS="$PLATFORM_CFLAGS -Wall -Werror"
- ], [
- AC_MSG_RESULT([no])
- ])
- CFLAGS="$save_CFLAGS"
-
- dnl Paranoia for --enable-debug=full
- if test x"$enable_debug" = x"full"; then
- dnl Enable extensive debugging
- PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_ENABLE_DEBUG"
-
- dnl Use -O0 -g3 if the compiler supports it
- save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -O0 -g3"
- AC_MSG_CHECKING([whether $CC accepts -O0 -g3])
- AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [
- AC_MSG_RESULT([yes])
- PLATFORM_CFLAGS="$PLATFORM_CFLAGS -O0 -g3"
- ], [
- AC_MSG_RESULT([no])
- ])
- CFLAGS="$save_CFLAGS"
- fi
-else
- dnl Print the result
- AC_MSG_RESULT([$enable_debug])
-
- dnl Disable debugging (release build)
- PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DNDEBUG"
-
- dnl Disable object cast checks
- PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_CAST_CHECKS"
-
- dnl Disable all checks for --enable-debug=no
- if test x"$enable_debug" = x"no"; then
- PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS"
- fi
-fi
+XDT_FEATURE_DEBUG()
+#AC_ARG_ENABLE([debug],
+#AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes/full@:>@], [Turn on debugging @<:@default=thunar_debug_default@:>@]),
+# [], [enable_debug=thunar_debug_default])
+#AC_MSG_CHECKING([whether to enable debugging support])
+#if test x"$enable_debug" = x"full" -o x"$enable_debug" = x"yes"; then
+# dnl Print the result
+# AC_MSG_RESULT([$enable_debug])
+#
+# dnl Make sure we detect possible errors (if supported)
+# save_CFLAGS="$CFLAGS"
+# CFLAGS="$CFLAGS -Wall -Werror"
+# AC_MSG_CHECKING([whether $CC accepts -Wall -Werror])
+# AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [
+# AC_MSG_RESULT([yes])
+# PLATFORM_CFLAGS="$PLATFORM_CFLAGS -Wall -Werror"
+# ], [
+# AC_MSG_RESULT([no])
+# ])
+# CFLAGS="$save_CFLAGS"
+#
+# dnl Paranoia for --enable-debug=full
+# if test x"$enable_debug" = x"full"; then
+# dnl Enable extensive debugging
+# PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_ENABLE_DEBUG"
+#
+# dnl Use -O0 -g3 if the compiler supports it
+# save_CFLAGS="$CFLAGS"
+# CFLAGS="$CFLAGS -O0 -g3"
+# AC_MSG_CHECKING([whether $CC accepts -O0 -g3])
+# AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [
+# AC_MSG_RESULT([yes])
+# PLATFORM_CFLAGS="$PLATFORM_CFLAGS -O0 -g3"
+# ], [
+# AC_MSG_RESULT([no])
+# ])
+# CFLAGS="$save_CFLAGS"
+# fi
+#else
+# dnl Print the result
+# AC_MSG_RESULT([$enable_debug])
+#
+# dnl Disable debugging (release build)
+# PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DNDEBUG"
+#
+# dnl Disable object cast checks
+# PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_CAST_CHECKS"
+#
+# dnl Disable all checks for --enable-debug=no
+# if test x"$enable_debug" = x"no"; then
+# PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS"
+# fi
+#fi
dnl **************************************
dnl *** Check for linker optimizations ***
diff --git a/po/LINGUAS b/po/LINGUAS
deleted file mode 100644
index f353e56..0000000
--- a/po/LINGUAS
+++ /dev/null
@@ -1,2 +0,0 @@
-# set of available languages (in alphabetic order)
-ar be ca cs da de dz el en_GB eo es et eu fi fr gl he hu id it ja ka ko ku lt lv mk nb nl nn pa pl pt_BR pt ro ru sk sq sv tr uk ur zh_CN zh_TW
More information about the Xfce4-commits
mailing list