telegnome r15 - in trunk: . intl macros pixmaps po src

[cjwatson svn gnome org]

Author: cjwatson
Date: Wed Feb 20 15:32:58 2008
New Revision: 15
URL: http://svn.gnome.org/viewvc/telegnome?rev=15&view=rev

Log:
* configure.in (AM_ACLOCAL_INCLUDE): Add m4.
(AM_GNU_GETTEXT): Use external libintl.
(AC_CONFIG_FILES): Remove intl/Makefile.
* Makefile.am (SUBDIRS): Remove intl.
(EXTRA_DIST): Add config.rpath and m4/ChangeLog.
(ACLOCAL_AMFLAGS): New variable.
* macros/gnome-x-checks.m4 (GNOME_X_CHECKS): Provide a third
argument to AC_DEFINE with a description. Comment out
GNOME_PTHREAD_CHECK requirement for now.
* macros/autogen.sh: Pass the --copy option to automake.
Remove all autogenerated files from the repository, as is the usual
practice in GNOME SVN.

Removed:
   trunk/ABOUT-NLS
   trunk/INSTALL
   trunk/Makefile.in
   trunk/acconfig.h
   trunk/aclocal.m4
   trunk/build-stamp
   trunk/config.h.in
   trunk/configure
   trunk/install-sh
   trunk/intl/
   trunk/macros/Makefile.in
   trunk/missing
   trunk/mkinstalldirs
   trunk/pixmaps/Makefile.in
   trunk/po/Makefile.in.in
   trunk/src/Makefile.in
   trunk/stamp-h.in
Modified:
   trunk/   (props changed)
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.in
   trunk/macros/   (props changed)
   trunk/macros/autogen.sh
   trunk/macros/gnome-x-checks.m4
   trunk/pixmaps/   (props changed)
   trunk/po/   (props changed)
   trunk/src/   (props changed)

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Wed Feb 20 15:32:58 2008
@@ -1,6 +1,7 @@
-SUBDIRS=intl macros src po pixmaps doc
+SUBDIRS=macros src po pixmaps doc
 
-EXTRA_DIST = $(srcdir)/telegnome.desktop \
+EXTRA_DIST = config.rpath m4/ChangeLog \
+	$(srcdir)/telegnome.desktop \
 	BUGS
 
 Internetdir=$(datadir)/gnome/apps/Internet
@@ -12,6 +13,4 @@
 @MAINT macros/macros.dep: macros/Makefile.am
 @MAINT@ cd macros && $(MAKE) macros.dep
 
-
-
-
+ACLOCAL_AMFLAGS = -I m4

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Feb 20 15:32:58 2008
@@ -7,7 +7,7 @@
 
 AM_MAINTAINER_MODE
 
-AM_ACLOCAL_INCLUDE(macros)
+AM_ACLOCAL_INCLUDE(macros m4)
 
 GNOME_INIT
 
@@ -24,7 +24,7 @@
 AC_SUBST(PROGRAMS_TELEGNOME)
 
 ALL_LINGUAS="az fr it nl ru sv zh_CN"
-AM_GNU_GETTEXT
+AM_GNU_GETTEXT([external])
 localedir='${prefix}/${DATADIRNAME}/locale'
 AC_SUBST(localedir)
 
@@ -32,12 +32,8 @@
 	   pixmaps/Makefile 
 	   src/Makefile
 	   macros/Makefile 
-	   intl/Makefile  
 	   po/Makefile.in
 	   doc/Makefile
 	   doc/C/Makefile
 	 ])
 AC_OUTPUT
-
-
-

Modified: trunk/macros/autogen.sh
==============================================================================
--- trunk/macros/autogen.sh	(original)
+++ trunk/macros/autogen.sh	Wed Feb 20 15:32:58 2008
@@ -126,8 +126,8 @@
 	echo "Running autoheader..."
 	autoheader
       fi
-      echo "Running automake --gnu $am_opt ..."
-      automake --add-missing --gnu $am_opt
+      echo "Running automake --gnu --copy $am_opt ..."
+      automake --add-missing --gnu --copy $am_opt
       echo "Running autoconf ..."
       autoconf
     )

Modified: trunk/macros/gnome-x-checks.m4
==============================================================================
--- trunk/macros/gnome-x-checks.m4	(original)
+++ trunk/macros/gnome-x-checks.m4	Wed Feb 20 15:32:58 2008
@@ -66,14 +66,14 @@
 	fi
 
 	if test "$GNOME_HAVE_SM" = true; then
-	   AC_DEFINE(HAVE_LIBSM)
+	   AC_DEFINE([HAVE_LIBSM], [], [Define if you have the sm library.])
 	fi
 
 	XPM_LIBS=""
 	AC_CHECK_LIB(Xpm, XpmFreeXpmImage, [XPM_LIBS="-lXpm"], , $x_libs)
 	AC_SUBST(XPM_LIBS)
 
-	AC_REQUIRE([GNOME_PTHREAD_CHECK])
+	dnl AC_REQUIRE([GNOME_PTHREAD_CHECK])
         LDFLAGS="$saved_ldflags"
 
 	AC_PROVIDE([GNOME_X_CHECKS])