gtkhtml r8808 - trunk

[mbarnes svn gnome org]

Author: mbarnes
Date: Wed Apr  2 18:39:42 2008
New Revision: 8808
URL: http://svn.gnome.org/viewvc/gtkhtml?rev=8808&view=rev

Log:
2008-04-02  Matthew Barnes  <mbarnes redhat com>

	* configure.in: Fix a distcheck error.



Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.in

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Wed Apr  2 18:39:42 2008
@@ -44,5 +44,4 @@
 	intltool-update.in			\
 	intltool-merge.in
 
-DISTCHECK_CONFIGURE_FLAGS =			\
-	--with-bonobo-editor
+DISTCHECK_CONFIGURE_FLAGS = --with-bonobo-editor

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Apr  2 18:39:42 2008
@@ -100,15 +100,15 @@
         PKG_CHECK_MODULES(EDITOR, $EDITOR_MODULES)
         AC_SUBST(EDITOR_CFLAGS)
         AC_SUBST(EDITOR_LIBS)
-
-        ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
-        AC_SUBST(ORBIT_IDL)
-
-        BONOBO_IDL_INCLUDES="-I`$PKG_CONFIG --variable=idldir libbonobo-2.0` -I`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
-        AC_SUBST(BONOBO_IDL_INCLUDES)
 fi
 AM_CONDITIONAL(BONOBO_EDITOR, test x$bonobo_editor = xyes)
 
+# These are still needed for 'dist' targets.
+BONOBO_IDL_INCLUDES="-I`$PKG_CONFIG --variable=idldir libbonobo-2.0` -I`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
+AC_SUBST(BONOBO_IDL_INCLUDES)
+ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
+AC_SUBST(ORBIT_IDL)
+
 dnl **********************************
 dnl soup for testgtkhtml
 dnl **********************************