2001-04-19 17:31:23 +00:00
|
|
|
AC_INIT(src)
|
1999-12-05 00:40:26 +00:00
|
|
|
|
2001-03-02 18:34:23 +00:00
|
|
|
dnl ==========================================================================
|
|
|
|
dnl
|
|
|
|
dnl If you add a version number here, you *must* add an AC_SUBST line for
|
|
|
|
dnl it too, or it will never make it into the spec file!
|
|
|
|
dnl
|
|
|
|
dnl ==========================================================================
|
|
|
|
|
2001-03-02 01:08:30 +00:00
|
|
|
GNOME_REQUIRED=1.2.8
|
|
|
|
GNOME_LIBS_REQUIRED=1.2.11
|
|
|
|
GTK_REQUIRED=1.2.9
|
|
|
|
GLIB_REQUIRED=1.2.9
|
2001-04-26 20:28:34 +00:00
|
|
|
BONOBO_REQUIRED=0.37
|
|
|
|
OAF_REQUIRED=0.6.5
|
2001-03-02 01:08:30 +00:00
|
|
|
GCONF_REQUIRED=0.12
|
2001-03-02 01:36:21 +00:00
|
|
|
GDK_PIXBUF_REQUIRED=0.10.0
|
2001-04-26 20:28:34 +00:00
|
|
|
CONTROL_CENTER_REQUIRED=1.3
|
2001-03-02 01:36:21 +00:00
|
|
|
IMLIB_REQUIRED=1.9.8
|
|
|
|
LIBXML_REQUIRED=1.8.10
|
2001-04-26 20:28:34 +00:00
|
|
|
ORBIT_REQUIRED=0.5.7
|
2001-03-30 02:21:26 +00:00
|
|
|
GNOME_VFS_REQUIRED=1.1
|
2001-03-02 01:36:21 +00:00
|
|
|
POPT_REQUIRED=1.5
|
2001-03-22 22:28:47 +00:00
|
|
|
FREETYPE_REQUIRED=2.0.1
|
|
|
|
FREETYPE_LIBRARY_REQUIRED=6.1.0
|
2001-04-26 20:28:34 +00:00
|
|
|
MEDUSA_REQUIRED=0.5
|
|
|
|
ESOUND_REQUIRED=0.2.22
|
2001-03-02 01:36:21 +00:00
|
|
|
LIBGHTTP_REQUIRED=1.0.9
|
2001-03-08 08:34:30 +00:00
|
|
|
SCROLLKEEPER_REQUIRED=0.1.4
|
2001-04-26 20:28:34 +00:00
|
|
|
AMMONITE_REQUIRED=1.0.0
|
2001-04-04 00:07:15 +00:00
|
|
|
LIBRSVG_REQUIRED=0.0.1
|
|
|
|
EEL_REQUIRED=0.0.1
|
2001-03-02 01:08:30 +00:00
|
|
|
|
2001-03-02 18:34:23 +00:00
|
|
|
AC_SUBST(IMLIB_REQUIRED)
|
|
|
|
AC_SUBST(LIBXML_REQUIRED)
|
|
|
|
AC_SUBST(ORBIT_REQUIRED)
|
|
|
|
AC_SUBST(GNOME_VFS_REQUIRED)
|
|
|
|
AC_SUBST(POPT_REQUIRED)
|
|
|
|
AC_SUBST(FREETYPE_REQUIRED)
|
|
|
|
AC_SUBST(MEDUSA_REQUIRED)
|
|
|
|
AC_SUBST(ESOUND_REQUIRED)
|
|
|
|
AC_SUBST(LIBGHTTP_REQUIRED)
|
|
|
|
AC_SUBST(SCROLLKEEPER_REQUIRED)
|
2001-04-04 00:07:15 +00:00
|
|
|
AC_SUBST(LIBRSVG_REQUIRED)
|
|
|
|
AC_SUBST(EEL_REQUIRED)
|
2001-03-02 18:34:23 +00:00
|
|
|
|
2001-03-02 01:08:30 +00:00
|
|
|
dnl ===========================================================================
|
|
|
|
|
|
|
|
dnl EAZEL_VERSION_CANON(version)
|
|
|
|
dnl 1
|
|
|
|
|
|
|
|
AC_DEFUN(EAZEL_VERSION_CANON, [`
|
|
|
|
|
|
|
|
dnl Assumes that there are no more than 999 revisions at a level,
|
|
|
|
dnl no more than three levels of revision.
|
|
|
|
dnl
|
|
|
|
dnl Any more than that, and test starts messing up the numeric
|
|
|
|
dnl comparisons because its integers overflow, and there's no
|
|
|
|
dnl way to do string comparisons in the shell. Grr.
|
|
|
|
dnl
|
|
|
|
dnl Must come up with some way to fix this.
|
|
|
|
|
|
|
|
echo "$1" |
|
|
|
|
tr . '\012' |
|
|
|
|
sed -e 's/^/000/' -e 's/^.*\(...\)/\1/' |
|
|
|
|
tr -d '\012' |
|
|
|
|
sed 's/$/000000000/
|
|
|
|
s/^\(.........\).*/\1/'
|
|
|
|
`])
|
|
|
|
|
|
|
|
dnl EAZEL_VERSION_INSIST(package, get-version-cmd, operator, want-version-var)
|
|
|
|
dnl 1 2 3 4
|
|
|
|
|
|
|
|
AC_DEFUN(EAZEL_VERSION_INSIST, [
|
|
|
|
ez_want_version=[$]$4
|
|
|
|
|
|
|
|
case "$3" in
|
|
|
|
">") ez_operator=-gt ;;
|
|
|
|
">=") ez_operator=-ge ;;
|
|
|
|
"<") ez_operator=-lt ;;
|
|
|
|
"<=") ez_operator=-le ;;
|
|
|
|
"=") ez_operator=-eq ;;
|
|
|
|
"!=") ez_operator=-ne ;;
|
|
|
|
*) AC_ERROR(Unknown operator $3 in configure script) ;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
AC_MSG_CHECKING(for $1 $3 [$ez_want_version])
|
|
|
|
|
|
|
|
if ez_installed_version="`$2`"
|
|
|
|
then
|
|
|
|
AC_MSG_RESULT([$ez_installed_version])
|
|
|
|
else
|
|
|
|
AC_ERROR($2 failed)
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test "EAZEL_VERSION_CANON([$ez_installed_version])" "$ez_operator" \
|
|
|
|
"EAZEL_VERSION_CANON([$ez_want_version])"
|
|
|
|
then
|
|
|
|
:
|
|
|
|
AC_SUBST($4)
|
|
|
|
else
|
|
|
|
AC_ERROR($1 version [$ez_want_version] is required.)
|
|
|
|
fi
|
|
|
|
])
|
|
|
|
|
|
|
|
dnl ===========================================================================
|
|
|
|
|
1999-12-05 00:40:26 +00:00
|
|
|
if test -n "$GNOME2_PATH"; then
|
|
|
|
PATH="$GNOME2_PATH/bin:$PATH"
|
|
|
|
export PATH
|
|
|
|
fi
|
|
|
|
|
2001-04-06 19:41:57 +00:00
|
|
|
AM_INIT_AUTOMAKE(nautilus, 1.0.2.1)
|
1999-12-05 00:40:26 +00:00
|
|
|
AM_CONFIG_HEADER(config.h)
|
|
|
|
|
|
|
|
AM_MAINTAINER_MODE
|
|
|
|
|
|
|
|
AM_DISABLE_STATIC
|
|
|
|
AM_PROG_LIBTOOL
|
|
|
|
|
xml-i18n-toolized Nautilus (plus a bit of other cleanup) as part
of resolving bug 2693 (I will consider my work done once I have
also handled Bonobo).
* autogen.sh, configure.in: xml-i18n-toolize
* .cvsignore: ignore xml-i18n scripts
* Makefile.am: distribute xml-i18n-scripts
* components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in:
Renamed from components/adapter/nautilus-adapter.oafinfo; mark
translatable strings transalatable.
* components/adapter/Makefile.am: Deal w/ oaf file rename, do
merge.
* components/adapter/.cvsignore: Ignore .oaf file.
* components/hardware/.cvsignore, components/hardware/Makefile.am,
components/hardware/Nautilus_View_hardware.oaf.in,
components/hardware/nautilus-hardware-view.oafinfo: Ditto.
* components/history/.cvsignore, components/history/Makefile.am,
components/history/Nautilus_View_history.oaf.in,
components/history/nautilus-history-view.oafinfo: Ditto.
* components/image-viewer/.cvsignore,
components/image-viewer/Makefile.am,
components/image-viewer/Nautilus_View_image.oaf.in,
components/image-viewer/nautilus-image-view.oafinfo: Ditto.
* components/loser/content/.cvsignore,
components/loser/content/Makefile.am,
components/loser/content/Nautilus_View_content-loser.oaf.in,
components/loser/content/nautilus-content-loser.oafinfo: Ditto.
* components/loser/sidebar/.cvsignore,
components/loser/sidebar/Makefile.am,
components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in,
components/loser/sidebar/nautilus-sidebar-loser.oafinfo: Ditto.
* components/mozilla/.cvsignore, components/mozilla/Makefile.am,
components/mozilla/Nautilus_View_mozilla.oaf.in,
components/mozilla/nautilus-mozilla-content-view.oafinfo: Ditto.
* components/music/.cvsignore, components/music/Makefile.am,
components/music/Nautilus_View_music.oaf.in,
components/music/nautilus-music-view.oafinfo: Ditto.
* components/notes/.cvsignore, components/notes/Makefile.am,
components/notes/Nautilus_View_notes.oaf.in,
components/notes/nautilus-notes.oafinfo: Ditto.
* components/rpmview/.cvsignore, components/rpmview/Makefile.am,
components/rpmview/Nautilus_View_rpm.oaf.in,
components/rpmview/nautilus-rpm-view.oafinfo: Ditto.
* components/sample/.cvsignore, components/sample/Makefile.am,
components/sample/Nautilus_View_sample.oaf.in,
components/sample/nautilus-sample-content-view.oafinfo: Ditto.
* components/services/install/nautilus-view/.cvsignore,
components/services/install/nautilus-view/Makefile.am,
components/services/install/nautilus-view/Nautilus_View_install.oaf.in,
components/services/install/nautilus-view/nautilus-service-install-view.oafinfo:
Ditto.
* components/services/install/server/.cvsignore,
components/services/install/server/Makefile.am,
components/services/install/server/Trilobite_Service_install.oaf.in,
components/services/install/server/trilobite-eazel-install-service.oafinfo:
Ditto.
* components/services/login/nautilus-view/.cvsignore,
components/services/login/nautilus-view/Makefile.am,
components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in,
components/services/login/nautilus-view/nautilus-change-password-view.oafinfo:
Ditto.
* components/services/summary/nautilus-view/.cvsignore,
components/services/summary/nautilus-view/Makefile.am,
components/services/summary/nautilus-view/Nautilus_View_services-summary.oaf.in,
components/services/summary/nautilus-view/nautilus-summary-view.oafinfo: Ditto.
* components/services/trilobite/sample/.cvsignore,
components/services/trilobite/sample/nautilus-view/Makefile.am,
components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in,
components/services/trilobite/sample/nautilus-view/nautilus-sample-service-view.oafinfo:
Ditto.
* components/services/trilobite/sample/service/.cvsignore,
components/services/trilobite/sample/service/Makefile.am,
components/services/trilobite/sample/service/Trilobite_Service_sample.oaf.in,
components/services/trilobite/sample/service/trilobite-eazel-sample-service.oafinfo:
Ditto.
* components/text/.cvsignore, components/text/Makefile.am,
components/text/Nautilus_View_text.oaf.in,
components/text/nautilus-text-view.oafinfo: Ditto.
* src/.cvsignore, src/Makefile.am, src/Nautilus_shell.oaf.in,
src/nautilus.oafinfo: Ditto.
* components/tree/.cvsignore, components/tree/Makefile.am,
components/tree/Nautilus_View_tree.oaf.in,
components/tree/nautilus-tree-view.oafinfo.shlib: Ditto, and
removed ability to build tree view as an exe component (no one was
really using it anyway).
* components/tree/nautilus-tree-view.oafinfo.exe: Removed.
* components/help/.cvsignore, components/help/Makefile.am,
components/help/Nautilus_View_help.oaf.in:
components/help/help-contents.oafinfo: Ditto, and merged other
oafinfo files into Nautilus_View_help.oaf.in, commented out.
* components/help/help-factory.oafinfo,
components/help/help-index.oafinfo,
components/help/help-search.oafinfo: Removed.
* po/POTFILES.in: Added .oaf.in files.
* po/README.tools, po/ui-extract.pl, po/ui-testcases.glade,
po/ui-testcases.xml, po/update.pl, po/update.sh: Removed these
now-obsolete files.
* components/services/Makefile.am: Removed time service from build.
* components/html/*, components/websearch/*: cvs deleted these
obsolete long since non-built components.
* ChangeLog-200001018: Renamed to ChangeLog-20001018 (whoops)
2001-01-05 13:10:51 +00:00
|
|
|
AM_PROG_XML_I18N_TOOLS
|
|
|
|
|
1999-12-05 00:40:26 +00:00
|
|
|
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-11-27 23:28:42 +00:00
|
|
|
AM_PATH_ESD
|
1999-12-05 00:40:26 +00:00
|
|
|
|
2000-06-06 09:18:00 +00:00
|
|
|
dnl ORBit
|
|
|
|
AM_PATH_ORBIT
|
|
|
|
|
2000-10-04 20:43:34 +00:00
|
|
|
dnl ====================================
|
2000-10-06 07:25:37 +00:00
|
|
|
dnl = Begin profiling support
|
2000-10-04 20:43:34 +00:00
|
|
|
dnl ====================================
|
2000-10-04 21:01:07 +00:00
|
|
|
ENABLE_PROFILER=
|
2000-10-04 20:43:34 +00:00
|
|
|
AC_ARG_ENABLE(profiler,
|
|
|
|
[ --enable-profiler Enable profiler],
|
|
|
|
ENABLE_PROFILER=1
|
|
|
|
AC_DEFINE(ENABLE_PROFILER))
|
|
|
|
|
|
|
|
if test "x$ENABLE_PROFILER" = "x1"
|
|
|
|
then
|
|
|
|
CFLAGS="-g -O -gdwarf-2 -finstrument-functions -D__NO_STRING_INLINES"
|
2000-10-04 21:32:45 +00:00
|
|
|
LDFLAGS="/gnome/PROFILE/lib/libprofiler.so -lpthread"
|
2000-10-04 20:43:34 +00:00
|
|
|
fi
|
|
|
|
|
2000-10-04 22:09:18 +00:00
|
|
|
AC_SUBST(ENABLE_PROFILER)
|
|
|
|
AM_CONDITIONAL(ENABLE_PROFILER, test "x$ENABLE_PROFILER" = "x1")
|
2000-10-04 20:43:34 +00:00
|
|
|
dnl ====================================
|
2000-10-06 07:25:37 +00:00
|
|
|
dnl = End profiling support
|
2000-10-04 20:43:34 +00:00
|
|
|
dnl ====================================
|
|
|
|
|
2001-02-23 16:06:09 +00:00
|
|
|
dnl ====================================
|
|
|
|
dnl = Check for different mount systems
|
|
|
|
dnl ====================================
|
|
|
|
|
2001-02-22 14:21:55 +00:00
|
|
|
echo "
|
|
|
|
Determining mount system properties:
|
|
|
|
"
|
|
|
|
AC_CHECK_FUNCS( setmntent endmntent )
|
|
|
|
AC_CHECK_HEADERS( mntent.h sys/mnttab.h sys/vfstab.h sys/cdio.h )
|
|
|
|
echo "
|
|
|
|
"
|
|
|
|
|
2001-02-23 16:06:09 +00:00
|
|
|
dnl ====================================
|
|
|
|
dnl = Method for changing environment
|
|
|
|
dnl ====================================
|
|
|
|
|
2001-02-22 14:21:55 +00:00
|
|
|
AC_CHECK_FUNCS( setenv unsetenv putenv )
|
Add checks to fix things on Solaris regarding mounting, environment
2000-09-11 Seth Nickell <seth@eazel.com>
* configure.in:
Add checks to fix things on Solaris regarding mounting,
environment variables, and fonts.
Added tests for compiler warning flags that are not supported
with all versions of GCC.
* helper-utilities/authenticate/nautilus-authenticate-pam.c:
(pam_conversion_func):
Remove "const" from system call for compatibility with Solaris.
* libnautilus-extensions/nautilus-file.c:
(get_id_from_digit_string):
uid_t != int, so change functions converting from string to
uid_t to deal with greater bit uids properly.
* libnautilus-extensions/nautilus-glib-extensions.h:
* libnautilus-extensions/nautilus-glib-extensions.c:
(nautilus_g_setenv), (nautilus_g_unsetenv):
Add system gnostic functions for setting and removing variables
from the environment.
* libnautilus-extensions/nautilus-scalable-font.c:
(initialize_global_stuff_if_needed):
Temporary fix to deal with the absence of "RedHat-style" font
paths on Solaris and Debian whilst font paths are still
hard-coded.
* libnautilus-extensions/nautilus-volume-monitor.c:
(nautilus_volume_monitor_get_volume_name),
(nautilus_volume_monitor_volume_is_mounted),
(mount_volumes_update_is_mounted), (mnttab_add_mount_volume),
(mntent_add_mount_volume), (find_volumes):
Rewrite sections to use the appropriate Solaris mounting
functions if Linux-style mount/umount/mount-table manipulation
functions are not available.
* libnautilus/nautilus-view-component.idl:
* src/nautilus-view-frame-corba.c:
* src/nautilus-zoomable-frame-corba.c:
(impl_Nautilus_ZoomableFrame_report_zoom_level_changed):
Change doubles to floats to work around an ORBit problem on
Solaris wherein doubles are not correctly aligned.
* src/file-manager/fm-desktop-icon-view.c:
remove gratuitous linux specific header inclusion
* src/nautilus-first-time-druid.c: (set_http_proxy):
* src/nautilus-main.c: (main):
* src/nautilus-shell.c: (corba_restart):
(impl_Nautilus_ViewFrame_report_load_progress):
Changed "setenv" and "unsetenv" calls to use nautilus_g_setenv
and nautilus_g_unsetenv.
* src/nautilus-window-manage-views.c:
(report_sidebar_panel_failure_to_user):
Add better error message to sidebar failures where it can't
figure out which sidebar failed. Done in order to fix null
string being passed to dialogue function which segfaulted
Nautilus on Solaris.
Yes children, your Nautilus will now run and frollick in the green,
green pasture of the multi-cpu UltraSparc.
2000-09-12 02:01:33 +00:00
|
|
|
|
2001-04-28 01:51:32 +00:00
|
|
|
dnl ====================================
|
|
|
|
dnl Check for FAM header -- we find the library at runtime
|
|
|
|
dnl ====================================
|
Add some initial code to deal with file notification and monitoring. This
2001-04-12 Seth Nickell <snickell@stanford.edu>
Add some initial code to deal with file notification and
monitoring. This isn't hooked in yet, but provides interfaces
for Nautilus code to use.
* configure.in:
Add configure checks for FAM.
* libnautilus-extensions/Makefile.am:
Include FAM libraries if they exist.
* libnautilus-extensions/nautilus-monitor.c:
(nautilus_monitor_establish_connection),
(nautilus_monitor_get_fam),
(nautilus_monitor_find_path_from_request),
(nautilus_monitor_find_request_from_path),
(nautilus_monitor_delete_first_request_found),
(nautilus_monitor_get_uri),
(nautilus_monitor_process_fam_notifications),
(nautilus_monitor_add_file), (nautilus_monitor_add_directory),
(nautilus_monitor_remove):
* libnautilus-extensions/nautilus-monitor.h:
The code that actually communicates w/ FAM.
2001-04-12 22:43:38 +00:00
|
|
|
AC_CHECK_HEADERS(fam.h)
|
2001-02-23 16:06:09 +00:00
|
|
|
|
2001-02-22 14:21:55 +00:00
|
|
|
dnl ====================================
|
2001-02-23 16:06:09 +00:00
|
|
|
dnl = Use x86 optimized music routines?
|
|
|
|
dnl ====================================
|
|
|
|
_system_is_x86="no"
|
|
|
|
AC_CHECK_HEADER( asm/vm86.h, _system_is_x86="yes" )
|
|
|
|
AM_CONDITIONAL(X86_OPTIMIZED, test "x$_system_is_x86" = "xyes")
|
|
|
|
|
2001-05-02 04:24:22 +00:00
|
|
|
dnl =======================
|
|
|
|
dnl = begin tests for FreeType2
|
|
|
|
dnl =======================
|
|
|
|
NAUTILUS_PATH_FREETYPE2($FREETYPE_LIBRARY_REQUIRED,,
|
2000-10-06 07:25:37 +00:00
|
|
|
AC_MSG_ERROR([
|
2001-05-02 04:24:22 +00:00
|
|
|
*** FreeType2 $FREETYPE_REQUIRED or better is required. You can obtain a
|
|
|
|
*** packaged version of FreeType2 over here:
|
|
|
|
*** http://developer.eazel.com/eazel-hacking/updates/freetype2
|
|
|
|
*** source versions are available from ftp://ftp.freetype.org]))
|
2000-10-06 07:25:37 +00:00
|
|
|
|
|
|
|
AC_SUBST(FREETYPE2_CFLAGS)
|
|
|
|
AC_SUBST(FREETYPE2_LIBS)
|
|
|
|
dnl =======================
|
|
|
|
dnl = End tests for FreeType2
|
|
|
|
dnl =======================
|
|
|
|
|
2000-04-19 10:05:14 +00:00
|
|
|
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-09-29 13:50:48 +00:00
|
|
|
dnl = --disable-mozilla-component can be used to disable building of the
|
|
|
|
dnl = mozilla component even if the mozilla development libraries are
|
|
|
|
dnl = detected.
|
2000-04-19 10:05:14 +00:00
|
|
|
dnl ====================================
|
2000-09-29 13:50:48 +00:00
|
|
|
mozilla_component_disabled="no"
|
|
|
|
|
|
|
|
AC_ARG_ENABLE(mozilla-component,
|
|
|
|
[ --disable-mozilla-component= Disable the mozilla component],
|
|
|
|
mozilla_component_disabled="yes")
|
|
|
|
|
2000-10-04 21:16:45 +00:00
|
|
|
dnl Dont build the mozilla component for profiled builds cause the c++ compiler
|
|
|
|
dnl used for mozilla rpms is not binary compatible with the one used for profiling.
|
|
|
|
if test "x$ENABLE_PROFILER" = "x1"
|
|
|
|
then
|
|
|
|
mozilla_component_disabled="yes"
|
|
|
|
fi
|
|
|
|
|
2000-09-29 13:50:48 +00:00
|
|
|
found_mozilla=false
|
|
|
|
|
|
|
|
if test "x$mozilla_component_disabled" = "xno"
|
|
|
|
then
|
2000-04-19 10:05:14 +00:00
|
|
|
BUILD_MOZILLA_COMPONENT=
|
2000-06-20 01:01:21 +00:00
|
|
|
MOZILLA_COMPONENT_CFLAGS=
|
|
|
|
MOZILLA_COMPONENT_LDFLAGS=
|
2000-09-04 15:17:06 +00:00
|
|
|
MOZILLA_COMPONENT_LIBS=
|
2000-06-20 01:01:21 +00:00
|
|
|
|
|
|
|
_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"
|
Fixed bug 640 (icon cache never frees images (awaiting GdkPixbuf
fix)). Also took care of bug 3145 (zillions of 'main_loops !=
NULL' assertion failures when quitting) and bug 3138 (Some code in
the icon factory is cut and pasted from elsewhere). And a few
unrelated things that came up while I was busy working on these.
* configure.in: Applied patch from Dan Winship to fix handling of
CFLAGS and LDFLAGS. Fixes some missing quoting and other mistakes.
* libnautilus-extensions/Makefile.am:
* libnautilus-extensions/nautilus-icon-factory-private.h:
* libnautilus-extensions/nautilus-thumbnails.c:
* libnautilus-extensions/nautilus-thumbnails.h:
Broke out the thumbnailing code into its own source file for
clarity.
* libnautilus-extensions/nautilus-directory.c:
* libnautilus-extensions/nautilus-file-utilities.h:
* libnautilus-extensions/nautilus-file-utilities.c:
(nautilus_make_directory_and_parents):
Moved nautilus_make_directory_and_parents into a place where the
thumbnail code can share it instead of requiring its own copy.
* libnautilus-extensions/nautilus-global-preferences.h:
* libnautilus-extensions/nautilus-global-preferences.c:
(destroy_global_prefs_dialog), (global_preferences_get_dialog),
(nautilus_global_preferences_dialog_update),
(nautilus_global_preferences_initialize):
* libnautilus-extensions/nautilus-preferences.h:
* libnautilus-extensions/nautilus-preferences.c:
(preferences_initialize_if_needed), (preferences_shutdown):
* src/nautilus-application.c: (nautilus_application_destroy):
Changed code so that it cleans up with g_atexit instead of with an
explicit shutdown call. This makes it sequence correctly with
other atexit code.
* libnautilus-extensions/nautilus-icon-canvas-item.h:
* libnautilus-extensions/nautilus-icon-canvas-item.c:
(nautilus_icon_canvas_item_destroy),
(nautilus_icon_canvas_item_set_attach_points),
(emblem_layout_next):
* libnautilus-extensions/nautilus-icon-container.c:
(nautilus_icon_container_update_icon):
Added a Nautilus prefix to the EmblemAttachPoints typedef, since
it's public.
* libnautilus-extensions/nautilus-icon-factory.h:
* libnautilus-extensions/nautilus-icon-factory.c:
Changed the icon factory structure so that it will actually free
pixbufs when done with them. Made some other small fixes to the
icon factory in passing, including removing some redundant code
and fixing the logic for getting custom icons and deleting the
icon factory and g_atexit time.
* src/file-manager/fm-icon-view.c: (play_file), (preview_sound):
Restructured the logic for playing sound previews a little to get
rid of compiler warnings and close some loopholes in the old code.
* src/nautilus-main.c: (is_event_loop_needed),
(quit_if_in_main_loop), (nautilus_gtk_main_quit_all),
(event_loop_unregister), (nautilus_main_event_loop_register),
(nautilus_main_is_event_loop_mainstay),
(nautilus_main_event_loop_quit), (main): Fixed the main loop
quitting logic so that it is a bit simpler and works with the
gnome-vfs code that runs event handling after the last main loop
is gone.
2000-09-20 00:44:07 +00:00
|
|
|
LDFLAGS="$_save_ldflags -L$_mozilla_lib_place"
|
2000-06-20 01:01:21 +00:00
|
|
|
|
|
|
|
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
|
Fixed bug 640 (icon cache never frees images (awaiting GdkPixbuf
fix)). Also took care of bug 3145 (zillions of 'main_loops !=
NULL' assertion failures when quitting) and bug 3138 (Some code in
the icon factory is cut and pasted from elsewhere). And a few
unrelated things that came up while I was busy working on these.
* configure.in: Applied patch from Dan Winship to fix handling of
CFLAGS and LDFLAGS. Fixes some missing quoting and other mistakes.
* libnautilus-extensions/Makefile.am:
* libnautilus-extensions/nautilus-icon-factory-private.h:
* libnautilus-extensions/nautilus-thumbnails.c:
* libnautilus-extensions/nautilus-thumbnails.h:
Broke out the thumbnailing code into its own source file for
clarity.
* libnautilus-extensions/nautilus-directory.c:
* libnautilus-extensions/nautilus-file-utilities.h:
* libnautilus-extensions/nautilus-file-utilities.c:
(nautilus_make_directory_and_parents):
Moved nautilus_make_directory_and_parents into a place where the
thumbnail code can share it instead of requiring its own copy.
* libnautilus-extensions/nautilus-global-preferences.h:
* libnautilus-extensions/nautilus-global-preferences.c:
(destroy_global_prefs_dialog), (global_preferences_get_dialog),
(nautilus_global_preferences_dialog_update),
(nautilus_global_preferences_initialize):
* libnautilus-extensions/nautilus-preferences.h:
* libnautilus-extensions/nautilus-preferences.c:
(preferences_initialize_if_needed), (preferences_shutdown):
* src/nautilus-application.c: (nautilus_application_destroy):
Changed code so that it cleans up with g_atexit instead of with an
explicit shutdown call. This makes it sequence correctly with
other atexit code.
* libnautilus-extensions/nautilus-icon-canvas-item.h:
* libnautilus-extensions/nautilus-icon-canvas-item.c:
(nautilus_icon_canvas_item_destroy),
(nautilus_icon_canvas_item_set_attach_points),
(emblem_layout_next):
* libnautilus-extensions/nautilus-icon-container.c:
(nautilus_icon_container_update_icon):
Added a Nautilus prefix to the EmblemAttachPoints typedef, since
it's public.
* libnautilus-extensions/nautilus-icon-factory.h:
* libnautilus-extensions/nautilus-icon-factory.c:
Changed the icon factory structure so that it will actually free
pixbufs when done with them. Made some other small fixes to the
icon factory in passing, including removing some redundant code
and fixing the logic for getting custom icons and deleting the
icon factory and g_atexit time.
* src/file-manager/fm-icon-view.c: (play_file), (preview_sound):
Restructured the logic for playing sound previews a little to get
rid of compiler warnings and close some loopholes in the old code.
* src/nautilus-main.c: (is_event_loop_needed),
(quit_if_in_main_loop), (nautilus_gtk_main_quit_all),
(event_loop_unregister), (nautilus_main_event_loop_register),
(nautilus_main_is_event_loop_mainstay),
(nautilus_main_event_loop_quit), (main): Fixed the main loop
quitting logic so that it is a bit simpler and works with the
gnome-vfs code that runs event handling after the last main loop
is gone.
2000-09-20 00:44:07 +00:00
|
|
|
CC="$_save_cc"
|
2000-04-19 10:05:14 +00:00
|
|
|
|
2000-06-20 01:01:21 +00:00
|
|
|
dnl gtk superwin library
|
Fixed bug 640 (icon cache never frees images (awaiting GdkPixbuf
fix)). Also took care of bug 3145 (zillions of 'main_loops !=
NULL' assertion failures when quitting) and bug 3138 (Some code in
the icon factory is cut and pasted from elsewhere). And a few
unrelated things that came up while I was busy working on these.
* configure.in: Applied patch from Dan Winship to fix handling of
CFLAGS and LDFLAGS. Fixes some missing quoting and other mistakes.
* libnautilus-extensions/Makefile.am:
* libnautilus-extensions/nautilus-icon-factory-private.h:
* libnautilus-extensions/nautilus-thumbnails.c:
* libnautilus-extensions/nautilus-thumbnails.h:
Broke out the thumbnailing code into its own source file for
clarity.
* libnautilus-extensions/nautilus-directory.c:
* libnautilus-extensions/nautilus-file-utilities.h:
* libnautilus-extensions/nautilus-file-utilities.c:
(nautilus_make_directory_and_parents):
Moved nautilus_make_directory_and_parents into a place where the
thumbnail code can share it instead of requiring its own copy.
* libnautilus-extensions/nautilus-global-preferences.h:
* libnautilus-extensions/nautilus-global-preferences.c:
(destroy_global_prefs_dialog), (global_preferences_get_dialog),
(nautilus_global_preferences_dialog_update),
(nautilus_global_preferences_initialize):
* libnautilus-extensions/nautilus-preferences.h:
* libnautilus-extensions/nautilus-preferences.c:
(preferences_initialize_if_needed), (preferences_shutdown):
* src/nautilus-application.c: (nautilus_application_destroy):
Changed code so that it cleans up with g_atexit instead of with an
explicit shutdown call. This makes it sequence correctly with
other atexit code.
* libnautilus-extensions/nautilus-icon-canvas-item.h:
* libnautilus-extensions/nautilus-icon-canvas-item.c:
(nautilus_icon_canvas_item_destroy),
(nautilus_icon_canvas_item_set_attach_points),
(emblem_layout_next):
* libnautilus-extensions/nautilus-icon-container.c:
(nautilus_icon_container_update_icon):
Added a Nautilus prefix to the EmblemAttachPoints typedef, since
it's public.
* libnautilus-extensions/nautilus-icon-factory.h:
* libnautilus-extensions/nautilus-icon-factory.c:
Changed the icon factory structure so that it will actually free
pixbufs when done with them. Made some other small fixes to the
icon factory in passing, including removing some redundant code
and fixing the logic for getting custom icons and deleting the
icon factory and g_atexit time.
* src/file-manager/fm-icon-view.c: (play_file), (preview_sound):
Restructured the logic for playing sound previews a little to get
rid of compiler warnings and close some loopholes in the old code.
* src/nautilus-main.c: (is_event_loop_needed),
(quit_if_in_main_loop), (nautilus_gtk_main_quit_all),
(event_loop_unregister), (nautilus_main_event_loop_register),
(nautilus_main_is_event_loop_mainstay),
(nautilus_main_event_loop_quit), (main): Fixed the main loop
quitting logic so that it is a bit simpler and works with the
gnome-vfs code that runs event handling after the last main loop
is gone.
2000-09-20 00:44:07 +00:00
|
|
|
LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtksuperwin"
|
2000-06-20 01:01:21 +00:00
|
|
|
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
|
Fixed bug 640 (icon cache never frees images (awaiting GdkPixbuf
fix)). Also took care of bug 3145 (zillions of 'main_loops !=
NULL' assertion failures when quitting) and bug 3138 (Some code in
the icon factory is cut and pasted from elsewhere). And a few
unrelated things that came up while I was busy working on these.
* configure.in: Applied patch from Dan Winship to fix handling of
CFLAGS and LDFLAGS. Fixes some missing quoting and other mistakes.
* libnautilus-extensions/Makefile.am:
* libnautilus-extensions/nautilus-icon-factory-private.h:
* libnautilus-extensions/nautilus-thumbnails.c:
* libnautilus-extensions/nautilus-thumbnails.h:
Broke out the thumbnailing code into its own source file for
clarity.
* libnautilus-extensions/nautilus-directory.c:
* libnautilus-extensions/nautilus-file-utilities.h:
* libnautilus-extensions/nautilus-file-utilities.c:
(nautilus_make_directory_and_parents):
Moved nautilus_make_directory_and_parents into a place where the
thumbnail code can share it instead of requiring its own copy.
* libnautilus-extensions/nautilus-global-preferences.h:
* libnautilus-extensions/nautilus-global-preferences.c:
(destroy_global_prefs_dialog), (global_preferences_get_dialog),
(nautilus_global_preferences_dialog_update),
(nautilus_global_preferences_initialize):
* libnautilus-extensions/nautilus-preferences.h:
* libnautilus-extensions/nautilus-preferences.c:
(preferences_initialize_if_needed), (preferences_shutdown):
* src/nautilus-application.c: (nautilus_application_destroy):
Changed code so that it cleans up with g_atexit instead of with an
explicit shutdown call. This makes it sequence correctly with
other atexit code.
* libnautilus-extensions/nautilus-icon-canvas-item.h:
* libnautilus-extensions/nautilus-icon-canvas-item.c:
(nautilus_icon_canvas_item_destroy),
(nautilus_icon_canvas_item_set_attach_points),
(emblem_layout_next):
* libnautilus-extensions/nautilus-icon-container.c:
(nautilus_icon_container_update_icon):
Added a Nautilus prefix to the EmblemAttachPoints typedef, since
it's public.
* libnautilus-extensions/nautilus-icon-factory.h:
* libnautilus-extensions/nautilus-icon-factory.c:
Changed the icon factory structure so that it will actually free
pixbufs when done with them. Made some other small fixes to the
icon factory in passing, including removing some redundant code
and fixing the logic for getting custom icons and deleting the
icon factory and g_atexit time.
* src/file-manager/fm-icon-view.c: (play_file), (preview_sound):
Restructured the logic for playing sound previews a little to get
rid of compiler warnings and close some loopholes in the old code.
* src/nautilus-main.c: (is_event_loop_needed),
(quit_if_in_main_loop), (nautilus_gtk_main_quit_all),
(event_loop_unregister), (nautilus_main_event_loop_register),
(nautilus_main_is_event_loop_mainstay),
(nautilus_main_event_loop_quit), (main): Fixed the main loop
quitting logic so that it is a bit simpler and works with the
gnome-vfs code that runs event handling after the last main loop
is gone.
2000-09-20 00:44:07 +00:00
|
|
|
LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtkembedmoz $_mozilla_xpcom_libs"
|
2000-06-20 01:01:21 +00:00
|
|
|
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
|
Fixed bug 640 (icon cache never frees images (awaiting GdkPixbuf
fix)). Also took care of bug 3145 (zillions of 'main_loops !=
NULL' assertion failures when quitting) and bug 3138 (Some code in
the icon factory is cut and pasted from elsewhere). And a few
unrelated things that came up while I was busy working on these.
* configure.in: Applied patch from Dan Winship to fix handling of
CFLAGS and LDFLAGS. Fixes some missing quoting and other mistakes.
* libnautilus-extensions/Makefile.am:
* libnautilus-extensions/nautilus-icon-factory-private.h:
* libnautilus-extensions/nautilus-thumbnails.c:
* libnautilus-extensions/nautilus-thumbnails.h:
Broke out the thumbnailing code into its own source file for
clarity.
* libnautilus-extensions/nautilus-directory.c:
* libnautilus-extensions/nautilus-file-utilities.h:
* libnautilus-extensions/nautilus-file-utilities.c:
(nautilus_make_directory_and_parents):
Moved nautilus_make_directory_and_parents into a place where the
thumbnail code can share it instead of requiring its own copy.
* libnautilus-extensions/nautilus-global-preferences.h:
* libnautilus-extensions/nautilus-global-preferences.c:
(destroy_global_prefs_dialog), (global_preferences_get_dialog),
(nautilus_global_preferences_dialog_update),
(nautilus_global_preferences_initialize):
* libnautilus-extensions/nautilus-preferences.h:
* libnautilus-extensions/nautilus-preferences.c:
(preferences_initialize_if_needed), (preferences_shutdown):
* src/nautilus-application.c: (nautilus_application_destroy):
Changed code so that it cleans up with g_atexit instead of with an
explicit shutdown call. This makes it sequence correctly with
other atexit code.
* libnautilus-extensions/nautilus-icon-canvas-item.h:
* libnautilus-extensions/nautilus-icon-canvas-item.c:
(nautilus_icon_canvas_item_destroy),
(nautilus_icon_canvas_item_set_attach_points),
(emblem_layout_next):
* libnautilus-extensions/nautilus-icon-container.c:
(nautilus_icon_container_update_icon):
Added a Nautilus prefix to the EmblemAttachPoints typedef, since
it's public.
* libnautilus-extensions/nautilus-icon-factory.h:
* libnautilus-extensions/nautilus-icon-factory.c:
Changed the icon factory structure so that it will actually free
pixbufs when done with them. Made some other small fixes to the
icon factory in passing, including removing some redundant code
and fixing the logic for getting custom icons and deleting the
icon factory and g_atexit time.
* src/file-manager/fm-icon-view.c: (play_file), (preview_sound):
Restructured the logic for playing sound previews a little to get
rid of compiler warnings and close some loopholes in the old code.
* src/nautilus-main.c: (is_event_loop_needed),
(quit_if_in_main_loop), (nautilus_gtk_main_quit_all),
(event_loop_unregister), (nautilus_main_event_loop_register),
(nautilus_main_is_event_loop_mainstay),
(nautilus_main_event_loop_quit), (main): Fixed the main loop
quitting logic so that it is a bit simpler and works with the
gnome-vfs code that runs event handling after the last main loop
is gone.
2000-09-20 00:44:07 +00:00
|
|
|
CFLAGS="$_save_cflags"
|
|
|
|
LDFLAGS="$_save_ldflags"
|
|
|
|
CC="$_save_cc"
|
2000-06-20 01:01:21 +00:00
|
|
|
|
|
|
|
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-20 01:01:21 +00:00
|
|
|
AC_MSG_RESULT(yes)
|
2000-11-15 01:36:55 +00:00
|
|
|
AC_PROG_CXX
|
2000-06-20 01:01:21 +00:00
|
|
|
found_mozilla=true
|
|
|
|
|
2001-01-03 08:42:48 +00:00
|
|
|
MOZILLA_COMPONENT_RPATH_FLAGS=-Wl,-rpath=$_mozilla_lib_place
|
2000-11-22 14:28:43 +00:00
|
|
|
MOZILLA_COMPONENT_CFLAGS="-I$_mozilla_include_place -fno-rtti -fno-exceptions"
|
2000-06-20 01:01:21 +00:00
|
|
|
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"
|
2001-01-03 08:42:48 +00:00
|
|
|
AC_SUBST(MOZILLA_COMPONENT_RPATH_FLAGS)
|
2000-06-20 01:01:21 +00:00
|
|
|
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
|
2000-09-29 13:50:48 +00:00
|
|
|
fi
|
|
|
|
|
2000-04-19 10:05:14 +00:00
|
|
|
AM_CONDITIONAL(BUILD_MOZILLA_COMPONENT, test "x$found_mozilla" = "xtrue")
|
|
|
|
|
2000-09-27 21:27:31 +00:00
|
|
|
dnl
|
|
|
|
dnl EVIL1:
|
2000-09-04 15:17:06 +00:00
|
|
|
dnl
|
|
|
|
dnl The mozilla milestone version checks are very un-scientific.
|
|
|
|
dnl They are based on thing that I know changed between milestones,
|
|
|
|
dnl but are likely to not be right in the future. Unfortunately, there
|
|
|
|
dnl doesnt seem to be anything in mozilla (such as #define MOZILLA_VERSION)
|
|
|
|
dnl thing that we can check. -re
|
|
|
|
dnl
|
2000-09-27 21:27:31 +00:00
|
|
|
dnl EVIL2:
|
|
|
|
dnl
|
|
|
|
dnl The DEBUG check is a most evil hack. The problem im trying to solve
|
|
|
|
dnl is that we dont know whether the mozilla binaries we are using are built
|
|
|
|
dnl in debug mode or not (DEBUG). We need to know this so that we set
|
|
|
|
dnl appropiate compile flags in the mozilla component. Otherwise we get
|
|
|
|
dnl undefined symbols. Specifically, the undefined symbols are some
|
|
|
|
dnl destrcutors (nsCOMPtr_base::~nsCOMPtr_base) which are implemented only
|
|
|
|
dnl if the debug flag DEBUG is set a certain way.
|
|
|
|
dnl
|
2000-08-09 07:58:55 +00:00
|
|
|
if test "x$found_mozilla" = "xtrue"
|
|
|
|
then
|
2000-09-27 21:27:31 +00:00
|
|
|
dnl EVIL1:
|
2001-01-03 07:10:33 +00:00
|
|
|
grep -w gtk_moz_embed_set_profile_path $_mozilla_include_place/gtkmozembed.h > /dev/null 2>&1
|
2000-08-09 07:58:55 +00:00
|
|
|
|
|
|
|
if test $? -eq 0
|
|
|
|
then
|
2001-02-16 11:40:14 +00:00
|
|
|
MOZILLA_MILESTONE=VERSION_0_8
|
|
|
|
MOZILLA_PROFILES_CFLAGS="-DMOZILLA_HAVE_PROFILES_SUPPORT"
|
|
|
|
|
|
|
|
AC_SUBST(MOZILLA_PROFILES_CFLAGS)
|
2001-01-03 07:10:33 +00:00
|
|
|
else
|
2000-09-04 15:17:06 +00:00
|
|
|
grep -w GetName $_mozilla_include_place/nsIRequest.h > /dev/null 2>&1
|
|
|
|
|
|
|
|
if test $? -eq 0
|
|
|
|
then
|
2001-02-16 11:40:14 +00:00
|
|
|
MOZILLA_MILESTONE=VERSION_0_7
|
2001-01-03 07:10:33 +00:00
|
|
|
else
|
2001-02-16 11:40:14 +00:00
|
|
|
MOZILLA_MILESTONE=MILESTONE_17
|
2000-09-04 15:17:06 +00:00
|
|
|
fi
|
2000-08-09 07:58:55 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
AC_SUBST(MOZILLA_MILESTONE)
|
2000-09-27 21:27:31 +00:00
|
|
|
|
|
|
|
dnl EVIL2:
|
|
|
|
_xpcom_lib=$_mozilla_lib_place/libxpcom.so
|
|
|
|
_symbol="nsCOMPtr_base::~nsCOMPtr_base"
|
|
|
|
_num_symbols=`nm $_xpcom_lib 2> /dev/null | wc -l`
|
|
|
|
|
|
|
|
if test $_num_symbols -ne 0
|
|
|
|
then
|
|
|
|
nm --demangle $_xpcom_lib | grep $_symbol > /dev/null 2>&1
|
|
|
|
|
|
|
|
if test $? -eq 1
|
|
|
|
then
|
|
|
|
MOZILLA_COMPONENT_DEBUG_FLAGS="-DDEBUG"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
AC_SUBST(MOZILLA_COMPONENT_DEBUG_FLAGS)
|
2000-10-16 19:34:51 +00:00
|
|
|
|
2001-02-27 01:56:19 +00:00
|
|
|
if test "$MOZILLA_MILESTONE" != "VERSION_0_8"
|
2000-10-16 19:34:51 +00:00
|
|
|
then
|
|
|
|
|
|
|
|
AC_MSG_ERROR([
|
2001-02-27 01:56:19 +00:00
|
|
|
*** Mozilla 0.8 or greater is required to build the Nautilus Mozilla component.
|
2001-03-31 09:29:29 +00:00
|
|
|
*** Mozilla packages for RedHat 6.x and 7.x are available here:
|
|
|
|
*** http://developer.eazel.com/eazel-hacking/updates/redhat62/mozilla/
|
|
|
|
*** http://developer.eazel.com/eazel-hacking/updates/redhat70/mozilla/.])
|
2000-10-16 19:34:51 +00:00
|
|
|
fi
|
|
|
|
|
2000-08-09 07:58:55 +00:00
|
|
|
fi
|
|
|
|
|
2000-04-19 10:05:14 +00:00
|
|
|
dnl ====================================
|
2000-10-06 07:25:37 +00:00
|
|
|
dnl = End mozilla hacks
|
2000-04-19 10:05:14 +00:00
|
|
|
dnl ====================================
|
|
|
|
|
2001-03-03 01:25:34 +00:00
|
|
|
dnl ====================================
|
|
|
|
dnl = Bzip2
|
|
|
|
dnl ====================================
|
|
|
|
BZ_LIBS=
|
|
|
|
AC_CHECK_LIB(bz2, bzread, [AC_DEFINE(HAVE_LIBBZ2)
|
|
|
|
BZ_LIBS="-lbz2"])
|
|
|
|
dnl <= Check for bzip2 > 1.0.0
|
|
|
|
AC_CHECK_LIB(bz2, BZ2_bzread, [AC_DEFINE(HAVE_LIBBZ2)
|
|
|
|
BZ_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)
|
|
|
|
])
|
|
|
|
dnl =>
|
|
|
|
AC_SUBST(BZ_LIBS)
|
2001-03-17 04:45:00 +00:00
|
|
|
|
|
|
|
dnl ====================================
|
|
|
|
dnl = cdda module support
|
|
|
|
dnl ====================================
|
|
|
|
|
|
|
|
AM_CONDITIONAL(HAVE_CDDA, false);
|
|
|
|
AC_CHECK_HEADERS(cdda_interface.h cdda_paranoia.h, [
|
|
|
|
CDDA_LIBS="$CDDA_LIBS -lcdda_paranoia, -lcdda_interface";
|
|
|
|
AM_CONDITIONAL(HAVE_CDDA, true);
|
|
|
|
])
|
|
|
|
|
1999-12-05 00:40:26 +00:00
|
|
|
dnl Checks for libraries.
|
2001-03-02 01:08:30 +00:00
|
|
|
AM_PATH_GLIB($GLIB_REQUIRED,,
|
1999-12-05 00:40:26 +00:00
|
|
|
AC_MSG_ERROR([
|
2001-03-02 01:08:30 +00:00
|
|
|
*** GLIB $GLIB_REQUIRED or better is required. The latest version of GLIB
|
1999-12-05 00:40:26 +00:00
|
|
|
*** is always available from ftp://ftp.gtk.org/.]))
|
1999-12-14 02:37:14 +00:00
|
|
|
|
2001-03-02 01:08:30 +00:00
|
|
|
AC_SUBST(GLIB_REQUIRED)
|
|
|
|
|
|
|
|
AM_PATH_GTK($GTK_REQUIRED,,
|
2000-09-11 05:39:06 +00:00
|
|
|
AC_MSG_ERROR([
|
2001-03-02 01:08:30 +00:00
|
|
|
*** Gtk+ $GTK_REQUIRED or better is required. The latest version of GTK
|
2000-09-11 05:39:06 +00:00
|
|
|
*** is always available from ftp://ftp.gtk.org/.]))
|
|
|
|
|
2001-03-02 01:08:30 +00:00
|
|
|
AC_SUBST(GTK_REQUIRED)
|
|
|
|
|
2001-04-04 00:07:15 +00:00
|
|
|
AM_PATH_GNOME($GNOME_REQUIRED,,AC_MSG_ERROR([*** GNOME $GNOME_REQUIRED or better is required.]), gnomecanvaspixbuf bonobo bonobox bonobox_print vfs idl librsvg eel)
|
2001-03-02 01:08:30 +00:00
|
|
|
|
|
|
|
AC_SUBST(GNOME_REQUIRED)
|
|
|
|
|
|
|
|
AC_PATH_PROG(GNOME_CONFIG,gnome-config,no)
|
|
|
|
if test x$GNOME_CONFIG = xno; then
|
|
|
|
AC_MSG_ERROR(Couldn't find gnome-config. Please install the GNOME package)
|
|
|
|
fi
|
|
|
|
|
|
|
|
EAZEL_VERSION_INSIST(gnome-libs, $GNOME_CONFIG --version | awk '{print $2}', >=, GNOME_LIBS_REQUIRED)
|
2000-11-04 00:48:52 +00:00
|
|
|
|
2001-01-11 18:56:35 +00:00
|
|
|
dnl check for gnome_canvas_set_dither existence
|
|
|
|
_libs="$LIBS"
|
|
|
|
LIBS=$GNOMEUI_LIBS
|
|
|
|
AC_CHECK_FUNCS(gnome_canvas_set_dither)
|
|
|
|
LIBS="$_libs"
|
|
|
|
|
2001-03-02 01:36:21 +00:00
|
|
|
dnl control center
|
2001-04-27 02:57:42 +00:00
|
|
|
EAZEL_VERSION_INSIST(control-center, $GNOME_CONFIG --modversion capplet | awk -F- '{print $2}', >=, CONTROL_CENTER_REQUIRED)
|
2001-03-02 01:36:21 +00:00
|
|
|
|
2001-01-19 01:39:57 +00:00
|
|
|
dnl Bonobo
|
2001-03-02 01:08:30 +00:00
|
|
|
EAZEL_VERSION_INSIST(bonobo, $GNOME_CONFIG --modversion bonobo | awk -F- '{print $2}', >=, BONOBO_REQUIRED)
|
2000-09-15 08:33:12 +00:00
|
|
|
|
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(BONOBO_CFLAGS)
|
|
|
|
AC_SUBST(BONOBO_LIBS)
|
2000-08-03 18:47:48 +00:00
|
|
|
AC_SUBST(BONOBOX_CFLAGS)
|
|
|
|
AC_SUBST(BONOBOX_LIBS)
|
|
|
|
AC_SUBST(BONOBO_PRINT_CFLAGS)
|
|
|
|
AC_SUBST(BONOBO_PRINT_LIBS)
|
1999-12-14 02:37:14 +00:00
|
|
|
AC_SUBST(VFS_CFLAGS)
|
|
|
|
AC_SUBST(VFS_LIBS)
|
2001-04-04 00:07:15 +00:00
|
|
|
AC_SUBST(LIBRSVG_LIBS)
|
|
|
|
AC_SUBST(LIBRSVG_INCLUDEDIR)
|
|
|
|
AC_SUBST(EEL_LIBS)
|
|
|
|
AC_SUBST(EEL_INCLUDEDIR)
|
2000-09-07 00:57:04 +00:00
|
|
|
|
2001-03-06 02:25:34 +00:00
|
|
|
dnl Bug 7315: Rediscover CFLAGS for GTK, because gnome-config won't know
|
|
|
|
dnl all the necessary flags if GTK has been upgraded more recently than
|
|
|
|
dnl it has.
|
|
|
|
|
|
|
|
AC_PATH_PROG(GTK_CONFIG,gtk-config,false)
|
|
|
|
AC_MSG_CHECKING(for gtk-config cflags)
|
|
|
|
GTK_CFLAGS=`$GTK_CONFIG --cflags`
|
|
|
|
AC_MSG_RESULT($GTK_CFLAGS)
|
|
|
|
GNOMEUI_CFLAGS="$GNOMEUI_CFLAGS $GTK_CFLAGS"
|
|
|
|
AC_SUBST(GNOMEUI_CFLAGS)
|
|
|
|
|
2000-09-07 00:57:04 +00:00
|
|
|
IDL_CFLAGS="${IDL_CFLAGS} -I\$(top_srcdir) -I\$(top_builddir)"
|
|
|
|
|
|
|
|
echo "IDL_CFLAGS: $IDL_CFLAGS"
|
|
|
|
|
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
|
|
|
|
2001-03-02 01:08:30 +00:00
|
|
|
AM_PATH_OAF($OAF_REQUIRED)
|
|
|
|
AC_SUBST(OAF_REQUIRED)
|
2000-06-26 14:33:01 +00:00
|
|
|
|
2001-03-02 01:08:30 +00:00
|
|
|
AM_PATH_GCONF($GCONF_REQUIRED,,,gconf-gtk)
|
|
|
|
AC_SUBST(GCONF_REQUIRED)
|
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
|
2001-01-09 00:05:28 +00:00
|
|
|
|
|
|
|
XML_VERSION="`$XML_CONFIG --version`"
|
|
|
|
case "$XML_VERSION" in
|
|
|
|
1.*)
|
|
|
|
:
|
|
|
|
;;
|
|
|
|
|
|
|
|
*)
|
|
|
|
AC_ERROR(Nautilus needs gnome-xml version 1.x not $XML_VERSION)
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
1999-12-30 21:33:51 +00:00
|
|
|
XML_LIBS=`$XML_CONFIG --libs`
|
|
|
|
XML_CFLAGS=`$XML_CONFIG --cflags`
|
|
|
|
AC_SUBST(XML_LIBS)
|
|
|
|
AC_SUBST(XML_CFLAGS)
|
|
|
|
|
2001-03-01 03:03:00 +00:00
|
|
|
dnl ====================================
|
|
|
|
dnl = Begin tests for scrollkeeper
|
|
|
|
dnl ====================================
|
|
|
|
|
|
|
|
AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
|
|
|
|
if test x$SCROLLKEEPER_CONFIG = xno; then
|
|
|
|
AC_MSG_ERROR(Couldn't find scrollkeeper-config, please install the scrollkeeper packaga)
|
|
|
|
fi
|
|
|
|
|
|
|
|
dnl =======================
|
|
|
|
dnl = End tests for scrollkeeper
|
|
|
|
dnl =======================
|
|
|
|
|
2000-05-15 19:08:57 +00:00
|
|
|
dnl ====================================
|
|
|
|
dnl = begin gnome-http checks
|
|
|
|
dnl ====================================
|
2001-01-19 01:39:57 +00:00
|
|
|
AC_MSG_CHECKING(for gnome-http)
|
|
|
|
if gnome-config --libs ghttp > /dev/null 2>&1; then
|
|
|
|
ghttp_ok=true
|
|
|
|
else
|
|
|
|
ghttp_ok=false
|
|
|
|
fi
|
|
|
|
if $ghttp_ok; then
|
|
|
|
GHTTP_LIBS=`gnome-config --libs ghttp`
|
|
|
|
GHTTP_CFLAGS=`gnome-config --cflags ghttp`
|
|
|
|
AC_SUBST(GHTTP_LIBS)
|
|
|
|
AC_SUBST(GHTTP_CFLAGS)
|
|
|
|
AC_MSG_RESULT(found)
|
|
|
|
else
|
|
|
|
AC_MSG_ERROR(gnome-http is required to compile Nautilus)
|
2000-05-15 19:08:57 +00:00
|
|
|
fi
|
|
|
|
dnl ====================================
|
2000-10-06 07:25:37 +00:00
|
|
|
dnl = End ghttp checks
|
2000-05-15 19:08:57 +00:00
|
|
|
dnl ====================================
|
|
|
|
|
2000-10-31 23:11:57 +00:00
|
|
|
dnl ====================================
|
|
|
|
dnl = begin applet checks
|
|
|
|
dnl ====================================
|
|
|
|
AC_MSG_CHECKING(for applets)
|
2000-11-01 03:26:03 +00:00
|
|
|
APPLETS_CFLAGS=
|
|
|
|
APPLETS_LIBS=
|
2000-10-31 23:11:57 +00:00
|
|
|
HAVE_APPLETS="no"
|
|
|
|
|
2000-11-01 03:26:03 +00:00
|
|
|
gnome-config | grep applets > /dev/null 2>&1
|
|
|
|
|
|
|
|
if test $? -eq 0
|
|
|
|
then
|
2000-10-31 23:11:57 +00:00
|
|
|
HAVE_APPLETS="yes"
|
|
|
|
APPLETS_CFLAGS=`gnome-config --cflags applets`
|
|
|
|
APPLETS_LIBS=`gnome-config --libs applets`
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
else
|
|
|
|
HAVE_APPLETS="no"
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
fi
|
|
|
|
|
2000-11-01 03:26:03 +00:00
|
|
|
AM_CONDITIONAL(HAVE_APPLETS, test "x$HAVE_APPLETS" = "xyes")
|
|
|
|
|
2000-10-31 23:11:57 +00:00
|
|
|
AC_SUBST(HAVE_APPLETS)
|
|
|
|
AC_SUBST(APPLETS_CFLAGS)
|
|
|
|
AC_SUBST(APPLETS_LIBS)
|
|
|
|
dnl ====================================
|
|
|
|
dnl = begin applet checks
|
|
|
|
dnl ====================================
|
|
|
|
|
2001-03-03 00:53:50 +00:00
|
|
|
dnl ====================================
|
|
|
|
dnl = begin eazel-logos check
|
|
|
|
dnl ====================================
|
|
|
|
|
|
|
|
if test -d eazel-logos
|
|
|
|
then
|
|
|
|
HAVE_EAZEL_LOGOS=yes
|
2001-04-20 21:24:55 +00:00
|
|
|
EAZEL_LOGOS_PNG='%{_datadir}/pixmaps/nautilus/eazel-logos/*.png'
|
|
|
|
EAZEL_LOGOS_XML='%{_datadir}/pixmaps/nautilus/eazel-logos/*.xml'
|
|
|
|
EAZEL_LOGOS_LICENSE='%{_datadir}/pixmaps/nautilus/eazel-logos/LICENSE'
|
|
|
|
EAZEL_LOGOS_THROB='%{_datadir}/pixmaps/nautilus/eazel-logos/throbber/*.png'
|
2001-03-03 00:53:50 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
AM_CONDITIONAL(HAVE_EAZEL_LOGOS, test "x$HAVE_EAZEL_LOGOS" = "xyes")
|
|
|
|
AC_SUBST(EAZEL_LOGOS_PNG)
|
|
|
|
AC_SUBST(EAZEL_LOGOS_XML)
|
|
|
|
AC_SUBST(EAZEL_LOGOS_LICENSE)
|
|
|
|
AC_SUBST(EAZEL_LOGOS_THROB)
|
|
|
|
|
|
|
|
dnl ====================================
|
|
|
|
dnl = end eazel-logos check
|
|
|
|
dnl ====================================
|
|
|
|
|
2000-04-29 23:50:02 +00:00
|
|
|
dnl ====================================
|
|
|
|
dnl = begin gdk-pixbuf checks
|
|
|
|
dnl ====================================
|
2001-03-02 01:36:21 +00:00
|
|
|
AM_PATH_GDK_PIXBUF($GDK_PIXBUF_REQUIRED,,
|
|
|
|
AC_MSG_ERROR([*** gdk_pixbuf $GDK_PIXBUF_REQUIRED or better is required.]))
|
|
|
|
|
|
|
|
AC_SUBST(GDK_PIXBUF_REQUIRED)
|
2000-04-29 23:50:02 +00:00
|
|
|
dnl ====================================
|
2001-03-02 01:36:21 +00:00
|
|
|
dnl = end gdk-pixbuf checks
|
2000-04-29 23:50:02 +00:00
|
|
|
dnl ====================================
|
|
|
|
|
|
|
|
|
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-10-06 07:25:37 +00:00
|
|
|
dnl ====================================
|
|
|
|
dnl = Begin tests for medusa
|
|
|
|
dnl ====================================
|
2000-07-17 23:11:35 +00:00
|
|
|
AC_MSG_CHECKING(for Medusa)
|
|
|
|
|
2001-01-09 02:05:41 +00:00
|
|
|
case "`medusa-config --libs 2>/dev/null | cut -d ' ' -f1`" in
|
|
|
|
'')
|
2000-07-17 23:11:35 +00:00
|
|
|
MEDUSA_CFLAGS=""
|
|
|
|
MEDUSA_LIBS=""
|
|
|
|
AC_MSG_RESULT(no)
|
2001-01-09 02:05:41 +00:00
|
|
|
AC_MSG_WARN(Could not find medusa library. Please get it from GNOME's cvs.)
|
|
|
|
;;
|
|
|
|
|
|
|
|
*)
|
|
|
|
MEDUSA_CFLAGS=`medusa-config --cflags`
|
|
|
|
MEDUSA_LIBS=`medusa-config --libs`
|
|
|
|
AC_DEFINE(HAVE_MEDUSA)
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
;;
|
|
|
|
esac
|
2000-07-17 23:11:35 +00:00
|
|
|
|
|
|
|
AC_SUBST(MEDUSA_CFLAGS)
|
|
|
|
AC_SUBST(MEDUSA_LIBS)
|
|
|
|
dnl =======================
|
2000-10-06 07:25:37 +00:00
|
|
|
dnl = End tests for medusa
|
2000-08-30 18:21:12 +00:00
|
|
|
dnl =======================
|
|
|
|
|
2000-10-06 07:25:37 +00:00
|
|
|
dnl ====================================
|
2001-04-10 05:52:44 +00:00
|
|
|
dnl = Begin tests for ammonite
|
2000-10-06 07:25:37 +00:00
|
|
|
dnl ====================================
|
2001-04-10 05:52:44 +00:00
|
|
|
ammonite_module=`$GNOME_CONFIG --modversion ammonite 2> /dev/null | awk -F"-" '{ print $1; }'`
|
|
|
|
|
|
|
|
if test "$ammonite_module" = "ammonite"
|
|
|
|
then
|
|
|
|
HAVE_AMMONITE=1
|
|
|
|
AC_DEFINE(HAVE_AMMONITE)
|
|
|
|
else
|
|
|
|
HAVE_AMMONITE=0
|
|
|
|
fi
|
|
|
|
|
|
|
|
AC_SUBST(HAVE_AMMONITE)
|
|
|
|
|
|
|
|
if test "$HAVE_AMMONITE" = "1"
|
2000-08-30 18:21:12 +00:00
|
|
|
then
|
2001-03-12 20:56:56 +00:00
|
|
|
EAZEL_VERSION_INSIST(ammonite, $GNOME_CONFIG --modversion ammonite | awk -F- '{print $2}', >=, AMMONITE_REQUIRED)
|
2001-03-01 23:35:24 +00:00
|
|
|
|
2001-03-12 20:56:56 +00:00
|
|
|
AMMONITE_CFLAGS=`$GNOME_CONFIG --cflags ammonite`
|
|
|
|
AMMONITE_LIBS=`$GNOME_CONFIG --libs ammonite`
|
|
|
|
AC_SUBST(AMMONITE_CFLAGS)
|
|
|
|
AC_SUBST(AMMONITE_LIBS)
|
2000-08-30 18:21:12 +00:00
|
|
|
fi
|
|
|
|
dnl =======================
|
2000-10-06 07:25:37 +00:00
|
|
|
dnl = End tests for ammonite
|
2000-08-30 18:21:12 +00:00
|
|
|
dnl =======================
|
2000-07-17 23:11:35 +00:00
|
|
|
|
2000-10-06 07:25:37 +00:00
|
|
|
dnl ====================================
|
|
|
|
dnl = Begin tests for libpng
|
|
|
|
dnl ====================================
|
2000-03-03 23:52:55 +00:00
|
|
|
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-10-06 07:25:37 +00:00
|
|
|
dnl =======================
|
|
|
|
dnl = End tests for libpng
|
|
|
|
dnl =======================
|
2000-03-03 23:52:55 +00:00
|
|
|
|
2001-04-27 01:19:07 +00:00
|
|
|
dnl ====================================
|
|
|
|
dnl = Begin tests for libjpeg
|
|
|
|
dnl ====================================
|
|
|
|
if test -z "$LIBJPEG"; then
|
|
|
|
AC_CHECK_LIB(jpeg, jpeg_start_decompress,
|
|
|
|
AC_CHECK_HEADER(jpeglib.h,
|
|
|
|
jpeg_ok=yes,
|
|
|
|
jpeg_ok=no),
|
|
|
|
AC_MSG_WARN(*** (jpeg library not found) ***), -lm)
|
|
|
|
if test "$jpeg_ok" = yes; then
|
|
|
|
JPEG='jpeg'; LIBJPEG='-ljpeg'
|
|
|
|
AC_DEFINE(HAVE_LIBJPEG)
|
|
|
|
else
|
|
|
|
AC_MSG_WARN(*** JPEG loader will not be built (jpeg header file not found) ***)
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
AC_SUBST(LIBJPEG)
|
|
|
|
dnl =======================
|
|
|
|
dnl = End tests for libjpeg
|
|
|
|
dnl =======================
|
2001-03-21 05:15:42 +00:00
|
|
|
|
|
|
|
dnl =======================
|
|
|
|
dnl = Set up for library directories
|
|
|
|
dnl =======================
|
|
|
|
|
|
|
|
NAUTILUS_LIBS="-lnautilus `gnome-config --libs bonobox gnomeui gtk vfs`"
|
|
|
|
NAUTILUS_LIBDIR='-L${libdir}'
|
|
|
|
NAUTILUS_INCLUDEDIR='-I${includedir} '" `gnome-config --cflags bonobox gnomeui gtk vfs`"
|
|
|
|
AC_SUBST(NAUTILUS_LIBDIR)
|
|
|
|
AC_SUBST(NAUTILUS_INCLUDEDIR)
|
|
|
|
AC_SUBST(NAUTILUS_LIBS)
|
|
|
|
|
|
|
|
dnl =======================
|
|
|
|
dnl = End set up for library directories
|
|
|
|
dnl =======================
|
|
|
|
|
|
|
|
|
2000-04-12 19:34:11 +00:00
|
|
|
dnl Checks for i18n
|
2001-04-27 17:58:09 +00:00
|
|
|
ALL_LINGUAS="az ca cs da de el en_GB es fi fr ga gl hu it ja ko lt nl nn no pl pt_BR ru sk sl sv ta tr uk zh_TW.Big5"
|
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
|
2001-03-09 00:22:33 +00:00
|
|
|
AC_C_BIGENDIAN
|
1999-12-05 00:40:26 +00:00
|
|
|
|
2000-07-12 19:33:38 +00:00
|
|
|
dnl Turn on the additional warnings last, so -Werror doesn't affect other tests.
|
2000-08-08 01:36:50 +00:00
|
|
|
|
2000-07-12 19:33:38 +00:00
|
|
|
AC_ARG_ENABLE(more-warnings,
|
2000-08-08 01:36:50 +00:00
|
|
|
[ --enable-more-warnings Maximum compiler warnings],
|
|
|
|
set_more_warnings="$enableval",[
|
|
|
|
if test -f $srcdir/CVSVERSION; then
|
2001-03-10 02:03:55 +00:00
|
|
|
is_cvs_version=true
|
2000-08-08 01:36:50 +00:00
|
|
|
set_more_warnings=yes
|
|
|
|
else
|
|
|
|
set_more_warnings=no
|
|
|
|
fi
|
|
|
|
])
|
2000-07-12 19:33:38 +00:00
|
|
|
AC_MSG_CHECKING(for more warnings, including -Werror)
|
|
|
|
if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
|
|
|
|
AC_MSG_RESULT(yes)
|
2000-09-29 08:57:11 +00:00
|
|
|
CFLAGS="\
|
2000-09-05 21:24:35 +00:00
|
|
|
-Wall \
|
2000-07-12 19:33:38 +00:00
|
|
|
-Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
|
|
|
|
-Wnested-externs -Wpointer-arith \
|
reviewed by: Darin Adler <darin@eazel.com>
2000-11-13 Pavel Cisler <pavel@eazel.com>
reviewed by: Darin Adler <darin@eazel.com>
* configure.in:
Enable the sign-compare and cast-align warnings.
* components/help/converters/gnome-db2html2/gdb3html.c:
(find_first_element):
* components/help/hyperbola-filefmt.c: (fmt_free_tree_info):
* components/help/hyperbola-nav-index.c:
(hyperbola_navigation_index_update_clist), (despace),
(end_element):
* components/history/nautilus-history-view.c:
(history_load_location):
* components/mozilla/nautilus-mozilla-content-view.c:
(string_list_get_index_of_string):
* components/services/install/lib/eazel-install-corba-types.c:
(corba_string_sequence_to_glist),
(corba_packagedatastructlist_from_packagedata_list),
(packagedata_list_from_corba_packagedatastructlist),
(categorydata_list_from_corba_categorystructlist):
* components/services/install/lib/eazel-install-query.c:
(eazel_install_simple_rpm_query):
* components/services/install/lib/eazel-install-rpm-glue.c:
(eazel_install_monitor_rpm_process_pipe):
* components/services/install/lib/eazel-install-rpm-signature.c:
(read_rpm_lead), (read_rpm_signature):
* components/services/trilobite/libtrilobite/trilobite-root-helper.
c: (trilobite_root_helper_run_program),
(trilobite_root_helper_set_time):
* cut-n-paste-code/widgets/nautilusclist/nautilusclist.c:
(nautilus_clist_get_arg), (nautilus_clist_construct):
* helper-utilities/authenticate/nautilus-authenticate.c: (main):
* libnautilus-extensions/nautilus-background.c:
(set_image_and_color_image_loading_done_callback):
* libnautilus-extensions/nautilus-buffered-widget.c:
(nautilus_gdk_pixbuf_tile_alpha):
* libnautilus-extensions/nautilus-caption-table.c:
(entry_activate):
* libnautilus-extensions/nautilus-caption-table.h:
* libnautilus-extensions/nautilus-ctree.c:
(nautilus_ctree_node_nth), (nautilus_ctree_drag_motion):
* libnautilus-extensions/nautilus-ctree.h:
* libnautilus-extensions/nautilus-directory-async.c:
(metafile_write):
* libnautilus-extensions/nautilus-file-changes-queue.c:
(nautilus_file_changes_consume_changes):
* libnautilus-extensions/nautilus-file-operations-progress.c:
(truncate_string_from_start):
* libnautilus-extensions/nautilus-file-operations.c:
(extract_string_until):
* libnautilus-extensions/nautilus-file-utilities.c:
(nautilus_read_entire_file):
* libnautilus-extensions/nautilus-gdk-extensions.c:
(nautilus_get_largest_fitting_font):
* libnautilus-extensions/nautilus-global-preferences.c:
(global_preferences_get_sidebar_panel_view_identifiers):
* libnautilus-extensions/nautilus-gtk-extensions.c:
(nautilus_gtk_window_set_initial_geometry_from_string),
(nautilus_gtk_menu_set_item_visibility):
* libnautilus-extensions/nautilus-icon-canvas-item.c:
(draw_or_measure_label_text), (draw_or_measure_label_text_aa):
* libnautilus-extensions/nautilus-icon-container.c:
(rubberband_timeout_callback), (destroy), (compute_stretch):
* libnautilus-extensions/nautilus-icon-container.h:
(nautilus_icon_container_find_drop_target):
* libnautilus-extensions/nautilus-icon-factory.c:
(check_recently_used_list), (get_themed_icon_file_path),
(revise_scale_factors_if_too_big):
* libnautilus-extensions/nautilus-icon-text-item.c:
(recompute_bounding_box), (iti_draw), (iti_selection_motion):
* libnautilus-extensions/nautilus-label.c:
(nautilus_label_size_allocate), (label_recompute_line_geometries):
* libnautilus-extensions/nautilus-list.c: (draw_cell),
(nautilus_list_drag_data_received):
* libnautilus-extensions/nautilus-mime-actions.c:
(server_matches_content_requirements),
(nautilus_do_component_query):
* libnautilus-extensions/nautilus-password-dialog.c:
(caption_table_activate_callback):
* libnautilus-extensions/nautilus-preferences-item.c:
(has_image_file):
* libnautilus-extensions/nautilus-scalable-font.c:
(file_as_string), (parse_font_description_file),
(nautilus_text_layout_new):
* libnautilus-extensions/nautilus-scalable-font.h:
* libnautilus-extensions/nautilus-volume-monitor.c:
(check_permissions):
* libnautilus/nautilus-view.c:
(nautilus_shallow_g_list_from_uri_list):
* libnautilus/nautilus-zoomable.c:
(nautilus_g_list_from_ZoomLevelList):
* librsvg/rsvg-ft.c: (rsvg_ft_measure_or_render_string):
* librsvg/rsvg.c: (rsvg_parse_transform):
* src/file-manager/fm-icon-view.c:
(fm_icon_view_create_background_context_menu_items),
(get_sort_criterion_by_metadata_text), (get_sort_criterion_by_id):
* src/file-manager/fm-list-view.c: (select_row_common),
(select_matching_name_callback), (select_previous_next_common),
(fm_list_view_bump_zoom_level):
* src/nautilus-search-bar-criterion.c:
(nautilus_search_bar_criterion_update_valid_criteria_choices):
* src/nautilus-shell.c: (corba_open_windows),
(corba_open_default_window):
* src/nautilus-sidebar.c: (nautilus_sidebar_add_panel_items):
* src/nautilus-window-menus.c:
(nautilus_window_disable_keyboard_navigation_for_menus):
* src/nautilus-window.c: (nautilus_window_size_request):
Fix all sign-compare violations.
2000-11-14 02:46:02 +00:00
|
|
|
-Wcast-align -Wsign-compare \
|
2000-09-29 08:57:11 +00:00
|
|
|
-Werror \
|
|
|
|
$CFLAGS"
|
Add checks to fix things on Solaris regarding mounting, environment
2000-09-11 Seth Nickell <seth@eazel.com>
* configure.in:
Add checks to fix things on Solaris regarding mounting,
environment variables, and fonts.
Added tests for compiler warning flags that are not supported
with all versions of GCC.
* helper-utilities/authenticate/nautilus-authenticate-pam.c:
(pam_conversion_func):
Remove "const" from system call for compatibility with Solaris.
* libnautilus-extensions/nautilus-file.c:
(get_id_from_digit_string):
uid_t != int, so change functions converting from string to
uid_t to deal with greater bit uids properly.
* libnautilus-extensions/nautilus-glib-extensions.h:
* libnautilus-extensions/nautilus-glib-extensions.c:
(nautilus_g_setenv), (nautilus_g_unsetenv):
Add system gnostic functions for setting and removing variables
from the environment.
* libnautilus-extensions/nautilus-scalable-font.c:
(initialize_global_stuff_if_needed):
Temporary fix to deal with the absence of "RedHat-style" font
paths on Solaris and Debian whilst font paths are still
hard-coded.
* libnautilus-extensions/nautilus-volume-monitor.c:
(nautilus_volume_monitor_get_volume_name),
(nautilus_volume_monitor_volume_is_mounted),
(mount_volumes_update_is_mounted), (mnttab_add_mount_volume),
(mntent_add_mount_volume), (find_volumes):
Rewrite sections to use the appropriate Solaris mounting
functions if Linux-style mount/umount/mount-table manipulation
functions are not available.
* libnautilus/nautilus-view-component.idl:
* src/nautilus-view-frame-corba.c:
* src/nautilus-zoomable-frame-corba.c:
(impl_Nautilus_ZoomableFrame_report_zoom_level_changed):
Change doubles to floats to work around an ORBit problem on
Solaris wherein doubles are not correctly aligned.
* src/file-manager/fm-desktop-icon-view.c:
remove gratuitous linux specific header inclusion
* src/nautilus-first-time-druid.c: (set_http_proxy):
* src/nautilus-main.c: (main):
* src/nautilus-shell.c: (corba_restart):
(impl_Nautilus_ViewFrame_report_load_progress):
Changed "setenv" and "unsetenv" calls to use nautilus_g_setenv
and nautilus_g_unsetenv.
* src/nautilus-window-manage-views.c:
(report_sidebar_panel_failure_to_user):
Add better error message to sidebar failures where it can't
figure out which sidebar failed. Done in order to fix null
string being passed to dialogue function which segfaulted
Nautilus on Solaris.
Yes children, your Nautilus will now run and frollick in the green,
green pasture of the multi-cpu UltraSparc.
2000-09-12 02:01:33 +00:00
|
|
|
|
|
|
|
for option in -Wsign-promo -Wno-sign-compare; do
|
|
|
|
SAVE_CFLAGS="$CFLAGS"
|
|
|
|
CFLAGS="$CFLAGS $VFS_CFLAGS $option"
|
|
|
|
AC_MSG_CHECKING([whether gcc understands $option])
|
Fix extra dependency that was causing the xml.h files to be generated too
* Makefile.shared: Fix extra dependency that was causing the xml.h
files to be generated too often.
* configure.in: Fix code that detects the gcc options to work even
with -O on.
* src/nautilus-view-frame.h:
* src/nautilus-view-frame.c:
(nautilus_view_frame_initialize_class),
(view_frame_loaded), (view_frame_failed),
(nautilus_view_frame_handle_client_destroy),
(nautilus_view_frame_handle_client_gone),
(nautilus_view_frame_new), (check_if_view_is_gone),
(nautilus_view_frame_set_to_component),
(nautilus_view_frame_get_is_underway):
Revamp set of signals to be easier to understand. Handle all
failures uniformly,
* src/nautilus-window-manage-views.h:
* src/nautilus-window-manage-views.c: (change_selection),
(nautilus_window_update_for_new_location),
(nautilus_window_has_really_changed),
(nautilus_window_set_state_info),
(nautilus_window_set_sidebar_panels),
(zoom_level_changed_callback), (get_history_list_callback),
(change_selection_callback), (change_status_callback),
(failed_callback), (load_underway_callback),
(load_complete_callback), (open_location_callback),
(open_location_in_new_window_callback), (title_changed_callback),
(nautilus_window_connect_view), (nautilus_window_disconnect_view):
Make more of the view management private to this file. Use the
signals by their new names. Disconnect all the signals, not just
the error-related ones.
* src/nautilus-window.c:
(nautilus_window_set_content_view_widget): Updated the debugging
check to do it with the new Bonobo UI calls.
2000-10-23 22:21:12 +00:00
|
|
|
AC_TRY_COMPILE([], [],
|
Add checks to fix things on Solaris regarding mounting, environment
2000-09-11 Seth Nickell <seth@eazel.com>
* configure.in:
Add checks to fix things on Solaris regarding mounting,
environment variables, and fonts.
Added tests for compiler warning flags that are not supported
with all versions of GCC.
* helper-utilities/authenticate/nautilus-authenticate-pam.c:
(pam_conversion_func):
Remove "const" from system call for compatibility with Solaris.
* libnautilus-extensions/nautilus-file.c:
(get_id_from_digit_string):
uid_t != int, so change functions converting from string to
uid_t to deal with greater bit uids properly.
* libnautilus-extensions/nautilus-glib-extensions.h:
* libnautilus-extensions/nautilus-glib-extensions.c:
(nautilus_g_setenv), (nautilus_g_unsetenv):
Add system gnostic functions for setting and removing variables
from the environment.
* libnautilus-extensions/nautilus-scalable-font.c:
(initialize_global_stuff_if_needed):
Temporary fix to deal with the absence of "RedHat-style" font
paths on Solaris and Debian whilst font paths are still
hard-coded.
* libnautilus-extensions/nautilus-volume-monitor.c:
(nautilus_volume_monitor_get_volume_name),
(nautilus_volume_monitor_volume_is_mounted),
(mount_volumes_update_is_mounted), (mnttab_add_mount_volume),
(mntent_add_mount_volume), (find_volumes):
Rewrite sections to use the appropriate Solaris mounting
functions if Linux-style mount/umount/mount-table manipulation
functions are not available.
* libnautilus/nautilus-view-component.idl:
* src/nautilus-view-frame-corba.c:
* src/nautilus-zoomable-frame-corba.c:
(impl_Nautilus_ZoomableFrame_report_zoom_level_changed):
Change doubles to floats to work around an ORBit problem on
Solaris wherein doubles are not correctly aligned.
* src/file-manager/fm-desktop-icon-view.c:
remove gratuitous linux specific header inclusion
* src/nautilus-first-time-druid.c: (set_http_proxy):
* src/nautilus-main.c: (main):
* src/nautilus-shell.c: (corba_restart):
(impl_Nautilus_ViewFrame_report_load_progress):
Changed "setenv" and "unsetenv" calls to use nautilus_g_setenv
and nautilus_g_unsetenv.
* src/nautilus-window-manage-views.c:
(report_sidebar_panel_failure_to_user):
Add better error message to sidebar failures where it can't
figure out which sidebar failed. Done in order to fix null
string being passed to dialogue function which segfaulted
Nautilus on Solaris.
Yes children, your Nautilus will now run and frollick in the green,
green pasture of the multi-cpu UltraSparc.
2000-09-12 02:01:33 +00:00
|
|
|
has_option=yes,
|
|
|
|
has_option=no,)
|
|
|
|
CFLAGS="$SAVE_CFLAGS"
|
|
|
|
if test $has_option = yes; then
|
|
|
|
VFS_CFLAGS="$VFS_CFLAGS $option"
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($has_option)
|
|
|
|
unset has_option
|
|
|
|
unset SAVE_CFLAGS
|
|
|
|
done
|
|
|
|
unset option
|
2000-07-12 19:33:38 +00:00
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
fi
|
|
|
|
|
2001-03-10 02:03:55 +00:00
|
|
|
dnl
|
|
|
|
dnl Define the build message (used in the Nautilus about box)
|
|
|
|
dnl CVSVERSION overrides
|
|
|
|
dnl
|
|
|
|
|
|
|
|
NAUTILUS_BUILD_MESSAGE=""
|
|
|
|
AC_ARG_WITH(build-message, [ --with-build-message=MESSAGE Build (about box) message], NAUTILUS_BUILD_MESSAGE=$withval)
|
|
|
|
|
|
|
|
if test -n "$is_cvs_version"
|
|
|
|
then
|
|
|
|
NAUTILUS_BUILD_MESSAGE="Development Build"
|
|
|
|
fi
|
|
|
|
|
|
|
|
AC_DEFINE_UNQUOTED(NAUTILUS_BUILD_MESSAGE, "$NAUTILUS_BUILD_MESSAGE")
|
|
|
|
|
reviewed by: Gene Ragan <gzr@eazel.com>
* acconfig.h:
* configure.in:
Add a NAUTILUS_SOURCE_DIRECTORY that contains the location of the
nautilus source code, so that some checks can work without having
to do 'make install'
* components/services/install-view/nautilus-service-install-view.c:
(nautilus_service_install_view_initialize_class):
Initialize preferences so that smooth widgets and other nautilus
specific preferences work.
* components/services/summary/nautilus-summary-view.c:
(nautilus_summary_view_initialize_class):
Initialize preferences so that smooth widgets and other nautilus
specific preferences work.
* libnautilus-extensions/Makefile.am:
Remove macros that arent needed any more.
* libnautilus-extensions/nautilus-entry.h:
* libnautilus-extensions/nautilus-entry.c:
(nautilus_entry_initialize), (obscure_cursor),
(nautilus_entry_key_press), (nautilus_entry_motion_notify),
(nautilus_entry_set_text), (nautilus_entry_insert_text),
(nautilus_entry_delete_text), (nautilus_entry_initialize_class),
(nautilus_entry_set_special_tab_handling):
Make all the attributes private.
* libnautilus-extensions/nautilus-font-manager.c:
(at_exit_handler), (nautilus_free_static_storage_at_exit),
(gnome_vfs_init_if_needed), (font_description_table_add),
(font_description_table_new), (directory_contains_file),
(ensure_local_font_table),
(nautilus_font_manager_get_default_font),
(nautilus_font_manager_get_default_bold_font),
(nautilus_self_check_font_manager):
Remove dependency on nautilus-file-utilities. Update for new
machanism for finding data in the source directory so that checks
work even when Nautilus has not undergone 'make install.'
* libnautilus-extensions/nautilus-global-preferences.c:
(smooth_graphics_mode_changed_callback),
(nautilus_global_preferences_initialize):
Keep track of preferences smooth graphics mode changes and call
the new smooth widget api for changing the smoothness of all
tracked widgets.
* libnautilus-extensions/nautilus-scalable-font.c:
Remove a rogue unused #include.
* libnautilus-extensions/nautilus-smooth-widget.h:
* libnautilus-extensions/nautilus-smooth-widget.c:
(nautilus_smooth_widget_global_set_is_smooth),
(nautilus_smooth_widget_register):
Dont use preferences to track global smoothness changes. Add a
function to that instead.
* src/nautilus-location-bar.c: (nautilus_location_bar_initialize):
Update for privatized NautilusEntry attributes.
2001-04-02 23:02:56 +00:00
|
|
|
NAUTILUS_SOURCE_DIRECTORY=`(cd $srcdir && pwd)`
|
|
|
|
AC_DEFINE_UNQUOTED(NAUTILUS_SOURCE_DIRECTORY, "$NAUTILUS_SOURCE_DIRECTORY")
|
|
|
|
|
2000-08-05 01:34:57 +00:00
|
|
|
dnl
|
2000-10-16 20:13:48 +00:00
|
|
|
dnl Define the build timestamp if given in the environment.
|
2000-08-05 01:34:57 +00:00
|
|
|
dnl
|
2000-10-16 20:13:48 +00:00
|
|
|
if test -n "$EAZEL_BUILD_TIMESTAMP"
|
|
|
|
then
|
|
|
|
AC_DEFINE_UNQUOTED(EAZEL_BUILD_TIMESTAMP,"$EAZEL_BUILD_TIMESTAMP")
|
|
|
|
fi
|
2000-08-05 01:34:57 +00:00
|
|
|
|
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
|
2000-10-16 20:13:48 +00:00
|
|
|
helper-utilities/Makefile
|
2000-11-03 03:13:42 +00:00
|
|
|
helper-utilities/error-dialog/Makefile
|
2001-02-27 01:09:37 +00:00
|
|
|
helper-utilities/xml-migrate/Makefile
|
2000-11-04 00:52:02 +00:00
|
|
|
helper-scripts/Makefile
|
1999-12-14 19:46:16 +00:00
|
|
|
icons/Makefile
|
2001-01-22 09:19:55 +00:00
|
|
|
icons/crux_eggplant/Makefile
|
|
|
|
icons/crux_eggplant/backgrounds/Makefile
|
|
|
|
icons/crux_eggplant/sidebar_tab_pieces/Makefile
|
2001-03-02 07:23:26 +00:00
|
|
|
icons/crux_eggplant/throbber/Makefile
|
2001-05-01 02:42:14 +00:00
|
|
|
icons/crux_teal/Makefile
|
|
|
|
icons/crux_teal/backgrounds/Makefile
|
|
|
|
icons/crux_teal/sidebar_tab_pieces/Makefile
|
|
|
|
icons/crux_teal/throbber/Makefile
|
2000-09-20 01:30:48 +00:00
|
|
|
icons/gnome/Makefile
|
2000-10-26 19:31:02 +00:00
|
|
|
icons/gnome/throbber/Makefile
|
2001-01-19 02:42:05 +00:00
|
|
|
icons/sidebar_tab_pieces/Makefile
|
2001-05-01 02:42:14 +00:00
|
|
|
icons/sierra/Makefile
|
|
|
|
icons/tahoe/Makefile
|
2000-08-30 09:08:42 +00:00
|
|
|
icons/throbber/Makefile
|
2000-03-12 17:06:37 +00:00
|
|
|
data/Makefile
|
reviewed by: Darin Adler <darin@eazel.com>
Terminology change -- the window & menu item formerly known
as "Customization" are now known as "Backgrounds and Emblems";
the swatches of image formerly known as "backgrounds" are
now known as "patterns".
After 1.0 if this window acquires more varied content we will
have to redo the menu item & window label, though we will
continue to distinguish between "backgrounds" and "patterns",
since "backgrounds" encompasses colors as well as images.
Note that this change will only appear in full (and your
"Backgrounds and Emblems" window work in full) after you've
deleted your ~/.nautilus directory and let Nautilus make you
a new one.
* libnautilus-extensions/nautilus-gdk-pixbuf-extensions.c:
(file_opened_callback): Set vfs_handle to NULL on failure.
(load_done): Don't try to close pixbuf loader if it's NULL.
These two bugs were flushed out by a temporary state on my
machine where the theme was using a non-existent file for
its background image.
* data/backgrounds/Makefile.am: removed this file, as well as
all the image files in this directory.
* data/patterns/.cvsignore:
* data/patterns/Makefile.am: New files, copied from data/backgrounds.
Also copied over all image files from data/backgrounds, which is now
obsolete.
* data/Makefile.am: Changed "backgrounds" subdir to "patterns"
* configure.in: changed data/backgrounds/Makefile to
data/patterns/Makefile
* nautilus.spec.in: Changed regular expressions with "backgrounds"
to use "patterns"
* data/browser.xml: Changed "background" to "pattern" in the
terminology in this file, which gets installed into ~/.nautilus.
You have to remove your ~/.nautilus to get a fresh one of these;
without doing so the "Backgrounds and Emblems" window will be
confused (won't crash, will use wrong terminology and sometimes
have blank content).
* icons/ardmore/ardmore.xml:
* icons/arlo/arlo.xml:
* icons/default.xml:
* icons/eazel/eazel.xml:
* icons/gnome/gnome.xml:
* icons/vector/vector.xml:
* icons/villanova/villanova.xml: Changed "backgrounds" directory
references to "patterns"
* libnautilus-extensions/nautilus-customization-data.h:
* libnautilus-extensions/nautilus-customization-data.c:
(nautilus_customization_data_new),
(nautilus_customization_data_get_next_element_for_display),
(nautilus_customization_data_destroy),
(nautilus_customization_make_pattern_chit): Change "background" to
"pattern" in many places, including one public function name.
* src/nautilus-property-browser.c:
(nautilus_property_browser_initialize),
(nautilus_property_browser_drag_data_get), (make_drag_image),
(make_color_drag_image), (remove_pattern), (remove_emblem),
(nautilus_property_browser_remove_element),
(add_pattern_to_browser), (add_new_pattern),
(add_new_button_callback), (element_clicked_callback),
(make_properties_from_directories), (add_reset_property),
(nautilus_property_browser_update_contents),
(nautilus_property_browser_set_category): Change "background" to
"pattern" in many places. Also change window title from
"Customization Options" to "Backgrounds and Emblems".
* src/nautilus-shell-ui.xml: Change "Customization..." to
"Backgrounds and Emblems...".
* test/test-nautilus-background.c: (main):
* test/test-nautilus-font.c: (create_named_background):
* test/test-nautilus-label.c:
(widget_set_nautilus_background_image): Changed test code that was
using sample images from backgrounds directory to look in patterns
directory instead.
2000-12-11 19:30:39 +00:00
|
|
|
data/patterns/Makefile
|
2000-05-03 01:11:00 +00:00
|
|
|
data/emblems/Makefile
|
2000-06-01 01:24:21 +00:00
|
|
|
data/linksets/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
|
Fixes for bugs 2376, 4553, and 3799 This should make the complex search
2000-11-28 Rebecca Schulman <rebecka@eazel.com>
Fixes for bugs 2376, 4553, and 3799
This should make the complex search bar usable
and visible.
reviewed by: Maciej Stachowiak <mjs@eazel.com>
* configure.in:
* libnautilus-extensions/Makefile.am:
* cut-n-paste-code/widgets/Makefile.am:
* cut-n-paste-code/widgets/gimphwrapbox/.cvsignore:
* cut-n-paste-code/widgets/gimphwrapbox/Makefile.am:
* cut-n-paste-code/widgets/gimphwrapbox/gtkhwrapbox.c:
(gtk_hwrap_box_get_type), (gtk_hwrap_box_class_init),
(gtk_hwrap_box_init), (gtk_hwrap_box_new), (get_child_requisition),
(_gtk_hwrap_box_size_request), (get_layout_size),
(gtk_hwrap_box_size_request), (reverse_list_row_children),
(layout_row), (layout_rows), (gtk_hwrap_box_size_allocate):
* cut-n-paste-code/widgets/gimphwrapbox/gtkhwrapbox.h:
* cut-n-paste-code/widgets/gimphwrapbox/gtkwrapbox.c:
(gtk_wrap_box_get_type), (gtk_wrap_box_class_init),
(gtk_wrap_box_init), (gtk_wrap_box_set_arg),
(gtk_wrap_box_get_arg), (gtk_wrap_box_set_child_arg),
(gtk_wrap_box_get_child_arg), (gtk_wrap_box_child_type),
(gtk_wrap_box_set_homogeneous), (gtk_wrap_box_set_hspacing),
(gtk_wrap_box_set_vspacing), (gtk_wrap_box_set_justify),
(gtk_wrap_box_set_line_justify), (gtk_wrap_box_set_aspect_ratio),
(gtk_wrap_box_pack), (gtk_wrap_box_reorder_child),
(gtk_wrap_box_query_child_packing),
(gtk_wrap_box_query_child_forced_break),
(gtk_wrap_box_set_child_packing),
(gtk_wrap_box_set_child_forced_break),
(gtk_wrap_box_query_line_lengths), (gtk_wrap_box_map),
(gtk_wrap_box_unmap), (gtk_wrap_box_draw), (gtk_wrap_box_expose),
(gtk_wrap_box_add), (gtk_wrap_box_remove), (gtk_wrap_box_forall):
* cut-n-paste-code/widgets/gimphwrapbox/gtkwrapbox.h:
Copied and pasted the wrapping hbox from the Gimp.
I made a few modifications, including some resizing requests,
when the chosen size is not the right one for the actual
space available. Sizing wrapping boxes is a tricky problem
with gtk, because they have nonstandard sizing requests
(they can request x or y or z) and my solution is probably
not optimal, since some of the sizing adjustments are visible
on screen. However, a better fix is a lot more time consuming,
and should probably wait for past 1.0.
* src/nautilus-complex-search-bar.c:
(search_bar_criterion_type_changed_callback),
(queue_search_bar_resize_callback),
(nautilus_complex_search_bar_initialize_class),
(nautilus_complex_search_bar_initialize), (real_activate),
(nautilus_complex_search_bar_queue_resize),
(attach_criterion_to_search_bar),
(unattach_criterion_from_search_bar),
(load_find_them_pixmap_widget), (more_options_callback),
(fewer_options_callback), (update_options_buttons_state):
* src/nautilus-complex-search-bar.h:
Changed the criteria layout to be in a vbox instead of a table,
so that we can insert wrapping hboxes. Added a new function
that will effectively resize the complex search bar, and we call
it at appropriate points. Switched the packing order of the
buttons, since the wrap box has only one packing function, and it is
a pack_start, rather than a pack_end function
* src/nautilus-search-bar-criterion-private.h:
* src/nautilus-search-bar-criterion.c: (queue_bar_resize_callback),
(nautilus_search_bar_criterion_new_from_values),
(nautilus_search_bar_criterion_show),
(nautilus_search_bar_criterion_hide),
(nautilus_search_bar_criterion_update_valid_criteria_choices),
(hide_date_widget), (show_date_widget), (make_emblem_value_menu):
Put the criteria into wrapping boxes as part of their creation, and
trigger a resize of the complex search bar when the wrapping box
complains about its allocated size.
2000-11-28 23:21:50 +00:00
|
|
|
cut-n-paste-code/widgets/gimphwrapbox/Makefile
|
1999-12-06 23:23:41 +00:00
|
|
|
libnautilus/Makefile
|
2000-09-07 00:57:04 +00:00
|
|
|
libnautilus-adapter/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-09-15 08:33:12 +00:00
|
|
|
components/adapter/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
|
Fixed bug 2194, no scrollbars in image view Fixed bug 2215, image viewer
2000-09-15 Gene Z. Ragan <gzr@eazel.com>
Fixed bug 2194, no scrollbars in image view
Fixed bug 2215, image viewer needs to erase background
when loading image.
I fixed these bugs by writing a new image component. Is this bad?
I don't know. What is bad is the current state of the EOG bonobo
component. I don't think it is worth our time to fix it right now.
This component will also support the zoomable interface when
Maciej finishes the work there. It is doubtful the EOG bonobo
component would have a Nautilus specific dependency.
* components/Makefile.am:
* components/image-viewer/.cvsignore:
* components/image-viewer/Makefile.am:
* components/image-viewer/io-png.c: (png_write_data_fn),
(png_flush_fn), (image_save):
* components/image-viewer/io-png.h:
* components/image-viewer/nautilus-image-view.c:
(release_pixbuf_cb), (release_pixbuf), (bod_destroy_cb),
(get_pixbuf), (render_pixbuf), (redraw_view), (configure_size),
(resize_all_cb), (view_update), (save_image_to_stream),
(load_image_from_stream), (destroy_view),
(zoomable_zoom_in_callback), (zoomable_zoom_out_callback),
(zoomable_set_zoom_level_callback),
(zoomable_zoom_to_fit_callback), (drawing_area_exposed),
(view_size_allocate_cb), (scrolled_view_size_allocate_cb),
(view_factory_common), (scaled_view_factory),
(scrollable_view_factory), (bonobo_object_factory),
(init_bonobo_image_generic_factory), (init_server_factory), (main):
* components/image-viewer/nautilus-image-view.oafinfo:
* configure.in:
New files and functions.
2000-09-16 01:01:39 +00:00
|
|
|
components/image-viewer/Makefile
|
2000-03-06 00:22:44 +00:00
|
|
|
components/music/Makefile
|
first check-in of "news" sidebar view to display news from selected sites
first check-in of "news" sidebar view to display news from selected
sites that support an rss feed. It's around 80% completed now, and
should be quite usable; I just need to finish the remaining 80%.
* components/news/.cvsignore:
* components/news/Makefile.am:
* components/news/Nautilus_View_news.oaf.in:
* components/news/nautilus-news.c: (get_bonobo_properties),
(set_bonobo_properties), (do_destroy), (pixbuf_composite),
(draw_triangle), (draw_rss_logo_image), (draw_rss_title),
(draw_rss_items), (nautilus_news_draw_channel),
(nautilus_news_update_display), (nautilus_news_configure_event),
(nautilus_news_expose_event), (nautilus_news_set_prelight_index),
(go_to_uri), (toggle_open_state), (item_hit_test),
(nautilus_news_button_release_event),
(nautilus_news_motion_notify_event),
(nautilus_news_leave_notify_event), (nautilus_news_set_title),
(free_rss_data_item), (free_rss_channel_items), (free_channel),
(nautilus_news_free_channel_list), (bool_to_text),
(nautilus_news_make_channel_document),
(nautilus_news_save_channel_state), (rss_logo_callback),
(extract_items), (update_size_and_redraw),
(rss_read_done_callback), (nautilus_news_load_channel),
(nautilus_news_make_new_channel), (nautilus_news_add_channels),
(get_xml_path), (read_channel_list), (check_for_updates),
(news_get_indicator_image), (load_xpm_image),
(nautilus_news_load_images), (configure_button_clicked),
(add_site_button_clicked), (add_site_from_fields),
(add_command_buttons), (get_channel_from_name),
(check_button_toggled_callback), (nautilus_news_load_location),
(add_channel_entry), (add_channels_to_configure_list),
(set_up_add_widgets), (set_up_configure_widgets),
(set_up_main_widgets), (make_news_view), (main):
* components/news/news_bullet.png:
* components/news/news_channels.xml:
* components/news/pixmaps.h:
* configure.in:
2001-04-21 00:23:48 +00:00
|
|
|
components/news/Makefile
|
2000-02-15 02:51:00 +00:00
|
|
|
components/notes/Makefile
|
2000-03-03 17:28:29 +00:00
|
|
|
components/sample/Makefile
|
2000-04-19 03:55:01 +00:00
|
|
|
components/mozilla/Makefile
|
added a new text view component with zooming, settable fonts and
added a new text view component with zooming, settable fonts and
text-oriented services. The services are currently hardwired but there
will be a framework soon. You may have to delete your
/gnome/share/oaf/text-plain.oafinfo to see it in action.
* configure.in:
* components/Makefile.am:
* components/text/.cvsignore:
* components/text/Makefile.am:
build stuff for the new text view
* components/text/main.c: (text_view_object_destroyed),
(text_view_make_object), (main):
factory object for the text view
* components/text/nautilus-text-view-ui.xml:
xml file defining the menus for the text view
* components/text/nautilus-text-view.oafinfo:
oaf definitions for the text view
* components/text/nautilus-text-view.h:
interface file for the text view
* components/text/nautilus-text-view.c:
(nautilus_text_view_initialize_class),
(nautilus_text_view_initialize), (detach_file),
(nautilus_text_view_destroy),
(nautilus_text_view_get_nautilus_view),
(nautilus_text_view_update), (nautilus_text_view_load_uri),
(text_view_load_location_callback),
(nautilus_text_view_update_font), (get_selected_text),
(text_view_search_callback), (text_view_lookup_callback),
(nautilus_text_view_set_font), (handle_ui_event),
(merge_bonobo_menu_items), (nautilus_text_view_zoom_to_level),
(nautilus_text_view_bump_zoom_level), (zoomable_zoom_in_callback),
(zoomable_zoom_out_callback), (zoom_index_from_float),
(zoomable_set_zoom_level_callback),
(zoomable_zoom_to_fit_callback):
implementation for the text view
* libnautilus-extensions/nautilus-icon-container.c:
(lay_down_icons_horizontal):
fixed bug 3485, icon layout not using all of the available space, by tweaking the
code to not require the extra space between the columns
2000-11-28 01:43:43 +00:00
|
|
|
components/text/Makefile
|
2000-11-29 06:48:24 +00:00
|
|
|
components/text/services/Makefile
|
fixed bug 4369, throbber frozen during long refresh, by making the
fixed bug 4369, throbber frozen during long refresh, by making the
throbber a bonobo component so it's driven by its own thread.
Note that clicking on the throbber is temporarily broken; I'll
fix that soon. Also, made the frame delay be specified by the
theme and set the default to spin somewhat slower than before.
* configure.in:
* components/Makefile.am:
* components/throbber/.cvsignore:
* components/throbber/Makefile.am:
* components/throbber/nautilus-throbber.oafinfo:
added throbber component
* components/throbber/main.c: (throbber_object_destroyed),
(throbber_make_object), (main):
factory for the throbber component
* components/throbber/nautilus-throbber.c,h:
(nautilus_throbber_initialize_class), (is_throbbing),
(get_bonobo_properties), (set_bonobo_properties),
(nautilus_throbber_destroy), (nautilus_throbber_get_control),
(get_throbber_dimensions), (nautilus_throbber_initialize),
(nautilus_throbber_new), (nautilus_throbber_theme_changed),
(draw_pixbuf), (select_throbber_image), (draw_throbber_image),
(nautilus_throbber_draw), (nautilus_throbber_expose),
(nautilus_throbber_map), (bump_throbber_frame),
(nautilus_throbber_start),
(nautilus_throbber_remove_update_callback),
(nautilus_throbber_stop), (nautilus_throbber_unload_images),
(load_themed_image), (make_throbber_frame_name),
(nautilus_throbber_load_images),
(nautilus_throbber_button_press_event),
(nautilus_throbber_set_small_mode),
(nautilus_throbber_size_allocate),
(nautilus_throbber_size_request):
throbber widget for the bonobo component
* src/nautilus-window-toolbars.c: (theme_changed_callback),
(nautilus_window_initialize_toolbars):
set up throbber component in the toolbar
* src/nautilus-window.c,h: (nautilus_window_constructed),
(nautilus_window_allow_stop):
use property interface to start and stop the throbber
* icons/default.xml:
added delay specification to throbber in default theme
* nautilus-clean.sh:
clean throbber component as necessary
* src/Makefile.am:
* src/nautilus-throbber.c,h
removed old throbber widget
2001-01-16 03:44:40 +00:00
|
|
|
components/throbber/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-12 19:34:11 +00:00
|
|
|
po/Makefile.in
|
|
|
|
intl/Makefile
|
2000-06-01 06:00:19 +00:00
|
|
|
test/Makefile
|
2000-10-11 03:24:05 +00:00
|
|
|
user-guide/Makefile
|
2001-01-25 04:55:16 +00:00
|
|
|
user-guide/gnufdl/Makefile
|
2001-02-17 08:39:46 +00:00
|
|
|
user-guide/gnugpl/Makefile
|
2001-02-21 08:52:21 +00:00
|
|
|
help/Makefile
|
|
|
|
help/nautilus-user-manual/Makefile
|
|
|
|
help/nautilus-user-manual/C/Makefile
|
2001-02-24 10:18:08 +00:00
|
|
|
help/nautilus-user-manual/es/Makefile
|
2001-02-28 04:56:45 +00:00
|
|
|
help/nautilus-user-manual/ko/Makefile
|
2001-02-22 10:26:22 +00:00
|
|
|
help/nautilus-quick-reference/Makefile
|
|
|
|
help/nautilus-quick-reference/C/Makefile
|
2001-03-01 00:01:19 +00:00
|
|
|
help/nautilus-quick-reference/no/Makefile
|
2001-03-01 09:27:39 +00:00
|
|
|
help/nautilus-quick-reference/es/Makefile
|
2001-03-02 00:34:22 +00:00
|
|
|
help/nautilus-quick-reference/sv/Makefile
|
2001-03-08 14:01:02 +00:00
|
|
|
help/nautilus-quick-reference/ko/Makefile
|
2001-03-01 09:27:39 +00:00
|
|
|
help/nautilus-release-notes/Makefile
|
|
|
|
help/nautilus-release-notes/C/Makefile
|
2001-04-27 01:19:07 +00:00
|
|
|
help/nautilus-screenshot-guidelines/Makefile
|
|
|
|
help/nautilus-screenshot-guidelines/C/Makefile
|
2000-10-31 23:11:57 +00:00
|
|
|
applets/Makefile
|
|
|
|
applets/launcher/Makefile
|
2001-01-24 03:24:38 +00:00
|
|
|
applets/preferences-applet/Makefile
|
2001-02-17 08:39:46 +00:00
|
|
|
omf-install/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 =>
|
|
|
|
|
2001-03-22 15:33:59 +00:00
|
|
|
echo "Nautilus configuration summary:"
|
|
|
|
echo ""
|
|
|
|
|
|
|
|
dnl <= CFLAGS and LDFLAGS =>
|
|
|
|
echo "CFLAGS : $CFLAGS" | tr -s [:blank:] " "
|
|
|
|
echo "LDFLAGS : $LDFLAGS"
|
|
|
|
echo ""
|
|
|
|
|
2000-06-26 14:33:01 +00:00
|
|
|
dnl <= Mozilla component integrated? =>
|
|
|
|
case $found_mozilla in
|
2001-03-22 15:33:59 +00:00
|
|
|
t*)
|
|
|
|
echo "Mozilla component : YES"
|
|
|
|
echo " mozilla libraries : $_mozilla_lib_place"
|
|
|
|
echo " mozilla includes : $_mozilla_include_place"
|
|
|
|
echo " MOZILLA_MILESTONE : $MOZILLA_MILESTONE"
|
|
|
|
echo " MOZILLA_PROFILES_CFLAGS : $MOZILLA_PROFILES_CFLAGS"
|
|
|
|
echo " MOZILLA_COMPONENT_RPATH_FLAGS : $MOZILLA_COMPONENT_RPATH_FLAGS"
|
|
|
|
echo " MOZILLA_COMPONENT_DEBUG_FLAGS : $MOZILLA_COMPONENT_DEBUG_FLAGS"
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
echo "Mozilla component : NO"
|
|
|
|
;;
|
2000-06-26 14:33:01 +00:00
|
|
|
esac
|
2001-03-22 15:33:59 +00:00
|
|
|
|
2000-10-04 20:43:34 +00:00
|
|
|
dnl <= Profile support? =>
|
|
|
|
case "X$ENABLE_PROFILER" in
|
2001-03-22 15:33:59 +00:00
|
|
|
X1)
|
|
|
|
echo "Enable profiler : YES"
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
echo "Enable profiler : NO"
|
|
|
|
;;
|
2000-10-04 20:43:34 +00:00
|
|
|
esac
|
|
|
|
|
2001-04-10 05:52:44 +00:00
|
|
|
dnl <= Ammonite =>
|
|
|
|
echo "HAVE_AMMONITE : $HAVE_AMMONITE"
|
|
|
|
echo "AMMONITE_CFLAGS : $AMMONITE_CFLAGS"
|
|
|
|
echo "AMMONITE_LIBS : $AMMONITE_LIBS"
|
|
|
|
|
2000-10-06 07:25:37 +00:00
|
|
|
dnl <= FreeType2 =>
|
2001-03-22 15:33:59 +00:00
|
|
|
echo "FREETYPE2_CFLAGS : $FREETYPE2_CFLAGS"
|
|
|
|
echo "FREETYPE2_LIBS : $FREETYPE2_LIBS"
|
2000-06-26 14:36:10 +00:00
|
|
|
|
2000-10-16 20:13:48 +00:00
|
|
|
dnl <= Snapshot things =>
|
2001-03-22 15:33:59 +00:00
|
|
|
echo "EAZEL_BUILD_TIMESTAMP : $EAZEL_BUILD_TIMESTAMP"
|
|
|
|
echo "NAUTILUS_BUILD_MESSAGE : $NAUTILUS_BUILD_MESSAGE"
|
reviewed by: Gene Ragan <gzr@eazel.com>
* acconfig.h:
* configure.in:
Add a NAUTILUS_SOURCE_DIRECTORY that contains the location of the
nautilus source code, so that some checks can work without having
to do 'make install'
* components/services/install-view/nautilus-service-install-view.c:
(nautilus_service_install_view_initialize_class):
Initialize preferences so that smooth widgets and other nautilus
specific preferences work.
* components/services/summary/nautilus-summary-view.c:
(nautilus_summary_view_initialize_class):
Initialize preferences so that smooth widgets and other nautilus
specific preferences work.
* libnautilus-extensions/Makefile.am:
Remove macros that arent needed any more.
* libnautilus-extensions/nautilus-entry.h:
* libnautilus-extensions/nautilus-entry.c:
(nautilus_entry_initialize), (obscure_cursor),
(nautilus_entry_key_press), (nautilus_entry_motion_notify),
(nautilus_entry_set_text), (nautilus_entry_insert_text),
(nautilus_entry_delete_text), (nautilus_entry_initialize_class),
(nautilus_entry_set_special_tab_handling):
Make all the attributes private.
* libnautilus-extensions/nautilus-font-manager.c:
(at_exit_handler), (nautilus_free_static_storage_at_exit),
(gnome_vfs_init_if_needed), (font_description_table_add),
(font_description_table_new), (directory_contains_file),
(ensure_local_font_table),
(nautilus_font_manager_get_default_font),
(nautilus_font_manager_get_default_bold_font),
(nautilus_self_check_font_manager):
Remove dependency on nautilus-file-utilities. Update for new
machanism for finding data in the source directory so that checks
work even when Nautilus has not undergone 'make install.'
* libnautilus-extensions/nautilus-global-preferences.c:
(smooth_graphics_mode_changed_callback),
(nautilus_global_preferences_initialize):
Keep track of preferences smooth graphics mode changes and call
the new smooth widget api for changing the smoothness of all
tracked widgets.
* libnautilus-extensions/nautilus-scalable-font.c:
Remove a rogue unused #include.
* libnautilus-extensions/nautilus-smooth-widget.h:
* libnautilus-extensions/nautilus-smooth-widget.c:
(nautilus_smooth_widget_global_set_is_smooth),
(nautilus_smooth_widget_register):
Dont use preferences to track global smoothness changes. Add a
function to that instead.
* src/nautilus-location-bar.c: (nautilus_location_bar_initialize):
Update for privatized NautilusEntry attributes.
2001-04-02 23:02:56 +00:00
|
|
|
echo "NAUTILUS_SOURCE_DIRECTORY : $NAUTILUS_SOURCE_DIRECTORY"
|
2001-03-22 15:33:59 +00:00
|
|
|
echo "HAVE_APPLETS : $HAVE_APPLETS"
|
2000-11-01 03:26:03 +00:00
|
|
|
|
2000-06-26 14:36:10 +00:00
|
|
|
dnl <= End of configuration summary =>
|