[Desmume-cvs] desmume configure.ac,1.50,1.51 Makefile.am,1.5,1.6

[Pascal G. <evi...@us...>]

Update of /cvsroot/desmume/desmume
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv23364

Modified Files:
	configure.ac Makefile.am 
Log Message:
Really make gettext/intltool optionnal if gtk-glade isn't used.


Index: configure.ac
===================================================================
RCS file: /cvsroot/desmume/desmume/configure.ac,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- configure.ac	17 Jul 2007 05:15:07 -0000	1.50
+++ configure.ac	17 Jul 2007 05:24:00 -0000	1.51
@@ -99,6 +99,8 @@
 
 dnl - Determine which UIs to build and if po/ should be included
 PO_DIR=""
+PO_FILES=""
+PO_FILES_IN=""
 if test "x$HAVE_SDL" = "xyes"; then
   # SDL adds just a cli
   UI_DIR="cli $UI_DIR"
@@ -119,6 +121,8 @@
     AM_GLIB_GNU_GETTEXT
     AC_PROG_INTLTOOL
     PO_DIR="po"
+    PO_FILES="intltool-extract intltool-merge intltool-update"
+    PO_FILES_IN="intltool-extract.in intltool-merge.in intltool-update.in"
   fi
 fi
 
@@ -138,6 +142,8 @@
 
 AC_SUBST(UI_DIR)
 AC_SUBST(PO_DIR)
+AC_SUBST(PO_FILES)
+AC_SUBST(PO_FILES_IN)
 
 dnl - Compiler warnings
 

Index: Makefile.am
===================================================================
RCS file: /cvsroot/desmume/desmume/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am	17 Jul 2007 04:57:18 -0000	1.5
+++ Makefile.am	17 Jul 2007 05:24:00 -0000	1.6
@@ -1,5 +1,5 @@
 EXTRA_DIST = README.LIN README.WIN autogen.sh \
-		intltool-extract.in intltool-merge.in intltool-update.in
-DISTCLEANFILES = intltool-extract intltool-merge intltool-update
+		$(PO_FILES_IN)
+DISTCLEANFILES = $(PO_FILES)
 SUBDIRS = $(PO_DIR) src