[Xfce4-commits] <eatmonkey:aria2-xml-rpc> Update autotools build for Ruby draft

[Mike Massonnet]

Updating branch refs/heads/aria2-xml-rpc
         to b22028ada2c68e6b8595bb6affd5eb3e312a8d58 (commit)
       from 6a91c2f85ff537bedc7ab55a39fbad38d0674996 (commit)

commit b22028ada2c68e6b8595bb6affd5eb3e312a8d58
Author: Mike Massonnet <mmassonnet at xfce.org>
Date:   Sat Jan 23 12:05:45 2010 +0100

    Update autotools build for Ruby draft

 configure.ac.in      |   54 ++++++++++++++++++++++++++++++++-----------------
 eatmonkey.desktop.in |    2 +-
 po/POTFILES.in       |    4 +-
 src/Makefile.am      |   24 +++++++++++++++------
 4 files changed, 55 insertions(+), 29 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 4635e91..1a0cacd 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -18,8 +18,7 @@ m4_define([project_version], [project_version_major().project_version_minor().pr
 dnl ***************************
 dnl *** Initialize autoconf ***
 dnl ***************************
-AC_COPYRIGHT([Copyright (c) 2008-2009
-        The Xfce development team. All rights reserved.])
+AC_COPYRIGHT([Copyright (c) 2010 Mike Massonnet])
 AC_INIT([Eatmonkey], [project_version], [http://bugzilla.xfce.org/], [eatmonkey],
 	[http://goodies.xfce.org/projects/applications/eatmonkey])
 AC_PREREQ([2.50])
@@ -36,26 +35,37 @@ AM_MAINTAINER_MODE()
 dnl ********************************
 dnl *** Check for basic programs ***
 dnl ********************************
-AC_PROG_CC()
-AM_PROG_CC_C_O()
-AC_PROG_LD()
-AC_PROG_LIBTOOL()
+dnl#AC_PROG_CC()
+dnl#AM_PROG_CC_C_O()
+dnl#AC_PROG_LD()
+dnl#AC_PROG_LIBTOOL()
 AC_PROG_INSTALL()
 AC_PROG_INTLTOOL()
 
 dnl **********************************
 dnl *** Check for standard headers ***
 dnl **********************************
-AC_HEADER_STDC()
+dnl#AC_HEADER_STDC()
 
 dnl ***********************************
 dnl *** Check for required packages ***
 dnl ***********************************
-XDT_CHECK_LIBX11_REQUIRE()
-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.12.0])
-XDT_CHECK_PACKAGE([UNIQUE], [unique-1.0], [1.0.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
-XDT_CHECK_PACKAGE([LIBSOUP], [libsoup-2.4], [2.26])
+dnl#XDT_CHECK_LIBX11_REQUIRE()
+dnl#XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.12.0])
+dnl#XDT_CHECK_PACKAGE([UNIQUE], [unique-1.0], [1.0.0])
+dnl#XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
+dnl#XDT_CHECK_PACKAGE([LIBSOUP], [libsoup-2.4], [2.26])
+
+dnl ***********************
+dnl *** Check for valac ***
+dnl ***********************
+dnl#if test "x$USE_MAINTAINER_MODE" = "xyes" ; then
+dnl#	AM_PROG_VALAC([0.7.8])
+dnl#	if test "x$VALAC" = "x" ; then
+dnl#		AC_MSG_ERROR([Cannot find the "valac" compiler in your PATH])
+dnl#	fi
+dnl#	XDT_CHECK_PACKAGE([XFCE4VALA], [xfce4-vala], [4.6])
+dnl#fi
 
 dnl ******************************
 dnl *** Check for i18n support ***
@@ -65,7 +75,7 @@ XDT_I18N([@LINGUAS@])
 dnl ***********************************
 dnl *** Check for debugging support ***
 dnl ***********************************
-XDT_FEATURE_DEBUG()
+dnl#XDT_FEATURE_DEBUG()
 
 dnl ************************
 dnl *** Makefile outputs ***
@@ -79,9 +89,15 @@ po/Makefile.in
 dnl ***************************
 dnl *** Print configuration ***
 dnl ***************************
-echo
-echo "Build Configuration:"
-echo
-echo "* Debug Support:    $enable_debug"
-echo
-
+dnl#echo
+dnl#echo "Build Configuration:"
+dnl#echo
+dnl#if test "x$USE_MAINTAINER_MODE" = "xyes" ; then
+dnl#echo "* Maintainer Mode:  $USE_MAINTAINER_MODE"
+dnl#echo
+dnl#echo "    * Vala:         $VALAC $am__vala_version"
+dnl#echo
+dnl#fi
+dnl#echo "* Debug Support:    $enable_debug"
+dnl#echo
+ 
diff --git a/eatmonkey.desktop.in b/eatmonkey.desktop.in
index a2fbc62..410a7b1 100644
--- a/eatmonkey.desktop.in
+++ b/eatmonkey.desktop.in
@@ -3,7 +3,7 @@ Version=1.0
 _Name=Eatmonkey
 _Comment=Simple download manager for Xfce
 _GenericName=Download Manager
-Exec=eatmonkey --manager
+Exec=eatmonkey
 Icon=eatmonkey
 Terminal=false
 Type=Application
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b504e72..04c2e4e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,3 @@
-src/main.c
-src/statusicon.c
 eatmonkey.desktop.in
+[type: gettext/glade]src/manager.ui
+[type: gettext/glade]src/settings.ui
diff --git a/src/Makefile.am b/src/Makefile.am
index 99ce1e8..e06b8ec 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,10 @@
-INCLUDES =								\
- 	-I${top_srcdir}							\
- 	-DDATADIR=\"$(datadir)\"					\
- 	-DSRCDIR=\"$(top_srcdir)\"					\
- 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"			\
- 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
- 	-DLOCALEDIR=\"$(localedir)\"
+#INCLUDES =								\
+# 	-I${top_srcdir}							\
+# 	-DDATADIR=\"$(datadir)\"					\
+# 	-DSRCDIR=\"$(top_srcdir)\"					\
+# 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"			\
+# 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
+# 	-DLOCALEDIR=\"$(localedir)\"
 
 #           #
 # eatmonkey #
@@ -34,3 +34,13 @@ INCLUDES =								\
 #	@LIBXFCE4UTIL_LIBS@						\
 #	@LIBSOUP_LIBS@
 
+eatmonkeydir = $(datadir)/eatmonkey
+dist_eatmonkey_SCRIPTS =						\
+	eat.rb								\
+	eataria2.rb							\
+	eatmanager.rb							\
+	eatsettings.rb
+
+install-exec-hook:
+	cd $(DESTDIR)$(bindir) && $(LN_S) $(DESTDIR)$(eatmonkeydir)/eat.rb eatmonkey
+