mirror of
https://gitlab.gnome.org/GNOME/nautilus
synced 2024-10-29 23:47:15 +00:00
Fix freetype2 detection fix srcdir != builddir.
* configure.in: Fix freetype2 detection * Various makefiles: fix srcdir != builddir.
This commit is contained in:
Elliot Lee
parent
5122c9f427
commit
5868f1bf7a
4 changed files with 24 additions and 81 deletions
76
ChangeLog
76
ChangeLog
|
|
@ -1,76 +1,6 @@
|
|||
2000-11-09 Andy Hertzfeld <andy@eazel.com>
|
||||
|
||||
* src/nautilus-property-browser.c:
|
||||
(nautilus_property_browser_drag_data_get),
|
||||
(element_clicked_callback), (add_reset_property):
|
||||
fixed recently introduced bug where emblems wouldn't drag
|
||||
properly; also, used defined constant for reset image name.
|
||||
|
||||
2000-11-09 Darin Adler <darin@eazel.com>
|
||||
|
||||
buddy: John Sullivan <sullivan@eazel.com>
|
||||
|
||||
* libnautilus-extensions/Makefile.am:
|
||||
* libnautilus-extensions/nautilus-mime-actions.c:
|
||||
* libnautilus-extensions/nautilus-wait-until-ready.h:
|
||||
Removed the last vestiges of the wait calls.
|
||||
|
||||
* libnautilus-extensions/nautilus-program-choosing.h:
|
||||
Add declarations for cancel calls (not yet implemented).
|
||||
|
||||
* libnautilus-extensions/nautilus-program-choosing.c:
|
||||
(choose_application_hash), (choose_application_equal),
|
||||
(choose_application_destroy), (choose_component_hash),
|
||||
(choose_component_equal), (choose_component_destroy),
|
||||
(choose_component_callback), (nautilus_choose_component_for_file),
|
||||
(choose_application_callback),
|
||||
(nautilus_choose_application_for_file): Change the
|
||||
implementation to use call_when_ready instead of
|
||||
wait_until_ready.
|
||||
|
||||
* src/file-manager/fm-directory-view.c:
|
||||
Formatting tweaks.
|
||||
|
||||
2000-11-09 Mathieu Lacage <mathieu@eazel.com>
|
||||
|
||||
* docs/dnd.txt: doc about the dnd code.
|
||||
|
||||
2000-11-09 Andy Hertzfeld <andy@eazel.com>
|
||||
|
||||
fixed bug 4449, reset property in colors section of
|
||||
property browser.
|
||||
|
||||
* src/nautilus-property-browser.c:
|
||||
(nautilus_property_browser_drag_data_get),
|
||||
(element_clicked_callback), (add_reset_property),
|
||||
(make_properties_from_xml_node):
|
||||
add a reset property in the top left position, and add some
|
||||
checks to make it work, even though it's not a color.
|
||||
|
||||
2000-11-09 Gene Z. Ragan <gzr@eazel.com>
|
||||
|
||||
Fixed bug 3776, Crash when trying to drag URL .desktop
|
||||
file to desktop
|
||||
|
||||
* libnautilus-extensions/nautilus-icon-dnd.c:
|
||||
(receive_dropped_uri_list):
|
||||
Bail out is URI list is NULL
|
||||
|
||||
* src/file-manager/fm-desktop-icon-view.c:
|
||||
(icon_view_create_nautilus_links):
|
||||
Handle special cases. Create a NautilusLink in cases
|
||||
that a GnomeVFS symbolic link will not work.
|
||||
|
||||
2000-11-09 Mathieu Lacage <mathieu@eazel.com>
|
||||
|
||||
Fix bug 4619. fdl of nautilus collides with help from gnome-core.
|
||||
This is a workaround till we have a new shipped gnome-core.
|
||||
* nautilus.spec.in: remove fdl directory
|
||||
* user-guide/C/Makefile.am: remove fdl installation
|
||||
* user-guide/C/fdl.sgml: remove
|
||||
* user-guide/C/sgml/fdl.sgml: add
|
||||
* user-guide/C/sgml/nautilus.sgml: change to use the new fdl file.
|
||||
|
||||
2000-11-09 Elliot Lee <sopwith@redhat.com>
|
||||
* configure.in: Fix freetype2 detection
|
||||
* Various makefiles: fix srcdir != builddir.
|
||||
|
||||
2000-11-09 Darin Adler <darin@eazel.com>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ INCLUDES = -I. -I$(srcdir) \
|
|||
-I$(top_srcdir) \
|
||||
-I$(top_builddir) \
|
||||
-I$(includedir) \
|
||||
$(GNOME_CFLAGS) \
|
||||
$(APPLETS_CFLAGS) \
|
||||
-DDATADIR=\""$(datadir)"\" \
|
||||
-DBINDIR=\""$(bindir)"\" \
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ INCLUDES = \
|
|||
-DSTANDALONE \
|
||||
-DTRILOBITE_VERSION=\"0.1.0\" \
|
||||
-I$(srcdir) \
|
||||
-I. \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_builddir) \
|
||||
-I/usr/include/rpm \
|
||||
|
|
|
|||
27
configure.in
27
configure.in
|
|
@ -95,22 +95,33 @@ _found_freetype2_lib="no"
|
|||
_found_freetype2_header="no"
|
||||
_found_freetype2="no"
|
||||
|
||||
AC_ARG_WITH(freetype2,
|
||||
[ --with-freetype2-lib-prefix=PREFIX freetype2 library path],
|
||||
freetype2_lib_prefix=$withval,
|
||||
freetype2_lib_prefix="/usr/lib")
|
||||
AC_ARG_WITH(freetype2-libraries,
|
||||
[ --with-freetype2-libraries=PATH freetype2 library path],
|
||||
freetype2_lib_prefix=$withval)
|
||||
|
||||
AC_ARG_WITH(freetype2,
|
||||
[ --with-freetype2-include-prefix=PREFIX freetype2 include path],
|
||||
freetype2_include_prefix=$withval,
|
||||
freetype2_include_prefix="/usr/include/freetype2")
|
||||
AC_ARG_WITH(freetype2-includes,
|
||||
[ --with-freetype2-includes=PATH freetype2 include path],
|
||||
freetype2_include_prefix=$withval)
|
||||
|
||||
AC_ARG_WITH(freetype2-prefix,
|
||||
[ --with-freetype2-prefix=PATH freetype2 installation prefix],
|
||||
freetype2_prefix=$withval, freetype2_prefix="/usr")
|
||||
|
||||
if test -z "$freetype2_include_prefix"; then
|
||||
freetype2_include_prefix="${freetype2_prefix}/include/freetype2"
|
||||
fi
|
||||
if test -z "$freetype2_lib_prefix"; then
|
||||
freetype2_lib_prefix="${freetype2_prefix}/lib"
|
||||
fi
|
||||
|
||||
_save_cpp="$CPP"
|
||||
_save_ldflags="$LDFLAGS"
|
||||
CPP="$_save_cpp -I$freetype2_include_prefix"
|
||||
LDFLAGS="$_save_ldflags -L$freetype2_lib_prefix"
|
||||
AC_CHECK_HEADER(freetype/freetype.h, _found_freetype2_header="yes")
|
||||
AC_CHECK_LIB(freetype, FT_Init_FreeType, [_found_freetype2_lib="yes"])
|
||||
CPP="$_save_cpp"
|
||||
LDFLAGS="$_save_ldflags"
|
||||
|
||||
if test "x$_found_freetype2_lib" = "xyes" -a \
|
||||
"x$_found_freetype2_header" = "xyes"
|
||||
|
|
|
|||
Loading…
Reference in a new issue