commit 93f702120451fd9f5eb13ad398e63ea8ff636898
Author: phantomjinx <p.g.richard...@phantomjinx.co.uk>
Date: Tue Dec 28 19:48:20 2010 +0000
Update configure system
* configure.*
* Use autoupdate to replace deprecated m4 macros
* Rename configure.in to configure.ac
autogen.sh | 24 ++++++++++++------------
configure.in => configure.ac | 32 ++++++++++++++++++++------------
2 files changed, 32 insertions(+), 24 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 5f310ef..04b3831 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,7 +13,7 @@ if [ -n "$GNOME2_DIR" ]; then
export LD_LIBRARY_PATH
fi
-(test -f $srcdir/configure.in) || {
+(test -f $srcdir/configure.ac) || {
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
echo " top-level package directory"
exit 1
@@ -27,7 +27,7 @@ fi
DIE=1
}
-(grep "^IT_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && {
+(grep "^IT_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && {
(intltoolize --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have \`intltool' installed."
@@ -37,7 +37,7 @@ fi
}
}
-(grep "^AM_PROG_XML_I18N_TOOLS" $srcdir/configure.in >/dev/null) && {
+(grep "^AM_PROG_XML_I18N_TOOLS" $srcdir/configure.ac >/dev/null) && {
(xml-i18n-toolize --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have \`xml-i18n-toolize' installed."
@@ -47,7 +47,7 @@ fi
}
}
-(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
+(grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
(${LIBTOOL:-libtool} --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have \`libtool' installed."
@@ -56,8 +56,8 @@ fi
}
}
-(grep "^AM_GLIB_GNU_GETTEXT" $srcdir/configure.in >/dev/null) && {
- (grep "sed.*POTFILES" $srcdir/configure.in) > /dev/null || \
+(grep "^AM_GLIB_GNU_GETTEXT" $srcdir/configure.ac >/dev/null) && {
+ (grep "sed.*POTFILES" $srcdir/configure.ac) > /dev/null || \
(glib-gettextize --version) < /dev/null > /dev/null 2>&1 || {
if [ -f /etc/debian_version ]
then
@@ -106,7 +106,7 @@ xlc )
am_opt=--include-deps;;
esac
-for coin in `find $srcdir -name configure.in -print`
+for coin in `find $srcdir -name configure.ac -print`
do
dr=`dirname $coin`
if test -f $dr/NO-AUTO-GEN; then
@@ -117,7 +117,7 @@ do
aclocalinclude="$ACLOCAL_FLAGS"
- if grep "^AM_GLIB_GNU_GETTEXT" configure.in >/dev/null; then
+ if grep "^AM_GLIB_GNU_GETTEXT" configure.ac >/dev/null; then
echo "Creating $dr/aclocal.m4 ..."
test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
echo "Running glib-gettextize... Ignore non-fatal messages."
@@ -125,15 +125,15 @@ do
echo "Making $dr/aclocal.m4 writable ..."
test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
fi
- if grep "^IT_PROG_INTLTOOL" configure.in >/dev/null; then
+ if grep "^IT_PROG_INTLTOOL" configure.ac >/dev/null; then
echo "Running intltoolize..."
intltoolize --copy --force --automake
fi
- if grep "^AM_PROG_XML_I18N_TOOLS" configure.in >/dev/null; then
+ if grep "^AM_PROG_XML_I18N_TOOLS" configure.ac >/dev/null; then
echo "Running xml-i18n-toolize..."
xml-i18n-toolize --copy --force --automake
fi
- if grep "^A[CM]_PROG_LIBTOOL" configure.in >/dev/null; then
+ if grep "^A[CM]_PROG_LIBTOOL" configure.ac >/dev/null; then
if test -z "$NO_LIBTOOLIZE" ; then
echo "Running libtoolize..."
${LIBTOOLIZE:-libtoolize} --force --copy
@@ -141,7 +141,7 @@ do
fi
echo "Running aclocal $aclocalinclude ..."
${ACLOCAL:-aclocal} $aclocalinclude
- if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
+ if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
echo "Running autoheader..."
${AUTOHEADER:-autoheader}
fi
diff --git a/configure.in b/configure.ac
similarity index 95%
rename from configure.in
rename to configure.ac
index eb074d1..95cc140 100644
--- a/configure.in
+++ b/configure.ac
@@ -1,10 +1,10 @@
dnl Process this file with autoconf to produce a configure script.
# Require autoconf 2.55 or higher
-AC_PREREQ(2.55)
+AC_PREREQ(2.65)
-AC_INIT(gtkpod, m4_esyscmd([./version.sh | tr -d '\n']))
-AM_CONFIG_HEADER(config.h)
+AC_INIT([gtkpod],[m4_esyscmd(./version.sh | tr -d '\n')])
+AC_CONFIG_HEADERS([config.h])
AC_CONFIG_SRCDIR(src/main.c)
dnl libtool versioning
@@ -23,10 +23,17 @@ AC_SUBST(LIBGTKPOD_VERSION)
AM_INIT_AUTOMAKE([1.9 tar-ustar])
AM_MAINTAINER_MODE
AC_CANONICAL_HOST
-AC_ISC_POSIX
-AC_PROG_LIBTOOL
+AC_SEARCH_LIBS([strerror],[cposix])
+LT_INIT
AC_PROG_CC
-AM_PROG_CC_STDC
+AC_PROG_CC
+AC_DIAGNOSE([obsolete],[AM_PROG_CC_STDC:
+ your code should no longer depend upon `am_cv_prog_cc_stdc', but upon
+ `ac_cv_prog_cc_stdc'. Remove this warning and the assignment when
+ you adjust the code. You can also remove the above call to
+ AC_PROG_CC if you already called it elsewhere.])
+am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
+
IT_PROG_INTLTOOL([0.33])
@@ -135,7 +142,7 @@ AC_SEARCH_LIBS([id3_frame_field], ["id3tag" "id3tag -lz"],,
AC_MSG_ERROR([*** id3tag >= 0.15 lib not found (0.14 will not work!)]))
dnl Check for libcurl
-AC_ARG_WITH(curl, AC_HELP_STRING([--without-curl], [Disable coverart download
support]))
+AC_ARG_WITH(curl, AS_HELP_STRING([--without-curl],[Disable coverart download
support]))
if test "x$with_curl" != "xno"; then
PKG_CHECK_MODULES(CURL, [libcurl >= 7.10.0], have_curl=yes, have_curl=no)
if test "x$with_curl" = "xyes" -a "x$have_curl" = "xno"; then
@@ -157,7 +164,7 @@ dnl Check for webkit
dnl -------------------------------------------------------------
AC_ARG_ENABLE(plugin-coverweb,
- AC_HELP_STRING([--disable-plugin-coverweb],[Disable coverweb plugin for
finding coverart in gtkpod]),
+ AS_HELP_STRING([--disable-plugin-coverweb],[Disable coverweb plugin for
finding coverart in gtkpod]),
[ if test "$enableval" = "no"; then
user_disabled_coverweb=1
fi ],
@@ -181,7 +188,7 @@ dnl Check for gstreamer
dnl -------------------------------------------------------------
AC_ARG_ENABLE(plugin-media-player,
- AC_HELP_STRING([--disable-plugin-media-player],[Disable media player
plugin for playing tracks in gtkpod]),
+ AS_HELP_STRING([--disable-plugin-media-player],[Disable media player
plugin for playing tracks in gtkpod]),
[ if test "$enableval" = "no"; then
user_disabled_media_player=1
fi ],
@@ -207,7 +214,7 @@ fi
AM_CONDITIONAL(HAVE_PLUGIN_MEDIA_PLAYER, [test "x$media_player" = "xyes"])
dnl Check for libvorbisfile and libvorbis
-AC_ARG_WITH(ogg, AC_HELP_STRING([--without-ogg], [Disable Ogg/Vorbis support]))
+AC_ARG_WITH(ogg, AS_HELP_STRING([--without-ogg],[Disable Ogg/Vorbis support]))
if test "x$with_ogg" != "xno"; then
AC_SEARCH_LIBS(ov_open, ["vorbisfile"],
[AC_CHECK_HEADER(vorbis/vorbisfile.h, have_ogg=yes,
have_ogg_header=no)], have_ogg=no)
@@ -234,7 +241,7 @@ fi
AM_CONDITIONAL(HAVE_LIBVORBISFILE, test "x$have_ogg" = "xyes")
dnl Check for FLAC
-AC_ARG_WITH(flac, AC_HELP_STRING([--without-flac], [Disable FLAC support]))
+AC_ARG_WITH(flac, AS_HELP_STRING([--without-flac],[Disable FLAC support]))
if test "x$with_flac" != "xno"; then
AC_SEARCH_LIBS(FLAC__metadata_get_streaminfo, ["FLAC"],
[AC_CHECK_HEADER(FLAC/metadata.h, have_flac=yes,
have_flac_header=no)], have_flac=no)
@@ -291,7 +298,7 @@ AC_SUBST(gtkpod_script_dir)
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-AC_OUTPUT([
+AC_CONFIG_FILES([
Makefile
libgtkpod-1.0.pc
src/Makefile
@@ -451,6 +458,7 @@ plugins/mserv/icons/hicolor/32x32/places/Makefile
plugins/mserv/icons/hicolor/48x48/Makefile
plugins/mserv/icons/hicolor/48x48/places/Makefile
])
+AC_OUTPUT
echo "
Core Configuration for $PACKAGE $VERSION :
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
