kopia lustrzana https://gitlab.com/sane-project/backends
* configure.in, acinclude.ac: Cleanup autoconf 2.63 warnings.
add cv_ prefix to cached variable. Remove AC_ARG_PROGRAM as automake already invokes this. When prefered AC_USE_SYSTEM_EXTENSIONS exists, use that instead of AC_GNU_SOURCE/AC_AIX/AC_MINUX. Cleanup socket detection more by creating only a single SOCKET_LIBS that contains list of all optional libraries for any socket related funciton. Make sure that checks for socket related functions use SOCKET_LIBS when searching. Check for getopt_long() and getopt.h. Make OS/2 use -no-undefined (same as windows). * ltmain.sh, m4/libtool.m4: Upgrade to libtool 1.5.26. * Makefile.am: Cleanups to match configure updates. * frontend/scanimage.c, include/Makefile.in, lib/getopt.c lib/getopt1.c, toosl/sane-desc.c, include/lgetopt.h: Rename internal getopt.h to lgetopt.h to allow using external getopt.h when it exists. This allows to go back to optionally compiling getopt()/getopt_long() and its prototypes and not have conflicts with external headers/symbols.merge-requests/1/head
Chris Bagwell
rodzic
c7d8b3e21c
commit
caba90c552
20
ChangeLog
20
ChangeLog
|
|
@ -1,3 +1,23 @@
|
|||
2009-02-04 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
|
||||
* configure.in, acinclude.ac: Cleanup autoconf 2.63 warnings.
|
||||
add cv_ prefix to cached variable. Remove AC_ARG_PROGRAM as
|
||||
automake already invokes this. When prefered AC_USE_SYSTEM_EXTENSIONS
|
||||
exists, use that instead of AC_GNU_SOURCE/AC_AIX/AC_MINUX.
|
||||
Cleanup socket detection more by creating only a single
|
||||
SOCKET_LIBS that contains list of all optional libraries
|
||||
for any socket related funciton. Make sure that checks
|
||||
for socket related functions use SOCKET_LIBS when searching.
|
||||
Check for getopt_long() and getopt.h. Make OS/2 use
|
||||
-no-undefined (same as windows).
|
||||
* ltmain.sh, m4/libtool.m4: Upgrade to libtool 1.5.26.
|
||||
* Makefile.am: Cleanups to match configure updates.
|
||||
* frontend/scanimage.c, include/Makefile.in, lib/getopt.c
|
||||
lib/getopt1.c, toosl/sane-desc.c, include/lgetopt.h:
|
||||
Rename internal getopt.h to lgetopt.h to allow using
|
||||
external getopt.h when it exists. This allows to go
|
||||
back to optionally compiling getopt()/getopt_long() and its
|
||||
prototypes and not have conflicts with external headers/symbols.
|
||||
|
||||
2009-02-04 Nicolas Martin <nicols-guest at users.alioth.debian.org>
|
||||
* doc/sane-pixma.man doc/descriptions/pixma.desc:
|
||||
Added ImageClass MF4120 support in pixma backend docs.
|
||||
|
|
|
|||
|
|
@ -113,6 +113,7 @@ DEPEND_RECURSIVE = @DEPEND_RECURSIVE@
|
|||
DISTCLEAN_FILES = @DISTCLEAN_FILES@
|
||||
DLLTOOL = @DLLTOOL@
|
||||
DL_LIBS = @DL_LIBS@
|
||||
DSYMUTIL = @DSYMUTIL@
|
||||
DVIPS = @DVIPS@
|
||||
DYNAMIC_FLAG = @DYNAMIC_FLAG@
|
||||
ECHO = @ECHO@
|
||||
|
|
@ -123,7 +124,6 @@ EGREP = @EGREP@
|
|||
EXEEXT = @EXEEXT@
|
||||
F77 = @F77@
|
||||
FFLAGS = @FFLAGS@
|
||||
GETHOSTBYADDR_LIBS = @GETHOSTBYADDR_LIBS@
|
||||
GPHOTO2_CPPFLAGS = @GPHOTO2_CPPFLAGS@
|
||||
GPHOTO2_LIBS = @GPHOTO2_LIBS@
|
||||
GREP = @GREP@
|
||||
|
|
@ -157,7 +157,7 @@ MATH_LIB = @MATH_LIB@
|
|||
MKDIR_P = @MKDIR_P@
|
||||
MSGFMT = @MSGFMT@
|
||||
MSGMERGE = @MSGMERGE@
|
||||
NO_UNDEFINED_LDFLAGS = @NO_UNDEFINED_LDFLAGS@
|
||||
NMEDIT = @NMEDIT@
|
||||
NUMBER_VERSION = @NUMBER_VERSION@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
|
|
@ -178,6 +178,7 @@ SANEI_JPEG = @SANEI_JPEG@
|
|||
SANEI_JPEG_LO = @SANEI_JPEG_LO@
|
||||
SANE_CONFIG_PATH = @SANE_CONFIG_PATH@
|
||||
SCSI_LIBS = @SCSI_LIBS@
|
||||
SED = @SED@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
SOCKET_LIBS = @SOCKET_LIBS@
|
||||
|
|
|
|||
|
|
@ -357,18 +357,19 @@ dnl
|
|||
|
||||
AC_DEFUN([SANE_LINKER_RPATH],
|
||||
[dnl AC_REQUIRE([AC_SUBST])dnl This line resulted in an empty AC_SUBST() !!
|
||||
AC_CACHE_CHECK([linker parameter to set runtime link path], LINKER_RPATH,
|
||||
[LINKER_RPATH=
|
||||
AC_CACHE_CHECK([linker parameter to set runtime link path], my_cv_LINKER_RPATH,
|
||||
[my_cv_LINKER_RPATH=
|
||||
case "$host_os" in
|
||||
linux* | freebsd* | netbsd* | openbsd* | irix*)
|
||||
# I believe this only works with GNU ld [pere 2001-04-16]
|
||||
LINKER_RPATH="-Wl,-rpath,"
|
||||
my_cv_LINKER_RPATH="-Wl,-rpath,"
|
||||
;;
|
||||
solaris*)
|
||||
LINKER_RPATH="-R "
|
||||
my_cv_LINKER_RPATH="-R "
|
||||
;;
|
||||
esac
|
||||
])
|
||||
LINKER_RPATH="$my_cv_LINKER_RPATH"
|
||||
AC_SUBST(LINKER_RPATH)dnl
|
||||
])
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ V_MAJOR = @V_MAJOR@
|
|||
V_MINOR = @V_MINOR@
|
||||
V_REV = @V_REV@
|
||||
|
||||
AM_LDFLAGS = @STRICT_LDFLAGS@ @NO_UNDEFINED_LDFLAGS@
|
||||
AM_LDFLAGS = @STRICT_LDFLAGS@
|
||||
# The -rpath option is added because we are creating _LTLIBRARIES based
|
||||
# on configure substitution. This causes automake to not know the
|
||||
# correct $libdir and must be added here.
|
||||
|
|
@ -376,7 +376,7 @@ libdell1600n_net_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dell1600n_net
|
|||
nodist_libsane_dell1600n_net_la_SOURCES = dell1600n_net-s.c
|
||||
libsane_dell1600n_net_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dell1600n_net
|
||||
libsane_dell1600n_net_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
|
||||
libsane_dell1600n_net_la_LIBADD = $(COMMON_LIBS) libdell1600n_net.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo @TIFF_LIBS@ @JPEG_LIBS@ @SOCKET_LIBS@ @GETHOSTBYADDR_LIBS@
|
||||
libsane_dell1600n_net_la_LIBADD = $(COMMON_LIBS) libdell1600n_net.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo @TIFF_LIBS@ @JPEG_LIBS@ @SOCKET_LIBS@
|
||||
EXTRA_DIST += dell1600n_net.conf.in
|
||||
|
||||
libdmc_la_SOURCES = dmc.c dmc.h
|
||||
|
|
@ -412,7 +412,7 @@ libepson2_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=epson2
|
|||
nodist_libsane_epson2_la_SOURCES = epson2-s.c
|
||||
libsane_epson2_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=epson2
|
||||
libsane_epson2_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
|
||||
libsane_epson2_la_LIBADD = $(COMMON_LIBS) libepson2.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo @SCSI_LIBS@ @USB_LIBS@ @SOCKET_LIBS@ @GETHOSTBYADDR_LIBS@
|
||||
libsane_epson2_la_LIBADD = $(COMMON_LIBS) libepson2.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo @SCSI_LIBS@ @USB_LIBS@ @SOCKET_LIBS@
|
||||
EXTRA_DIST += epson2.conf.in
|
||||
|
||||
libfujitsu_la_SOURCES = fujitsu.c fujitsu.h fujitsu-scsi.h
|
||||
|
|
@ -656,7 +656,7 @@ libnet_la_CPPFLAGS = $(AM_CPPFLAGS) @AVAHI_CFLAGS@ -DBACKEND_NAME=net
|
|||
nodist_libsane_net_la_SOURCES = net-s.c
|
||||
libsane_net_la_CPPFLAGS = $(AM_CPPFLAGS) @AVAHI_CFLAGS@ -DBACKEND_NAME=net
|
||||
libsane_net_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
|
||||
libsane_net_la_LIBADD = $(COMMON_LIBS) libnet.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo @AVAHI_LIBS@ @SOCKET_LIBS@ @GETHOSTBYADDR_LIBS@
|
||||
libsane_net_la_LIBADD = $(COMMON_LIBS) libnet.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo @AVAHI_LIBS@ @SOCKET_LIBS@
|
||||
EXTRA_DIST += net.conf.in
|
||||
|
||||
libniash_la_SOURCES = niash.c
|
||||
|
|
@ -691,7 +691,7 @@ libpixma_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=pixma
|
|||
nodist_libsane_pixma_la_SOURCES = pixma-s.c
|
||||
libsane_pixma_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=pixma
|
||||
libsane_pixma_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
|
||||
libsane_pixma_la_LIBADD = $(COMMON_LIBS) libpixma.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_thread.lo @MATH_LIB@ @SOCKET_LIBS@ @GETHOSTBYADDR_LIBS@ @USB_LIBS@
|
||||
libsane_pixma_la_LIBADD = $(COMMON_LIBS) libpixma.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_thread.lo @MATH_LIB@ @SOCKET_LIBS@ @USB_LIBS@
|
||||
EXTRA_DIST += pixma.conf.in
|
||||
EXTRA_DIST += pixma_sane_options.c pixma_sane_options.h
|
||||
|
||||
|
|
@ -963,6 +963,6 @@ EXTRA_DIST += dll.conf.in dll.aliases
|
|||
nodist_libsane_la_SOURCES = dll-s.c dll-preload.h
|
||||
libsane_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dll
|
||||
libsane_la_LDFLAGS = $(DIST_LIBS_LDFLAGS)
|
||||
libsane_la_LIBADD = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo ../sanei/sanei_jpeg.lo @DL_LIBS@ @LIBV4L_LIBS@ @MATH_LIB@ @IEEE1284_LIBS@ @TIFF_LIBS@ @JPEG_LIBS@ @GPHOTO2_LIBS@ @SOCKET_LIBS@ @GETHOSTBYADDR_LIBS@ @USB_LIBS@ @AVAHI_LIBS@
|
||||
libsane_la_LIBADD = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo ../sanei/sanei_jpeg.lo @DL_LIBS@ @LIBV4L_LIBS@ @MATH_LIB@ @IEEE1284_LIBS@ @TIFF_LIBS@ @JPEG_LIBS@ @GPHOTO2_LIBS@ @SOCKET_LIBS@ @USB_LIBS@ @AVAHI_LIBS@
|
||||
# WARNING: Automake is getting this wrong so have to do it ourselves.
|
||||
libsane_la_DEPENDENCIES = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo ../sanei/sanei_jpeg.lo
|
||||
|
|
|
|||
|
|
@ -1292,6 +1292,7 @@ DEPEND_RECURSIVE = @DEPEND_RECURSIVE@
|
|||
DISTCLEAN_FILES = @DISTCLEAN_FILES@
|
||||
DLLTOOL = @DLLTOOL@
|
||||
DL_LIBS = @DL_LIBS@
|
||||
DSYMUTIL = @DSYMUTIL@
|
||||
DVIPS = @DVIPS@
|
||||
DYNAMIC_FLAG = @DYNAMIC_FLAG@
|
||||
ECHO = @ECHO@
|
||||
|
|
@ -1302,7 +1303,6 @@ EGREP = @EGREP@
|
|||
EXEEXT = @EXEEXT@
|
||||
F77 = @F77@
|
||||
FFLAGS = @FFLAGS@
|
||||
GETHOSTBYADDR_LIBS = @GETHOSTBYADDR_LIBS@
|
||||
GPHOTO2_CPPFLAGS = @GPHOTO2_CPPFLAGS@
|
||||
GPHOTO2_LIBS = @GPHOTO2_LIBS@
|
||||
GREP = @GREP@
|
||||
|
|
@ -1338,7 +1338,7 @@ MATH_LIB = @MATH_LIB@
|
|||
MKDIR_P = @MKDIR_P@
|
||||
MSGFMT = @MSGFMT@
|
||||
MSGMERGE = @MSGMERGE@
|
||||
NO_UNDEFINED_LDFLAGS = @NO_UNDEFINED_LDFLAGS@
|
||||
NMEDIT = @NMEDIT@
|
||||
NUMBER_VERSION = @NUMBER_VERSION@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
|
|
@ -1359,6 +1359,7 @@ SANEI_JPEG = @SANEI_JPEG@
|
|||
SANEI_JPEG_LO = @SANEI_JPEG_LO@
|
||||
SANE_CONFIG_PATH = @SANE_CONFIG_PATH@
|
||||
SCSI_LIBS = @SCSI_LIBS@
|
||||
SED = @SED@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
SOCKET_LIBS = @SOCKET_LIBS@
|
||||
|
|
@ -1429,7 +1430,7 @@ top_builddir = @top_builddir@
|
|||
top_srcdir = @top_srcdir@
|
||||
configdir = ${sysconfdir}/sane.d
|
||||
AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -DLIBDIR="$(libdir)/sane"
|
||||
AM_LDFLAGS = @STRICT_LDFLAGS@ @NO_UNDEFINED_LDFLAGS@
|
||||
AM_LDFLAGS = @STRICT_LDFLAGS@
|
||||
# The -rpath option is added because we are creating _LTLIBRARIES based
|
||||
# on configure substitution. This causes automake to not know the
|
||||
# correct $libdir and must be added here.
|
||||
|
|
@ -1711,7 +1712,7 @@ libdell1600n_net_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dell1600n_net
|
|||
nodist_libsane_dell1600n_net_la_SOURCES = dell1600n_net-s.c
|
||||
libsane_dell1600n_net_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dell1600n_net
|
||||
libsane_dell1600n_net_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
|
||||
libsane_dell1600n_net_la_LIBADD = $(COMMON_LIBS) libdell1600n_net.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo @TIFF_LIBS@ @JPEG_LIBS@ @SOCKET_LIBS@ @GETHOSTBYADDR_LIBS@
|
||||
libsane_dell1600n_net_la_LIBADD = $(COMMON_LIBS) libdell1600n_net.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo @TIFF_LIBS@ @JPEG_LIBS@ @SOCKET_LIBS@
|
||||
libdmc_la_SOURCES = dmc.c dmc.h
|
||||
libdmc_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dmc
|
||||
nodist_libsane_dmc_la_SOURCES = dmc-s.c
|
||||
|
|
@ -1735,7 +1736,7 @@ libepson2_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=epson2
|
|||
nodist_libsane_epson2_la_SOURCES = epson2-s.c
|
||||
libsane_epson2_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=epson2
|
||||
libsane_epson2_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
|
||||
libsane_epson2_la_LIBADD = $(COMMON_LIBS) libepson2.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo @SCSI_LIBS@ @USB_LIBS@ @SOCKET_LIBS@ @GETHOSTBYADDR_LIBS@
|
||||
libsane_epson2_la_LIBADD = $(COMMON_LIBS) libepson2.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo @SCSI_LIBS@ @USB_LIBS@ @SOCKET_LIBS@
|
||||
libfujitsu_la_SOURCES = fujitsu.c fujitsu.h fujitsu-scsi.h
|
||||
libfujitsu_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=fujitsu
|
||||
nodist_libsane_fujitsu_la_SOURCES = fujitsu-s.c
|
||||
|
|
@ -1891,7 +1892,7 @@ libnet_la_CPPFLAGS = $(AM_CPPFLAGS) @AVAHI_CFLAGS@ -DBACKEND_NAME=net
|
|||
nodist_libsane_net_la_SOURCES = net-s.c
|
||||
libsane_net_la_CPPFLAGS = $(AM_CPPFLAGS) @AVAHI_CFLAGS@ -DBACKEND_NAME=net
|
||||
libsane_net_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
|
||||
libsane_net_la_LIBADD = $(COMMON_LIBS) libnet.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo @AVAHI_LIBS@ @SOCKET_LIBS@ @GETHOSTBYADDR_LIBS@
|
||||
libsane_net_la_LIBADD = $(COMMON_LIBS) libnet.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo @AVAHI_LIBS@ @SOCKET_LIBS@
|
||||
libniash_la_SOURCES = niash.c
|
||||
libniash_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=niash
|
||||
nodist_libsane_niash_la_SOURCES = niash-s.c
|
||||
|
|
@ -1915,7 +1916,7 @@ libpixma_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=pixma
|
|||
nodist_libsane_pixma_la_SOURCES = pixma-s.c
|
||||
libsane_pixma_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=pixma
|
||||
libsane_pixma_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
|
||||
libsane_pixma_la_LIBADD = $(COMMON_LIBS) libpixma.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_thread.lo @MATH_LIB@ @SOCKET_LIBS@ @GETHOSTBYADDR_LIBS@ @USB_LIBS@
|
||||
libsane_pixma_la_LIBADD = $(COMMON_LIBS) libpixma.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_thread.lo @MATH_LIB@ @SOCKET_LIBS@ @USB_LIBS@
|
||||
libplustek_la_SOURCES = plustek.c plustek.h
|
||||
libplustek_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=plustek
|
||||
nodist_libsane_plustek_la_SOURCES = plustek-s.c
|
||||
|
|
@ -2096,7 +2097,7 @@ libsane_dll_la_LIBADD = $(COMMON_LIBS) libdll.la ../sanei/sanei_init_debug.lo ..
|
|||
nodist_libsane_la_SOURCES = dll-s.c dll-preload.h
|
||||
libsane_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dll
|
||||
libsane_la_LDFLAGS = $(DIST_LIBS_LDFLAGS)
|
||||
libsane_la_LIBADD = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo ../sanei/sanei_jpeg.lo @DL_LIBS@ @LIBV4L_LIBS@ @MATH_LIB@ @IEEE1284_LIBS@ @TIFF_LIBS@ @JPEG_LIBS@ @GPHOTO2_LIBS@ @SOCKET_LIBS@ @GETHOSTBYADDR_LIBS@ @USB_LIBS@ @AVAHI_LIBS@
|
||||
libsane_la_LIBADD = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo ../sanei/sanei_jpeg.lo @DL_LIBS@ @LIBV4L_LIBS@ @MATH_LIB@ @IEEE1284_LIBS@ @TIFF_LIBS@ @JPEG_LIBS@ @GPHOTO2_LIBS@ @SOCKET_LIBS@ @USB_LIBS@ @AVAHI_LIBS@
|
||||
# WARNING: Automake is getting this wrong so have to do it ourselves.
|
||||
libsane_la_DEPENDENCIES = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo ../sanei/sanei_jpeg.lo
|
||||
all: all-am
|
||||
|
|
|
|||
Plik diff jest za duży
Load Diff
59
configure.in
59
configure.in
|
|
@ -19,8 +19,7 @@ dnl known timestamp issues.
|
|||
AM_MAINTAINER_MODE
|
||||
|
||||
AC_CONFIG_HEADERS([include/sane/config.h])
|
||||
AC_PREREQ(2.54)dnl dnl Minimum Autoconf version required.
|
||||
AC_ARG_PROGRAM
|
||||
AC_PREREQ(2.54) dnl Minimum Autoconf version required.
|
||||
|
||||
PACKAGE=AC_PACKAGE_NAME
|
||||
VERSION=AC_PACKAGE_VERSION
|
||||
|
|
@ -94,9 +93,10 @@ SANE_LINKER_RPATH
|
|||
dnl ***********************************************************************
|
||||
dnl Checks for unix variants
|
||||
dnl ***********************************************************************
|
||||
AC_GNU_SOURCE
|
||||
AC_AIX
|
||||
AC_MINIX
|
||||
m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [AC_USE_SYSTEM_EXTENSIONS])
|
||||
m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[AC_GNU_SOURCE])
|
||||
m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[AC_AIX])
|
||||
m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[AC_MINIX])
|
||||
AC_ISC_POSIX
|
||||
|
||||
AC_NEED_BYTEORDER_H([include/byteorder.h])
|
||||
|
|
@ -119,12 +119,6 @@ case ${host_os} in
|
|||
esac
|
||||
AC_SUBST(SYSLOG_LIBS)
|
||||
|
||||
AC_CHECK_FUNC(gethostbyaddr, [GETHOSTBYADDR_LIBS=], [AC_CHECK_LIB(nsl, gethostbyaddr, GETHOSTBYADDR_LIBS="-lnsl", [AC_CHECK_LIB(bind, gethostbyaddr, GETHOSTBYADDR_LIBS="-lbind")])])
|
||||
AC_SUBST(GETHOSTBYADDR_LIBS)
|
||||
|
||||
AC_CHECK_LIB(socket, socket, SOCKET_LIBS="-lsocket -lnsl",, -lnsl)
|
||||
AC_SUBST(SOCKET_LIBS)
|
||||
|
||||
SANE_CHECK_JPEG
|
||||
SANE_CHECK_TIFF
|
||||
SANE_CHECK_IEEE1284
|
||||
|
|
@ -158,7 +152,7 @@ AC_CHECK_HEADERS(fcntl.h unistd.h libc.h sys/dsreq.h sys/select.h \
|
|||
sys/socket.h sys/io.h sys/hw.h sys/types.h linux/ppdev.h \
|
||||
dev/ppbus/ppi.h machine/cpufunc.h sys/bitypes.h sys/sem.h sys/poll.h \
|
||||
windows.h be/kernel/OS.h limits.h sys/ioctl.h asm/types.h\
|
||||
netinet/in.h tiffio.h ifaddrs.h pwd.h)
|
||||
netinet/in.h tiffio.h ifaddrs.h pwd.h getopt.h)
|
||||
AC_CHECK_HEADERS([asm/io.h],,,[#include <sys/types.h>])
|
||||
|
||||
SANE_CHECK_MISSING_HEADERS
|
||||
|
|
@ -229,24 +223,53 @@ AC_C_INLINE
|
|||
dnl ***********************************************************************
|
||||
dnl Checks for library functions
|
||||
dnl ***********************************************************************
|
||||
|
||||
dnl Define SOCKET_LIB, NSL_LIB, BIND_LIB, and RESOLV_LIB when required
|
||||
dnl for functions we use.
|
||||
AC_CHECK_FUNC(gethostbyaddr,, [AC_CHECK_LIB(bind, gethostbyaddr, BIND_LIB="-lbind")])
|
||||
AC_CHECK_FUNC(gethostbyaddr,, [AC_CHECK_LIB(nsl, gethostbyaddr, NSL_LIB="-lnsl")])
|
||||
AC_CHECK_FUNC(socket, [SOCKET_LIBS=], [AC_CHECK_LIB(socket, socket, SOCKET_LIB="-lsocket")])
|
||||
AC_CHECK_FUNC(inet_aton,, [AC_CHECK_LIB(resolv, inet_aton, RESOLV_LIB="-lresolv")])
|
||||
|
||||
dnl Group related network libraries together so they can always be linked
|
||||
dnl in.
|
||||
SOCKET_LIBS="$SOCKET_LIB $NSL_LIB $BIND_LIB $RESOLV_LIB"
|
||||
AC_SUBST(SOCKET_LIBS)
|
||||
|
||||
dnl define HAVE_* values for network functions. This may require
|
||||
dnl SOCKET_LIBS so set LIBS temporarily.
|
||||
save_LIBS="$LIBS"
|
||||
LIBS="$LIBS $SOCKET_LIBS"
|
||||
AC_CHECK_FUNCS(inet_addr inet_aton inet_ntoa)
|
||||
AC_REPLACE_FUNCS(inet_ntop inet_pton)
|
||||
LIBS="$save_LIBS"
|
||||
|
||||
if test "$ac_cv_header_be_kernel_OS_h" = "yes" ; then
|
||||
dnl those are known to be broken in BeOS (BONE)
|
||||
ac_cv_func_getaddrinfo=no
|
||||
ac_cv_func_getnameinfo=no
|
||||
fi
|
||||
|
||||
AC_FUNC_ALLOCA
|
||||
AC_FUNC_MMAP
|
||||
AC_CHECK_FUNCS(atexit inet_addr inet_aton inet_ntoa ioperm i386_set_ioperm \
|
||||
AC_CHECK_FUNCS(atexit ioperm i386_set_ioperm \
|
||||
mkdir strftime strstr strtod \
|
||||
cfmakeraw tcsendbreak strcasecmp strncasecmp _portaccess \
|
||||
getaddrinfo getnameinfo poll setitimer iopl )
|
||||
AC_REPLACE_FUNCS(getenv inet_ntop inet_pton isfdtype sigprocmask snprintf \
|
||||
AC_REPLACE_FUNCS(getenv isfdtype sigprocmask snprintf \
|
||||
strcasestr strdup strndup strsep usleep vsyslog)
|
||||
|
||||
SANE_PROTOTYPES
|
||||
|
||||
if test "$ac_cv_header_os2_h" = "yes" ; then
|
||||
AC_DEFINE(strncasecmp, strnicmp, [Define for OS/2 only])
|
||||
AC_DEFINE(strcasecmp, stricmp, [Define for OS/2 only])
|
||||
fi
|
||||
|
||||
if test "$ac_cv_header_getopt_h" = "yes" ; then
|
||||
AC_CHECK_FUNCS(getopt_long)
|
||||
fi
|
||||
|
||||
dnl ***********************************************************************
|
||||
dnl checks for system services
|
||||
dnl ***********************************************************************
|
||||
|
|
@ -421,13 +444,11 @@ AC_LIBTOOL_WIN32_DLL
|
|||
AC_DISABLE_STATIC
|
||||
AC_PROG_LIBTOOL
|
||||
|
||||
dnl Windows/Cygwin needs this, else the library creation fails
|
||||
dnl BeOS also needs this (why isnt it the default anyway ???)
|
||||
dnl Windows (cygwin/mingw), BeOS, and OS/2 need this.
|
||||
case $host_os in
|
||||
cygwin* | mingw* | beos*)
|
||||
NO_UNDEFINED_LDFLAGS=-no-undefined
|
||||
cygwin* | mingw* | beos* | os2*)
|
||||
LDFLAGS="$LDFLAGS -no-undefined"
|
||||
esac
|
||||
AC_SUBST(NO_UNDEFINED_LDFLAGS)
|
||||
|
||||
dnl Check for lock dir
|
||||
|
||||
|
|
|
|||
|
|
@ -26,14 +26,14 @@
|
|||
* internal remapping functions in liblib.la before we include
|
||||
* include/sane/config.h.
|
||||
*/
|
||||
#include <stdlib.h> /* Can define getopt() */
|
||||
# include "../include/lalloca.h" /* MUST come first for AIX! */
|
||||
#include "../include/lalloca.h" /* MUST come first for AIX! */
|
||||
#include "../include/sane/config.h"
|
||||
|
||||
#include <assert.h>
|
||||
#include "../include/getopt.h"
|
||||
#include "lgetopt.h"
|
||||
#include <signal.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <stdarg.h>
|
||||
|
|
@ -1252,10 +1252,10 @@ scan_it (void)
|
|||
if (must_buffer)
|
||||
{
|
||||
/* We're either scanning a multi-frame image or the
|
||||
scanner doesn't know what the eventual image height
|
||||
will be (common for hand-held scanners). In either
|
||||
case, we need to buffer all data before we can write
|
||||
the image. */
|
||||
scanner doesn't know what the eventual image height
|
||||
will be (common for hand-held scanners). In either
|
||||
case, we need to buffer all data before we can write
|
||||
the image. */
|
||||
image.width = parm.bytes_per_line;
|
||||
|
||||
if (parm.lines >= 0)
|
||||
|
|
@ -1356,7 +1356,7 @@ scan_it (void)
|
|||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
break;
|
||||
}
|
||||
}
|
||||
else /* ! must_buffer */
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ SANE_INCLUDES = $(addprefix $(top_srcdir)/include/sane/,$(INSTALLED_INCLUDES)) \
|
|||
sanei_pio.h sanei_pp.h sanei_pv8630.h sanei_scsi.h sanei_tcp.h \
|
||||
sanei_thread.h sanei_udp.h sanei_usb.h sanei_wire.h )
|
||||
|
||||
OTHER_INCLUDES = $(addprefix $(top_srcdir)/include/,Makefile.in getopt.h \
|
||||
OTHER_INCLUDES = $(addprefix $(top_srcdir)/include/,Makefile.in lgetopt.h \
|
||||
lalloca.h lassert.h md5.h font_6x11.h)
|
||||
|
||||
DISTFILES = $(SANE_INCLUDES) $(OTHER_INCLUDES)
|
||||
|
|
|
|||
|
|
@ -17,6 +17,12 @@
|
|||
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||
02111-1307 USA. */
|
||||
|
||||
#if defined(HAVE_GETOPT_H) && defined(HAVE_GETOPT_LONG)
|
||||
|
||||
#include <getopt.h>
|
||||
|
||||
#else
|
||||
|
||||
#ifndef _GETOPT_H
|
||||
|
||||
#ifndef __need_getopt
|
||||
|
|
@ -38,10 +44,6 @@
|
|||
extern "C" {
|
||||
#endif
|
||||
|
||||
#define optind sanei_optind
|
||||
#define optarg sanei_optarg
|
||||
#define getopt sanei_getopt
|
||||
|
||||
/* For communication from `getopt' to the caller.
|
||||
When `getopt' finds an option that takes an argument,
|
||||
the argument value is returned here.
|
||||
|
|
@ -82,7 +84,7 @@ extern int optopt;
|
|||
The field `has_arg' is:
|
||||
no_argument (or 0) if the option does not take an argument,
|
||||
required_argument (or 1) if the option requires an argument,
|
||||
optional_argument (or 2) if the option takes an optional argument.
|
||||
optional_argument (or 2) if the option takes an optional argument.
|
||||
|
||||
If the field `flag' is not NULL, it points to a variable that is set
|
||||
to the value given in the field `val' when the option is found, but
|
||||
|
|
@ -154,15 +156,15 @@ extern int getopt ();
|
|||
# ifndef __need_getopt
|
||||
extern int getopt_long (int ___argc, char *const *___argv,
|
||||
const char *__shortopts,
|
||||
const struct option *__longopts, int *__longind);
|
||||
const struct option *__longopts, int *__longind);
|
||||
extern int getopt_long_only (int ___argc, char *const *___argv,
|
||||
const char *__shortopts,
|
||||
const struct option *__longopts, int *__longind);
|
||||
const struct option *__longopts, int *__longind);
|
||||
|
||||
/* Internal only. Users should not call this directly. */
|
||||
extern int _getopt_internal (int ___argc, char *const *___argv,
|
||||
const char *__shortopts,
|
||||
const struct option *__longopts, int *__longind,
|
||||
const struct option *__longopts, int *__longind,
|
||||
int __long_only);
|
||||
# endif
|
||||
#else /* not __STDC__ */
|
||||
|
|
@ -182,4 +184,6 @@ extern int _getopt_internal ();
|
|||
/* Make sure we later can get all the definitions and declarations. */
|
||||
#undef __need_getopt
|
||||
|
||||
#endif /* getopt.h */
|
||||
#endif /* lgetopt.h */
|
||||
|
||||
#endif /* !external getopt.h */
|
||||
|
|
@ -88,6 +88,12 @@
|
|||
/* Define to 1 if you have the `getnameinfo' function. */
|
||||
#undef HAVE_GETNAMEINFO
|
||||
|
||||
/* Define to 1 if you have the <getopt.h> header file. */
|
||||
#undef HAVE_GETOPT_H
|
||||
|
||||
/* Define to 1 if you have the `getopt_long' function. */
|
||||
#undef HAVE_GETOPT_LONG
|
||||
|
||||
/* Define to 1 if you have the `getpagesize' function. */
|
||||
#undef HAVE_GETPAGESIZE
|
||||
|
||||
|
|
|
|||
|
|
@ -99,6 +99,7 @@ DEPEND_RECURSIVE = @DEPEND_RECURSIVE@
|
|||
DISTCLEAN_FILES = @DISTCLEAN_FILES@
|
||||
DLLTOOL = @DLLTOOL@
|
||||
DL_LIBS = @DL_LIBS@
|
||||
DSYMUTIL = @DSYMUTIL@
|
||||
DVIPS = @DVIPS@
|
||||
DYNAMIC_FLAG = @DYNAMIC_FLAG@
|
||||
ECHO = @ECHO@
|
||||
|
|
@ -109,7 +110,6 @@ EGREP = @EGREP@
|
|||
EXEEXT = @EXEEXT@
|
||||
F77 = @F77@
|
||||
FFLAGS = @FFLAGS@
|
||||
GETHOSTBYADDR_LIBS = @GETHOSTBYADDR_LIBS@
|
||||
GPHOTO2_CPPFLAGS = @GPHOTO2_CPPFLAGS@
|
||||
GPHOTO2_LIBS = @GPHOTO2_LIBS@
|
||||
GREP = @GREP@
|
||||
|
|
@ -143,7 +143,7 @@ MATH_LIB = @MATH_LIB@
|
|||
MKDIR_P = @MKDIR_P@
|
||||
MSGFMT = @MSGFMT@
|
||||
MSGMERGE = @MSGMERGE@
|
||||
NO_UNDEFINED_LDFLAGS = @NO_UNDEFINED_LDFLAGS@
|
||||
NMEDIT = @NMEDIT@
|
||||
NUMBER_VERSION = @NUMBER_VERSION@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
|
|
@ -164,6 +164,7 @@ SANEI_JPEG = @SANEI_JPEG@
|
|||
SANEI_JPEG_LO = @SANEI_JPEG_LO@
|
||||
SANE_CONFIG_PATH = @SANE_CONFIG_PATH@
|
||||
SCSI_LIBS = @SCSI_LIBS@
|
||||
SED = @SED@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
SOCKET_LIBS = @SOCKET_LIBS@
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
"Keep this file name-space clean" means, talk to drepper@gnu.org
|
||||
before changing it!
|
||||
Copyright (C) 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001,2002
|
||||
Free Software Foundation, Inc.
|
||||
Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
|
|
@ -20,6 +20,7 @@
|
|||
License along with the GNU C Library; if not, write to the Free
|
||||
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||
02111-1307 USA. */
|
||||
#if !defined(HAVE_GETOPT_H) || !defined(HAVE_GETOPT_LONG)
|
||||
|
||||
/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
|
||||
Ditto for AIX 3.2 and <stdlib.h>. */
|
||||
|
|
@ -1282,3 +1283,4 @@ main (argc, argv)
|
|||
}
|
||||
|
||||
#endif /* TEST */
|
||||
#endif /* !HAVE_GETOPT_LONG */
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
License along with the GNU C Library; if not, write to the Free
|
||||
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||
02111-1307 USA. */
|
||||
#if !defined(HAVE_GETOPT_H) || !defined(HAVE_GETOPT_LONG)
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
|
|
@ -199,3 +200,4 @@ main (argc, argv)
|
|||
}
|
||||
|
||||
#endif /* TEST */
|
||||
#endif /* HAVE_GETOPT_LONG */
|
||||
|
|
|
|||
293
ltmain.sh
293
ltmain.sh
|
|
@ -1,8 +1,12 @@
|
|||
# Local changes for sane-backends (search for "Local change"):
|
||||
# 2003-04-30: Henning Meirer-Geinitz
|
||||
# * soname changed to "libsane" for every backend (all systems but AIX)
|
||||
|
||||
# ltmain.sh - Provide generalized library-building support services.
|
||||
# NOTE: Changing this file will not affect anything until you rerun configure.
|
||||
#
|
||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
|
||||
# Free Software Foundation, Inc.
|
||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
|
||||
# 2007, 2008 Free Software Foundation, Inc.
|
||||
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -24,10 +28,6 @@
|
|||
# configuration script generated by Autoconf, you may include it under
|
||||
# the same distribution terms that you use for the rest of that program.
|
||||
|
||||
# Local changes for sane-backends (search for "Local change"):
|
||||
# 2003-04-30: Henning Meier-Geinitz
|
||||
# * soname changed to "libsane" for every backend (all systems but AIX)
|
||||
|
||||
basename="s,^.*/,,g"
|
||||
|
||||
# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
|
||||
|
|
@ -47,14 +47,22 @@ EXIT_FAILURE=1
|
|||
|
||||
PROGRAM=ltmain.sh
|
||||
PACKAGE=libtool
|
||||
VERSION=1.5.22
|
||||
TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
|
||||
VERSION=1.5.26
|
||||
TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
|
||||
|
||||
# See if we are running on zsh, and set the options which allow our
|
||||
# commands through without removal of \ escapes.
|
||||
if test -n "${ZSH_VERSION+set}" ; then
|
||||
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
|
||||
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
||||
emulate sh
|
||||
NULLCMD=:
|
||||
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
|
||||
# is contrary to our usage. Disable this feature.
|
||||
alias -g '${1+"$@"}'='"$@"'
|
||||
setopt NO_GLOB_SUBST
|
||||
else
|
||||
case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
|
||||
fi
|
||||
BIN_SH=xpg4; export BIN_SH # for Tru64
|
||||
DUALCASE=1; export DUALCASE # for MKS sh
|
||||
|
||||
# Check that we have a working $echo.
|
||||
if test "X$1" = X--no-reexec; then
|
||||
|
|
@ -109,11 +117,19 @@ esac
|
|||
# These must not be set unconditionally because not all systems understand
|
||||
# e.g. LANG=C (notably SCO).
|
||||
# We save the old values to restore during execute mode.
|
||||
if test "${LC_ALL+set}" = set; then
|
||||
save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
|
||||
fi
|
||||
if test "${LANG+set}" = set; then
|
||||
save_LANG="$LANG"; LANG=C; export LANG
|
||||
lt_env=
|
||||
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
|
||||
do
|
||||
eval "if test \"\${$lt_var+set}\" = set; then
|
||||
save_$lt_var=\$$lt_var
|
||||
lt_env=\"$lt_var=\$$lt_var \$lt_env\"
|
||||
$lt_var=C
|
||||
export $lt_var
|
||||
fi"
|
||||
done
|
||||
|
||||
if test -n "$lt_env"; then
|
||||
lt_env="env $lt_env"
|
||||
fi
|
||||
|
||||
# Make sure IFS has a sensible default
|
||||
|
|
@ -140,6 +156,8 @@ duplicate_deps=no
|
|||
preserve_args=
|
||||
lo2o="s/\\.lo\$/.${objext}/"
|
||||
o2lo="s/\\.${objext}\$/.lo/"
|
||||
extracted_archives=
|
||||
extracted_serial=0
|
||||
|
||||
#####################################
|
||||
# Shell function definitions:
|
||||
|
|
@ -200,7 +218,13 @@ func_win32_libid ()
|
|||
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
|
||||
$EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
|
||||
win32_nmres=`eval $NM -f posix -A $1 | \
|
||||
$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
|
||||
$SED -n -e '1,100{
|
||||
/ I /{
|
||||
s,.*,import,
|
||||
p
|
||||
q
|
||||
}
|
||||
}'`
|
||||
case $win32_nmres in
|
||||
import*) win32_libid_type="x86 archive import";;
|
||||
*) win32_libid_type="x86 archive static";;
|
||||
|
|
@ -331,7 +355,17 @@ func_extract_archives ()
|
|||
*) my_xabs=`pwd`"/$my_xlib" ;;
|
||||
esac
|
||||
my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
|
||||
my_xdir="$my_gentop/$my_xlib"
|
||||
my_xlib_u=$my_xlib
|
||||
while :; do
|
||||
case " $extracted_archives " in
|
||||
*" $my_xlib_u "*)
|
||||
extracted_serial=`expr $extracted_serial + 1`
|
||||
my_xlib_u=lt$extracted_serial-$my_xlib ;;
|
||||
*) break ;;
|
||||
esac
|
||||
done
|
||||
extracted_archives="$extracted_archives $my_xlib_u"
|
||||
my_xdir="$my_gentop/$my_xlib_u"
|
||||
|
||||
$show "${rm}r $my_xdir"
|
||||
$run ${rm}r "$my_xdir"
|
||||
|
|
@ -458,11 +492,12 @@ do
|
|||
;;
|
||||
|
||||
--version)
|
||||
$echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
|
||||
$echo
|
||||
$echo "Copyright (C) 2005 Free Software Foundation, Inc."
|
||||
$echo "This is free software; see the source for copying conditions. There is NO"
|
||||
$echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
||||
echo "\
|
||||
$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
|
||||
|
||||
Copyright (C) 2008 Free Software Foundation, Inc.
|
||||
This is free software; see the source for copying conditions. There is NO
|
||||
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
||||
exit $?
|
||||
;;
|
||||
|
||||
|
|
@ -759,9 +794,11 @@ if test -z "$show_help"; then
|
|||
*.class) xform=class ;;
|
||||
*.cpp) xform=cpp ;;
|
||||
*.cxx) xform=cxx ;;
|
||||
*.f90) xform=f90 ;;
|
||||
*.[fF][09]?) xform=[fF][09]. ;;
|
||||
*.for) xform=for ;;
|
||||
*.java) xform=java ;;
|
||||
*.obj) xform=obj ;;
|
||||
*.sx) xform=sx ;;
|
||||
esac
|
||||
|
||||
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
|
||||
|
|
@ -930,7 +967,7 @@ EOF
|
|||
$run $rm "$lobj" "$output_obj"
|
||||
|
||||
$show "$command"
|
||||
if $run eval "$command"; then :
|
||||
if $run eval $lt_env "$command"; then :
|
||||
else
|
||||
test -n "$output_obj" && $run $rm $removelist
|
||||
exit $EXIT_FAILURE
|
||||
|
|
@ -1002,7 +1039,7 @@ EOF
|
|||
command="$command$suppress_output"
|
||||
$run $rm "$obj" "$output_obj"
|
||||
$show "$command"
|
||||
if $run eval "$command"; then :
|
||||
if $run eval $lt_env "$command"; then :
|
||||
else
|
||||
$run $rm $removelist
|
||||
exit $EXIT_FAILURE
|
||||
|
|
@ -1135,6 +1172,7 @@ EOF
|
|||
thread_safe=no
|
||||
vinfo=
|
||||
vinfo_number=no
|
||||
single_module="${wl}-single_module"
|
||||
|
||||
func_infer_tag $base_compile
|
||||
|
||||
|
|
@ -1142,8 +1180,9 @@ EOF
|
|||
for arg
|
||||
do
|
||||
case $arg in
|
||||
-all-static | -static)
|
||||
if test "X$arg" = "X-all-static"; then
|
||||
-all-static | -static | -static-libtool-libs)
|
||||
case $arg in
|
||||
-all-static)
|
||||
if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
|
||||
$echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
|
||||
fi
|
||||
|
|
@ -1151,12 +1190,20 @@ EOF
|
|||
dlopen_self=$dlopen_self_static
|
||||
fi
|
||||
prefer_static_libs=yes
|
||||
else
|
||||
;;
|
||||
-static)
|
||||
if test -z "$pic_flag" && test -n "$link_static_flag"; then
|
||||
dlopen_self=$dlopen_self_static
|
||||
fi
|
||||
prefer_static_libs=built
|
||||
fi
|
||||
;;
|
||||
-static-libtool-libs)
|
||||
if test -z "$pic_flag" && test -n "$link_static_flag"; then
|
||||
dlopen_self=$dlopen_self_static
|
||||
fi
|
||||
prefer_static_libs=yes
|
||||
;;
|
||||
esac
|
||||
build_libtool_libs=no
|
||||
build_old_libs=yes
|
||||
break
|
||||
|
|
@ -1604,13 +1651,18 @@ EOF
|
|||
continue
|
||||
;;
|
||||
|
||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
|
||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||
compiler_flags="$compiler_flags $arg"
|
||||
compile_command="$compile_command $arg"
|
||||
finalize_command="$finalize_command $arg"
|
||||
continue
|
||||
;;
|
||||
|
||||
-multi_module)
|
||||
single_module="${wl}-multi_module"
|
||||
continue
|
||||
;;
|
||||
|
||||
-module)
|
||||
module=yes
|
||||
continue
|
||||
|
|
@ -1624,10 +1676,11 @@ EOF
|
|||
# -m* pass through architecture-specific compiler args for GCC
|
||||
# -m*, -t[45]*, -txscale* pass through architecture-specific
|
||||
# compiler args for GCC
|
||||
# -pg pass through profiling flag for GCC
|
||||
# -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
|
||||
# -F/path gives path to uninstalled frameworks, gcc on darwin
|
||||
# @file GCC response files
|
||||
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
|
||||
-t[45]*|-txscale*|@*)
|
||||
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
|
||||
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
|
||||
|
||||
# Unknown arguments in both finalize_command and compile_command need
|
||||
# to be aesthetically quoted because they are evaled later.
|
||||
|
|
@ -1655,9 +1708,9 @@ EOF
|
|||
|
||||
-no-install)
|
||||
case $host in
|
||||
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
|
||||
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
|
||||
# The PATH hackery in wrapper scripts is required on Windows
|
||||
# in order for the loader to find any dlls it needs.
|
||||
# and Darwin in order for the loader to find any dlls it needs.
|
||||
$echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
|
||||
$echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
|
||||
fast_install=no
|
||||
|
|
@ -1716,7 +1769,7 @@ EOF
|
|||
continue
|
||||
;;
|
||||
|
||||
-static)
|
||||
-static | -static-libtool-libs)
|
||||
# The effects of -static are defined in a previous loop.
|
||||
# We used to do the same as -all-static on platforms that
|
||||
# didn't have a PIC flag, but the assumption that the effects
|
||||
|
|
@ -2098,7 +2151,7 @@ EOF
|
|||
lib=
|
||||
found=no
|
||||
case $deplib in
|
||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
|
||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||
if test "$linkmode,$pass" = "prog,link"; then
|
||||
compile_deplibs="$deplib $compile_deplibs"
|
||||
finalize_deplibs="$deplib $finalize_deplibs"
|
||||
|
|
@ -2113,7 +2166,12 @@ EOF
|
|||
continue
|
||||
fi
|
||||
name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
|
||||
for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
|
||||
if test "$linkmode" = lib; then
|
||||
searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
|
||||
else
|
||||
searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
|
||||
fi
|
||||
for searchdir in $searchdirs; do
|
||||
for search_ext in .la $std_shrext .so .a; do
|
||||
# Search the libtool library
|
||||
lib="$searchdir/lib${name}${search_ext}"
|
||||
|
|
@ -2494,7 +2552,9 @@ EOF
|
|||
|
||||
if test "$linkmode,$pass" = "prog,link"; then
|
||||
if test -n "$library_names" &&
|
||||
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
|
||||
{ { test "$prefer_static_libs" = no ||
|
||||
test "$prefer_static_libs,$installed" = "built,yes"; } ||
|
||||
test -z "$old_library"; }; then
|
||||
# We need to hardcode the library path
|
||||
if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
|
||||
# Make sure the rpath contains only unique directories.
|
||||
|
|
@ -2907,12 +2967,18 @@ EOF
|
|||
# we do not want to link against static libs,
|
||||
# but need to link against shared
|
||||
eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
|
||||
eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
|
||||
if test -n "$deplibrary_names" ; then
|
||||
for tmp in $deplibrary_names ; do
|
||||
depdepl=$tmp
|
||||
done
|
||||
if test -f "$path/$depdepl" ; then
|
||||
if test -f "$deplibdir/$depdepl" ; then
|
||||
depdepl="$deplibdir/$depdepl"
|
||||
elif test -f "$path/$depdepl" ; then
|
||||
depdepl="$path/$depdepl"
|
||||
else
|
||||
# Can't find it, oh well...
|
||||
depdepl=
|
||||
fi
|
||||
# do not add paths which are already there
|
||||
case " $newlib_search_path " in
|
||||
|
|
@ -3060,9 +3126,10 @@ EOF
|
|||
|
||||
case $linkmode in
|
||||
oldlib)
|
||||
if test -n "$deplibs"; then
|
||||
$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
|
||||
fi
|
||||
case " $deplibs" in
|
||||
*\ -l* | *\ -L*)
|
||||
$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
|
||||
esac
|
||||
|
||||
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
|
||||
$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
|
||||
|
|
@ -3190,7 +3257,7 @@ EOF
|
|||
# which has an extra 1 added just for fun
|
||||
#
|
||||
case $version_type in
|
||||
darwin|linux|osf|windows)
|
||||
darwin|linux|osf|windows|none)
|
||||
current=`expr $number_major + $number_minor`
|
||||
age="$number_minor"
|
||||
revision="$number_revision"
|
||||
|
|
@ -3201,9 +3268,10 @@ EOF
|
|||
age="0"
|
||||
;;
|
||||
irix|nonstopux)
|
||||
current=`expr $number_major + $number_minor - 1`
|
||||
current=`expr $number_major + $number_minor`
|
||||
age="$number_minor"
|
||||
revision="$number_minor"
|
||||
lt_irix_increment=no
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
|
@ -3262,7 +3330,8 @@ EOF
|
|||
versuffix="$major.$age.$revision"
|
||||
# Darwin ld doesn't like 0 for these options...
|
||||
minor_current=`expr $current + 1`
|
||||
verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
|
||||
xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
|
||||
verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
|
||||
;;
|
||||
|
||||
freebsd-aout)
|
||||
|
|
@ -3276,8 +3345,11 @@ EOF
|
|||
;;
|
||||
|
||||
irix | nonstopux)
|
||||
major=`expr $current - $age + 1`
|
||||
|
||||
if test "X$lt_irix_increment" = "Xno"; then
|
||||
major=`expr $current - $age`
|
||||
else
|
||||
major=`expr $current - $age + 1`
|
||||
fi
|
||||
case $version_type in
|
||||
nonstopux) verstring_prefix=nonstopux ;;
|
||||
*) verstring_prefix=sgi ;;
|
||||
|
|
@ -3414,11 +3486,11 @@ EOF
|
|||
fi
|
||||
|
||||
# Eliminate all temporary directories.
|
||||
for path in $notinst_path; do
|
||||
lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
|
||||
deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
|
||||
dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
|
||||
done
|
||||
#for path in $notinst_path; do
|
||||
# lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
|
||||
# deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
|
||||
# dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
|
||||
#done
|
||||
|
||||
if test -n "$xrpath"; then
|
||||
# If the user specified any rpath flags, then add them.
|
||||
|
|
@ -3519,13 +3591,12 @@ EOF
|
|||
int main() { return 0; }
|
||||
EOF
|
||||
$rm conftest
|
||||
$LTCC $LTCFLAGS -o conftest conftest.c $deplibs
|
||||
if test "$?" -eq 0 ; then
|
||||
if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
|
||||
ldd_output=`ldd conftest`
|
||||
for i in $deplibs; do
|
||||
name=`expr $i : '-l\(.*\)'`
|
||||
# If $name is empty we are operating on a -L argument.
|
||||
if test "$name" != "" && test "$name" -ne "0"; then
|
||||
if test "$name" != "" && test "$name" != "0"; then
|
||||
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
|
||||
case " $predeps $postdeps " in
|
||||
*" $i "*)
|
||||
|
|
@ -3564,9 +3635,7 @@ EOF
|
|||
# If $name is empty we are operating on a -L argument.
|
||||
if test "$name" != "" && test "$name" != "0"; then
|
||||
$rm conftest
|
||||
$LTCC $LTCFLAGS -o conftest conftest.c $i
|
||||
# Did it work?
|
||||
if test "$?" -eq 0 ; then
|
||||
if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
|
||||
ldd_output=`ldd conftest`
|
||||
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
|
||||
case " $predeps $postdeps " in
|
||||
|
|
@ -3598,7 +3667,7 @@ EOF
|
|||
droppeddeps=yes
|
||||
$echo
|
||||
$echo "*** Warning! Library $i is needed by this library but I was not able to"
|
||||
$echo "*** make it link in! You will probably need to install it or some"
|
||||
$echo "*** make it link in! You will probably need to install it or some"
|
||||
$echo "*** library that it depends on before this library will be fully"
|
||||
$echo "*** functional. Installing it before continuing would be even better."
|
||||
fi
|
||||
|
|
@ -3884,7 +3953,10 @@ EOF
|
|||
test -n "$hardcode_libdirs"; then
|
||||
libdir="$hardcode_libdirs"
|
||||
if test -n "$hardcode_libdir_flag_spec_ld"; then
|
||||
eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
|
||||
case $archive_cmds in
|
||||
*\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
|
||||
*) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
|
||||
esac
|
||||
else
|
||||
eval dep_rpath=\"$hardcode_libdir_flag_spec\"
|
||||
fi
|
||||
|
|
@ -3927,18 +3999,18 @@ EOF
|
|||
# backend is possible. Also the following test was moved to this
|
||||
# location.
|
||||
#
|
||||
# If -module or -export-dynamic was specified, set the dlname.
|
||||
# If -module or -export-dynamic was specified, set the dlname
|
||||
if test "$module" = yes || test "$export_dynamic" = yes; then
|
||||
# On all known operating systems, these are identical.
|
||||
dlname="$soname"
|
||||
fi
|
||||
case $host in
|
||||
*aix*)
|
||||
;;
|
||||
;;
|
||||
*)
|
||||
soname=`echo $soname | sed -e "s/libsane-[A-Za-z_0-9]*/libsane/g"`
|
||||
soname=`echo $soname | sed -e "s/libsane-[A-Za-z_0-9]*/libsane/g"`
|
||||
esac
|
||||
# End of local change.
|
||||
#End of local change
|
||||
|
||||
lib="$output_objdir/$realname"
|
||||
linknames=
|
||||
|
|
@ -4203,7 +4275,7 @@ EOF
|
|||
fi
|
||||
done
|
||||
|
||||
# Local change for sane-backends: moved up
|
||||
# Local change for sane-backends; moved up
|
||||
# # If -module or -export-dynamic was specified, set the dlname.
|
||||
# if test "$module" = yes || test "$export_dynamic" = yes; then
|
||||
# # On all known operating systems, these are identical.
|
||||
|
|
@ -4213,9 +4285,10 @@ EOF
|
|||
;;
|
||||
|
||||
obj)
|
||||
if test -n "$deplibs"; then
|
||||
$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
|
||||
fi
|
||||
case " $deplibs" in
|
||||
*\ -l* | *\ -L*)
|
||||
$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
|
||||
esac
|
||||
|
||||
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
|
||||
$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
|
||||
|
|
@ -4262,12 +4335,14 @@ EOF
|
|||
reload_conv_objs=
|
||||
gentop=
|
||||
# reload_cmds runs $LD directly, so let us get rid of
|
||||
# -Wl from whole_archive_flag_spec
|
||||
# -Wl from whole_archive_flag_spec and hope we can get by with
|
||||
# turning comma into space..
|
||||
wl=
|
||||
|
||||
if test -n "$convenience"; then
|
||||
if test -n "$whole_archive_flag_spec"; then
|
||||
eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
|
||||
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
|
||||
reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
|
||||
else
|
||||
gentop="$output_objdir/${obj}x"
|
||||
generated="$generated $gentop"
|
||||
|
|
@ -4715,16 +4790,16 @@ static const void *lt_preloaded_setup() {
|
|||
case $host in
|
||||
*cygwin* | *mingw* )
|
||||
if test -f "$output_objdir/${outputname}.def" ; then
|
||||
compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
|
||||
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
|
||||
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
|
||||
finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
|
||||
else
|
||||
compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
|
||||
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
|
||||
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
|
||||
finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
|
||||
fi
|
||||
;;
|
||||
* )
|
||||
compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
|
||||
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
|
||||
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
|
||||
finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
|
@ -4739,13 +4814,13 @@ static const void *lt_preloaded_setup() {
|
|||
# really was required.
|
||||
|
||||
# Nullify the symbol file.
|
||||
compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
|
||||
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
|
||||
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
|
||||
finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
|
||||
fi
|
||||
|
||||
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
|
||||
# Replace the output file specification.
|
||||
compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
|
||||
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
|
||||
link_command="$compile_command$compile_rpath"
|
||||
|
||||
# We have no uninstalled library dependencies, so finalize right now.
|
||||
|
|
@ -4832,7 +4907,7 @@ static const void *lt_preloaded_setup() {
|
|||
if test "$fast_install" != no; then
|
||||
link_command="$finalize_var$compile_command$finalize_rpath"
|
||||
if test "$fast_install" = yes; then
|
||||
relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
|
||||
relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
|
||||
else
|
||||
# fast_install is set to needless
|
||||
relink_command=
|
||||
|
|
@ -4869,7 +4944,7 @@ static const void *lt_preloaded_setup() {
|
|||
fi
|
||||
done
|
||||
relink_command="(cd `pwd`; $relink_command)"
|
||||
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
|
||||
relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
|
||||
fi
|
||||
|
||||
# Quote $echo for shipping.
|
||||
|
|
@ -5276,6 +5351,20 @@ EOF
|
|||
Xsed='${SED} -e 1s/^X//'
|
||||
sed_quote_subst='$sed_quote_subst'
|
||||
|
||||
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
|
||||
if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
|
||||
emulate sh
|
||||
NULLCMD=:
|
||||
# Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
|
||||
# is contrary to our usage. Disable this feature.
|
||||
alias -g '\${1+\"\$@\"}'='\"\$@\"'
|
||||
setopt NO_GLOB_SUBST
|
||||
else
|
||||
case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
|
||||
fi
|
||||
BIN_SH=xpg4; export BIN_SH # for Tru64
|
||||
DUALCASE=1; export DUALCASE # for MKS sh
|
||||
|
||||
# The HP-UX ksh and POSIX shell print the target directory to stdout
|
||||
# if CDPATH is set.
|
||||
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
||||
|
|
@ -5418,7 +5507,7 @@ else
|
|||
;;
|
||||
esac
|
||||
$echo >> $output "\
|
||||
\$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
|
||||
\$echo \"\$0: cannot exec \$program \$*\"
|
||||
exit $EXIT_FAILURE
|
||||
fi
|
||||
else
|
||||
|
|
@ -5604,7 +5693,7 @@ fi\
|
|||
done
|
||||
# Quote the link command for shipping.
|
||||
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
|
||||
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
|
||||
relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
|
||||
if test "$hardcode_automatic" = yes ; then
|
||||
relink_command=
|
||||
fi
|
||||
|
|
@ -5949,9 +6038,9 @@ relink_command=\"$relink_command\""
|
|||
|
||||
if test -n "$inst_prefix_dir"; then
|
||||
# Stick the inst_prefix_dir data into the link command.
|
||||
relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
|
||||
relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
|
||||
else
|
||||
relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
|
||||
relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
|
||||
fi
|
||||
|
||||
$echo "$modename: warning: relinking \`$file'" 1>&2
|
||||
|
|
@ -6160,7 +6249,7 @@ relink_command=\"$relink_command\""
|
|||
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
|
||||
outputname="$tmpdir/$file"
|
||||
# Replace the output file specification.
|
||||
relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
|
||||
relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
|
||||
|
||||
$show "$relink_command"
|
||||
if $run eval "$relink_command"; then :
|
||||
|
|
@ -6371,8 +6460,10 @@ relink_command=\"$relink_command\""
|
|||
if test -f "$dir/$objdir/$dlname"; then
|
||||
dir="$dir/$objdir"
|
||||
else
|
||||
$echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
|
||||
exit $EXIT_FAILURE
|
||||
if test ! -f "$dir/$dlname"; then
|
||||
$echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
|
||||
exit $EXIT_FAILURE
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
|
||||
|
|
@ -6436,12 +6527,12 @@ relink_command=\"$relink_command\""
|
|||
fi
|
||||
|
||||
# Restore saved environment variables
|
||||
if test "${save_LC_ALL+set}" = set; then
|
||||
LC_ALL="$save_LC_ALL"; export LC_ALL
|
||||
fi
|
||||
if test "${save_LANG+set}" = set; then
|
||||
LANG="$save_LANG"; export LANG
|
||||
fi
|
||||
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
|
||||
do
|
||||
eval "if test \"\${save_$lt_var+set}\" = set; then
|
||||
$lt_var=\$save_$lt_var; export $lt_var
|
||||
fi"
|
||||
done
|
||||
|
||||
# Now prepare to actually exec the command.
|
||||
exec_cmd="\$cmd$args"
|
||||
|
|
@ -6798,9 +6889,9 @@ The following components of LINK-COMMAND are treated specially:
|
|||
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
|
||||
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
|
||||
-export-symbols SYMFILE
|
||||
try to export only the symbols listed in SYMFILE
|
||||
try to export only the symbols listed in SYMFILE
|
||||
-export-symbols-regex REGEX
|
||||
try to export only the symbols matching REGEX
|
||||
try to export only the symbols matching REGEX
|
||||
-LLIBDIR search LIBDIR for required installed libraries
|
||||
-lNAME OUTPUT-FILE requires the installed library libNAME
|
||||
-module build a library that can dlopened
|
||||
|
|
@ -6814,9 +6905,11 @@ The following components of LINK-COMMAND are treated specially:
|
|||
-release RELEASE specify package release information
|
||||
-rpath LIBDIR the created library will eventually be installed in LIBDIR
|
||||
-R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
|
||||
-static do not do any dynamic linking of libtool libraries
|
||||
-static do not do any dynamic linking of uninstalled libtool libraries
|
||||
-static-libtool-libs
|
||||
do not do any dynamic linking of libtool libraries
|
||||
-version-info CURRENT[:REVISION[:AGE]]
|
||||
specify library version info [each variable defaults to 0]
|
||||
specify library version info [each variable defaults to 0]
|
||||
|
||||
All other options (arguments beginning with \`-') are ignored.
|
||||
|
||||
|
|
|
|||
Plik diff jest za duży
Load Diff
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
#include <../include/sane/config.h>
|
||||
|
||||
#include "../include/getopt.h"
|
||||
#include "lgetopt.h"
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
|
@ -822,7 +822,7 @@ read_files (void)
|
|||
return SANE_FALSE;
|
||||
}
|
||||
/* now we check if everything is ok with the previous backend
|
||||
before we read the new one */
|
||||
before we read the new one */
|
||||
if (current_backend)
|
||||
{
|
||||
type_entry *current_type = current_backend->type;
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue