[niepce: 11/14] Fix build system for Magellan

[Hubert Figuière <hub src gnome org>]

commit 29597d9ecc12ee7b4a47380f729461dfea0d346a
Author: Hubert Figuière <hub figuiere net>
Date:   Sat Jun 8 13:13:43 2013 -0400

    Fix build system for Magellan

 configure.ac             |   45 +++-
 magellan/Makefile.am     |   13 +-
 magellan/autogen.sh      |   52 ---
 magellan/configure.ac    |  120 -------
 magellan/m4/boost.m4     |  767 ----------------------------------------------
 magellan/src/Makefile.am |   10 +-
 6 files changed, 50 insertions(+), 957 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 528a289..c1f6a75 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,10 +62,20 @@ AC_ARG_ENABLE(camerawire,[  --enable-camerawire   Enable building Camerawire],[
 ],[
     NP_APP_CAMERAWIRE=no
 ])
+AC_ARG_ENABLE(magellan,[  --enable-magellan   Enable building Magellan],[
+    NP_APP_MAGELLAN=yes
+    if test ! -z "$NP_APPS" ; then
+        NP_APPS="$NP_APPS,"
+    fi
+    NP_APPS="$NP_APPSmagellan"
+],[
+    NP_APP_MAGELLAN=no
+])
 AC_ARG_ENABLE(allapps, [  --enable-allapps   Enable all apps],[
     NP_APP_NIEPCE=yes
     NP_APP_CAMERAWIRE=yes
-    NP_APPS="niepce,camerawire"
+    NP_APP_MAGELLAN=yes
+    NP_APPS="niepce,camerawire,magellan"
 ],[
 
 ])
@@ -235,6 +245,39 @@ camerawire/po/Makefile
 
 fi
 
+dnl ================
+dnl magellan
+dnl ================
+
+AM_CONDITIONAL(MG_BUILD, test "$NP_APP_MAGELLAN" = "yes")
+if test "$NP_APP_MAGELLAN" = "yes" ; then
+MAJOR_VERSION=0
+MINOR_VERSION=0
+MICRO_VERSION=1
+
+MG_VERSION="$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION"
+AC_SUBST(MG_VERSION)
+
+GETTEXT_PACKAGE=magellan
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"],
+                   [The domain to use with gettext])
+AM_GLIB_GNU_GETTEXT
+
+MG_LOCALEDIR=[${datadir}/locale]
+AC_SUBST(MG_LOCALEDIR)
+
+AC_DEFINE_UNQUOTED([MG_BUILD_CONFIG], ["$MG_BUILD_CONFIG"], [The string used to hardcode the build config.])
+
+AC_CONFIG_FILES([
+magellan/Makefile
+magellan/src/Makefile
+magellan/po/Makefile.in
+magellan/po/Makefile
+])
+
+fi
+
 AC_OUTPUT
 
 echo "
diff --git a/magellan/Makefile.am b/magellan/Makefile.am
index c1b9041..01dd116 100644
--- a/magellan/Makefile.am
+++ b/magellan/Makefile.am
@@ -1,14 +1,3 @@
-ACLOCAL_AMFLAGS = -I m4
-
 EXTRA_DIST = COPYING AUTHORS README
 
-INTLTOOL_FILES = intltool-extract.in \
-                 intltool-merge.in \
-                 intltool-update.in
-
-DISTCLEANFILES = intltool-extract \
-                 intltool-merge \
-                 intltool-update \
-                 po/.intltool-merge-cache
-
-SUBDIRS = src
\ No newline at end of file
+SUBDIRS = src
diff --git a/magellan/src/Makefile.am b/magellan/src/Makefile.am
index 7e9f528..f06f3c0 100644
--- a/magellan/src/Makefile.am
+++ b/magellan/src/Makefile.am
@@ -1,6 +1,6 @@
 
 
-AM_CPPFLAGS = -DCW_LOCALEDIR=\"${CW_LOCALEDIR}\"
+AM_CPPFLAGS = -DMG_LOCALEDIR=\"${MG_LOCALEDIR}\"
 
 gladefiles = mgwindow.ui
 gladedir = @datarootdir@/niepce/glade/
@@ -10,7 +10,7 @@ bin_PROGRAMS = magellan
 
 INCLUDES = -DDATADIR=\"$(datadir)\" \
        -DGLADEDIR=\"$(gladedir)\" \
-       -I$(top_srcdir)/../src/ -I$(top_srcdir)/src  \
+       -I$(top_srcdir)/src  \
        @LIBGLIBMM_CFLAGS@ @LIBGTKMM_CFLAGS@
 
 magellan_SOURCES = \
@@ -20,7 +20,7 @@ magellan_SOURCES = \
 
 
 magellan_LDADD = @LIBGLIBMM_LIBS@ @LIBGTKMM_LIBS@ \
-       $(top_builddir)/../src/fwk/toolkit/libniepceframework.a \
-       $(top_builddir)/../src/fwk/utils/libniepceutils.a \
-       $(top_builddir)/../src/fwk/base/libfwkbase.a \
+       $(top_builddir)/src/fwk/toolkit/libniepceframework.a \
+       $(top_builddir)/src/fwk/utils/libniepceutils.a \
+       $(top_builddir)/src/fwk/base/libfwkbase.a \
        $(NULL)