From dcb0364d32b0bc041fa6801ba5271f64b45e2f68 Mon Sep 17 00:00:00 2001 From: rh Date: Sun, 12 Jan 2003 06:49:36 +0000 Subject: Update gnome-utils to 1.4.1.2. Notable changes include: * Works with gtkhtml-1.1 * Remove guile support to unbreak gnome (needs fixing in the guile 1.4 and 1.6 packages) * Translation updates * Build fixes * Update documentation * Search unusual install paths for data * Fix task redraw bug * New popup menu entries * Misc bugfixes * Fixes to configure/makefile setup * spec file file list fixes * coredump fixes * column drawing fixes * fix for printing dates, titles and tooltips * updated man pages --- misc/gnome-utils/Makefile | 12 +- misc/gnome-utils/PLIST | 90 +------------ misc/gnome-utils/distinfo | 8 +- misc/gnome-utils/patches/patch-ac | 262 +++++++++++++++++++++++++------------- 4 files changed, 192 insertions(+), 180 deletions(-) (limited to 'misc') diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile index e840eeb800f..249c7b888da 100644 --- a/misc/gnome-utils/Makefile +++ b/misc/gnome-utils/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.53 2003/01/07 03:56:27 uebayasi Exp $ +# $NetBSD: Makefile,v 1.54 2003/01/12 06:49:36 rh Exp $ -DISTNAME= gnome-utils-1.4.1 -PKGREVISION= 4 +DISTNAME= gnome-utils-1.4.1.2 CATEGORIES= misc x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-utils/1.4/} +EXTRACT_SUFX= .tar.bz2 MAINTAINER= rh@netbsd.org HOMEPAGE= http://www.gnome.org/ @@ -19,13 +19,17 @@ USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --localstatedir=${SCROLLKEEPER_DATADIR} +CONFIGURE_ENV+= BUILD_GUILE=no +CONFIGURE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig" +CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}" .include "../../textproc/scrollkeeper/buildlink2.mk" .include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/gnome-objc/buildlink2.mk" .include "../../devel/libglade/buildlink2.mk" .include "../../devel/libgtop/buildlink2.mk" .include "../../devel/ncurses/buildlink2.mk" -.include "../../lang/guile14/buildlink2.mk" +#.include "../../lang/guile14/buildlink2.mk" # XXX: req. guile1[46] fix first .include "../../www/gtkhtml/buildlink2.mk" .include "../../x11/gnome-core/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/gnome-utils/PLIST b/misc/gnome-utils/PLIST index 3236c1962ba..943f94e6a5a 100644 --- a/misc/gnome-utils/PLIST +++ b/misc/gnome-utils/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2002/07/17 13:46:49 rh Exp $ +@comment $NetBSD: PLIST,v 1.6 2003/01/12 06:49:37 rh Exp $ bin/gcalc bin/gcharmap bin/gcolorsel @@ -10,7 +10,6 @@ bin/gless bin/gnome-exe-handler bin/gsearchtool bin/gshutdown -bin/gtt bin/guname bin/gw bin/logview @@ -31,7 +30,6 @@ man/man1/gfontsel.1 man/man1/gless.1 man/man1/gnome-exe-handler.1 man/man1/gsearchtool.1 -man/man1/gtt.1 man/man1/guname.1 man/man1/gw.1 man/man1/logview.1 @@ -53,7 +51,6 @@ share/gcolorsel/glade/view-color-edit.glade share/gcolorsel/glade/view-color-generic-properties.glade share/gcolorsel/glade/view-color-grid-properties.glade share/gcolorsel/glade/view-color-list-properties.glade -share/gnome/apps/Applications/gtt.desktop share/gnome/apps/System/gdiskfree.desktop share/gnome/apps/System/gshutdown.desktop share/gnome/apps/System/guname.desktop @@ -495,53 +492,6 @@ share/gnome/help/gshutdown_util/es/license.sgml share/gnome/help/gshutdown_util/es/ln10.html share/gnome/help/gshutdown_util/es/topic.dat share/gnome/help/gshutdown_util/es/usage.html -share/gnome/help/gtt/C/authors.html -share/gnome/help/gtt/C/bugs.html -share/gnome/help/gtt/C/dialogs.html -share/gnome/help/gtt/C/docbook.css -share/gnome/help/gtt/C/figures/gtt_mainwin.png -share/gnome/help/gtt/C/figures/gtt_prefswin.png -share/gnome/help/gtt/C/gtt.sgml -share/gnome/help/gtt/C/index.html -share/gnome/help/gtt/C/license.html -share/gnome/help/gtt/C/ln10.html -share/gnome/help/gtt/C/preferences.html -share/gnome/help/gtt/C/stylesheet-images/caution.gif -share/gnome/help/gtt/C/stylesheet-images/home.gif -share/gnome/help/gtt/C/stylesheet-images/important.gif -share/gnome/help/gtt/C/stylesheet-images/next.gif -share/gnome/help/gtt/C/stylesheet-images/note.gif -share/gnome/help/gtt/C/stylesheet-images/prev.gif -share/gnome/help/gtt/C/stylesheet-images/tip.gif -share/gnome/help/gtt/C/stylesheet-images/toc-blank.gif -share/gnome/help/gtt/C/stylesheet-images/toc-minus.gif -share/gnome/help/gtt/C/stylesheet-images/toc-plus.gif -share/gnome/help/gtt/C/stylesheet-images/up.gif -share/gnome/help/gtt/C/stylesheet-images/warning.gif -share/gnome/help/gtt/C/topic.dat -share/gnome/help/gtt/C/usage.html -share/gnome/help/gtt/de/index.html -share/gnome/help/gtt/de/topic.dat -share/gnome/help/gtt/es/docbook.css -share/gnome/help/gtt/es/figures/gtt_mainwin.png -share/gnome/help/gtt/es/figures/gtt_prefswin.png -share/gnome/help/gtt/es/gtt.sgml -share/gnome/help/gtt/es/index.html -share/gnome/help/gtt/es/ln10.html -share/gnome/help/gtt/es/stylesheet-images/caution.gif -share/gnome/help/gtt/es/stylesheet-images/home.gif -share/gnome/help/gtt/es/stylesheet-images/important.gif -share/gnome/help/gtt/es/stylesheet-images/next.gif -share/gnome/help/gtt/es/stylesheet-images/note.gif -share/gnome/help/gtt/es/stylesheet-images/prev.gif -share/gnome/help/gtt/es/stylesheet-images/tip.gif -share/gnome/help/gtt/es/stylesheet-images/toc-blank.gif -share/gnome/help/gtt/es/stylesheet-images/toc-minus.gif -share/gnome/help/gtt/es/stylesheet-images/toc-plus.gif -share/gnome/help/gtt/es/stylesheet-images/up.gif -share/gnome/help/gtt/es/stylesheet-images/warning.gif -share/gnome/help/gtt/es/topic.dat -share/gnome/help/gtt/es/usage.html share/gnome/help/guname/C/authors.html share/gnome/help/guname/C/docbook.css share/gnome/help/guname/C/figures/guname-cpuinfo.png @@ -684,20 +634,6 @@ share/gnome/help/stripchart/es/stylesheet-images/up.gif share/gnome/help/stripchart/es/stylesheet-images/warning.gif share/gnome/help/stripchart/es/topic.dat share/gnome/help/stripchart/es/usage.html -share/gtt/ghtml/C/bigtable.ghtml -share/gtt/ghtml/C/invoice.ghtml -share/gtt/ghtml/C/journal.ghtml -share/gtt/ghtml/C/noproject.ghtml -share/gtt/ghtml/C/primer.ghtml -share/gtt/glade/interval_edit.glade -share/gtt/glade/interval_popup.glade -share/gtt/glade/journal.glade -share/gtt/glade/not-implemented.glade -share/gtt/glade/plugin.glade -share/gtt/glade/prefs.glade -share/gtt/glade/project_properties.glade -share/gtt/glade/task_popup.glade -share/gtt/glade/task_properties.glade share/idl/gsu.idl ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gnome-utils.mo ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnome-utils.mo @@ -708,6 +644,7 @@ ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gnome-utils.mo ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gnome-utils.mo ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnome-utils.mo ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gnome-utils.mo +${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gnome-utils.mo ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gnome-utils.mo ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnome-utils.mo ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gnome-utils.mo @@ -745,6 +682,7 @@ share/omf/gnome-utils/gcalc-es.omf share/omf/gnome-utils/gcalc-it.omf share/omf/gnome-utils/gcharmap-C.omf share/omf/gnome-utils/gcolorsel-C.omf +share/omf/gnome-utils/gdialog-C.omf share/omf/gnome-utils/gdict-C.omf share/omf/gnome-utils/gdict-es.omf share/omf/gnome-utils/gdiskfree-C.omf @@ -758,21 +696,19 @@ share/omf/gnome-utils/gsearchtool-C.omf share/omf/gnome-utils/gsearchtool-es.omf share/omf/gnome-utils/gsearchtool-it.omf share/omf/gnome-utils/gshutdown-C.omf -share/omf/gnome-utils/gtt-C.omf +share/omf/gnome-utils/gshutdown-es.omf share/omf/gnome-utils/guname-C.omf share/omf/gnome-utils/gw-C.omf +share/omf/gnome-utils/logview-C.omf share/omf/gnome-utils/meat-grinder-C.omf share/omf/gnome-utils/stripchart-C.omf share/omf/gnome-utils/stripchart-es.omf -share/omf/gnome-utils/gdialog-C.omf -share/omf/gnome-utils/gshutdown-es.omf -share/omf/gnome-utils/logview-C.omf -share/pixmaps/gdiskfree-splash.png -share/pixmaps/gdiskfree.png share/pixmaps/gcharmap-logo.png share/pixmaps/gcharmap-map-16.xpm share/pixmaps/gcharmap-map-big.xpm share/pixmaps/gdict.png +share/pixmaps/gdiskfree-splash.png +share/pixmaps/gdiskfree.png share/pixmaps/gnome-fontsel.png share/pixmaps/gnome-searchtool.png share/pixmaps/gnome-shutdown.png @@ -785,10 +721,6 @@ share/stripchart/stripchart.params @dirrm share/pixmaps/logview @dirrm share/omf/gnome-utils @dirrm share/logview -@dirrm share/gtt/glade -@dirrm share/gtt/ghtml/C -@dirrm share/gtt/ghtml -@dirrm share/gtt @dirrm share/gnome/help/stripchart/es/stylesheet-images @dirrm share/gnome/help/stripchart/es/figures @dirrm share/gnome/help/stripchart/es @@ -813,14 +745,6 @@ share/stripchart/stripchart.params @dirrm share/gnome/help/guname/C/figures @dirrm share/gnome/help/guname/C @dirrm share/gnome/help/guname -@dirrm share/gnome/help/gtt/es/stylesheet-images -@dirrm share/gnome/help/gtt/es/figures -@dirrm share/gnome/help/gtt/es -@dirrm share/gnome/help/gtt/de -@dirrm share/gnome/help/gtt/C/stylesheet-images -@dirrm share/gnome/help/gtt/C/figures -@dirrm share/gnome/help/gtt/C -@dirrm share/gnome/help/gtt @exec ${MKDIR} %D/share/gnome/help/gshutdown_util/es/stylesheet-images @dirrm share/gnome/help/gshutdown_util/es/stylesheet-images @dirrm share/gnome/help/gshutdown_util/es/figures diff --git a/misc/gnome-utils/distinfo b/misc/gnome-utils/distinfo index 05c56b6fbf6..e35a69f6114 100644 --- a/misc/gnome-utils/distinfo +++ b/misc/gnome-utils/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.7 2002/12/01 16:25:56 salo Exp $ +$NetBSD: distinfo,v 1.8 2003/01/12 06:49:37 rh Exp $ -SHA1 (gnome-utils-1.4.1.tar.gz) = a266e22838231ea7e6df5487d2787f33abe59961 -Size (gnome-utils-1.4.1.tar.gz) = 4342060 bytes +SHA1 (gnome-utils-1.4.1.2.tar.bz2) = ae8148a7402d94c948ee41e1921a055906c62c67 +Size (gnome-utils-1.4.1.2.tar.bz2) = 3280620 bytes SHA1 (patch-aa) = 27b24e4d80033c285cebde37e263583c4a9905af SHA1 (patch-ab) = cf12496463e31f48c75caab18ffe4a93db8d5781 -SHA1 (patch-ac) = 628d3dbade2eb8e3a76dd670c5fd6a9f0df99134 +SHA1 (patch-ac) = 89e7f71e812cf67f39d446a163a798f5d25ea819 SHA1 (patch-af) = 60d22abb2c4c1813d51d90116901b543cf1be99a SHA1 (patch-ag) = 96d31d113f8aa5ca3e881768e2395052d8c01fe6 SHA1 (patch-ah) = 9d4ceb307deb5123ac77330c5e9f94771ad88300 diff --git a/misc/gnome-utils/patches/patch-ac b/misc/gnome-utils/patches/patch-ac index 15e1f3054c7..37c47b524c5 100644 --- a/misc/gnome-utils/patches/patch-ac +++ b/misc/gnome-utils/patches/patch-ac @@ -1,130 +1,214 @@ -$NetBSD: patch-ac,v 1.6 2002/12/01 16:25:57 salo Exp $ +$NetBSD: patch-ac,v 1.7 2003/01/12 06:49:38 rh Exp $ ---- configure.orig Fri Oct 5 07:22:36 2001 +--- configure.orig Fri Feb 1 10:57:01 2002 +++ configure -@@ -6468,125 +6468,8 @@ - fi +@@ -5504,8 +5504,8 @@ if test "$OBJECTIVE_C" = yes; then + echo "$as_me:5504: checking for an obGnomeConf.sh" >&5 + echo $ECHO_N "checking for an obGnomeConf.sh... $ECHO_C" >&6 + my_gnome_libdir=`$GNOME_CONFIG --libdir` +- if test -f $my_gnome_libdir/obGnomeConf.sh; then +- . $my_gnome_libdir/obGnomeConf.sh ++ if test -f $LOCALBASE/lib/obGnomeConf.sh; then ++ . $LOCALBASE/lib/obGnomeConf.sh + echo "$as_me:5509: result: found $my_gnome_libdir" >&5 + echo "${ECHO_T}found $my_gnome_libdir" >&6 + ac_cv_have_gnome_objc=yes +@@ -8858,17 +8858,7 @@ main () + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:8861: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:8864: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:8867: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:8870: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if false ; then + + ac_cv_guile_found=yes + cat >>confdefs.h <<\EOF +@@ -9032,12 +9022,12 @@ fi + GLADE_LIBS=`gnome-config --libs libglade` + GLADE_CFLAGS=`gnome-config --cflags libglade` +-GTKHTML_LIBS=`$GNOME_CONFIG --libs gtkhtml` +-GTKHTML_CFLAGS=`$GNOME_CONFIG --cflags gtkhtml` ++GTKHTML_LIBS=`pkg-config --libs gtkhtml-1.1` ++GTKHTML_CFLAGS=`pkg-config --cflags gtkhtml-1.1` + echo "$as_me:9038: checking for GtkHTML" >&5 + echo $ECHO_N "checking for GtkHTML... $ECHO_C" >&6 +-if gnome-config --libs gtkhtml > /dev/null 2>&1; then ++if pkg-config --libs gtkhtml-1.1 > /dev/null 2>&1; then + echo "$as_me:9041: result: found" >&5 + echo "${ECHO_T}found" >&6 + else +@@ -9226,163 +9216,6 @@ if test "x$GNOME_XML_LIB" != "x"; then + else + HAVE_LIBXML_TRUE='#' + HAVE_LIBXML_FALSE= +-fi +- -build_gfloppy=true --ac_safe=`echo "linux/fd.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for linux/fd.h""... $ac_c" 1>&6 --echo "configure:6475: checking for linux/fd.h" >&5 --if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 +-echo "$as_me:9232: checking for linux/fd.h" >&5 +-echo $ECHO_N "checking for linux/fd.h... $ECHO_C" >&6 +-if test "${ac_cv_header_linux_fd_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 -else -- cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +-#line 9238 "configure" -#include "confdefs.h" -#include --EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:6485: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` --if test -z "$ac_err"; then -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=yes" +-_ACEOF +-if { (eval echo "$as_me:9242: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +- ac_status=$? +- egrep -v '^ *\+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:9248: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- else +- ac_cpp_err= +- fi -else -- echo "$ac_err" >&5 -- echo "configure: failed program was:" >&5 +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then +- ac_cv_header_linux_fd_h=yes +-else +- echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=no" +- ac_cv_header_linux_fd_h=no -fi --rm -f conftest* +-rm -f conftest.err conftest.$ac_ext -fi --if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- cat >> confdefs.h <<\EOF +-echo "$as_me:9267: result: $ac_cv_header_linux_fd_h" >&5 +-echo "${ECHO_T}$ac_cv_header_linux_fd_h" >&6 +-if test $ac_cv_header_linux_fd_h = yes; then +- cat >>confdefs.h <<\EOF -#define HAVE_LINUX_FD_H 1 -EOF - -else -- echo "$ac_t""no" 1>&6 --build_gfloppy=false -- echo "configure: warning: *** gfloppy will not be built." 1>&2 +- build_gfloppy=false +- { echo "$as_me:9276: WARNING: *** gfloppy will not be built." >&5 +-echo "$as_me: WARNING: *** gfloppy will not be built." >&2;} -fi - -# Check for the ext2fs library --echo $ac_n "checking for ext2fs_mkdir in -lext2fs""... $ac_c" 1>&6 --echo "configure:6513: checking for ext2fs_mkdir in -lext2fs" >&5 --ac_lib_var=`echo ext2fs'_'ext2fs_mkdir | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 +-echo "$as_me:9281: checking for ext2fs_mkdir in -lext2fs" >&5 +-echo $ECHO_N "checking for ext2fs_mkdir in -lext2fs... $ECHO_C" >&6 +-if test "${ac_cv_lib_ext2fs_ext2fs_mkdir+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 -else -- ac_save_LIBS="$LIBS" +- ac_check_lib_save_LIBS=$LIBS -LIBS="-lext2fs $LIBS" --cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +-#line 9289 "configure" -#include "confdefs.h" +- -/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif -/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char ext2fs_mkdir(); -- --int main() { --ext2fs_mkdir() --; return 0; } --EOF --if { (eval echo configure:6532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" +- builtin and then its argument prototype would still apply. */ +-char ext2fs_mkdir (); +-int +-main () +-{ +-ext2fs_mkdir (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9308: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:9311: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9314: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:9317: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_lib_ext2fs_ext2fs_mkdir=yes -else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" +- echo "$as_me: failed program was:" >&5 +-cat conftest.$ac_ext >&5 +-ac_cv_lib_ext2fs_ext2fs_mkdir=no -fi --rm -f conftest* --LIBS="$ac_save_LIBS" -- +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS -fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 +-echo "$as_me:9328: result: $ac_cv_lib_ext2fs_ext2fs_mkdir" >&5 +-echo "${ECHO_T}$ac_cv_lib_ext2fs_ext2fs_mkdir" >&6 +-if test $ac_cv_lib_ext2fs_ext2fs_mkdir = yes; then - x_libs="-lext2fs" -else -- echo "$ac_t""no" 1>&6 - build_gfloppy=false -- echo "configure: warning: --*** libext2fs not found. You need e2fsprogs and e2fsprogs-devel installed to build gfloppy." 1>&2 +- build_gfloppy=false +- { echo "$as_me:9334: WARNING: +-*** libext2fs not found. You need e2fsprogs and e2fsprogs-devel installed to build gfloppy." >&5 +-echo "$as_me: WARNING: +-*** libext2fs not found. You need e2fsprogs and e2fsprogs-devel installed to build gfloppy." >&2;} -fi - +- -# check for ext2fs header specific includes --ac_safe=`echo "ext2fs/ext2_io.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for ext2fs/ext2_io.h""... $ac_c" 1>&6 --echo "configure:6558: checking for ext2fs/ext2_io.h" >&5 --if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 +-echo "$as_me:9341: checking for ext2fs/ext2_io.h" >&5 +-echo $ECHO_N "checking for ext2fs/ext2_io.h... $ECHO_C" >&6 +-if test "${ac_cv_header_ext2fs_ext2_io_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 -else -- cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +-#line 9347 "configure" -#include "confdefs.h" -#include --EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:6568: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` --if test -z "$ac_err"; then -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=yes" +-_ACEOF +-if { (eval echo "$as_me:9351: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +- ac_status=$? +- egrep -v '^ *\+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:9357: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then +- ac_cv_header_ext2fs_ext2_io_h=yes -else -- echo "$ac_err" >&5 -- echo "configure: failed program was:" >&5 +- echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=no" +- ac_cv_header_ext2fs_ext2_io_h=no -fi --rm -f conftest* +-rm -f conftest.err conftest.$ac_ext -fi --if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -- echo "$ac_t""yes" 1>&6 +-echo "$as_me:9376: result: $ac_cv_header_ext2fs_ext2_io_h" >&5 +-echo "${ECHO_T}$ac_cv_header_ext2fs_ext2_io_h" >&6 +-if test $ac_cv_header_ext2fs_ext2_io_h = yes; then - : -else -- echo "$ac_t""no" 1>&6 --build_gfloppy=false -- echo "configure: warning: --*** ext2fs/ext2_io.h not found. You need e2fsprogs-devel installed." 1>&2 --fi - - +- build_gfloppy=false +- { echo "$as_me:9382: WARNING: +-*** ext2fs/ext2_io.h not found. You need e2fsprogs-devel installed." >&5 +-echo "$as_me: WARNING: +-*** ext2fs/ext2_io.h not found. You need e2fsprogs-devel installed." >&2;} + fi + if test "$build_gfloppy" = true; then -- cgit v1.2.3