kopia lustrzana https://gitlab.com/sane-project/backends
Add -all_load to linker flags on MacOS X to avoid linker errors.
Henning Geinitz
rodzic
12a842efaa
commit
69a101ef06
|
|
@ -3,6 +3,10 @@
|
|||
* configure configure.in frontend/saned.c
|
||||
include/sane/config.h.in: Test for poll() and disable IPV6 if
|
||||
not found.
|
||||
* include/lalloca.h: Remove test for MacOS X. That one breaks some
|
||||
MacOS X systems.
|
||||
* configure configure.in frontend/Makefile.in tools/Makefile.in:
|
||||
Add -all_load to linker flags on MacOS X to avoid linker errors.
|
||||
|
||||
2003-05-01 Oliver Rauch <Oliver.Rauch@XSane.org>
|
||||
|
||||
|
|
|
|||
|
|
@ -463,7 +463,7 @@ ac_includes_default="\
|
|||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS V_MAJOR V_MINOR V_REV PACKAGE VERSION NUMBER_VERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE CPP EGREP SANE_CONFIG_PATH MSGFMT XGETTEXT MSGMERGE LATEX DVIPS MAKEINDEX INCLUDES LINKER_RPATH DL_LIB DYNAMIC_FLAG HAVE_GPHOTO2 ac_ct_HAVE_GPHOTO2 ALLOCA LIBOBJS LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL DC210 DC240 DJPEG CANON_PP HPSJ5S GPHOTO2 PINT QCAM V4L NET SANED SNAPSCAN DLL_PRELOAD PNM SM3600 INSTALL_TRANSLATIONS SELECTED_BACKENDS USE_LATEX DISTCLEAN_FILES LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS V_MAJOR V_MINOR V_REV PACKAGE VERSION NUMBER_VERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE CPP EGREP SANE_CONFIG_PATH MSGFMT XGETTEXT MSGMERGE LATEX DVIPS MAKEINDEX INCLUDES LINKER_RPATH DL_LIB DYNAMIC_FLAG LIBLIBFLAGS HAVE_GPHOTO2 ac_ct_HAVE_GPHOTO2 ALLOCA LIBOBJS LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL DC210 DC240 DJPEG CANON_PP HPSJ5S GPHOTO2 PINT QCAM V4L NET SANED SNAPSCAN DLL_PRELOAD PNM SM3600 INSTALL_TRANSLATIONS SELECTED_BACKENDS USE_LATEX DISTCLEAN_FILES LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -4990,6 +4990,10 @@ _ACEOF
|
|||
fi
|
||||
# OS/2 needs this
|
||||
fi
|
||||
if test "`uname`" = "Darwin" ; then
|
||||
LIBLIBFLAGS="-all_load"
|
||||
fi
|
||||
|
||||
|
||||
echo "$as_me:$LINENO: checking for jpeg_start_decompress in -ljpeg" >&5
|
||||
echo $ECHO_N "checking for jpeg_start_decompress in -ljpeg... $ECHO_C" >&6
|
||||
|
|
@ -9110,7 +9114,7 @@ ia64-*-hpux*)
|
|||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 9113 "configure"' > conftest.$ac_ext
|
||||
echo '#line 9117 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -10289,7 +10293,7 @@ fi
|
|||
|
||||
|
||||
# Provide some information about the compiler.
|
||||
echo "$as_me:10292:" \
|
||||
echo "$as_me:10296:" \
|
||||
"checking for Fortran 77 compiler version" >&5
|
||||
ac_compiler=`set X $ac_compile; echo $2`
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
|
||||
|
|
@ -11294,11 +11298,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:11297: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:11301: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:11301: \$? = $ac_status" >&5
|
||||
echo "$as_me:11305: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
|
|
@ -11526,11 +11530,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:11529: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:11533: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:11533: \$? = $ac_status" >&5
|
||||
echo "$as_me:11537: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
|
|
@ -11593,11 +11597,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:11596: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:11600: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:11600: \$? = $ac_status" >&5
|
||||
echo "$as_me:11604: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -13605,7 +13609,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 13608 "configure"
|
||||
#line 13612 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -13703,7 +13707,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 13706 "configure"
|
||||
#line 13710 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -15835,11 +15839,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:15838: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15842: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:15842: \$? = $ac_status" >&5
|
||||
echo "$as_me:15846: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
|
|
@ -15902,11 +15906,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:15905: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15909: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:15909: \$? = $ac_status" >&5
|
||||
echo "$as_me:15913: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -17145,7 +17149,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 17148 "configure"
|
||||
#line 17152 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -17243,7 +17247,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 17246 "configure"
|
||||
#line 17250 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -18065,11 +18069,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:18068: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:18072: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:18072: \$? = $ac_status" >&5
|
||||
echo "$as_me:18076: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
|
|
@ -18132,11 +18136,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:18135: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:18139: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:18139: \$? = $ac_status" >&5
|
||||
echo "$as_me:18143: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -20072,11 +20076,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:20075: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:20079: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:20079: \$? = $ac_status" >&5
|
||||
echo "$as_me:20083: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
|
|
@ -20304,11 +20308,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:20307: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:20311: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:20311: \$? = $ac_status" >&5
|
||||
echo "$as_me:20315: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
|
|
@ -20371,11 +20375,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:20374: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:20378: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:20378: \$? = $ac_status" >&5
|
||||
echo "$as_me:20382: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -22383,7 +22387,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 22386 "configure"
|
||||
#line 22390 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -22481,7 +22485,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 22484 "configure"
|
||||
#line 22488 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -24359,6 +24363,7 @@ s,@INCLUDES@,$INCLUDES,;t t
|
|||
s,@LINKER_RPATH@,$LINKER_RPATH,;t t
|
||||
s,@DL_LIB@,$DL_LIB,;t t
|
||||
s,@DYNAMIC_FLAG@,$DYNAMIC_FLAG,;t t
|
||||
s,@LIBLIBFLAGS@,$LIBLIBFLAGS,;t t
|
||||
s,@HAVE_GPHOTO2@,$HAVE_GPHOTO2,;t t
|
||||
s,@ac_ct_HAVE_GPHOTO2@,$ac_ct_HAVE_GPHOTO2,;t t
|
||||
s,@ALLOCA@,$ALLOCA,;t t
|
||||
|
|
|
|||
|
|
@ -89,6 +89,11 @@ if test "`uname`" != "IRIX" -a "`uname`" != "IRIX64"; then
|
|||
AC_CHECK_LIB(socket, socket)
|
||||
AC_CHECK_LIB(syslog, syslog) # OS/2 needs this
|
||||
fi
|
||||
dnl ugh bad test...
|
||||
if test "`uname`" = "Darwin" ; then
|
||||
LIBLIBFLAGS="-all_load"
|
||||
fi
|
||||
AC_SUBST(LIBLIBFLAGS)
|
||||
SANE_CHECK_JPEG
|
||||
SANE_CHECK_IEEE1284
|
||||
SANE_CHECK_GPHOTO2
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ CPPFLAGS = @CPPFLAGS@
|
|||
CFLAGS = @CFLAGS@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LIBS = @LIBS@
|
||||
LIBLIBFLAGS = @LIBLIBFLAGS@
|
||||
|
||||
LIBTOOL = ../libtool
|
||||
MINST = --mode=install
|
||||
|
|
@ -90,19 +91,19 @@ uninstall:
|
|||
done
|
||||
|
||||
test: test.o $(LIBSANE) $(LIBLIB)
|
||||
@$(LIBTOOL) $(MLINK) $(LINK) test.o $(LIBSANE) $(LIBLIB) $(LIBS)
|
||||
@$(LIBTOOL) $(MLINK) $(LINK) test.o $(LIBSANE) $(LIBLIBFLAGS) $(LIBLIB) $(LIBS)
|
||||
|
||||
saned: saned.o $(LIBSANEI) $(LIBSANE) $(LIBLIB)
|
||||
@$(LIBTOOL) $(MLINK) $(LINK) saned.o $(LIBSANEI) $(LIBSANE) $(LIBLIB) \
|
||||
@$(LIBTOOL) $(MLINK) $(LINK) saned.o $(LIBSANEI) $(LIBSANE) $(LIBLIBFLAGS) $(LIBLIB) \
|
||||
$(LIBS)
|
||||
|
||||
scanimage: $(SCAN_OBJS) $(LIBSANE) $(LIBLIB)
|
||||
@$(LIBTOOL) $(MLINK) $(LINK) $(SCAN_OBJS) $(LIBSANE) $(LIBLIB) $(LIBS)
|
||||
@$(LIBTOOL) $(MLINK) $(LINK) $(SCAN_OBJS) $(LIBSANE) $(LIBLIBFLAGS) $(LIBLIB) $(LIBS)
|
||||
|
||||
# tstbackend is not compiled by default.
|
||||
# To compile it, add tstbackend to BINPROGS.
|
||||
tstbackend: tstbackend.o $(LIBSANE) $(LIBLIB)
|
||||
@$(LIBTOOL) $(MLINK) $(LINK) tstbackend.o $(LIBSANE) $(LIBLIB) $(LIBS)
|
||||
@$(LIBTOOL) $(MLINK) $(LINK) tstbackend.o $(LIBSANE) $(LIBLIBFLAGS) $(LIBLIB) $(LIBS)
|
||||
|
||||
clean:
|
||||
rm -f *.o tstbackend
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ CPPFLAGS = @CPPFLAGS@
|
|||
CFLAGS = @CFLAGS@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LIBS = @LIBS@
|
||||
LIBLIBFLAGS = @LIBLIBFLAGS@
|
||||
DEFS = @DEFS@
|
||||
|
||||
LIBTOOL = ../libtool
|
||||
|
|
@ -92,7 +93,7 @@ sane-config: sane-config.in $(top_builddir)/config.status
|
|||
sane-find-scanner: sane-find-scanner.o ../backend/sane_strstatus.lo \
|
||||
../sanei/sanei_scsi.lo ../sanei/sanei_usb.lo ../sanei/sanei_init_debug.lo
|
||||
@$(LIBTOOL) $(MLINK) $(LINK) sane-find-scanner.o \
|
||||
../backend/sane_strstatus.lo $(LIBSANEI) $(LIBLIB) $(LIBS)
|
||||
../backend/sane_strstatus.lo $(LIBSANEI) $(LIBLIBFLAGS) $(LIBLIB) $(LIBS)
|
||||
|
||||
gamma4scanimage: gamma4scanimage.o
|
||||
@$(LIBTOOL) $(MLINK) $(LINK) gamma4scanimage.o -lm
|
||||
|
|
@ -103,9 +104,9 @@ gamma4scanimage: gamma4scanimage.o
|
|||
|
||||
umax_pp: umax_pp.o ../backend/umax_pp_low.o
|
||||
@$(LIBTOOL) $(MLINK) $(LINK) umax_pp.o ../backend/umax_pp_low.o \
|
||||
$(LIBSANEI) $(LIBLIB) $(LIBS)
|
||||
$(LIBSANEI) $(LIBLIBFLAGS) $(LIBLIB) $(LIBS)
|
||||
sane-desc: sane-desc.o
|
||||
@$(LIBTOOL) $(MLINK) $(LINK) sane-desc.o $(LIBSANEI) $(LIBLIB) $(LIBS)
|
||||
@$(LIBTOOL) $(MLINK) $(LINK) sane-desc.o $(LIBSANEI) $(LIBLIBFLAGS) $(LIBLIB) $(LIBS)
|
||||
|
||||
depend:
|
||||
makedepend $(INCLUDES) *.c
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue