dia r4166 - in trunk: . bindings data/icons/48x48/apps

[hans svn gnome org]

Author: hans
Date: Fri Jan  2 12:38:52 2009
New Revision: 4166
URL: http://svn.gnome.org/viewvc/dia?rev=4166&view=rev

Log:
2009-01-02  Hans Breuer  <hans breuer org>

	* Makefile.am bindings/Makefile.am data/icons/48x48/apps/Makefile.am :
	get rid of "variable `*' is used but `*' is undefied" warnings
	
	* configure.in : remove traces of gnome print here as well



Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/bindings/Makefile.am
   trunk/configure.in
   trunk/data/icons/48x48/apps/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Fri Jan  2 12:38:52 2009
@@ -8,7 +8,8 @@
 #desktop_files = $(desktop_in_files:.desktop.in.in=.desktop)
 
 applicationsdir = $(datadir)/applications
-applications_DATA = $(desktop_files)
+#applications_DATA = $(desktop_files)
+pkgdata_DATA =
 
 CLEANFILES = core-translation-report dia.keys dia.desktop 
 

Modified: trunk/bindings/Makefile.am
==============================================================================
--- trunk/bindings/Makefile.am	(original)
+++ trunk/bindings/Makefile.am	Fri Jan  2 12:38:52 2009
@@ -22,13 +22,13 @@
 ## nothing to be installed yet
 if WITH_SWIG
 ## this is not working yet (link error)
-pkgpyexec_LTLIBRARIES = $(libpython_bindings)
+#pkgpyexec_LTLIBRARIES = $(libpython_bindings)
 # the python part (import dia;)
 pkgpython_PYTHON = dia.py
 else
-noinst_LTLIBRARIES = $(libpython_bindings)
 pkgpython_PYTHON = 
 endif
+noinst_LTLIBRARIES = $(libpython_bindings)
 
 # c++ wrapper over Dia's C api
 _dia_la_SOURCES = \

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Jan  2 12:38:52 2009
@@ -131,17 +131,6 @@
 
 AM_CONDITIONAL(HAVE_BONOBO,false)
 
-dnl Look for Gnome Print
-AC_ARG_WITH(gnomeprint,
-[  --with-gnomeprint        compile *experimental* gnomeprint plug-in],,with_gnomeprint=no)
-if test "x$with_gnomeprint" == "xyes"; then
-  PKG_CHECK_MODULES(GNOMEPRINT, libgnomeprint-2.2, have_gnomeprint=yes,have_gnomeprint=no)
-  AC_SUBST(GNOMEPRINT_LIBS)
-  AC_SUBST(GNOMEPRINT_CFLAGS)
-  AC_DEFINE(HAVE_GNOMEPRINT,1,[Define if building with Gnome Print support])
-fi
-AM_CONDITIONAL(WITH_GNOMEPRINT, test "x$with_gnomeprint" != "xno")
-
 dnl Look for Cairo
 AC_ARG_WITH(cairo,
 [  --with-cairo           compile cairo plug-in],,with_cairo=yes)
@@ -632,7 +621,6 @@
 	Python support:				${with_python}
 	Libart support (PNG export):		${have_libart}
 	Cairo support (PNG, PDF, print):	${with_cairo}
-	Gnome Print support (experimental):	${with_gnomeprint}
 	Dia Python bindings with SWIG		${with_swig}
 	WMF plug-in with libEMF:                ${emf_ok}
 	html doc:                               ${xsltproc_ok}

Modified: trunk/data/icons/48x48/apps/Makefile.am
==============================================================================
--- trunk/data/icons/48x48/apps/Makefile.am	(original)
+++ trunk/data/icons/48x48/apps/Makefile.am	Fri Jan  2 12:38:52 2009
@@ -7,6 +7,8 @@
 icons_DATA = \
 	dia.png
 
+noinst_DATA =
+
 EXTRA_DIST = \
 	$(icons_DATA) \
 	$(noinst_DATA)