mirror
/
sane-project-frontends
kopia lustrzana https://gitlab.com/sane-project/frontends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'master' into gtk3

merge-requests/6/head
Ordissimo 2023-02-08 22:38:17 +01:00
rodzic 8e6a50bfa6 0d7bff9d8f
commit 0d2bdd998f
6 zmienionych plików z 32 dodań i 31 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
acinclude.m4
Wyświetl plik

@ -484,6 +484,7 @@ dnl
AC_TRY_RUN([
#include <sane/sane.h>
#include <stdio.h>
#include <stdlib.h>
int
main ()

22
aclocal.m4 vendored
Wyświetl plik

@ -1,6 +1,6 @@
# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# Copyright (C) 1996-2021 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -12,9 +12,9 @@
# PARTICULAR PURPOSE.
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
dnl serial 11 (pkg-config-0.29.1)
dnl
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
# serial 12 (pkg-config-0.29.2)
dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
dnl
@ -55,7 +55,7 @@ dnl
dnl See the "Since" comment for each macro you use to see what version
dnl of the macros you require.
m4_defun([PKG_PREREQ],
[m4_define([PKG_MACROS_VERSION], [0.29.1])
[m4_define([PKG_MACROS_VERSION], [0.29.2])
m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
[m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
])dnl PKG_PREREQ
@ -156,7 +156,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
pkg_failed=no
AC_MSG_CHECKING([for $1])
AC_MSG_CHECKING([for $2])
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
@ -166,11 +166,11 @@ and $1[]_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.])
if test $pkg_failed = yes; then
AC_MSG_RESULT([no])
AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
else
else
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
@ -187,7 +187,7 @@ installed software in a non-standard prefix.
_PKG_TEXT])[]dnl
])
elif test $pkg_failed = untried; then
AC_MSG_RESULT([no])
AC_MSG_RESULT([no])
m4_default([$4], [AC_MSG_FAILURE(
[The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@ -292,7 +292,7 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl
# Obsolete and "removed" macros, that must however still report explicit
# error messages when used, to smooth transition.
#
# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# Copyright (C) 1996-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,

28
configure vendored
Wyświetl plik

@ -6378,8 +6378,8 @@ printf "%s\n" "no" >&6; }
fi
pkg_failed=no
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SANE" >&5
printf %s "checking for SANE... " >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sane-backends >= 1.0.0" >&5
printf %s "checking for sane-backends >= 1.0.0... " >&6; }
if test -n "$SANE_CFLAGS"; then
pkg_cv_SANE_CFLAGS="$SANE_CFLAGS"
@ -6419,7 +6419,7 @@ fi
if test $pkg_failed = yes; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@ -6446,7 +6446,7 @@ Alternatively, you may set the environment variables SANE_CFLAGS
and SANE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
@ -6465,7 +6465,7 @@ else
SANE_LIBS=$pkg_cv_SANE_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
HAVE_SANE=yes
fi
if test -n "$SANE_PREFIX"; then
@ -6514,8 +6514,6 @@ SANE_LDFLAGS=$pkg_cv_SANE_LDFLAGS
if test "x$SANE_LDFLAGS" = x""
then :
else $as_nop
HAVE_SANE=yes
fi
if test "x${HAVE_SANE}" = "x"; then
echo "**********************************************************************"
@ -6537,8 +6535,8 @@ if test "${USE_GUI}" = "yes"; then
if test "${USE_GTK3}" = "yes" || test "${USE_GIMP}" = "yes"; then
pkg_failed=no
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
printf %s "checking for GTK... " >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gtk+-3.0" >&5
printf %s "checking for gtk+-3.0... " >&6; }
if test -n "$GTK_CFLAGS"; then
pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
@ -6578,7 +6576,7 @@ fi
if test $pkg_failed = yes; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@ -6604,7 +6602,7 @@ printf "%s\n" "$as_me: WARNING: *** GIMP 2.0 plugin requested, but GTK+ 3.0 not
printf "%s\n" "$as_me: WARNING: *** GTK+ 3.0 not found, falling back to GTK+ < 3.0 if possible ***" >&2;}
fi
elif test $pkg_failed = untried; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
if test "${USE_GIMP}" = "yes"; then
@ -6627,8 +6625,8 @@ fi
if test "${USE_GIMP}" = "yes"; then
pkg_failed=no
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GIMP" >&5
printf %s "checking for GIMP... " >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gimp-2.0" >&5
printf %s "checking for gimp-2.0... " >&6; }
if test -n "$GIMP_CFLAGS"; then
pkg_cv_GIMP_CFLAGS="$GIMP_CFLAGS"
@ -6668,7 +6666,7 @@ fi
if test $pkg_failed = yes; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@ -6695,7 +6693,7 @@ Alternatively, you may set the environment variables GIMP_CFLAGS
and GIMP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}

5
configure.in
Wyświetl plik

@ -106,10 +106,9 @@ fi
AC_CHECK_TOOL(RANLIB, ranlib, :)
PKG_CHECK_MODULES([SANE], [sane-backends >= 1.0.0])
PKG_CHECK_MODULES([SANE], [sane-backends >= 1.0.0], HAVE_SANE=yes)
PKG_CHECK_VAR([SANE_PREFIX], [sane-backends >= 1.0.0], [prefix])
PKG_CHECK_VAR([SANE_LDFLAGS], [sane-backends >= 1.0.0], [ldflags],
[HAVE_SANE=yes])
PKG_CHECK_VAR([SANE_LDFLAGS], [sane-backends >= 1.0.0], [ldflags])
dnl Print error message if sane is missing
if test "x${HAVE_SANE}" = "x"; then
echo "**********************************************************************"

3
include/sane/config.h.in
Wyświetl plik

@ -102,9 +102,12 @@
/* Define to 1 if you have the `strtod' function. */
#undef HAVE_STRTOD
<<<<<<< HEAD
/* Define to 1 if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H
=======
>>>>>>> master
/* Define to 1 if you have the <sys/socket.h> header file. */
#undef HAVE_SYS_SOCKET_H

4
src/scanadf.c
Wyświetl plik

@ -1452,7 +1452,7 @@ main (int argc, char **argv)
{
fprintf (stderr, "%s: sane_get_devices() failed: %s\n",
prog_name, sane_strstatus (status));
exit (1);
scanadf_exit (1);
}
for (i = 0; device_list[i]; ++i)
@ -1461,7 +1461,7 @@ main (int argc, char **argv)
device_list[i]->name, device_list[i]->vendor,
device_list[i]->model, device_list[i]->type);
}
exit (0);
scanadf_exit (0);
}
case 'o': outputFile = optarg; break;