Attachment #136644 for bug #198058

View | Details | Raw Unified | Return to bug 198058
Collapse All | Expand All

Lines 109-114 Link Here

(-)browser-plugin/Makefile.am (+2 lines)
109	$(WARN_CFLAGS) \	109	$(WARN_CFLAGS) \
110	$(DBUS_CFLAGS) \	110	$(DBUS_CFLAGS) \
111	$(NVTV_CFLAGS) \	111	$(NVTV_CFLAGS) \
		112	$(SN_CFLAGS) \
112	$(AM_CFLAGS)	113	$(AM_CFLAGS)
113		114
114	totem_plugin_viewer_LDADD = \	115	totem_plugin_viewer_LDADD = \
Lines 122-127 Link Here
122	$(DBUS_LIBS) \	123	$(DBUS_LIBS) \
123	$(NVTV_LIBS) \	124	$(NVTV_LIBS) \
124	$(XTEST_LIBS) \	125	$(XTEST_LIBS) \
		126	$(SN_LIBS) \
125	$(X_LIBS)	127	$(X_LIBS)
126		128
127	BUILT_SOURCES += \	129	BUILT_SOURCES += \




AM_CONDITIONAL([ENABLE_MULLY_PLUGIN],[test "$enable_mully_plugin" = "yes"])
AM_CONDITIONAL([ENABLE_CONE_PLUGIN],[test "$enable_cone_plugin" = "yes"])

if test "$enable_basic_plugin" = "yes" ||
   test "$enable_gmp_plugin" = "yes" ||
   test "$enable_complex_plugin" = "yes" ||
   test "$enable_narrowspace_plugin" = "yes" ||
   test "$enable_mully_plugin" = "yes" ||
   test "$enable_cone_plugin" = "yes" ; then

   PKG_CHECK_MODULES([SN], [ libstartup-notification-1.0 >= 0.8 ])
   AC_SUBST([SN_CFLAGS])
   AC_SUBST([SN_LIBS])
fi

dnl ********
dnl Nautilus
dnl ********

Return to bug 198058

Lines 685-690 Link Here

(-)configure.in (+12 lines)
685	AM_CONDITIONAL([ENABLE_MULLY_PLUGIN],[test "$enable_mully_plugin" = "yes"])	686	AM_CONDITIONAL([ENABLE_MULLY_PLUGIN],[test "$enable_mully_plugin" = "yes"])
686	AM_CONDITIONAL([ENABLE_CONE_PLUGIN],[test "$enable_cone_plugin" = "yes"])	687	AM_CONDITIONAL([ENABLE_CONE_PLUGIN],[test "$enable_cone_plugin" = "yes"])
687		688
		689	if test "$enable_basic_plugin" = "yes" \|\|
		690	test "$enable_gmp_plugin" = "yes" \|\|
		691	test "$enable_complex_plugin" = "yes" \|\|
		692	test "$enable_narrowspace_plugin" = "yes" \|\|
		693	test "$enable_mully_plugin" = "yes" \|\|
		694	test "$enable_cone_plugin" = "yes" ; then
		695
		696	PKG_CHECK_MODULES([SN], [ libstartup-notification-1.0 >= 0.8 ])
		697	AC_SUBST([SN_CFLAGS])
		698	AC_SUBST([SN_LIBS])
		699	fi
		700
688	dnl ********	701	dnl ********
689	dnl Nautilus	702	dnl Nautilus
690	dnl ********	703	dnl ********