Commit c7e49a83 authored by Ramiro Estrugo's avatar Ramiro Estrugo
Browse files

Dont install the currently broken components (websearch)

* components/Makefile.am:
Dont install the currently broken components (websearch)

* components/help/Makefile.am:
* components/help/help-contents.oafinfo:
* components/help/help-factory.oafinfo:
* components/help/help-index.oafinfo:
* components/help/help-search.oafinfo:
* components/help/hyperbola.oafinfo:
Split the oafinfo for help components into pieces so we can
control which get intalled and which dont (like the broken onces)

* configure.in:
Fix a small dumb typo.
parent c32699a6
......@@ -12,6 +12,11 @@ if BUILD_RPMVIEW_COMPONENT
RPMVIEW_COMPONENT_SUBDIRS = rpmview
endif
# These components are broken:
#
# websearch
#
SUBDIRS = \
hardware \
help \
......@@ -22,7 +27,6 @@ SUBDIRS = \
notes \
sample \
tree \
websearch \
$(SERVICE_SUBDIRS) \
$(RPMVIEW_COMPONENT_SUBDIRS) \
$(MOZILLA_COMPONENT_SUBDIRS) \
......
NULL=
SUBDIRS=converters
bin_PROGRAMS=hyperbola
......@@ -37,7 +39,17 @@ hyperbola_SOURCES= \
hyperbola-nav-search.c
oafdir=$(datadir)/oaf
oaf_DATA=hyperbola.oafinfo
# These are broken:
#
# help-search.oafinfo
# help-index.oafinfo
#
oaf_DATA=\
help-factory.oafinfo \
help-contents.oafinfo \
$(NULL)
mapdatadir=$(datadir)/hyperbola/maps
mapdata_DATA=pages.map
......
......@@ -24,43 +24,4 @@
</oaf_attribute>
</oaf_server>
<oaf_server iid="OAFIID:hyperbola_navigation_index:0bafadc7-09f1-4f10-8c8e-dad53124fc49" type="factory" location="OAFIID:hyperbola_factory:02b54c63-101b-4b27-a285-f99ed332ecdb">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Nautilus/MetaView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Help Index"/>
<oaf_attribute name="name" type="string" value="Help Index sidebar panel"/>
<oaf_attribute name="nautilus:sidebar_panel_name" type="string" value="Help Index"/>
<oaf_attribute name="nautilus:recommended_uri_schemes" type="stringv">
<item value="help"/>
<item value="man"/>
<item value="info"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Help Index"/>
</oaf_server>
<oaf_server iid="OAFIID:hyperbola_navigation_search:89b2f3b8-4f09-49c8-9a7b-ccb14d034813" type="factory" location="OAFIID:hyperbola_factory:02b54c63-101b-4b27-a285-f99ed332ecdb">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Nautilus/MetaView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Help Search"/>
<oaf_attribute name="name" type="string" value="Help Search sidebar panel"/>
<oaf_attribute name="nautilus:sidebar_panel_name" type="string" value="Help Search"/>
<oaf_attribute name="nautilus:recommended_uri_schemes" type="stringv">
<item value="help"/>
<item value="man"/>
<item value="info"/>
</oaf_attribute>
</oaf_server>
</oaf_info>
<oaf_info>
<oaf_server iid="OAFIID:hyperbola_factory:02b54c63-101b-4b27-a285-f99ed332ecdb" type="exe" location="hyperbola">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Internal use only"/>
</oaf_server>
<oaf_server iid="OAFIID:hyperbola_navigation_tree:57542ce0-71ff-442d-a764-462c92514234" type="factory" location="OAFIID:hyperbola_factory:02b54c63-101b-4b27-a285-f99ed332ecdb">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Nautilus/MetaView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Help Navigation Tree"/>
<oaf_attribute name="name" type="string" value="Help Contents sidebar panel"/>
<oaf_attribute name="nautilus:sidebar_panel_name" type="string" value="Help Contents"/>
<oaf_attribute name="nautilus:recommended_uri_schemes" type="stringv">
<item value="help"/>
<item value="man"/>
<item value="info"/>
</oaf_attribute>
</oaf_server>
</oaf_info>
<oaf_info>
<oaf_server iid="OAFIID:hyperbola_factory:02b54c63-101b-4b27-a285-f99ed332ecdb" type="exe" location="hyperbola">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Internal use only"/>
</oaf_server>
<oaf_server iid="OAFIID:hyperbola_navigation_tree:57542ce0-71ff-442d-a764-462c92514234" type="factory" location="OAFIID:hyperbola_factory:02b54c63-101b-4b27-a285-f99ed332ecdb">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Nautilus/MetaView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Help Navigation Tree"/>
<oaf_attribute name="name" type="string" value="Help Contents sidebar panel"/>
<oaf_attribute name="nautilus:sidebar_panel_name" type="string" value="Help Contents"/>
<oaf_attribute name="nautilus:recommended_uri_schemes" type="stringv">
<item value="help"/>
<item value="man"/>
<item value="info"/>
</oaf_attribute>
</oaf_server>
</oaf_info>
<oaf_info>
<oaf_server iid="OAFIID:hyperbola_factory:02b54c63-101b-4b27-a285-f99ed332ecdb" type="exe" location="hyperbola">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Internal use only"/>
</oaf_server>
</oaf_info>
<oaf_info>
<oaf_server iid="OAFIID:hyperbola_navigation_index:0bafadc7-09f1-4f10-8c8e-dad53124fc49" type="factory" location="OAFIID:hyperbola_factory:02b54c63-101b-4b27-a285-f99ed332ecdb">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Nautilus/MetaView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Help Index"/>
<oaf_attribute name="name" type="string" value="Help Index sidebar panel"/>
<oaf_attribute name="nautilus:sidebar_panel_name" type="string" value="Help Index"/>
<oaf_attribute name="nautilus:recommended_uri_schemes" type="stringv">
<item value="help"/>
<item value="man"/>
<item value="info"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Help Index"/>
</oaf_server>
</oaf_info>
<oaf_info>
<oaf_server iid="OAFIID:hyperbola_navigation_search:89b2f3b8-4f09-49c8-9a7b-ccb14d034813" type="factory" location="OAFIID:hyperbola_factory:02b54c63-101b-4b27-a285-f99ed332ecdb">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Nautilus/MetaView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Help Search"/>
<oaf_attribute name="name" type="string" value="Help Search sidebar panel"/>
<oaf_attribute name="nautilus:sidebar_panel_name" type="string" value="Help Search"/>
<oaf_attribute name="nautilus:recommended_uri_schemes" type="stringv">
<item value="help"/>
<item value="man"/>
<item value="info"/>
</oaf_attribute>
</oaf_server>
</oaf_info>
......@@ -127,7 +127,7 @@ _mozilla_all_nspr_flags="$_mozilla_nspr_libs $_mozilla_plc_libs $_mozilla_plds_l
dnl Now check for the evil c++ ones "by hand"
CC="g++"
LDFLAGS="$_save_cflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lxpcom"
LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lxpcom"
AC_MSG_CHECKING(for xpcom)
AC_CACHE_VAL(have_xpcom,
[AC_TRY_COMPILE([extern "C" int NS_RegistryGetFactory(void**);]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment