Commit 418fbb98 authored by Olaf Meeuwissen's avatar Olaf Meeuwissen

Sync autofoo, once again ...

parent 60218293
Pipeline #3620800 passed with stage
in 4 minutes and 20 seconds
......@@ -19348,6 +19348,23 @@ done
fi
# Slightly abuse the AC_LIBOBJ macro to mark files as replacement code
if test x$ac_cv_header_getopt_h != xyes \
&& test x$ac_cv_func_getopt_long != xyes; then :
case " $LIBOBJS " in
*" getopt.$ac_objext "* ) ;;
*) LIBOBJS="$LIBOBJS getopt.$ac_objext"
;;
esac
case " $LIBOBJS " in
*" getopt1.$ac_objext "* ) ;;
*) LIBOBJS="$LIBOBJS getopt1.$ac_objext"
;;
esac
fi
if test -c /dev/urandom ; then
$as_echo "#define HAVE_DEV_URANDOM 1" >>confdefs.h
......@@ -19870,7 +19887,7 @@ done
if test "$ac_cv_header_sys_scsiio_h" = "yes" \
-a "$ac_cv_header_scsi_h" = "yes"; then
&& "$ac_cv_header_scsi_h" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if 'scsireq_t' needs to be defined as 'struct scsireq'" >&5
$as_echo_n "checking if 'scsireq_t' needs to be defined as 'struct scsireq'... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
......
......@@ -109,8 +109,7 @@ am_saned_OBJECTS = saned.$(OBJEXT)
saned_OBJECTS = $(am_saned_OBJECTS)
am__DEPENDENCIES_1 =
saned_DEPENDENCIES = ../backend/libsane.la ../sanei/libsanei.la \
../lib/liblib.la ../lib/libfelib.la $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
../lib/liblib.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
......@@ -118,16 +117,13 @@ am__v_lt_1 =
am_scanimage_OBJECTS = scanimage.$(OBJEXT) stiff.$(OBJEXT)
scanimage_OBJECTS = $(am_scanimage_OBJECTS)
scanimage_DEPENDENCIES = ../backend/libsane.la ../sanei/libsanei.la \
../lib/liblib.la ../lib/libfelib.la $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
../lib/liblib.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_OBJECTS = test.$(OBJEXT)
test_OBJECTS = $(am_test_OBJECTS)
test_DEPENDENCIES = ../lib/liblib.la ../lib/libfelib.la \
../backend/libsane.la
test_DEPENDENCIES = ../lib/liblib.la ../backend/libsane.la
am_tstbackend_OBJECTS = tstbackend.$(OBJEXT)
tstbackend_OBJECTS = $(am_tstbackend_OBJECTS)
tstbackend_DEPENDENCIES = ../lib/liblib.la ../lib/libfelib.la \
../backend/libsane.la
tstbackend_DEPENDENCIES = ../lib/liblib.la ../backend/libsane.la
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
......@@ -383,16 +379,16 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
scanimage_SOURCES = scanimage.c stiff.c stiff.h
scanimage_LDADD = ../backend/libsane.la ../sanei/libsanei.la ../lib/liblib.la \
../lib/libfelib.la $(PNG_LIBS) $(JPEG_LIBS)
$(PNG_LIBS) $(JPEG_LIBS)
saned_SOURCES = saned.c
saned_LDADD = ../backend/libsane.la ../sanei/libsanei.la ../lib/liblib.la \
../lib/libfelib.la $(SYSLOG_LIBS) $(SYSTEMD_LIBS)
$(SYSLOG_LIBS) $(SYSTEMD_LIBS)
test_SOURCES = test.c
test_LDADD = ../lib/liblib.la ../lib/libfelib.la ../backend/libsane.la
test_LDADD = ../lib/liblib.la ../backend/libsane.la
tstbackend_SOURCES = tstbackend.c
tstbackend_LDADD = ../lib/liblib.la ../lib/libfelib.la ../backend/libsane.la
tstbackend_LDADD = ../lib/liblib.la ../backend/libsane.la
all: all-am
.SUFFIXES:
......
......@@ -80,10 +80,10 @@ build_triplet = @build@
host_triplet = @host@
subdir = lib
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/mkinstalldirs alloca.c getenv.c inet_ntop.c \
vsyslog.c strdup.c strndup.c isfdtype.c sigprocmask.c syslog.c \
usleep.c inet_pton.c sleep.c strcasestr.c snprintf.c strsep.c \
$(top_srcdir)/depcomp
$(top_srcdir)/mkinstalldirs alloca.c getenv.c strndup.c \
strdup.c isfdtype.c usleep.c inet_pton.c inet_ntop.c \
snprintf.c vsyslog.c syslog.c getopt1.c strsep.c getopt.c \
sleep.c sigprocmask.c strcasestr.c $(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
......@@ -102,16 +102,13 @@ CONFIG_HEADER = $(top_builddir)/include/sane/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libfelib_la_LIBADD =
am_libfelib_la_OBJECTS = getopt.lo getopt1.lo md5.lo
libfelib_la_OBJECTS = $(am_libfelib_la_OBJECTS)
liblib_la_DEPENDENCIES = $(LTALLOCA) $(LTLIBOBJS)
am_liblib_la_OBJECTS = md5.lo
liblib_la_OBJECTS = $(am_liblib_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
liblib_la_DEPENDENCIES = $(LTALLOCA) $(LTLIBOBJS)
am_liblib_la_OBJECTS =
liblib_la_OBJECTS = $(am_liblib_la_OBJECTS)
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
......@@ -146,8 +143,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
SOURCES = $(libfelib_la_SOURCES) $(liblib_la_SOURCES)
DIST_SOURCES = $(libfelib_la_SOURCES) $(liblib_la_SOURCES)
SOURCES = $(liblib_la_SOURCES)
DIST_SOURCES = $(liblib_la_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
......@@ -363,9 +360,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
noinst_LTLIBRARIES = liblib.la libfelib.la
libfelib_la_SOURCES = getopt.c getopt1.c md5.c
liblib_la_SOURCES =
noinst_LTLIBRARIES = liblib.la
liblib_la_SOURCES = md5.c
liblib_la_LIBADD = $(LTALLOCA) $(LTLIBOBJS)
all: all-am
......@@ -413,9 +409,6 @@ clean-noinstLTLIBRARIES:
rm -f $${locs}; \
}
libfelib.la: $(libfelib_la_OBJECTS) $(libfelib_la_DEPENDENCIES) $(EXTRA_libfelib_la_DEPENDENCIES)
$(AM_V_CCLD)$(LINK) $(libfelib_la_OBJECTS) $(libfelib_la_LIBADD) $(LIBS)
liblib.la: $(liblib_la_OBJECTS) $(liblib_la_DEPENDENCIES) $(EXTRA_liblib_la_DEPENDENCIES)
$(AM_V_CCLD)$(LINK) $(liblib_la_OBJECTS) $(liblib_la_LIBADD) $(LIBS)
......@@ -427,6 +420,8 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/alloca.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getenv.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt1.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/inet_ntop.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/inet_pton.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/isfdtype.Plo@am__quote@
......@@ -440,8 +435,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/syslog.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/usleep.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vsyslog.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Plo@am__quote@
.c.o:
......
......@@ -105,8 +105,8 @@ am_sanei_check_test_OBJECTS = sanei_check_test.$(OBJEXT)
sanei_check_test_OBJECTS = $(am_sanei_check_test_OBJECTS)
am__DEPENDENCIES_1 =
am__DEPENDENCIES_2 = ../../sanei/libsanei.la ../../lib/liblib.la \
../../lib/libfelib.la $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
sanei_check_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
......@@ -590,7 +590,7 @@ EXTRA_DIST = data/boolean.conf data/empty.conf data/fixed.conf data/int.conf \
data/wrong-fixed.conf data/wrong-range.conf \
data/wrong-string-list.conf
TEST_LDADD = ../../sanei/libsanei.la ../../lib/liblib.la ../../lib/libfelib.la $(MATH_LIB) $(USB_LIBS) $(PTHREAD_LIBS)
TEST_LDADD = ../../sanei/libsanei.la ../../lib/liblib.la $(MATH_LIB) $(USB_LIBS) $(PTHREAD_LIBS)
TESTS = $(check_PROGRAMS)
sanei_constrain_test_SOURCES = sanei_constrain_test.c
sanei_constrain_test_LDADD = $(TEST_LDADD)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment