1999-12-05 00:40:26 +00:00
|
|
|
AC_INIT(src)
|
|
|
|
|
|
|
|
|
|
if test -n "$GNOME2_PATH"; then
|
|
|
|
|
PATH="$GNOME2_PATH/bin:$PATH"
|
|
|
|
|
export PATH
|
|
|
|
|
fi
|
|
|
|
|
|
2000-04-19 15:32:55 +00:00
|
|
|
AM_INIT_AUTOMAKE(nautilus, 0.1.0)
|
1999-12-05 00:40:26 +00:00
|
|
|
AM_CONFIG_HEADER(config.h)
|
|
|
|
|
|
|
|
|
|
AM_MAINTAINER_MODE
|
|
|
|
|
|
|
|
|
|
AM_DISABLE_STATIC
|
|
|
|
|
AM_PROG_LIBTOOL
|
|
|
|
|
|
|
|
|
|
AM_SANITY_CHECK
|
|
|
|
|
AC_PROG_CC
|
2000-03-03 23:52:55 +00:00
|
|
|
AC_PROG_CPP
|
1999-12-05 00:40:26 +00:00
|
|
|
AC_PROG_INSTALL
|
|
|
|
|
AC_PROG_LN_S
|
|
|
|
|
AC_PROG_MAKE_SET
|
|
|
|
|
AC_ISC_POSIX
|
|
|
|
|
|
2000-06-06 09:18:00 +00:00
|
|
|
dnl ORBit
|
|
|
|
|
AM_PATH_ORBIT
|
|
|
|
|
|
2000-03-04 00:02:48 +00:00
|
|
|
dnl
|
|
|
|
|
EAZEL_SERVICES=
|
|
|
|
|
AC_ARG_ENABLE(eazel-services,
|
|
|
|
|
[--enable-eazel-services Eazel services],
|
|
|
|
|
EAZEL_SERVICES=1
|
|
|
|
|
AC_DEFINE(EAZEL_SERVICES))
|
|
|
|
|
|
|
|
|
|
AC_SUBST(EAZEL_SERVICES)
|
|
|
|
|
|
2000-04-02 01:39:04 +00:00
|
|
|
AM_CONDITIONAL(EAZEL_SERVICES, test "x$EAZEL_SERVICES" = "x1")
|
|
|
|
|
|
2000-04-28 03:12:56 +00:00
|
|
|
dnl ====================================
|
|
|
|
|
dnl =
|
|
|
|
|
dnl = authenticate helper
|
|
|
|
|
dnl =
|
|
|
|
|
dnl ====================================
|
2000-04-27 16:05:08 +00:00
|
|
|
BUILD_AUTHENTICATE_HELPER=
|
2000-04-28 03:12:56 +00:00
|
|
|
|
|
|
|
|
AC_CHECK_LIB(pam, pam_authenticate,
|
|
|
|
|
[BUILD_AUTHENTICATE_HELPER=1
|
|
|
|
|
AC_DEFINE(HAVE_PAM)
|
|
|
|
|
AC_CHECK_LIB(pam_misc, pam_misc_setenv,
|
|
|
|
|
[PAM_LIBS="-ldl -lpam -lpam_misc"], [PAM_LIBS="-ldl -lpam"], -ldl -lpam) ], [PAM_LIBS=], -ldl)
|
|
|
|
|
|
|
|
|
|
AC_SUBST(PAM_LIBS)
|
2000-04-27 16:05:08 +00:00
|
|
|
|
|
|
|
|
AM_CONDITIONAL(BUILD_AUTHENTICATE_HELPER, test "x$BUILD_AUTHENTICATE_HELPER" = "x1")
|
2000-04-28 03:12:56 +00:00
|
|
|
dnl ====================================
|
|
|
|
|
dnl = end authenticate helper
|
|
|
|
|
dnl ====================================
|
2000-04-27 16:05:08 +00:00
|
|
|
|
2000-04-19 10:05:14 +00:00
|
|
|
dnl ====================================
|
|
|
|
|
dnl =
|
|
|
|
|
dnl = mozilla embedded component support
|
|
|
|
|
dnl =
|
2000-06-20 01:01:21 +00:00
|
|
|
dnl = The following voodoo does detection of mozilla libraries needed by
|
|
|
|
|
dnl = the nautilus mozilla component.
|
|
|
|
|
dnl =
|
|
|
|
|
dnl = The nautilus mozilla component is only built if these libraries are found
|
|
|
|
|
dnl =
|
2000-04-19 10:05:14 +00:00
|
|
|
dnl ====================================
|
|
|
|
|
BUILD_MOZILLA_COMPONENT=
|
2000-06-20 01:01:21 +00:00
|
|
|
MOZILLA_COMPONENT_CFLAGS=
|
|
|
|
|
MOZILLA_COMPONENT_LDFLAGS=
|
|
|
|
|
|
|
|
|
|
_mozilla_lib_place=/usr/lib/mozilla
|
|
|
|
|
_mozilla_include_place=/usr/include/mozilla
|
|
|
|
|
|
|
|
|
|
dnl Add a flag to override the default mozilla lib dir
|
|
|
|
|
AC_ARG_WITH(mozilla-lib-place,
|
|
|
|
|
[ --with-mozilla-lib-place Set mozilla 'lib' place ],
|
|
|
|
|
[ _mozilla_lib_place="$withval" ])
|
|
|
|
|
|
|
|
|
|
dnl Add a flag to override the default mozilla include dir
|
|
|
|
|
AC_ARG_WITH(mozilla-include-place,
|
|
|
|
|
[ --with-mozilla-include-place Set mozilla 'include' place ],
|
|
|
|
|
[ _mozilla_include_place="$withval" ])
|
|
|
|
|
|
|
|
|
|
_mozilla_nspr_libs=
|
|
|
|
|
_mozilla_plc_libs=
|
|
|
|
|
_mozilla_plds_libs=
|
|
|
|
|
_mozilla_xpcom_libs=
|
|
|
|
|
_mozilla_gtk_moz_embed_libs=
|
|
|
|
|
_mozilla_gtk_super_win_libs=
|
|
|
|
|
|
|
|
|
|
dnl Save flags and compiler
|
|
|
|
|
_save_cflags="$CFLAGS"
|
|
|
|
|
_save_ldflags="$LDFLAGS"
|
|
|
|
|
_save_cc="$CC"
|
|
|
|
|
|
|
|
|
|
dnl Hack flags to find the mozilla stuff
|
|
|
|
|
CFLAGS="$_save_cflags -I$_mozilla_include_place"
|
|
|
|
|
LDFLAGS="$_save_cflags -L$_mozilla_lib_place"
|
|
|
|
|
|
|
|
|
|
dnl Check for nspr and friends
|
|
|
|
|
AC_CHECK_LIB(nspr4, PR_Init, [_mozilla_nspr_libs="-lnspr4"])
|
|
|
|
|
LDFLAGS="$LDFLAGS $_mozilla_nspr_libs"
|
|
|
|
|
AC_CHECK_LIB(plc4, PL_strcmp, [_mozilla_plc_libs="-lplc4"])
|
|
|
|
|
AC_CHECK_LIB(plds4, PL_NewHashTable, [_mozilla_plds_libs="-lplds4"])
|
|
|
|
|
|
|
|
|
|
_mozilla_all_nspr_flags="$_mozilla_nspr_libs $_mozilla_plc_libs $_mozilla_plds_libs"
|
|
|
|
|
|
|
|
|
|
dnl Now check for the evil c++ ones "by hand"
|
|
|
|
|
CC="g++"
|
|
|
|
|
|
2000-07-05 12:30:16 +00:00
|
|
|
LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lxpcom"
|
2000-06-20 01:01:21 +00:00
|
|
|
AC_MSG_CHECKING(for xpcom)
|
|
|
|
|
AC_CACHE_VAL(have_xpcom,
|
|
|
|
|
[AC_TRY_COMPILE([extern "C" int NS_RegistryGetFactory(void**);]
|
|
|
|
|
[],
|
|
|
|
|
[NS_RegistryGetFactory(0); return 0;],
|
|
|
|
|
[have_xpcom=true],
|
|
|
|
|
[have_xpcom=false])])
|
|
|
|
|
if test "$have_xpcom" = "true" ; then
|
|
|
|
|
_mozilla_xpcom_libs="-lxpcom"
|
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
|
else
|
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
|
fi
|
2000-04-19 10:05:14 +00:00
|
|
|
|
2000-06-20 01:01:21 +00:00
|
|
|
dnl The next two are pure from evil
|
|
|
|
|
CC=$_save_cc
|
2000-04-19 10:05:14 +00:00
|
|
|
|
2000-06-20 01:01:21 +00:00
|
|
|
dnl gtk superwin library
|
|
|
|
|
LDFLAGS="$_save_cflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtksuperwin"
|
|
|
|
|
AC_CHECK_LIB(gtksuperwin, gdk_superwin_get_type, [_mozilla_gtk_super_win_libs="-lgtksuperwin"])
|
2000-04-19 10:05:14 +00:00
|
|
|
|
2000-06-20 01:01:21 +00:00
|
|
|
dnl gtk moz embed library
|
|
|
|
|
LDFLAGS="$_save_cflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtkembedmoz $_mozilla_xpcom_libs"
|
|
|
|
|
AC_CHECK_LIB(gtkembedmoz, gtk_moz_embed_get_type, [_mozilla_gtk_moz_embed_libs="-lgtkembedmoz"])
|
2000-04-19 10:05:14 +00:00
|
|
|
|
2000-06-20 01:01:21 +00:00
|
|
|
dnl Restore the flags and compiler
|
|
|
|
|
CFLAGS=$_save_cflags
|
|
|
|
|
LDFLAGS=$_save_ldflags
|
|
|
|
|
CC=$_save_cc
|
|
|
|
|
|
|
|
|
|
dnl Now make sure all the libraries are good
|
|
|
|
|
AC_MSG_CHECKING(for Mozilla)
|
|
|
|
|
|
|
|
|
|
if test -n "$_mozilla_nspr_libs" -a \
|
|
|
|
|
-n "$_mozilla_plc_libs" -a \
|
|
|
|
|
-n "$_mozilla_plds_libs" -a \
|
|
|
|
|
-n "$_mozilla_xpcom_libs" -a \
|
|
|
|
|
-n "$_mozilla_gtk_super_win_libs" -a \
|
|
|
|
|
-n "$_mozilla_gtk_moz_embed_libs"
|
2000-04-19 10:05:14 +00:00
|
|
|
then
|
2000-06-29 21:04:42 +00:00
|
|
|
AC_PROG_CXX
|
2000-06-20 01:01:21 +00:00
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
|
found_mozilla=true
|
|
|
|
|
|
|
|
|
|
MOZILLA_COMPONENT_CFLAGS=-I$_mozilla_include_place
|
|
|
|
|
MOZILLA_COMPONENT_LDFLAGS=-L$_mozilla_lib_place
|
|
|
|
|
MOZILLA_COMPONENT_LIBS="$_mozilla_gtk_moz_embed_libs \
|
|
|
|
|
$_mozilla_gtk_super_win_libs \
|
|
|
|
|
$_mozilla_xpcom_libs \
|
|
|
|
|
$_mozilla_nspr_libs \
|
|
|
|
|
$_mozilla_plc_libs \
|
|
|
|
|
$_mozilla_plds_libs"
|
|
|
|
|
|
|
|
|
|
AC_SUBST(MOZILLA_COMPONENT_CFLAGS)
|
|
|
|
|
AC_SUBST(MOZILLA_COMPONENT_LDFLAGS)
|
|
|
|
|
AC_SUBST(MOZILLA_COMPONENT_LIBS)
|
2000-04-19 10:05:14 +00:00
|
|
|
else
|
|
|
|
|
AC_MSG_RESULT(no)
|
2000-06-20 01:01:21 +00:00
|
|
|
found_mozilla=false
|
2000-04-19 10:05:14 +00:00
|
|
|
fi
|
|
|
|
|
AM_CONDITIONAL(BUILD_MOZILLA_COMPONENT, test "x$found_mozilla" = "xtrue")
|
|
|
|
|
|
|
|
|
|
dnl ====================================
|
|
|
|
|
dnl = end mozilla hacks
|
|
|
|
|
dnl ====================================
|
|
|
|
|
|
2000-04-23 13:08:05 +00:00
|
|
|
dnl ====================================
|
|
|
|
|
dnl = rpmview component support
|
|
|
|
|
dnl ====================================
|
|
|
|
|
|
|
|
|
|
rpm_libs=
|
2000-06-14 16:30:36 +00:00
|
|
|
AC_CHECK_LIB(bz2, bzread, [rpm_libs=-lbz2])
|
2000-06-14 16:30:36 +00:00
|
|
|
dnl <= Check for bzip2 > 1.0.0
|
2000-06-30 16:21:05 +00:00
|
|
|
AC_CHECK_LIB(bz2, BZ2_bzread, [rpm_libs=-lbz2
|
|
|
|
|
dnl <= define the wrapper-functions to get the Bzip2 stuff working .. =>
|
|
|
|
|
AC_DEFINE(bzread,BZ2_bzread)
|
|
|
|
|
AC_DEFINE(bzopen,BZ2_bzopen)
|
|
|
|
|
AC_DEFINE(bzdopen,BZ2_bzdopen)
|
|
|
|
|
AC_DEFINE(bzwrite,BZ2_bzwrite)
|
|
|
|
|
AC_DEFINE(bzerror,BZ2_bzerror)
|
|
|
|
|
AC_DEFINE(bzclose,BZ2_bzclose)
|
|
|
|
|
AC_DEFINE(bzflush,BZ2_bzflush)
|
|
|
|
|
AC_DEFINE(bzCompress,BZ2_bzCompress)
|
|
|
|
|
AC_DEFINE(bzCompressInit,BZ2_bzCompressInit)
|
|
|
|
|
AC_DEFINE(bzDecompress,BZ2_bzDecompress)
|
|
|
|
|
AC_DEFINE(bzDecompressInit,BZ2_bzDecompressInit)
|
|
|
|
|
])
|
2000-06-14 16:30:36 +00:00
|
|
|
dnl =>
|
2000-04-23 13:08:05 +00:00
|
|
|
AC_CHECK_LIB(popt, poptParseArgvString, [rpm_libs="$rpm_libs -lpopt"])
|
|
|
|
|
AC_CHECK_LIB(rpm, rpmRunTransactions,[build_rpmview=true],
|
|
|
|
|
[build_rpmview=false],-lz $rpm_libs -ldb)
|
|
|
|
|
LDFLAGS="$save_LDFLAGS"
|
|
|
|
|
if test "x$build_rpmview" = "xtrue" ; then
|
|
|
|
|
AC_DEFINE(HAVE_RPM)
|
|
|
|
|
RPM_LIBS="-lrpm -lz $rpm_libs -ldb"
|
|
|
|
|
fi
|
|
|
|
|
AC_SUBST(RPM_LIBS)
|
|
|
|
|
AM_CONDITIONAL(BUILD_RPMVIEW_COMPONENT, test "x$build_rpmview" = "xtrue")
|
|
|
|
|
|
|
|
|
|
dnl ====================================
|
|
|
|
|
dnl = end rpmview checks
|
|
|
|
|
dnl ====================================
|
|
|
|
|
|
1999-12-05 00:40:26 +00:00
|
|
|
dnl Checks for libraries.
|
|
|
|
|
AM_PATH_GLIB(1.2.0,,
|
|
|
|
|
AC_MSG_ERROR([
|
|
|
|
|
*** GLIB 1.2.0 or better is required. The latest version of GLIB
|
|
|
|
|
*** is always available from ftp://ftp.gtk.org/.]))
|
1999-12-14 02:37:14 +00:00
|
|
|
|
Fix typo Fix srcdir != builddir:
* TODO: Fix typo
* components/rpmview/Makefile.am,
components/services/install/command-line/Makefile.am,
components/services/install/lib/Makefile.am,
components/services/install/nautilus-view/Makefile.am,
components/services/install/server/Makefile.am,
components/services/startup/lib/Makefile.am,
components/services/time/command-line/Makefile.am,
components/services/time/service/Makefile.am,
components/services/trilobite/helper/Makefile.am,
components/services/trilobite/sample/command-line/Makefile.am,
components/services/trilobite/sample/service/Makefile.am,
components/services/vault/command-line/Makefile.am,
cut-n-paste-code/widgets/e-paned/Makefile.am,
cut-n-paste-code/widgets/nautilus-druid/Makefile.am,
libnautilus-extensions/Makefile.am,
src/Makefile.am,
test/Makefile.am: Fix srcdir != builddir:
* components/services/trilobite/helper/eazel-helper.c,
components/services/vault/command-line/vault-operations.c,
libnautilus-extensions/nautilus-graphic.c,
libnautilus-extensions/nautilus-icon-container.c,
libnautilus-extensions/nautilus-list.c: Include string.h
for strlen prototype.
2000-07-13 22:16:54 +00:00
|
|
|
AM_PATH_GNOME(1.0.0,,AC_MSG_ERROR([*** GNOME 1.0.0 or better is required.]), gnomecanvaspixbuf bonobo vfs idl)
|
2000-07-01 02:21:28 +00:00
|
|
|
AC_SUBST(GNOMECANVASPIXBUF_LIBS)
|
|
|
|
|
AC_SUBST(GNOMECANVASPIXBUF_INCLUDEDIR)
|
1999-12-06 00:49:57 +00:00
|
|
|
AC_SUBST(GNORBA_CFLAGS)
|
|
|
|
|
AC_SUBST(GNORBA_LIBS)
|
|
|
|
|
AC_SUBST(BONOBO_CFLAGS)
|
|
|
|
|
AC_SUBST(BONOBO_LIBS)
|
1999-12-14 02:37:14 +00:00
|
|
|
AC_SUBST(VFS_CFLAGS)
|
|
|
|
|
AC_SUBST(VFS_LIBS)
|
Some build fixes.
* acconfig.h:
* configure.in:
Removed the NAUTILUS_PREFIX that I added. I did it wrong.
* libnautilus-extensions/nautilus-file-utilities.h:
* libnautilus-extensions/nautilus-file-utilities.c:
(nautilus_pixmap_file):
* components/hardware/nautilus-hardware-view.c:
(setup_overview_form):
* components/services/startup/nautilus-view/nautilus-service-startup-view.c:
(setup_form_title), (setup_signup_form), (setup_config_form):
* libnautilus-extensions/nautilus-icon-canvas-item.c: (map_pixbuf):
* libnautilus-extensions/nautilus-icon-factory.c:
(make_full_icon_path):
* src/nautilus-application.c: (display_caveat):
* src/nautilus-property-browser.c:
(nautilus_property_browser_initialize),
(nautilus_emblem_dialog_new), (make_category_link):
* src/nautilus-zoom-control.c: (nautilus_zoom_control_initialize):
Replaced most uses of gnome_pixmap_file on "nautilus/"
with a call to a new nautilus_pixmap_file in an attempt to
make installations where nautilus has a different prefix
from gnome-libs work. I now think this is a waste of time,
but Mathieu Lacage says this is still an improvement.
* components/help/Makefile.am:
* components/help/hyperbola-filefmt.c: (fmt_map_entry):
Use HYPERBOLA_DATADIR instead of NAUTILUS_PREFIX.
* components/websearch/ntl-web-search.c:
(web_search_populate_engines):
Use WEB_SEARCH_DATADIR instead of NAUTILUS_PREFIX.
* components/mozilla/nautilus-mozilla-content-view.c:
(nautilus_mozilla_content_view_initialize),
(mozilla_content_view_set_busy_cursor),
(mozilla_content_view_request_progress_change),
(mozilla_content_view_clear_busy_cursor),
(mozilla_load_location_callback), (bonobo_mozilla_callback),
(mozilla_merge_bonobo_items_callback),
(mozilla_title_changed_callback),
(mozilla_location_changed_callback), (mozilla_net_status_callback),
(mozilla_link_message_callback), (mozilla_progress_callback),
(mozilla_open_uri_callback):
Took a cut at fixing the Mozilla component for the new API.
Ramiro will have to take care of the rest.
* components/services/install/lib/Makefile.am:
* components/services/time/command-line/Makefile.am:
* components/services/time/nautilus-view/Makefile.am:
* components/services/time/service/Makefile.am:
* components/services/trilobite/libtrilobite/Makefile.am:
* components/services/trilobite/sample/command-line/Makefile.am:
* components/services/trilobite/sample/service/Makefile.am:
* libnautilus/Makefile.am:
Updated all ORBit IDL compiles to use IDL_CFLAGS as suggested
in the form of a patch by Martijn van Beers.
* libnautilus-extensions/Makefile.am:
* libnautilus-extensions/nautilus-file-utilities.c:
(nautilus_get_user_main_directory),
(nautilus_get_pixmap_directory):
* libnautilus-extensions/nautilus-link-set.c:
(get_link_set_document):
* src/Makefile.am:
* src/nautilus-property-browser.c:
(nautilus_property_browser_drag_data_get), (make_drag_image),
(get_xml_path), (make_properties_from_directory):
* src/nautilus-link-set-window.c: (get_link_set_names):
* src/file-manager/Makefile.am:
* src/file-manager/fm-properties-window.c: (get_property_names):
Used NAUTILUS_DATADIR and DATADIR instead of NAUTILUS_PREFIX.
* libnautilus-extensions/nautilus-file-utilities.h:
* libnautilus-extensions/nautilus-file-utilities.c:
(nautilus_get_uri_from_local_path): Added a new helper function for
use when you have a path and need a URI. This does a better job
than just adding a "file://" on the front.
* libnautilus-extensions/nautilus-gtk-extensions.h:
* libnautilus-extensions/nautilus-gtk-extensions.c:
(get_first_callback), (nautilus_gtk_container_get_first_child):
* src/nautilus-window-toolbars.c: (setup_button):
* src/nautilus-window.c:
(replace_special_current_view_in_content_view_menu):
Implemented the first_child function and used it where appropriate.
* libnautilus-extensions/nautilus-preferences-item.c:
(add_icon_themes): Use nautilus_get_pixmap_directory intead of
misusing gnome_pixmap_file by calling it on a directory name.
* nautilus-installer/src/support.c: (create_pixmap),
(create_image): Added FIXMEs since it isn't clear if this code
will work with a Nautilus prefix that's not the same as the
gnome-libs prefix.
* Makefile.am: Tweaked white space.
2000-06-13 19:05:33 +00:00
|
|
|
AC_SUBST(IDL_CFLAGS)
|
1999-12-14 02:37:14 +00:00
|
|
|
|
2000-06-26 14:33:01 +00:00
|
|
|
AM_PATH_OAF(0.3.0)
|
|
|
|
|
|
2000-06-26 11:56:12 +00:00
|
|
|
dnl GnomeVFS can compile without OAF support, Nautilus depends on OAF.
|
|
|
|
|
dnl Make USING_OAF be defined
|
2000-06-26 14:33:01 +00:00
|
|
|
|
2000-06-26 11:56:12 +00:00
|
|
|
AC_DEFINE(USING_OAF)
|
2000-04-19 15:32:55 +00:00
|
|
|
|
2000-06-25 11:39:38 +00:00
|
|
|
AM_PATH_GCONF(0.5.0,,,gconf-gtk)
|
2000-04-19 15:32:55 +00:00
|
|
|
|
1999-12-30 21:33:51 +00:00
|
|
|
AC_PATH_PROG(XML_CONFIG,xml-config,no)
|
|
|
|
|
if test x$XML_CONFIG = xno; then
|
2000-01-22 07:20:53 +00:00
|
|
|
AC_MSG_ERROR(Couldn't find xml-config please install the gnome-xml package)
|
1999-12-30 21:33:51 +00:00
|
|
|
fi
|
|
|
|
|
XML_LIBS=`$XML_CONFIG --libs`
|
|
|
|
|
XML_CFLAGS=`$XML_CONFIG --cflags`
|
|
|
|
|
AC_SUBST(XML_LIBS)
|
|
|
|
|
AC_SUBST(XML_CFLAGS)
|
|
|
|
|
|
2000-05-15 19:08:57 +00:00
|
|
|
dnl ====================================
|
|
|
|
|
dnl = begin gnome-http checks
|
|
|
|
|
dnl ====================================
|
|
|
|
|
|
2000-06-10 23:08:13 +00:00
|
|
|
AC_PATH_PROG(GHTTP_CONFIG,gnome-config,no)
|
2000-05-15 19:08:57 +00:00
|
|
|
if test x$GHTTP_CONFIG = xno; then
|
|
|
|
|
AC_MSG_ERROR(Could not find ghttp libraries.)
|
|
|
|
|
fi
|
2000-06-10 23:08:13 +00:00
|
|
|
GHTTP_LIBS=`$GHTTP_CONFIG --libs ghttp`
|
|
|
|
|
GHTTP_CFLAGS=`$GHTTP_CONFIG --cflags ghttp`
|
2000-05-15 19:08:57 +00:00
|
|
|
AC_SUBST(GHTTP_LIBS)
|
|
|
|
|
AC_SUBST(GHTTP_CFLAGS)
|
|
|
|
|
|
|
|
|
|
dnl ====================================
|
|
|
|
|
dnl = end ghttp checks
|
|
|
|
|
dnl ====================================
|
|
|
|
|
|
2000-04-29 23:50:02 +00:00
|
|
|
dnl ====================================
|
|
|
|
|
dnl = begin gdk-pixbuf checks
|
|
|
|
|
dnl ====================================
|
|
|
|
|
AM_PATH_GDK_PIXBUF(0.7.0,,
|
|
|
|
|
AC_MSG_ERROR([*** gdk_pixbuf 0.7.0 or better is required.]))
|
|
|
|
|
dnl ====================================
|
|
|
|
|
dnl = begin gdk-pixbuf checks
|
|
|
|
|
dnl ====================================
|
|
|
|
|
|
|
|
|
|
|
2000-01-22 07:20:53 +00:00
|
|
|
AC_PATH_PROG(LIBWWW_CONFIG,libwww-config,no)
|
|
|
|
|
if test x$LIBWWW_CONFIG = xno; then
|
|
|
|
|
AC_MSG_ERROR(Couldn't find libwww-config try http://www.w3.org/Library/Distribution.html to get a copy of libwww)
|
|
|
|
|
fi
|
|
|
|
|
LIBWWW_LIBS=`$LIBWWW_CONFIG --libs`
|
|
|
|
|
LIBWWW_CFLAGS=`$LIBWWW_CONFIG --cflags`
|
|
|
|
|
AC_SUBST(LIBWWW_LIBS)
|
|
|
|
|
AC_SUBST(LIBWWW_CFLAGS)
|
|
|
|
|
|
2000-04-21 05:10:21 +00:00
|
|
|
AC_CHECK_LIB(z, gzopen, [Z_LIBS=-lz
|
|
|
|
|
AC_SUBST(Z_LIBS)], AC_MSG_ERROR([*** zlib is required]))
|
|
|
|
|
|
2000-06-26 14:33:01 +00:00
|
|
|
dnl <= check for GtkHTML =>
|
2000-02-03 22:18:09 +00:00
|
|
|
AC_MSG_CHECKING(for GtkHTML)
|
|
|
|
|
if gnome-config --libs gtkhtml > /dev/null 2>&1; then
|
|
|
|
|
AC_MSG_RESULT(yes)
|
2000-06-25 11:39:38 +00:00
|
|
|
dnl <= check for GtkHTML >= 0.4
|
|
|
|
|
AC_MSG_CHECKING(for GtkHTML >= 0.4)
|
|
|
|
|
if test `gnome-config --modversion gtkhtml|sed -e 's/.*-[[[:digit:]]].//g'` -ge 4 ; then
|
|
|
|
|
AC_MSG_RESULT([yeah, we are very up-to-date])
|
|
|
|
|
GTKHTML_LIBS=`gnome-config --libs gtkhtml`
|
|
|
|
|
GTKHTML_CFLAGS=`gnome-config --cflags gtkhtml`
|
|
|
|
|
else
|
|
|
|
|
AC_MSG_ERROR([Your GtkHTML is not up-to-date enough for nautilus!])
|
|
|
|
|
fi
|
|
|
|
|
dnl =>
|
2000-02-03 22:18:09 +00:00
|
|
|
else
|
|
|
|
|
AC_MSG_ERROR([Not Found])
|
|
|
|
|
AC_MSG_ERROR([GtkHTML from the GNOME CVS is required])
|
|
|
|
|
fi
|
|
|
|
|
AC_SUBST(GTKHTML_LIBS)
|
|
|
|
|
AC_SUBST(GTKHTML_CFLAGS)
|
|
|
|
|
|
2000-03-03 23:52:55 +00:00
|
|
|
dnl Test for libpng
|
|
|
|
|
if test -z "$LIBPNG"; then
|
|
|
|
|
AC_CHECK_LIB(png, png_read_info,
|
|
|
|
|
AC_CHECK_HEADER(png.h,
|
|
|
|
|
png_ok=yes,
|
|
|
|
|
png_ok=no),
|
|
|
|
|
AC_MSG_ERROR(*** (PNG library not found) ***), -lz -lm)
|
|
|
|
|
if test "$png_ok" = yes; then
|
|
|
|
|
AC_MSG_CHECKING([for png_structp in png.h])
|
|
|
|
|
AC_TRY_COMPILE([#include <png.h>],
|
|
|
|
|
[png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;],
|
|
|
|
|
png_ok=yes,
|
|
|
|
|
png_ok=no)
|
|
|
|
|
AC_MSG_RESULT($png_ok)
|
|
|
|
|
if test "$png_ok" = yes; then
|
|
|
|
|
PNG='png'; LIBPNG='-lpng -lz'
|
|
|
|
|
else
|
|
|
|
|
AC_MSG_WARN(*** PNG loader will not be built (PNG library is too old) ***)
|
|
|
|
|
fi
|
|
|
|
|
else
|
|
|
|
|
AC_MSG_WARN(*** PNG loader will not be built (PNG header file not found) ***)
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
AC_SUBST(LIBPNG)
|
|
|
|
|
|
2000-04-12 19:34:11 +00:00
|
|
|
dnl Checks for i18n
|
2000-06-14 16:30:36 +00:00
|
|
|
ALL_LINGUAS="da de fr gl ja ko no ru sv tr"
|
2000-04-12 19:34:11 +00:00
|
|
|
AM_GNOME_GETTEXT
|
|
|
|
|
# AM_GNOME_GETTEXT above substs $DATADIRNAME
|
|
|
|
|
# this is the directory where the *.{mo,gmo} files are installed
|
|
|
|
|
gnomelocaledir='${prefix}/${DATADIRNAME}/locale'
|
|
|
|
|
AC_SUBST(gnomelocaledir)
|
|
|
|
|
|
1999-12-05 00:40:26 +00:00
|
|
|
dnl Checks for typedefs, structures, and compiler characteristics.
|
|
|
|
|
AC_C_CONST
|
|
|
|
|
|
2000-07-12 19:33:38 +00:00
|
|
|
dnl Turn on the additional warnings last, so -Werror doesn't affect other tests.
|
|
|
|
|
AC_ARG_ENABLE(more-warnings,
|
|
|
|
|
[--enable-more-warnings Maximum compiler warnings],
|
|
|
|
|
set_more_warnings="$enableval", set_more_warnings=yes)
|
|
|
|
|
AC_MSG_CHECKING(for more warnings, including -Werror)
|
|
|
|
|
if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
|
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
|
CFLAGS="$CFLAGS \
|
|
|
|
|
-Wall -Wno-uninitialized \
|
|
|
|
|
-Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
|
|
|
|
|
-Wnested-externs -Wpointer-arith \
|
|
|
|
|
-Wno-sign-compare -Wsign-promo \
|
|
|
|
|
-Werror"
|
|
|
|
|
else
|
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
|
fi
|
|
|
|
|
|
1999-12-05 00:40:26 +00:00
|
|
|
AC_OUTPUT([
|
2000-04-26 18:37:21 +00:00
|
|
|
nautilus.spec
|
1999-12-05 00:40:26 +00:00
|
|
|
Makefile
|
1999-12-14 19:46:16 +00:00
|
|
|
icons/Makefile
|
2000-06-30 08:11:38 +00:00
|
|
|
icons/arlo/Makefile
|
Hand tuned icons for multiple resolutions.
So for example you can have an icon designed for the 96x96
size, which is called i-directory-96.png, and it will be
loaded instead of loading i-directory.png and scaling it.
* libnautilus/nautilus-icon-factory.c:
(nautilus_icon_factory_get_icon_name_for_regular_file),
(add_size_to_icon_name), (nautilus_icon_factory_load_icon),
(nautilus_icon_factory_create_image_for_item),
(get_larger_icon_size), (get_smaller_icon_size),
(get_next_icon_size_to_try), (load_specific_image),
(load_image_for_scaling), (load_image_scale_if_necessary),
(nautilus_icon_factory_mark_recently_used), (mark_recently_used),
(nautilus_icon_factory_get_pixbuf_for_icon),
(get_image_from_cache), (nautilus_icon_factory_scale): Changed the
icon factory so it will look for icons of multiple resolutions and
scale the nearest. Also made other improvements including sharing
a single fallback icon instead of making multiple ones, using the
"core-dump" icon for files named "core", adding some additional
g_return_if_fail.
* libnautilus/nautilus-icon-factory.c:
(self_test_next_icon_size_to_try),
(nautilus_self_check_icon_factory):
* libnautilus/nautilus-lib-self-check-functions.h:
The new code needed a bit of self-check code, so I added it.
* libnautilus/nautilus-directory.c:
(nautilus_directory_try_to_read_metafile),
(nautilus_directory_construct_alternate_metafile_uri):
Since "make check" was failing, I checked to see what was wrong.
The code that was respecting the new "valid_fields" part of
GnomeVFSFileInfo was looking at the wrong field (flags instead
of valid_fields), which caused all metafile reading to fail.
While debugging this, I noticed that the alternate metafiles
had particularly bad long names, so I fixed that too.
* libnautilus/nautilus-directory.c: (nautilus_file_ref):
* libnautilus/nautilus-glib-extensions.c:
(nautilus_strdup_strftime):
* libnautilus/nautilus-string.c: (nautilus_string_to_int):
Switched from using <limits.h> constants to the ones from
<glib.h>. I have no idea why I made this change. All hail
glib! C Standard be damned!
* fm-directory-view.c:
(use_eazel_theme_icons_cb), (add_menu_item),
(fm_directory_view_real_append_background_context_menu_items):
Started on a user interface to switch to the Eazel theme
icons so you can see the multiple-resolution icons, but
I wanted to check in, so I stopped before it was done.
* src/nautilus-index-title.c:
Reindented Andy's new code to match the emacs mode header.
* configure.in:
* icons/Makefile.am:
* icons/eazel/.cvsignore:
* icons/eazel/Makefile.am:
* icons/eazel/i-directory-24.png:
* icons/eazel/i-directory-36.png:
* icons/eazel/i-directory-72.png:
* icons/eazel/i-directory-96.png:
* icons/eazel/i-directory.png:
I needed some variable-size icons to demonstrate the multiple
resolution support in the icon factory, so I added a few
directory icons from gnomad. Since these don't match the other
icons, I made them part of an "eazel" icons theme.
* RENAMING: Some new name ideas.
2000-02-18 01:17:30 +00:00
|
|
|
icons/eazel/Makefile
|
2000-06-02 23:49:16 +00:00
|
|
|
icons/vector/Makefile
|
2000-03-12 17:06:37 +00:00
|
|
|
data/Makefile
|
|
|
|
|
data/top/Makefile
|
2000-05-03 01:11:00 +00:00
|
|
|
data/backgrounds/Makefile
|
|
|
|
|
data/emblems/Makefile
|
2000-06-01 01:24:21 +00:00
|
|
|
data/linksets/Makefile
|
1999-12-13 22:44:06 +00:00
|
|
|
idl/Makefile
|
Added a place to put cut-n-paste code. Cut-n-pasted the e-paned widget
* Makefile.am:
* components/hardware/Makefile.am:
* components/help/Makefile.am:
* components/history/Makefile.am:
* components/html/Makefile.am:
* components/loser/content/Makefile.am:
* components/loser/sidebar/Makefile.am:
* components/music/Makefile.am:
* components/notes/Makefile.am:
* components/rpmview/Makefile.am:
* components/sample/Makefile.am:
* components/services/startup/nautilus-view/Makefile.am:
* components/services/time/nautilus-view/Makefile.am:
* components/services/trilobite/sample/nautilus-view/Makefile.am:
* components/websearch/Makefile.am:
* configure.in:
* cut-n-paste-code/.cvsignore:
* cut-n-paste-code/Makefile.am:
* cut-n-paste-code/README:
* cut-n-paste-code/widgets/.cvsignore:
* cut-n-paste-code/widgets/Makefile.am:
* cut-n-paste-code/widgets/e-paned/.cvsignore:
* cut-n-paste-code/widgets/e-paned/Makefile.am:
* cut-n-paste-code/widgets/e-paned/e-hpaned.c: (e_hpaned_get_type),
(e_hpaned_class_init), (e_hpaned_init), (e_hpaned_new),
(e_hpaned_size_request), (e_hpaned_size_allocate), (e_hpaned_draw),
(e_hpaned_xor_line), (e_hpaned_button_press),
(e_hpaned_button_release), (e_hpaned_motion),
(e_hpaned_handle_shown):
* cut-n-paste-code/widgets/e-paned/e-hpaned.h:
* cut-n-paste-code/widgets/e-paned/e-paned.c: (e_paned_get_type),
(e_paned_class_init), (e_paned_child_type), (e_paned_init),
(e_paned_set_arg), (e_paned_get_arg), (e_paned_realize),
(e_paned_map), (e_paned_unmap), (e_paned_unrealize),
(e_paned_expose), (e_paned_add1), (e_paned_add2), (e_paned_pack1),
(e_paned_pack2), (e_paned_add), (e_paned_remove), (e_paned_forall),
(e_paned_get_position), (e_paned_set_position),
(e_paned_set_handle_size), (e_paned_compute_position),
(e_paned_handle_shown), (e_paned_quantized_size):
* cut-n-paste-code/widgets/e-paned/e-paned.h:
* cut-n-paste-code/widgets/e-paned/e-vpaned.c: (e_vpaned_get_type),
(e_vpaned_class_init), (e_vpaned_init), (e_vpaned_new),
(e_vpaned_size_request), (e_vpaned_size_allocate), (e_vpaned_draw),
(e_vpaned_xor_line), (e_vpaned_button_press),
(e_vpaned_button_release), (e_vpaned_motion),
(e_vpaned_handle_shown):
* cut-n-paste-code/widgets/e-paned/e-vpaned.h:
* helper-utilities/authenticate/Makefile.am:
* libnautilus-extensions/Makefile.am:
* libnautilus-extensions/README:
* libnautilus/README:
* src/Makefile.am:
* test/Makefile.am:
Added a place to put cut-n-paste code. Cut-n-pasted the e-paned
widget from evolution. Yes, and evil thing to do. Send me mail
with alternative solutions.
Also added README files for libnautilus and
libnautilus-extenstions to clarify thieir public vs internal
state.
* src/nautilus-window.c: (nautilus_window_constructed),
(nautilus_window_real_set_content_view):
Use the new NautilusHorizontalSplitter widget instead of
the gtk one.
2000-06-14 16:30:36 +00:00
|
|
|
cut-n-paste-code/Makefile
|
|
|
|
|
cut-n-paste-code/widgets/Makefile
|
|
|
|
|
cut-n-paste-code/widgets/e-paned/Makefile
|
2000-07-01 02:23:18 +00:00
|
|
|
cut-n-paste-code/widgets/nautilus-druid/Makefile
|
2000-04-14 01:33:35 +00:00
|
|
|
librsvg/Makefile
|
1999-12-06 23:23:41 +00:00
|
|
|
libnautilus/Makefile
|
2000-04-14 15:16:44 +00:00
|
|
|
libnautilus-extensions/Makefile
|
1999-12-05 00:40:26 +00:00
|
|
|
src/Makefile
|
1999-12-10 00:52:54 +00:00
|
|
|
src/file-manager/Makefile
|
1999-12-09 23:56:07 +00:00
|
|
|
components/Makefile
|
2000-04-24 09:05:21 +00:00
|
|
|
components/hardware/Makefile
|
|
|
|
|
components/hardware/icons/Makefile
|
1999-12-09 23:56:07 +00:00
|
|
|
components/history/Makefile
|
1999-12-10 07:00:00 +00:00
|
|
|
components/help/Makefile
|
2000-01-27 01:37:08 +00:00
|
|
|
components/help/converters/Makefile
|
2000-02-03 02:19:02 +00:00
|
|
|
components/help/converters/gnome-db2html2/Makefile
|
2000-01-27 01:37:08 +00:00
|
|
|
components/help/converters/gnome-info2html2/Makefile
|
|
|
|
|
components/help/converters/gnome-man2html2/Makefile
|
1999-12-20 23:59:08 +00:00
|
|
|
components/html/Makefile
|
2000-01-04 01:52:23 +00:00
|
|
|
components/websearch/Makefile
|
2000-03-06 00:22:44 +00:00
|
|
|
components/music/Makefile
|
2000-02-15 02:51:00 +00:00
|
|
|
components/notes/Makefile
|
2000-04-03 06:59:26 +00:00
|
|
|
components/rpmview/Makefile
|
2000-03-03 17:28:29 +00:00
|
|
|
components/sample/Makefile
|
2000-04-19 03:55:01 +00:00
|
|
|
components/mozilla/Makefile
|
2000-04-01 21:45:45 +00:00
|
|
|
components/services/Makefile
|
2000-05-09 20:46:01 +00:00
|
|
|
components/services/trilobite/Makefile
|
|
|
|
|
components/services/trilobite/idl/Makefile
|
2000-05-24 20:33:53 +00:00
|
|
|
components/services/trilobite/libtrilobite/Makefile
|
2000-05-09 20:46:01 +00:00
|
|
|
components/services/trilobite/sample/Makefile
|
2000-06-16 09:15:05 +00:00
|
|
|
components/services/trilobite/sample/idl/Makefile
|
|
|
|
|
components/services/trilobite/sample/lib/Makefile
|
2000-05-11 20:44:45 +00:00
|
|
|
components/services/trilobite/sample/service/Makefile
|
|
|
|
|
components/services/trilobite/sample/command-line/Makefile
|
|
|
|
|
components/services/trilobite/sample/nautilus-view/Makefile
|
|
|
|
|
components/services/trilobite/sample/nautilus-view/icons/Makefile
|
2000-07-11 00:20:43 +00:00
|
|
|
components/services/trilobite/helper/Makefile
|
2000-05-09 20:46:01 +00:00
|
|
|
components/services/time/Makefile
|
2000-05-20 01:08:38 +00:00
|
|
|
components/services/time/service/Makefile
|
2000-05-09 20:46:01 +00:00
|
|
|
components/services/time/command-line/Makefile
|
|
|
|
|
components/services/time/nautilus-view/Makefile
|
Docs with my scetches on how to redo the rpm-glue to make
* components/services/docs/installer-dep-check:
Docs with my scetches on how to redo the rpm-glue to make
eazel-install-lib autofetch deps.
* components/services/install/command-line/eazel-alt-install.c:
(eazel_download_progress):
Borked, but compiles again. Will update when libinstall stabilizes.
* components/services/install/lib/eazel-install-object.c:
(gtk_marshal_NONE__POINTER_ENUM_POINTER),
(eazel_install_class_initialize),
(eazel_install_emit_download_failed),
(eazel_install_emit_install_failed),
(eazel_install_emit_uninstall_failed):
Revamped the install_failed signal to take a PackageData object
instead of char * name.
* components/services/install/lib/eazel-install-protocols.c:
(http_fetch_remote_file):
* components/services/install/lib/eazel-install-public.h:
* components/services/install/lib/eazel-install-rpm-glue.c:
(install_new_packages), (download_a_package),
(download_all_packages), (install_all_packages),
(uninstall_packages), (uninstall_a_package),
(build_packagedata_list_from_deps), (do_rpm_install),
(do_rpm_uninstall), (ensure_deps_are_fetched):
* components/services/install/lib/eazel-install-types.c:
(categorydata_destroy_foreach), (categorydata_destroy),
(packagedata_new_from_rpm_header), (packagedata_destroy_foreach),
(packagedata_destroy):
* components/services/install/lib/eazel-install-types.h:
Doing a lot of hacking to prepare for the autofetch stuff.
* nautilus-installer/src/prescript:
* nautilus-installer/src/HACKING:
* nautilus-installer/src/Makefile:
* nautilus-installer/src/Makefile.am:
* nautilus-installer/src/callbacks.c: (druid_cancel),
(begin_install), (druid_finish), (prep_install), (set_images):
* nautilus-installer/src/installer.c:
(append_string_to_window_list), (download_failed),
(install_failed_foreach), (requeue), (install_failed),
(gen_report), (installer):
* nautilus-installer/src/link.sh:
* nautilus-installer/src/main.c:
Hacking in the installer. This one is borked sine I'm trying to
figure out the right scheme of reported dep fails. Actually, I
want the lib to autofetch deps by option, instead of failing them
Also added stuff to link.sh, so it builds static from scratch,
strips gzips and adds prescript to the gzexe file. So if you build
using link.sh, you get a 644 binary which when executed using
sh ./nautilus-installer prompts for root password and does the
magic. Easier for newbies.
* components/services/time/idl/Makefile.am:
* components/services/install/idl//Makefile.am:
* components/services/time/Makefile.am:
* components/services/install/Makefile.am:
* components/services/install/lib/Makefile.am:
* components/services/time/service/Makefile.am:
* components/services/trilobite/idl/Makefile.am:
* components/services/trilobite/libtrilobite/Makefile.am:
* components/services/trilobite/sample/service/Makefile.am:
* configure.in:
* nautilus.spec.in:
* po/POTFILES.in:
* src/Makefile.am:
Loads of makefile fixing to make make dist and rpm -ta work.
2000-06-02 10:10:12 +00:00
|
|
|
components/services/time/idl/Makefile
|
2000-04-01 21:45:45 +00:00
|
|
|
components/services/startup/Makefile
|
2000-05-13 20:18:52 +00:00
|
|
|
components/services/startup/lib/Makefile
|
2000-05-09 20:46:01 +00:00
|
|
|
components/services/startup/command-line/Makefile
|
|
|
|
|
components/services/startup/nautilus-view/Makefile
|
|
|
|
|
components/services/startup/nautilus-view/icons/Makefile
|
2000-04-18 00:46:24 +00:00
|
|
|
components/services/install/Makefile
|
2000-05-13 20:18:52 +00:00
|
|
|
components/services/install/lib/Makefile
|
2000-06-28 04:37:45 +00:00
|
|
|
components/services/install/lib/makefile.staticlib
|
Docs with my scetches on how to redo the rpm-glue to make
* components/services/docs/installer-dep-check:
Docs with my scetches on how to redo the rpm-glue to make
eazel-install-lib autofetch deps.
* components/services/install/command-line/eazel-alt-install.c:
(eazel_download_progress):
Borked, but compiles again. Will update when libinstall stabilizes.
* components/services/install/lib/eazel-install-object.c:
(gtk_marshal_NONE__POINTER_ENUM_POINTER),
(eazel_install_class_initialize),
(eazel_install_emit_download_failed),
(eazel_install_emit_install_failed),
(eazel_install_emit_uninstall_failed):
Revamped the install_failed signal to take a PackageData object
instead of char * name.
* components/services/install/lib/eazel-install-protocols.c:
(http_fetch_remote_file):
* components/services/install/lib/eazel-install-public.h:
* components/services/install/lib/eazel-install-rpm-glue.c:
(install_new_packages), (download_a_package),
(download_all_packages), (install_all_packages),
(uninstall_packages), (uninstall_a_package),
(build_packagedata_list_from_deps), (do_rpm_install),
(do_rpm_uninstall), (ensure_deps_are_fetched):
* components/services/install/lib/eazel-install-types.c:
(categorydata_destroy_foreach), (categorydata_destroy),
(packagedata_new_from_rpm_header), (packagedata_destroy_foreach),
(packagedata_destroy):
* components/services/install/lib/eazel-install-types.h:
Doing a lot of hacking to prepare for the autofetch stuff.
* nautilus-installer/src/prescript:
* nautilus-installer/src/HACKING:
* nautilus-installer/src/Makefile:
* nautilus-installer/src/Makefile.am:
* nautilus-installer/src/callbacks.c: (druid_cancel),
(begin_install), (druid_finish), (prep_install), (set_images):
* nautilus-installer/src/installer.c:
(append_string_to_window_list), (download_failed),
(install_failed_foreach), (requeue), (install_failed),
(gen_report), (installer):
* nautilus-installer/src/link.sh:
* nautilus-installer/src/main.c:
Hacking in the installer. This one is borked sine I'm trying to
figure out the right scheme of reported dep fails. Actually, I
want the lib to autofetch deps by option, instead of failing them
Also added stuff to link.sh, so it builds static from scratch,
strips gzips and adds prescript to the gzexe file. So if you build
using link.sh, you get a 644 binary which when executed using
sh ./nautilus-installer prompts for root password and does the
magic. Easier for newbies.
* components/services/time/idl/Makefile.am:
* components/services/install/idl//Makefile.am:
* components/services/time/Makefile.am:
* components/services/install/Makefile.am:
* components/services/install/lib/Makefile.am:
* components/services/time/service/Makefile.am:
* components/services/trilobite/idl/Makefile.am:
* components/services/trilobite/libtrilobite/Makefile.am:
* components/services/trilobite/sample/service/Makefile.am:
* configure.in:
* nautilus.spec.in:
* po/POTFILES.in:
* src/Makefile.am:
Loads of makefile fixing to make make dist and rpm -ta work.
2000-06-02 10:10:12 +00:00
|
|
|
components/services/install/idl/Makefile
|
Added the server directory.
* components/services/install/Makefile.am:
Added the server directory.
* components/services/install/command-line/Makefile.am:
*
components/services/install/command-line/eazel-alt-install-corba.c:
(set_parameters_from_command_line),
(eazel_download_progress_signal), (eazel_install_progress_signal),
(download_failed), (install_failed), (dep_check), (create_package),
(done), (main):
* components/services/install/command-line/genpkg_list.example:
Vamping together yet another eazel-alt-install that uses the new
corba service installer.
* components/services/install/idl/trilobite-eazel-install.idl:
* components/services/install/lib/Makefile.am:
* components/services/install/lib/eazel-install-corba-callback.c:
(impl_download_progress), (impl_download_failed), (impl_dep_check),
(impl_install_progress), (impl_uninstall_progress),
(impl_install_failed), (impl_uninstall_failed), (impl_done),
(eazel_install_callback_get_epv),
(eazel_install_callback_create_corba_object),
(eazel_install_callback_destroy),
(eazel_install_callback_class_initialize),
(eazel_install_callback_initialize),
(eazel_install_callback_get_type), (eazel_install_callback_new),
(eazel_install_callback_corba):
* components/services/install/lib/eazel-install-corba-callback.h:
* components/services/install/lib/eazel-install-corba-types.c:
(corba_packagestructlist_from_packagedata_list),
(corba_packagedatastructlist_from_packagedata_list),
(corba_packagedatastruct_from_packagedata),
(corba_packagestruct_from_packagedata),
(packagedata_list_from_corba_packagestructlist),
(packagedata_list_from_corba_packagedatastructlist),
(packagedata_from_corba_packagedatastruct),
(packagedata_from_corba_packagestruct):
* components/services/install/lib/eazel-install-corba-types.h:
* components/services/install/lib/eazel-install-corba.c:
(impl_Eazel_Install_install), (impl_Eazel_Install_uninstall),
(impl_Eazel_Install_install_packages),
(impl_Eazel_Install_uninstall_packages),
(impl_Eazel_Install__set_verbose),
(impl_Eazel_Install__get_verbose),
(impl_Eazel_Install__set_silent), (impl_Eazel_Install__get_silent),
(impl_Eazel_Install__set_test_mode),
(impl_Eazel_Install__get_test_mode),
(impl_Eazel_Install__set_force), (impl_Eazel_Install__get_force),
(impl_Eazel_Install__set_update), (impl_Eazel_Install__get_update),
(impl_Eazel_Install__set_tmp_dir),
(impl_Eazel_Install__get_tmp_dir),
(impl_Eazel_Install__set_server), (impl_Eazel_Install__get_server),
(impl_Eazel_Install__set_server_port),
(impl_Eazel_Install__get_server_port),
(impl_Eazel_Install__set_log_file),
(impl_Eazel_Install__get_log_file),
(impl_Eazel_Install__set_protocol),
(impl_Eazel_Install__get_protocol), (eazel_install_get_epv),
(eazel_install_create_corba_object):
* components/services/install/lib/eazel-install-object.c:
(eazel_install_set_arg), (eazel_install_class_initialize),
(eazel_install_initialize), (eazel_install_get_type),
(eazel_install_new_with_config),
(eazel_install_fetch_remote_package_list),
(eazel_install_open_log), (eazel_install_install_packages),
(eazel_install_uninstall), (eazel_install_emit_install_progress),
(eazel_install_emit_install_progress_default),
(eazel_install_emit_download_progress),
(eazel_install_emit_download_progress_default),
(eazel_install_emit_download_failed),
(eazel_install_emit_download_failed_default),
(eazel_install_emit_install_failed),
(eazel_install_emit_install_failed_default),
(eazel_install_emit_uninstall_failed),
(eazel_install_emit_dependency_check),
(eazel_install_emit_dependency_check_default),
(eazel_install_emit_done), (eazel_install_emit_done_default):
* components/services/install/lib/eazel-install-private.h:
* components/services/install/lib/eazel-install-protocols.c:
(get_url_for_package), (get_search_url_for_package):
* components/services/install/lib/eazel-install-public.h:
* components/services/install/lib/eazel-install-rpm-glue.c:
(install_new_packages), (download_all_packages),
(install_all_packages), (rpm_show_progress), (do_rpm_install),
(eazel_install_prune_packages_helper),
(eazel_install_prepare_rpm_system),
(eazel_install_add_headers_to_rpm_set),
(eazel_install_fetch_rpm_dependencies), (print_package_list),
(eazel_install_ensure_deps), (ei_extract_attributes),
(eazel_install_query_package_system):
* components/services/install/lib/eazel-install-rpm-glue.h:
* components/services/install/lib/eazel-install-types.c:
(rpmfilename_from_packagedata):
* components/services/install/lib/eazel-install-types.h:
*
components/services/install/lib/trilobite-eazel-install-service.oaf
info:
* components/services/install/server/Makefile.am:
*
components/services/install/server/trilobite-eazel-install-service.
oafinfo:
Added a load of stuff to make the install service a corba
service. There are corba/c converters in
eazel-install-corba-types, moved a load of the corba magic into
eazel-install-corba.c and created a gtk+ object in
eazel-install-corba-callback that embodies the client interface to
the install service.
* components/services/time/service/Makefile.am:
* components/services/time/service/trilobite-eazel-time-service.c:
(trilobite_eazel_time_service_initialize):
Changed the default url to the new testmachine.
*
components/services/trilobite/libtrilobite/trilobite-core-distribut
ion.c: (trilobite_get_distribution_name),
(trilobite_get_distribution_enum):
*
components/services/trilobite/libtrilobite/trilobite-core-distribut
ion.h:
Added call to get the distro enum from the generated string. Used
for the corbafication of libinstall.
* configure.in:
Added the server dir makefile for services/install/server
* nautilus-installer/src/HACKING:
* nautilus-installer/src/Makefile:
* nautilus-installer/src/Makefile.am:
* nautilus-installer/src/installer.c: (installer):
* nautilus-installer/src/interface.c: (create_window):
* nautilus-installer/src/link.sh:
* nautilus-installer/src/prescript:
Updated to still work, as long as libinstall is compiled using
EAZEL_INSTALL_NO_CORBA (see the hacking file)
* nautilus.spec.in:
Changed gnome-xml to libxml
2000-06-21 21:08:12 +00:00
|
|
|
components/services/install/server/Makefile
|
2000-05-09 20:46:01 +00:00
|
|
|
components/services/install/command-line/Makefile
|
|
|
|
|
components/services/install/nautilus-view/Makefile
|
2000-06-18 08:37:37 +00:00
|
|
|
components/services/login/Makefile
|
|
|
|
|
components/services/login/idl/Makefile
|
|
|
|
|
components/services/login/lib/Makefile
|
|
|
|
|
components/services/login/service/Makefile
|
|
|
|
|
components/services/login/nautilus-view/Makefile
|
|
|
|
|
components/services/login/nautilus-view/icons/Makefile
|
|
|
|
|
components/services/summary/Makefile
|
|
|
|
|
components/services/summary/idl/Makefile
|
|
|
|
|
components/services/summary/lib/Makefile
|
|
|
|
|
components/services/summary/service/Makefile
|
|
|
|
|
components/services/summary/nautilus-view/Makefile
|
|
|
|
|
components/services/summary/nautilus-view/icons/Makefile
|
2000-06-18 22:04:13 +00:00
|
|
|
components/services/inventory/Makefile
|
|
|
|
|
components/services/inventory/idl/Makefile
|
|
|
|
|
components/services/inventory/lib/Makefile
|
|
|
|
|
components/services/inventory/service/Makefile
|
|
|
|
|
components/services/inventory/nautilus-view/Makefile
|
|
|
|
|
components/services/inventory/nautilus-view/icons/Makefile
|
2000-06-18 05:13:26 +00:00
|
|
|
components/services/vault/Makefile
|
|
|
|
|
components/services/vault/idl/Makefile
|
|
|
|
|
components/services/vault/lib/Makefile
|
|
|
|
|
components/services/vault/service/Makefile
|
|
|
|
|
components/services/vault/command-line/Makefile
|
|
|
|
|
components/services/vault/nautilus-view/Makefile
|
|
|
|
|
components/services/vault/nautilus-view/icons/Makefile
|
Completed bugzilla task 763, Test component needed for failure
cases. Two new components called "Content Loser" and "Sidebar
Loser" will fail on startup based on environment variables or in
response to menu or toolbar items (Darin suggested using silly
names, though not these specific ones).
* components/loser/README: Some docs on making the new components
fail.
* components/loser/content/main.c,
components/loser/content/nautilus-content-loser.c,
components/loser/content/nautilus-content-loser.h: New content
view which fails on demand.
* components/loser/content/nautilus-content-loser.oafinfo: oaf
activation record for it.
* components/loser/sidebar/main.c,
components/loser/sidebar/nautilus-sidebar-loser.c,
components/loser/sidebar/nautilus-sidebar-loser.h: New sidebar
panel that fails on demand.
* components/loser/sidebar/nautilus-sidebar-loser.oafinfo: oaf
activation record for it.
* components/Makefile.am, components/loser/Makefile.am,
components/loser/content/Makefile.am,
components/loser/sidebar/Makefile.am, configure.in: Added loser
components to build.
* nautilus-clean.sh: Added loser components to nautilus-clean.sh
2000-05-23 07:23:50 +00:00
|
|
|
components/loser/Makefile
|
|
|
|
|
components/loser/content/Makefile
|
|
|
|
|
components/loser/sidebar/Makefile
|
2000-06-20 00:31:54 +00:00
|
|
|
components/tree/Makefile
|
2000-04-27 16:05:08 +00:00
|
|
|
helper-utilities/Makefile
|
|
|
|
|
helper-utilities/authenticate/Makefile
|
2000-07-14 18:53:54 +00:00
|
|
|
tools/Makefile
|
|
|
|
|
tools/leak-checker/Makefile
|
2000-04-12 19:34:11 +00:00
|
|
|
po/Makefile.in
|
|
|
|
|
intl/Makefile
|
2000-06-01 06:00:19 +00:00
|
|
|
test/Makefile
|
1999-12-05 00:40:26 +00:00
|
|
|
])
|
2000-06-26 14:33:01 +00:00
|
|
|
|
2000-06-26 14:36:10 +00:00
|
|
|
dnl <= Configuration summary =>
|
|
|
|
|
|
|
|
|
|
echo "<= Nautilus configuration summary :"
|
2000-06-26 14:33:01 +00:00
|
|
|
dnl <= Rpm-view integrated? =>
|
|
|
|
|
grep -sq HAVE_RPM config.h
|
|
|
|
|
case $? in
|
|
|
|
|
0)
|
|
|
|
|
echo "
|
|
|
|
|
RPMview component : YES"
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
echo "
|
|
|
|
|
RPMview component : NO"
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
dnl <= Mozilla component integrated? =>
|
|
|
|
|
case $found_mozilla in
|
|
|
|
|
t*)
|
|
|
|
|
echo "
|
|
|
|
|
Mozilla component : YES"
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
echo "
|
|
|
|
|
Mozilla component : NO"
|
|
|
|
|
;;
|
|
|
|
|
esac
|
2000-06-26 14:36:10 +00:00
|
|
|
dnl <= Do we want Eazel services =>
|
2000-06-26 14:33:01 +00:00
|
|
|
case "X$EAZEL_SERVICES" in
|
|
|
|
|
X1)
|
|
|
|
|
echo "
|
|
|
|
|
Eazel services : YES"
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
echo "
|
|
|
|
|
Eazel services : NO"
|
|
|
|
|
;;
|
|
|
|
|
esac
|
2000-06-26 14:36:10 +00:00
|
|
|
echo "=>"
|
|
|
|
|
|
|
|
|
|
dnl <= End of configuration summary =>
|