diff --git a/Changelog b/Changelog index 744566e..1dd2158 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,8 @@ +2004-05-12 Henning Meier-Geinitz + + * acinclude.m4 aclocal.m4 configure sane-frontends.lsm: Removed + old links to ftp.mostang.com. + 2004-04-29 Julien Blache * src/gtkglue.h: looks like someone wanted GSGDialog.twocolumn to an int rather than a GtkWidget *. Fixed. diff --git a/acinclude.m4 b/acinclude.m4 index ff28e51..9c7f451 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -517,7 +517,7 @@ main () major, minor, micro); } - printf("*** SANE is always available from ftp://ftp.mostang.com\n"); + printf("*** SANE is always available from http://www.sane-project.org\n"); printf("***\n"); printf("*** If you have already installed a sufficient version, this error\n"); printf("*** probably means that the wrong copy of the sane-config shell script is\n"); diff --git a/aclocal.m4 b/aclocal.m4 index e92d7b6..b83ffbb 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,15 +1,14 @@ -# generated automatically by aclocal 1.7.9 -*- Autoconf -*- +dnl aclocal.m4 generated automatically by aclocal 1.4-p4 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without +dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A +dnl PARTICULAR PURPOSE. # acinclude.m4 for sane-frontends # AM_PATH_GTK @@ -528,7 +527,7 @@ main () major, minor, micro); } - printf("*** SANE is always available from ftp://ftp.mostang.com\n"); + printf("*** SANE is always available from http://www.sane-project.org\n"); printf("***\n"); printf("*** If you have already installed a sufficient version, this error\n"); printf("*** probably means that the wrong copy of the sane-config shell script is\n"); @@ -602,52 +601,8 @@ main () # ******************************************************************** -# isc-posix.m4 serial 2 (gettext-0.11.2) -dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. -# This file is not needed with autoconf-2.53 and newer. Remove it in 2005. - -# This test replaces the one in autoconf. -# Currently this macro should have the same name as the autoconf macro -# because gettext's gettext.m4 (distributed in the automake package) -# still uses it. Otherwise, the use in gettext.m4 makes autoheader -# give these diagnostics: -# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX -# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX - -undefine([AC_ISC_POSIX]) - -AC_DEFUN([AC_ISC_POSIX], - [ - dnl This test replaces the obsolescent AC_ISC_POSIX kludge. - AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) - ] -) - - -# Copyright 1996, 1997, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 2 +# serial 1 # @defmac AC_PROG_CC_STDC # @maindex PROG_CC_STDC @@ -664,7 +619,7 @@ AC_DEFUN([AC_ISC_POSIX], # program @code{ansi2knr}, which comes with Ghostscript. # @end defmac -AC_DEFUN([AM_PROG_CC_STDC], +AC_DEFUN(AM_PROG_CC_STDC, [AC_REQUIRE([AC_PROG_CC]) AC_BEFORE([$0], [AC_C_INLINE]) AC_BEFORE([$0], [AC_C_CONST]) @@ -674,7 +629,7 @@ dnl like #elif. dnl FIXME: can't do this because then AC_AIX won't work due to a dnl circular dependency. dnl AC_BEFORE([$0], [AC_PROG_CPP]) -AC_MSG_CHECKING([for ${CC-cc} option to accept ANSI C]) +AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C) AC_CACHE_VAL(am_cv_prog_cc_stdc, [am_cv_prog_cc_stdc=no ac_save_CC="$CC" @@ -682,10 +637,9 @@ ac_save_CC="$CC" # breaks some systems' header files. # AIX -qlanglvl=ansi # Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE +# HP-UX -Aa -D_HPUX_SOURCE # SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" AC_TRY_COMPILE( @@ -727,7 +681,7 @@ CC="$ac_save_CC" if test -z "$am_cv_prog_cc_stdc"; then AC_MSG_RESULT([none needed]) else - AC_MSG_RESULT([$am_cv_prog_cc_stdc]) + AC_MSG_RESULT($am_cv_prog_cc_stdc) fi case "x$am_cv_prog_cc_stdc" in x|xno) ;; @@ -735,8 +689,6 @@ case "x$am_cv_prog_cc_stdc" in esac ]) -AU_DEFUN([fp_PROG_CC_STDC], [AM_PROG_CC_STDC]) - # Configure paths for GTK+ # Owen Taylor 1997-2001 @@ -941,7 +893,7 @@ main () dnl AM_PATH_GIMP_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl Test for GIMP, and define GIMP_CFLAGS and GIMP_LIBS dnl -AC_DEFUN(AM_PATH_GIMP_2_0, +AC_DEFUN([AM_PATH_GIMP_2_0], [dnl dnl Get the cflags and libraries from pkg-config dnl @@ -967,7 +919,7 @@ AC_ARG_ENABLE(gimptest, [ --disable-gimptest do not try to compile and run no_gimp=yes fi - min_gimp_version=ifelse([$1], ,1.3.24,$1) + min_gimp_version=ifelse([$1], ,2.0.0,$1) AC_MSG_CHECKING(for GIMP - version >= $min_gimp_version) if test x$PKG_CONFIG != xno ; then diff --git a/configure b/configure index dcc3ab3..7948107 100755 --- a/configure +++ b/configure @@ -3002,14 +3002,13 @@ _ACEOF fi - - echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5 -echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6 -if test "${ac_cv_lib_cposix_strerror+set}" = set; then +echo "$as_me:$LINENO: checking for library containing strerror" >&5 +echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6 +if test "${ac_cv_search_strerror+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcposix $LIBS" + ac_func_search_save_LIBS=$LIBS +ac_cv_search_strerror=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -3053,24 +3052,79 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_cposix_strerror=yes + ac_cv_search_strerror="none required" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_cposix_strerror=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5 -echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6 -if test $ac_cv_lib_cposix_strerror = yes; then - LIBS="$LIBS -lcposix" -fi +if test "$ac_cv_search_strerror" = no; then + for ac_lib in cposix; do + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end 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 strerror (); +int +main () +{ +strerror (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_search_strerror="-l$ac_lib" +break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + done +fi +LIBS=$ac_func_search_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 +echo "${ECHO_T}$ac_cv_search_strerror" >&6 +if test "$ac_cv_search_strerror" != no; then + test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS" + +fi @@ -3086,10 +3140,9 @@ ac_save_CC="$CC" # breaks some systems' header files. # AIX -qlanglvl=ansi # Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE +# HP-UX -Aa -D_HPUX_SOURCE # SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" cat >conftest.$ac_ext <<_ACEOF @@ -6181,7 +6234,7 @@ main () major, minor, micro); } - printf("*** SANE is always available from ftp://ftp.mostang.com\n"); + printf("*** SANE is always available from http://www.sane-project.org\n"); printf("***\n"); printf("*** If you have already installed a sufficient version, this error\n"); printf("*** probably means that the wrong copy of the sane-config shell script is\n"); diff --git a/sane-frontends.lsm b/sane-frontends.lsm index 03cd208..c90bd09 100644 --- a/sane-frontends.lsm +++ b/sane-frontends.lsm @@ -15,8 +15,7 @@ Author: David.Mosberger@acm.org (David Mosberger-Tang) ttarrant@etnoteam.it (Tristan Tarrant) Maintained-by: henning@meier-geinitz.de (Henning Meier-Geinitz) Oliver.Rauch@rauch-domain.de (Oliver Rauch) - David.Mosberger@acm.org (David Mosberger-Tang) -Primary-site: ftp.mostang.com /pub/sane/sane-_VERSION_ +Primary-site: ftp.sane-project.org /pub/sane/sane-_VERSION_ _T_S_ kB sane-frontends-_VERSION_.tar.gz _L_S_ kB sane-frontends-_VERSION_.lsm Alternate-site: sunsite.unc.edu /pub/Linux/apps/graphics/capture