GNOME.org
 

[nautilus-actions] Create configure.ac from configure.in

commit c03f65a3c78e97c1f688e89c4c1d4f7ff85d9ccb
Author: Pierre Wieser <pwieser trychlos org>
Date:   Sat May 16 19:25:12 2009 +0200

    Create configure.ac from configure.in
---
 .gitignore                      |    1 +
 ChangeLog                       |    3 +
 configure.ac                    |  213 +++++++++++++++++++++++++++++++++++++++
 configure.in                    |  161 -----------------------------
 libnautilus-actions/Makefile.am |    2 +-
 nact/Makefile.am                |    2 +-
 plugin/Makefile.am              |    2 +-
 utils/Makefile.am               |    2 +-
 8 files changed, 221 insertions(+), 165 deletions(-)

diff --git a/.gitignore b/.gitignore
index 340b30c..08cd46c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ stamp-h1
 *.la
 *.lo
 nautilus-actions-*.tar.gz
+config.h.in~
diff --git a/ChangeLog b/ChangeLog
index 02f8c6a..ff35929 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-05-16 Pierre Wieser <pwieser trychlos org>
 
+	* configure.ac: created from configure.in
+	update all Makefile.am, replacing deprecated INCLUDES with AM_CPPFLAGS
+
 	* update po files
 
 	* Makefile.am: add DISTCLEANFILES,
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..343f234
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,213 @@
+# Nautilus Actions
+#
+# Copyright (C) 2005 The GNOME Foundation
+# Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
+# Copyright (C) 2009 Pierre Wieser and others (see AUTHORS)
+#
+# 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 Library; see the file COPYING.  If not,
+# write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA 02111-1307, USA.
+#
+# Authors:
+#   Frederic Ruaudel <grumz grumz net>
+#   Rodrigo Moya <rodrigo gnome-db org>
+#   Pierre Wieser <pwieser trychlos org>
+#   and many others (see AUTHORS)
+#
+# pwi 2009-05-16 created from configure.in
+
+AC_PREREQ([2.53])
+
+AC_INIT([nautilus-actions],[1.10],[maintainer nautilus-actions org])
+AC_CANONICAL_TARGET
+AM_INIT_AUTOMAKE
+
+AC_CONFIG_SRCDIR([plugin/nautilus-actions.c])
+
+AC_CONFIG_HEADERS([config.h])
+
+AC_CONFIG_FILES([
+	Makefile
+	libnautilus-actions/Makefile
+	plugin/Makefile
+	nact/Makefile
+	utils/Makefile
+	icons/Makefile
+	icons/16x16/Makefile
+	icons/22x22/Makefile
+	icons/32x32/Makefile
+	icons/48x48/Makefile
+	icons/scalable/Makefile
+	po/Makefile.in
+])
+
+#AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS")
+
+# don't agree with maintainer mode use
+# see http://www.gnu.org/software/automake/manual/automake.html#index-AM_005fMAINTAINER_005fMODE-1001
+# but gnome-autogen.sh forces its usage and gnome_common_init requires it
+AM_MAINTAINER_MODE
+
+# check for compiler characteristics and options
+AC_PROG_CC
+AC_PROG_GCC_TRADITIONAL
+AC_STDC_HEADERS
+
+# why ?
+#AM_DISABLE_STATIC
+
+# other traditional tools
+AC_PROG_INSTALL
+AC_PROG_MAKE_SET
+
+# Gnome stuff
+GNOME_COMMON_INIT
+GNOME_MAINTAINER_MODE_DEFINES
+GNOME_COMPILE_WARNINGS
+AC_SUBST([AM_CPPFLAGS],["${AM_CPPFLAGS} ${DISABLE_DEPRECATED}"])
+AC_SUBST([AM_CFLAGS],["${AM_CFLAGS} ${WARN_CFLAGS}"])
+
+# libtool
+AM_PROG_LIBTOOL
+
+# localization
+# note that this version is also required for in autogen.sh
+IT_PROG_INTLTOOL([0.35.5])
+GETTEXT_PACKAGE=${PACKAGE}
+AC_SUBST([GETTEXT_PACKAGE])
+AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["${GETTEXT_PACKAGE}"],[gettext package])
+AM_GLIB_GNU_GETTEXT
+
+# GConf support
+AC_PATH_PROG([GCONFTOOL],[gconftool-2])
+AM_GCONF_SOURCE_2
+
+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+if test "x$PKG_CONFIG" = "xno"; then
+        AC_MSG_ERROR([You need to install pkg-config])
+fi
+
+# these are the version as distributed with CentOS 4.x
+#
+# note that requiring through pkg-config the version number of the
+# nautilus-extension library actually returns the version number of
+# nautilus itself (e.g. 2.24.2) instead of the library version info
+# (1.1.0) ; for the usual final user, this is very analog to requiring
+# a whole gnome version
+GLIB_REQUIRED=2.4.0
+GTK_REQUIRED=2.4.0
+GLADE_REQUIRED=2.4.0
+GNOME_REQUIRED=2.7.0
+NAUTILUS_EXTENSION=2.8.0
+GCONF_REQUIRED=2.8.0
+LIBXML_REQUIRED=2.6.0
+GOBJECT_REQUIRED=2.4.0
+
+#AC_SUBST(GLIB_REQUIRED)
+#AC_SUBST(GTK_REQUIRED)
+#AC_SUBST(GLADE_REQUIRED)
+
+PKG_CHECK_MODULES([NAUTILUS_ACTIONS], \
+	glib-2.0				>= ${GLIB_REQUIRED}			\
+	gthread-2.0				>= ${GLIB_REQUIRED}			\
+	gmodule-2.0				>= ${GLIB_REQUIRED}			\
+	gtk+-2.0				>= ${GTK_REQUIRED}			\
+	libglade-2.0			>= ${GLADE_REQUIRED}		\
+	libgnome-2.0			>= ${GNOME_REQUIRED}		\
+	libgnomeui-2.0			>= ${GNOME_REQUIRED}		\
+	gconf-2.0				>= ${GCONF_REQUIRED}		\
+	libnautilus-extension	>= ${NAUTILUS_EXTENSION}	\
+	uuid)
+AC_SUBST([NAUTILUS_ACTIONS_CFLAGS])
+AC_SUBST([NAUTILUS_ACTIONS_LIBS])
+
+AC_ARG_WITH(nautilus-extdir,
+[ AC_HELP_STRING([--with-nautilus-extdir=EXTDIR],
+					  [EXTDIR define the folder where nautilus stores its extentions plugins. [default=auto]])],
+[ NAUTILUS_EXTENSIONS_DIR=$withval ],
+[ NAUTILUS_EXTENSIONS_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension` ])
+
+AC_SUBST(NAUTILUS_EXTENSIONS_DIR)
+
+if test -z ${NAUTILUS_EXTENSIONS_DIR}; then
+	AC_MSG_ERROR([*** Can't determine nautilus extension folder, please use --with-nautilus-extdir options to define it manually ]);
+fi
+
+OPTIONAL_SUBDIR="utils"
+BUILD_COMMANDLINE_TOOL="yes"
+AC_ARG_ENABLE(commandline-tool,
+[  --enable-commandline-tool            define if command line tools must be build (disable it if you have GTK+ <= 2.4).
+                           [default=auto]],
+[ BUILD_COMMANDLINE_TOOL=$enableval ])
+if test "x$BUILD_COMMANDLINE_TOOL" = "xno"; then
+   OPTIONAL_SUBDIR=""
+fi
+$PKG_CONFIG glib-2.0 --max-version=2.4
+if test "x$?" = "x0"; then
+	OPTIONAL_SUBDIR=""
+fi
+AC_SUBST(OPTIONAL_SUBDIR)
+
+default_config_path=`eval echo $datadir/nautilus-actions`
+AC_DEFINE_UNQUOTED(DEFAULT_CONFIG_PATH, "$default_config_path", [Default system configuration path])
+$PKG_CONFIG glib-2.0 --atleast-version=2.8
+if test "x$?" = "x0"; then
+	AC_DEFINE_UNQUOTED(HAVE_GLIB_2_8, 1, [Version of the glib-2.0 library is at least 2.8])
+fi
+
+PKG_CHECK_MODULES(NAUTILUS_ACTIONS_UTILS,\
+	 glib-2.0 >= $GLIB_REQUIRED                \
+	 gthread-2.0 >= $GLIB_REQUIRED             \
+	 gmodule-2.0 >= $GLIB_REQUIRED		  \
+	 gconf-2.0 >= $GCONF_REQUIRED \
+	 gobject-2.0 >= $GOBJECT_REQUIRED \
+	 libxml-2.0 >= $LIBXML_REQUIRED)
+AC_SUBST(NAUTILUS_ACTIONS_UTILS_CFLAGS)
+AC_SUBST(NAUTILUS_ACTIONS_UTILS_LIBS)
+
+# Check for menu update function
+AC_CHECK_LIB(nautilus-extension, nautilus_menu_item_new)
+AC_CHECK_FUNCS(nautilus_menu_provider_emit_items_updated_signal)
+
+#if test "x${exec_prefix}" = "xNONE"; then
+#	if test "x${prefix}" = "xNONE"; then
+#		if test "x${bindir}" = "xNONE"; then
+#			BINDIR=`eval echo $ac_default_prefix/bin`
+#		else
+#			BINDIR=`eval echo $bindir`
+#		fi
+#	else
+#		BINDIR=`eval echo $prefix/bin`
+#	fi
+#else
+#	BINDIR=`eval echo $bindir`
+#fi
+#AC_SUBST(BINDIR)
+#	
+#if test "x${prefix}" = "xNONE"; then
+#  DATADIR="${ac_default_prefix}/${DATADIRNAME}" 
+#  LOCALEDIR="${DATADIR}/locale"
+#  AC_DEFINE_UNQUOTED(LOCALEDIR, "${LOCALEDIR}", [Locale dir])
+#else
+#  DATADIR="${prefix}/${DATADIRNAME}"
+#  LOCALEDIR="${DATADIR}/locale"
+#  AC_DEFINE_UNQUOTED(LOCALEDIR, "${LOCALEDIR}", [Locale dir])
+#fi
+#AC_SUBST(DATADIR)
+#AC_SUBST(LOCALEDIR)
+
+AC_DEFINE_UNQUOTED(NAUTILUS_ACTIONS_CONFIG_VERSION, "2.0", [Version of the configuration format])
+AC_DEFINE_UNQUOTED(NAUTILUS_ACTIONS_CONFIG_GCONF_BASEDIR, "/apps/nautilus-actions", [GConf base dir where all config will be stored])
+
+AC_OUTPUT
\ No newline at end of file
diff --git a/configure.in b/configure.in
deleted file mode 100644
index 3784a95..0000000
--- a/configure.in
+++ /dev/null
@@ -1,161 +0,0 @@
-AC_PREREQ(2.52)
-
-AC_INIT(nautilus-actions, 1.10, http://www.nautilus-actions.org)
-AM_CONFIG_HEADER(config.h)
-
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
-
-AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS")
-
-AM_MAINTAINER_MODE
-                                                                                
-AM_DISABLE_STATIC
-AC_PROG_CC
-AM_PROG_LIBTOOL
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-if test "x$PKG_CONFIG" = "xno"; then
-        AC_MSG_ERROR([You need to install pkg-config])
-fi
-
-dnl --------------------------------------------------
-
-GLIB_REQUIRED=2.4.0
-GTK_REQUIRED=2.4.0
-GLADE_REQUIRED=2.4.0
-GNOME_REQUIRED=2.7.0
-NAUTILUS_EXTENSION=2.8.0
-GCONF_REQUIRED=2.8.0
-LIBXML_REQUIRED=2.6.0
-GOBJECT_REQUIRED=2.4.0
-
-AC_SUBST(GLIB_REQUIRED)
-AC_SUBST(GTK_REQUIRED)
-AC_SUBST(GLADE_REQUIRED)
-
-PKG_CHECK_MODULES(NAUTILUS_ACTIONS,\
-	 glib-2.0 >= $GLIB_REQUIRED                \
-	 gthread-2.0 >= $GLIB_REQUIRED             \
-	 gmodule-2.0 >= $GLIB_REQUIRED		  \
-	 gtk+-2.0    >= $GTK_REQUIRED             \
-	 libglade-2.0 >= $GLADE_REQUIRED            \
-	 libgnome-2.0 >= $GNOME_REQUIRED	\
-	 libgnomeui-2.0 >= $GNOME_REQUIRED	\
-	 gconf-2.0 >= $GCONF_REQUIRED \
-	 libnautilus-extension >= $NAUTILUS_EXTENSION \
-	 uuid)
-AC_SUBST(NAUTILUS_ACTIONS_CFLAGS)
-AC_SUBST(NAUTILUS_ACTIONS_LIBS)
-AC_ARG_WITH(nautilus-extdir,
-[ AC_HELP_STRING([--with-nautilus-extdir=EXTDIR],
-					  [EXTDIR define the folder where nautilus stores its extentions plugins. [default=auto]])],
-[ NAUTILUS_EXTENSIONS_DIR=$withval ],
-[ NAUTILUS_EXTENSIONS_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension` ])
-
-AC_SUBST(NAUTILUS_EXTENSIONS_DIR)
-
-if test -z ${NAUTILUS_EXTENSIONS_DIR}; then
-	AC_MSG_ERROR([*** Can't determine nautilus extension folder, please use --with-nautilus-extdir options to define it manually ]);
-fi
-
-OPTIONAL_SUBDIR="utils"
-BUILD_COMMANDLINE_TOOL="yes"
-AC_ARG_ENABLE(commandline-tool,
-[  --enable-commandline-tool            define if command line tools must be build (disable it if you have GTK+ <= 2.4).
-                           [default=auto]],
-[ BUILD_COMMANDLINE_TOOL=$enableval ])
-if test "x$BUILD_COMMANDLINE_TOOL" = "xno"; then
-   OPTIONAL_SUBDIR=""
-fi
-$PKG_CONFIG glib-2.0 --max-version=2.4
-if test "x$?" = "x0"; then
-	OPTIONAL_SUBDIR=""
-fi
-AC_SUBST(OPTIONAL_SUBDIR)
-
-default_config_path=`eval echo $datadir/nautilus-actions`
-AC_DEFINE_UNQUOTED(DEFAULT_CONFIG_PATH, "$default_config_path", [Default system configuration path])
-$PKG_CONFIG glib-2.0 --atleast-version=2.8
-if test "x$?" = "x0"; then
-	AC_DEFINE_UNQUOTED(HAVE_GLIB_2_8, 1, [Version of the glib-2.0 library is at least 2.8])
-fi
-
-PKG_CHECK_MODULES(NAUTILUS_ACTIONS_UTILS,\
-	 glib-2.0 >= $GLIB_REQUIRED                \
-	 gthread-2.0 >= $GLIB_REQUIRED             \
-	 gmodule-2.0 >= $GLIB_REQUIRED		  \
-	 gconf-2.0 >= $GCONF_REQUIRED \
-	 gobject-2.0 >= $GOBJECT_REQUIRED \
-	 libxml-2.0 >= $LIBXML_REQUIRED)
-AC_SUBST(NAUTILUS_ACTIONS_UTILS_CFLAGS)
-AC_SUBST(NAUTILUS_ACTIONS_UTILS_LIBS)
-
-# Check for menu update function
-AC_CHECK_LIB(nautilus-extension, nautilus_menu_item_new)
-AC_CHECK_FUNCS(nautilus_menu_provider_emit_items_updated_signal)
-
-dnl --------------------------------------------------
-
-GNOME_COMPILE_WARNINGS
-
-GNOME_COMMON_INIT
-
-dnl **** GConf support ***
-AC_PATH_PROG(GCONFTOOL, gconftool-2)
-AM_GCONF_SOURCE_2
-
-GETTEXT_PACKAGE=nautilus-actions
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [GetText Package])
-                                                                               
-AM_GLIB_GNU_GETTEXT
-
-IT_PROG_INTLTOOL([0.35.5])
-
-if test "x${exec_prefix}" = "xNONE"; then
-	if test "x${prefix}" = "xNONE"; then
-		if test "x${bindir}" = "xNONE"; then
-			BINDIR=`eval echo $ac_default_prefix/bin`
-		else
-			BINDIR=`eval echo $bindir`
-		fi
-	else
-		BINDIR=`eval echo $prefix/bin`
-	fi
-else
-	BINDIR=`eval echo $bindir`
-fi
-AC_SUBST(BINDIR)
-	
-if test "x${prefix}" = "xNONE"; then
-  DATADIR="${ac_default_prefix}/${DATADIRNAME}" 
-  LOCALEDIR="${DATADIR}/locale"
-  AC_DEFINE_UNQUOTED(LOCALEDIR, "${LOCALEDIR}", [Locale dir])
-else
-  DATADIR="${prefix}/${DATADIRNAME}"
-  LOCALEDIR="${DATADIR}/locale"
-  AC_DEFINE_UNQUOTED(LOCALEDIR, "${LOCALEDIR}", [Locale dir])
-fi
-AC_SUBST(DATADIR)
-AC_SUBST(LOCALEDIR)
-
-AC_DEFINE_UNQUOTED(NAUTILUS_ACTIONS_CONFIG_VERSION, "2.0", [Version of the configuration format])
-AC_DEFINE_UNQUOTED(NAUTILUS_ACTIONS_CONFIG_GCONF_BASEDIR, "/apps/nautilus-actions", [GConf base dir where all config will be stored])
-
-AC_OUTPUT([
-Makefile
-libnautilus-actions/Makefile
-plugin/Makefile
-nact/Makefile
-utils/Makefile
-icons/Makefile
-icons/16x16/Makefile
-icons/22x22/Makefile
-icons/32x32/Makefile
-icons/48x48/Makefile
-icons/scalable/Makefile
-po/Makefile.in
-])
-
diff --git a/libnautilus-actions/Makefile.am b/libnautilus-actions/Makefile.am
index a824fa5..35bd06b 100644
--- a/libnautilus-actions/Makefile.am
+++ b/libnautilus-actions/Makefile.am
@@ -29,7 +29,7 @@
 
 noinst_LTLIBRARIES = libnautilus-actions.la
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 	$(NAUTILUS_ACTIONS_CFLAGS)
 
diff --git a/nact/Makefile.am b/nact/Makefile.am
index 92b00e8..bf34429 100644
--- a/nact/Makefile.am
+++ b/nact/Makefile.am
@@ -30,7 +30,7 @@
 bin_PROGRAMS = \
 	nautilus-actions-config
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I $(top_srcdir)									\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"			\
 	-DGLADEDIR=\""$(datadir)/nautilus-actions/nact"\"	\
diff --git a/plugin/Makefile.am b/plugin/Makefile.am
index 6ffa2c5..692519b 100644
--- a/plugin/Makefile.am
+++ b/plugin/Makefile.am
@@ -27,7 +27,7 @@
 #
 # pwi 2009-05-16 fix to make distcheck successfully
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I $(top_srcdir)									\
 	$(NAUTILUS_ACTIONS_CFLAGS)
 
diff --git a/utils/Makefile.am b/utils/Makefile.am
index ff9cf7b..d1f9d59 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -31,7 +31,7 @@ bin_PROGRAMS = \
 	nautilus-actions-new-config					\
 	nautilus-actions-check-actions-change
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I $(top_srcdir)							\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 	$(NAUTILUS_ACTIONS_UTILS_CFLAGS)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]