diff options
| author | Maciej Stachowiak <mstachow@src.gnome.org> | 2000-08-08 01:36:50 +0000 |
|---|---|---|
| committer | Maciej Stachowiak <mstachow@src.gnome.org> | 2000-08-08 01:36:50 +0000 |
| commit | fb93d81e6d32b870632ed2aeff039c121c2752da (patch) | |
| tree | d20eddcc582d4b536f0026dc862ef7b61e422fe4 | |
| parent | 3bb6e868091fb3015e0f0bc20aefce1e51b249ee (diff) | |
| download | nautilus-fb93d81e6d32b870632ed2aeff039c121c2752da.tar.gz | |
New file, used to detect whether we are configuring a cvs version or a
* CVSVERSION: New file, used to detect whether we are configuring
a cvs version or a release tarball.
* configure.in: Default -Werror to off when configuring a release
tarball, and to on when configuring a cvs version.
| -rw-r--r-- | CVSVERSION | 4 | ||||
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 11 | ||||
| -rw-r--r-- | libnautilus-extensions/nautilus-global-preferences.c | 6 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-global-preferences.c | 6 |
5 files changed, 27 insertions, 8 deletions
diff --git a/CVSVERSION b/CVSVERSION new file mode 100644 index 000000000..5892a0aca --- /dev/null +++ b/CVSVERSION @@ -0,0 +1,4 @@ +This file is here to detect the fact that we are building a CVS +version and not a tarball. Do _not_ add it to any Makfile.am rules +that would cause it to be distributed in release tarballs! + @@ -1,3 +1,11 @@ +2000-08-07 Maciej Stachowiak <mjs@eazel.com> + + * CVSVERSION: New file, used to detect whether we are configuring + a cvs version or a release tarball. + + * configure.in: Default -Werror to off when configuring a release + tarball, and to on when configuring a cvs version. + 2000-08-07 Eskil Heyn Olsen <eskil@eazel.com> * components/rpmview/nautilus-rpm-view.c: diff --git a/configure.in b/configure.in index e1176f77c..37916e6c3 100644 --- a/configure.in +++ b/configure.in @@ -377,9 +377,16 @@ dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST dnl Turn on the additional warnings last, so -Werror doesn't affect other tests. + AC_ARG_ENABLE(more-warnings, -[--enable-more-warnings Maximum compiler warnings], -set_more_warnings="$enableval", set_more_warnings=yes) +[ --enable-more-warnings Maximum compiler warnings], +set_more_warnings="$enableval",[ +if test -f $srcdir/CVSVERSION; then + set_more_warnings=yes +else + set_more_warnings=no +fi +]) AC_MSG_CHECKING(for more warnings, including -Werror) if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then AC_MSG_RESULT(yes) diff --git a/libnautilus-extensions/nautilus-global-preferences.c b/libnautilus-extensions/nautilus-global-preferences.c index 1776c0da2..a455d6fe8 100644 --- a/libnautilus-extensions/nautilus-global-preferences.c +++ b/libnautilus-extensions/nautilus-global-preferences.c @@ -650,9 +650,9 @@ global_preferences_register (void) global_preferences_register_speed_tradeoff_with_defaults (NAUTILUS_PREFERENCES_SHOW_IMAGE_FILE_THUMBNAILS, _("Show thumbnails for image files"), - NAUTILUS_SPEED_TRADEOFF_LOCAL_ONLY, - NAUTILUS_SPEED_TRADEOFF_LOCAL_ONLY, - NAUTILUS_SPEED_TRADEOFF_LOCAL_ONLY); + NAUTILUS_SPEED_TRADEOFF_ALWAYS, + NAUTILUS_SPEED_TRADEOFF_ALWAYS, + NAUTILUS_SPEED_TRADEOFF_ALWAYS); global_preferences_register_speed_tradeoff_with_defaults (NAUTILUS_PREFERENCES_USE_PUBLIC_METADATA, _("Read and write metadata in each directory"), diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c index 1776c0da2..a455d6fe8 100644 --- a/libnautilus-private/nautilus-global-preferences.c +++ b/libnautilus-private/nautilus-global-preferences.c @@ -650,9 +650,9 @@ global_preferences_register (void) global_preferences_register_speed_tradeoff_with_defaults (NAUTILUS_PREFERENCES_SHOW_IMAGE_FILE_THUMBNAILS, _("Show thumbnails for image files"), - NAUTILUS_SPEED_TRADEOFF_LOCAL_ONLY, - NAUTILUS_SPEED_TRADEOFF_LOCAL_ONLY, - NAUTILUS_SPEED_TRADEOFF_LOCAL_ONLY); + NAUTILUS_SPEED_TRADEOFF_ALWAYS, + NAUTILUS_SPEED_TRADEOFF_ALWAYS, + NAUTILUS_SPEED_TRADEOFF_ALWAYS); global_preferences_register_speed_tradeoff_with_defaults (NAUTILUS_PREFERENCES_USE_PUBLIC_METADATA, _("Read and write metadata in each directory"), |