kopia lustrzana https://gitlab.com/sane-project/backends
Fix allowed gphoto2 version numbers
rodzic
e4b1534faa
commit
101a96218f
|
@ -232,6 +232,7 @@ AC_DEFUN(SANE_CHECK_GPHOTO2,
|
|||
"gphoto2 2.0beta4dev9" | \
|
||||
"gphoto2 2.0beta5"* | \
|
||||
"gphoto2 2.0beta6"* | \
|
||||
"gphoto2 2.0" | \
|
||||
"gphoto2 2.0.1"* \
|
||||
)
|
||||
CPPFLAGS="${CPPFLAGS} `gphoto2-config --cflags`"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
dnl aclocal.m4 generated automatically by aclocal 1.4-p4
|
||||
dnl aclocal.m4 generated automatically by aclocal 1.4-p5
|
||||
|
||||
dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
|
||||
dnl Copyright (C) 1994, 1995-8, 1999, 2001 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.
|
||||
|
@ -244,6 +244,7 @@ AC_DEFUN(SANE_CHECK_GPHOTO2,
|
|||
"gphoto2 2.0beta4dev9" | \
|
||||
"gphoto2 2.0beta5"* | \
|
||||
"gphoto2 2.0beta6"* | \
|
||||
"gphoto2 2.0" | \
|
||||
"gphoto2 2.0.1"* \
|
||||
)
|
||||
CPPFLAGS="${CPPFLAGS} `gphoto2-config --cflags`"
|
||||
|
@ -3759,6 +3760,31 @@ AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
|
|||
# This is just to silence aclocal about the macro not being used
|
||||
ifelse([AC_DISABLE_FAST_INSTALL])
|
||||
|
||||
# isc-posix.m4 serial 1 (gettext-0.10.40)
|
||||
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 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"])
|
||||
]
|
||||
)
|
||||
|
||||
|
||||
# serial 1
|
||||
|
||||
|
@ -3777,7 +3803,7 @@ ifelse([AC_DISABLE_FAST_INSTALL])
|
|||
# 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])
|
||||
|
|
Plik diff jest za duży
Load Diff
Ładowanie…
Reference in New Issue