Compare commits
9
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
585875bc07 | ||
|
|
862c94c485 | ||
|
|
fd6a5d112b | ||
|
|
7347e0eb26 | ||
|
|
981e33d1a8 | ||
|
|
09feb56516 | ||
|
|
f47538d475 | ||
|
|
38380e6484 | ||
|
|
5d383b32d1 |
No files matched your search
@@ -37,3 +37,13 @@
|
|||||||
1.2.4
|
1.2.4
|
||||||
* Turns out that the newer G15's have a different (5 byte) keyboard protocol.
|
* Turns out that the newer G15's have a different (5 byte) keyboard protocol.
|
||||||
* Optimise dumpPixmapIntoLCDFormat routine - Thanks to Adam Nielsen
|
* Optimise dumpPixmapIntoLCDFormat routine - Thanks to Adam Nielsen
|
||||||
|
1.2.5
|
||||||
|
* Remove 5BYTE_RETURN flag and process key packets based on length. Please
|
||||||
|
report any regressions.
|
||||||
|
* Add Solaris detection and remove locks if detected. Solaris' libUSB
|
||||||
|
blocks on read, forcing mutexes causes writes to block too.
|
||||||
|
1.2.6
|
||||||
|
* Re-Add 5BYTE_RETURN flag. Auto-detect does not work with Solaris' libusb.
|
||||||
|
* Add laptop GamePanel support.
|
||||||
|
1.2.7
|
||||||
|
* Fix keypress detection for G15v2 keyboards
|
||||||
+27
-15
@@ -1,8 +1,8 @@
|
|||||||
# Makefile.in generated by automake 1.10 from Makefile.am.
|
# Makefile.in generated by automake 1.10.1 from Makefile.am.
|
||||||
# @configure_input@
|
# @configure_input@
|
||||||
|
|
||||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
||||||
# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
||||||
# This Makefile.in is free software; the Free Software Foundation
|
# This Makefile.in is free software; the Free Software Foundation
|
||||||
# gives unlimited permission to copy and/or distribute it,
|
# gives unlimited permission to copy and/or distribute it,
|
||||||
# with or without modifications, as long as this notice is preserved.
|
# with or without modifications, as long as this notice is preserved.
|
||||||
@@ -33,6 +33,7 @@ PRE_UNINSTALL = :
|
|||||||
POST_UNINSTALL = :
|
POST_UNINSTALL = :
|
||||||
build_triplet = @build@
|
build_triplet = @build@
|
||||||
host_triplet = @host@
|
host_triplet = @host@
|
||||||
|
target_triplet = @target@
|
||||||
subdir = .
|
subdir = .
|
||||||
DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \
|
DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \
|
||||||
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
|
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
|
||||||
@@ -112,6 +113,7 @@ CXXFLAGS = @CXXFLAGS@
|
|||||||
CYGPATH_W = @CYGPATH_W@
|
CYGPATH_W = @CYGPATH_W@
|
||||||
DEFS = @DEFS@
|
DEFS = @DEFS@
|
||||||
DEPDIR = @DEPDIR@
|
DEPDIR = @DEPDIR@
|
||||||
|
DSYMUTIL = @DSYMUTIL@
|
||||||
ECHO = @ECHO@
|
ECHO = @ECHO@
|
||||||
ECHO_C = @ECHO_C@
|
ECHO_C = @ECHO_C@
|
||||||
ECHO_N = @ECHO_N@
|
ECHO_N = @ECHO_N@
|
||||||
@@ -134,6 +136,7 @@ LN_S = @LN_S@
|
|||||||
LTLIBOBJS = @LTLIBOBJS@
|
LTLIBOBJS = @LTLIBOBJS@
|
||||||
MAKEINFO = @MAKEINFO@
|
MAKEINFO = @MAKEINFO@
|
||||||
MKDIR_P = @MKDIR_P@
|
MKDIR_P = @MKDIR_P@
|
||||||
|
NMEDIT = @NMEDIT@
|
||||||
OBJEXT = @OBJEXT@
|
OBJEXT = @OBJEXT@
|
||||||
PACKAGE = @PACKAGE@
|
PACKAGE = @PACKAGE@
|
||||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||||
@@ -196,7 +199,11 @@ sbindir = @sbindir@
|
|||||||
sharedstatedir = @sharedstatedir@
|
sharedstatedir = @sharedstatedir@
|
||||||
srcdir = @srcdir@
|
srcdir = @srcdir@
|
||||||
sysconfdir = @sysconfdir@
|
sysconfdir = @sysconfdir@
|
||||||
|
target = @target@
|
||||||
target_alias = @target_alias@
|
target_alias = @target_alias@
|
||||||
|
target_cpu = @target_cpu@
|
||||||
|
target_os = @target_os@
|
||||||
|
target_vendor = @target_vendor@
|
||||||
top_builddir = @top_builddir@
|
top_builddir = @top_builddir@
|
||||||
top_srcdir = @top_srcdir@
|
top_srcdir = @top_srcdir@
|
||||||
LLIBDIR = @LIBDIR@
|
LLIBDIR = @LIBDIR@
|
||||||
@@ -266,8 +273,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
|
|||||||
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
|
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
|
||||||
if test -f $$p; then \
|
if test -f $$p; then \
|
||||||
f=$(am__strip_dir) \
|
f=$(am__strip_dir) \
|
||||||
echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
|
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
|
||||||
$(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
|
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
|
||||||
else :; fi; \
|
else :; fi; \
|
||||||
done
|
done
|
||||||
|
|
||||||
@@ -275,8 +282,8 @@ uninstall-libLTLIBRARIES:
|
|||||||
@$(NORMAL_UNINSTALL)
|
@$(NORMAL_UNINSTALL)
|
||||||
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
|
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
|
||||||
p=$(am__strip_dir) \
|
p=$(am__strip_dir) \
|
||||||
echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
|
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
|
||||||
$(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
|
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
|
||||||
done
|
done
|
||||||
|
|
||||||
clean-libLTLIBRARIES:
|
clean-libLTLIBRARIES:
|
||||||
@@ -350,8 +357,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
|||||||
unique=`for i in $$list; do \
|
unique=`for i in $$list; do \
|
||||||
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
||||||
done | \
|
done | \
|
||||||
$(AWK) ' { files[$$0] = 1; } \
|
$(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
|
||||||
END { for (i in files) print i; }'`; \
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
||||||
mkid -fID $$unique
|
mkid -fID $$unique
|
||||||
tags: TAGS
|
tags: TAGS
|
||||||
|
|
||||||
@@ -363,8 +370,8 @@ TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
|
|||||||
unique=`for i in $$list; do \
|
unique=`for i in $$list; do \
|
||||||
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
||||||
done | \
|
done | \
|
||||||
$(AWK) ' { files[$$0] = 1; } \
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
||||||
END { for (i in files) print i; }'`; \
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
||||||
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
||||||
test -n "$$unique" || unique=$$empty_fix; \
|
test -n "$$unique" || unique=$$empty_fix; \
|
||||||
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
||||||
@@ -374,13 +381,12 @@ ctags: CTAGS
|
|||||||
CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
|
CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
|
||||||
$(TAGS_FILES) $(LISP)
|
$(TAGS_FILES) $(LISP)
|
||||||
tags=; \
|
tags=; \
|
||||||
here=`pwd`; \
|
|
||||||
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
|
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
|
||||||
unique=`for i in $$list; do \
|
unique=`for i in $$list; do \
|
||||||
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
||||||
done | \
|
done | \
|
||||||
$(AWK) ' { files[$$0] = 1; } \
|
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
||||||
END { for (i in files) print i; }'`; \
|
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
||||||
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|
||||||
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
||||||
$$tags $$unique
|
$$tags $$unique
|
||||||
@@ -437,6 +443,10 @@ dist-bzip2: distdir
|
|||||||
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
|
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
|
||||||
$(am__remove_distdir)
|
$(am__remove_distdir)
|
||||||
|
|
||||||
|
dist-lzma: distdir
|
||||||
|
tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
|
||||||
|
$(am__remove_distdir)
|
||||||
|
|
||||||
dist-tarZ: distdir
|
dist-tarZ: distdir
|
||||||
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
|
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
|
||||||
$(am__remove_distdir)
|
$(am__remove_distdir)
|
||||||
@@ -463,6 +473,8 @@ distcheck: dist
|
|||||||
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
|
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
|
||||||
*.tar.bz2*) \
|
*.tar.bz2*) \
|
||||||
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
|
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
|
||||||
|
*.tar.lzma*) \
|
||||||
|
unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
|
||||||
*.tar.Z*) \
|
*.tar.Z*) \
|
||||||
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
|
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
|
||||||
*.shar.gz*) \
|
*.shar.gz*) \
|
||||||
@@ -618,8 +630,8 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
|
|||||||
|
|
||||||
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
|
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
|
||||||
clean-generic clean-libLTLIBRARIES clean-libtool ctags dist \
|
clean-generic clean-libLTLIBRARIES clean-libtool ctags dist \
|
||||||
dist-all dist-bzip2 dist-gzip dist-hook dist-shar dist-tarZ \
|
dist-all dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar \
|
||||||
dist-zip distcheck distclean distclean-compile \
|
dist-tarZ dist-zip distcheck distclean distclean-compile \
|
||||||
distclean-generic distclean-hdr distclean-libtool \
|
distclean-generic distclean-hdr distclean-libtool \
|
||||||
distclean-tags distcleancheck distdir distuninstallcheck dvi \
|
distclean-tags distcleancheck distdir distuninstallcheck dvi \
|
||||||
dvi-am html html-am info info-am install install-am \
|
dvi-am html html-am info info-am install install-am \
|
||||||
|
|||||||
@@ -6,3 +6,4 @@ LibG15 currently supports LCD & keys on the following devices:
|
|||||||
- G11 keyboard
|
- G11 keyboard
|
||||||
- Z10 speakers
|
- Z10 speakers
|
||||||
- 2nd revision of the G15 (amber backlight, 6 'G' keys, LCD)
|
- 2nd revision of the G15 (amber backlight, 6 'G' keys, LCD)
|
||||||
|
- Gamepanel available on some laptops
|
||||||
Vendored
+227
-115
@@ -1,7 +1,7 @@
|
|||||||
# generated automatically by aclocal 1.10 -*- Autoconf -*-
|
# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
|
||||||
|
|
||||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
||||||
# 2005, 2006 Free Software Foundation, Inc.
|
# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
||||||
# This file is free software; the Free Software Foundation
|
# This file is free software; the Free Software Foundation
|
||||||
# gives unlimited permission to copy and/or distribute it,
|
# gives unlimited permission to copy and/or distribute it,
|
||||||
# with or without modifications, as long as this notice is preserved.
|
# with or without modifications, as long as this notice is preserved.
|
||||||
@@ -11,14 +11,17 @@
|
|||||||
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
||||||
# PARTICULAR PURPOSE.
|
# PARTICULAR PURPOSE.
|
||||||
|
|
||||||
m4_if(m4_PACKAGE_VERSION, [2.61],,
|
m4_ifndef([AC_AUTOCONF_VERSION],
|
||||||
[m4_fatal([this file was generated for autoconf 2.61.
|
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
|
||||||
You have another version of autoconf. If you want to use that,
|
m4_if(AC_AUTOCONF_VERSION, [2.61],,
|
||||||
you should regenerate the build system entirely.], [63])])
|
[m4_warning([this file was generated for autoconf 2.61.
|
||||||
|
You have another version of autoconf. It may work, but is not guaranteed to.
|
||||||
|
If you have problems, you may need to regenerate the build system entirely.
|
||||||
|
To do so, use the procedure documented by the package, typically `autoreconf'.])])
|
||||||
|
|
||||||
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
|
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
|
||||||
|
|
||||||
# serial 51 AC_PROG_LIBTOOL
|
# serial 52 AC_PROG_LIBTOOL
|
||||||
|
|
||||||
|
|
||||||
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
|
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
|
||||||
@@ -106,7 +109,6 @@ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
|
|||||||
AC_REQUIRE([AC_OBJEXT])dnl
|
AC_REQUIRE([AC_OBJEXT])dnl
|
||||||
AC_REQUIRE([AC_EXEEXT])dnl
|
AC_REQUIRE([AC_EXEEXT])dnl
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_LIBTOOL_SYS_MAX_CMD_LEN
|
AC_LIBTOOL_SYS_MAX_CMD_LEN
|
||||||
AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
|
AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
|
||||||
AC_LIBTOOL_OBJDIR
|
AC_LIBTOOL_OBJDIR
|
||||||
@@ -208,6 +210,8 @@ file_magic*)
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
_LT_REQUIRED_DARWIN_CHECKS
|
||||||
|
|
||||||
AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
|
AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
|
||||||
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
|
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
|
||||||
enable_win32_dll=yes, enable_win32_dll=no)
|
enable_win32_dll=yes, enable_win32_dll=no)
|
||||||
@@ -224,6 +228,14 @@ AC_ARG_WITH([pic],
|
|||||||
[pic_mode=default])
|
[pic_mode=default])
|
||||||
test -z "$pic_mode" && pic_mode=default
|
test -z "$pic_mode" && pic_mode=default
|
||||||
|
|
||||||
|
# Check if we have a version mismatch between libtool.m4 and ltmain.sh.
|
||||||
|
#
|
||||||
|
# Note: This should be in AC_LIBTOOL_SETUP, _after_ $ltmain have been defined.
|
||||||
|
# We also should do it _before_ AC_LIBTOOL_LANG_C_CONFIG that actually
|
||||||
|
# calls AC_LIBTOOL_CONFIG and creates libtool.
|
||||||
|
#
|
||||||
|
_LT_VERSION_CHECK
|
||||||
|
|
||||||
# Use C for the default configuration in the libtool script
|
# Use C for the default configuration in the libtool script
|
||||||
tagname=
|
tagname=
|
||||||
AC_LIBTOOL_LANG_C_CONFIG
|
AC_LIBTOOL_LANG_C_CONFIG
|
||||||
@@ -231,6 +243,41 @@ _LT_AC_TAGCONFIG
|
|||||||
])# AC_LIBTOOL_SETUP
|
])# AC_LIBTOOL_SETUP
|
||||||
|
|
||||||
|
|
||||||
|
# _LT_VERSION_CHECK
|
||||||
|
# -----------------
|
||||||
|
AC_DEFUN([_LT_VERSION_CHECK],
|
||||||
|
[AC_MSG_CHECKING([for correct ltmain.sh version])
|
||||||
|
if test "x$ltmain" = "x" ; then
|
||||||
|
AC_MSG_RESULT(no)
|
||||||
|
AC_MSG_ERROR([
|
||||||
|
|
||||||
|
*** @<:@Gentoo@:>@ sanity check failed! ***
|
||||||
|
*** \$ltmain is not defined, please check the patch for consistency! ***
|
||||||
|
])
|
||||||
|
fi
|
||||||
|
gentoo_lt_version="1.5.26"
|
||||||
|
gentoo_ltmain_version=`sed -n '/^[[ ]]*VERSION=/{s/^[[ ]]*VERSION=//;p;q;}' "$ltmain"`
|
||||||
|
if test "x$gentoo_lt_version" != "x$gentoo_ltmain_version" ; then
|
||||||
|
AC_MSG_RESULT(no)
|
||||||
|
AC_MSG_ERROR([
|
||||||
|
|
||||||
|
*** @<:@Gentoo@:>@ sanity check failed! ***
|
||||||
|
*** libtool.m4 and ltmain.sh have a version mismatch! ***
|
||||||
|
*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) ***
|
||||||
|
|
||||||
|
Please run:
|
||||||
|
|
||||||
|
libtoolize --copy --force
|
||||||
|
|
||||||
|
if appropriate, please contact the maintainer of this
|
||||||
|
package (or your distribution) for help.
|
||||||
|
])
|
||||||
|
else
|
||||||
|
AC_MSG_RESULT(yes)
|
||||||
|
fi
|
||||||
|
])# _LT_VERSION_CHECK
|
||||||
|
|
||||||
|
|
||||||
# _LT_AC_SYS_COMPILER
|
# _LT_AC_SYS_COMPILER
|
||||||
# -------------------
|
# -------------------
|
||||||
AC_DEFUN([_LT_AC_SYS_COMPILER],
|
AC_DEFUN([_LT_AC_SYS_COMPILER],
|
||||||
@@ -287,9 +334,80 @@ ac_outfile=conftest.$ac_objext
|
|||||||
echo "$lt_simple_link_test_code" >conftest.$ac_ext
|
echo "$lt_simple_link_test_code" >conftest.$ac_ext
|
||||||
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
|
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
|
||||||
_lt_linker_boilerplate=`cat conftest.err`
|
_lt_linker_boilerplate=`cat conftest.err`
|
||||||
$rm conftest*
|
$rm -r conftest*
|
||||||
])# _LT_LINKER_BOILERPLATE
|
])# _LT_LINKER_BOILERPLATE
|
||||||
|
|
||||||
|
# _LT_REQUIRED_DARWIN_CHECKS
|
||||||
|
# --------------------------
|
||||||
|
# Check for some things on darwin
|
||||||
|
AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
|
||||||
|
case $host_os in
|
||||||
|
rhapsody* | darwin*)
|
||||||
|
AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
|
||||||
|
AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
|
||||||
|
|
||||||
|
AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
|
||||||
|
[lt_cv_apple_cc_single_mod=no
|
||||||
|
if test -z "${LT_MULTI_MODULE}"; then
|
||||||
|
# By default we will add the -single_module flag. You can override
|
||||||
|
# by either setting the environment variable LT_MULTI_MODULE
|
||||||
|
# non-empty at configure time, or by adding -multi_module to the
|
||||||
|
# link flags.
|
||||||
|
echo "int foo(void){return 1;}" > conftest.c
|
||||||
|
$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
|
||||||
|
-dynamiclib ${wl}-single_module conftest.c
|
||||||
|
if test -f libconftest.dylib; then
|
||||||
|
lt_cv_apple_cc_single_mod=yes
|
||||||
|
rm -rf libconftest.dylib*
|
||||||
|
fi
|
||||||
|
rm conftest.c
|
||||||
|
fi])
|
||||||
|
AC_CACHE_CHECK([for -exported_symbols_list linker flag],
|
||||||
|
[lt_cv_ld_exported_symbols_list],
|
||||||
|
[lt_cv_ld_exported_symbols_list=no
|
||||||
|
save_LDFLAGS=$LDFLAGS
|
||||||
|
echo "_main" > conftest.sym
|
||||||
|
LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
|
||||||
|
AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
|
||||||
|
[lt_cv_ld_exported_symbols_list=yes],
|
||||||
|
[lt_cv_ld_exported_symbols_list=no])
|
||||||
|
LDFLAGS="$save_LDFLAGS"
|
||||||
|
])
|
||||||
|
case $host_os in
|
||||||
|
rhapsody* | darwin1.[[0123]])
|
||||||
|
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
|
||||||
|
darwin1.*)
|
||||||
|
_lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
|
||||||
|
darwin*)
|
||||||
|
# if running on 10.5 or later, the deployment target defaults
|
||||||
|
# to the OS version, if on x86, and 10.4, the deployment
|
||||||
|
# target defaults to 10.4. Don't you love it?
|
||||||
|
case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
|
||||||
|
10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
|
||||||
|
_lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
|
||||||
|
10.[[012]]*)
|
||||||
|
_lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
|
||||||
|
10.*)
|
||||||
|
_lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
if test "$lt_cv_apple_cc_single_mod" = "yes"; then
|
||||||
|
_lt_dar_single_mod='$single_module'
|
||||||
|
fi
|
||||||
|
if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
|
||||||
|
_lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
|
||||||
|
else
|
||||||
|
_lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
|
||||||
|
fi
|
||||||
|
if test "$DSYMUTIL" != ":"; then
|
||||||
|
_lt_dsymutil="~$DSYMUTIL \$lib || :"
|
||||||
|
else
|
||||||
|
_lt_dsymutil=
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
])
|
||||||
|
|
||||||
# _LT_AC_SYS_LIBPATH_AIX
|
# _LT_AC_SYS_LIBPATH_AIX
|
||||||
# ----------------------
|
# ----------------------
|
||||||
@@ -614,7 +732,11 @@ sparc*-*solaris*)
|
|||||||
*64-bit*)
|
*64-bit*)
|
||||||
case $lt_cv_prog_gnu_ld in
|
case $lt_cv_prog_gnu_ld in
|
||||||
yes*) LD="${LD-ld} -m elf64_sparc" ;;
|
yes*) LD="${LD-ld} -m elf64_sparc" ;;
|
||||||
*) LD="${LD-ld} -64" ;;
|
*)
|
||||||
|
if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
|
||||||
|
LD="${LD-ld} -64"
|
||||||
|
fi
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
@@ -707,7 +829,7 @@ AC_CACHE_CHECK([$1], [$2],
|
|||||||
$2=yes
|
$2=yes
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
$rm conftest*
|
$rm -r conftest*
|
||||||
LDFLAGS="$save_LDFLAGS"
|
LDFLAGS="$save_LDFLAGS"
|
||||||
])
|
])
|
||||||
|
|
||||||
@@ -978,7 +1100,7 @@ else
|
|||||||
AC_CHECK_FUNC([shl_load],
|
AC_CHECK_FUNC([shl_load],
|
||||||
[lt_cv_dlopen="shl_load"],
|
[lt_cv_dlopen="shl_load"],
|
||||||
[AC_CHECK_LIB([dld], [shl_load],
|
[AC_CHECK_LIB([dld], [shl_load],
|
||||||
[lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
|
[lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
|
||||||
[AC_CHECK_FUNC([dlopen],
|
[AC_CHECK_FUNC([dlopen],
|
||||||
[lt_cv_dlopen="dlopen"],
|
[lt_cv_dlopen="dlopen"],
|
||||||
[AC_CHECK_LIB([dl], [dlopen],
|
[AC_CHECK_LIB([dl], [dlopen],
|
||||||
@@ -986,7 +1108,7 @@ else
|
|||||||
[AC_CHECK_LIB([svld], [dlopen],
|
[AC_CHECK_LIB([svld], [dlopen],
|
||||||
[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
|
[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
|
||||||
[AC_CHECK_LIB([dld], [dld_link],
|
[AC_CHECK_LIB([dld], [dld_link],
|
||||||
[lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
|
[lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
|
||||||
])
|
])
|
||||||
])
|
])
|
||||||
])
|
])
|
||||||
@@ -1303,7 +1425,7 @@ aix3*)
|
|||||||
soname_spec='${libname}${release}${shared_ext}$major'
|
soname_spec='${libname}${release}${shared_ext}$major'
|
||||||
;;
|
;;
|
||||||
|
|
||||||
aix4* | aix5*)
|
aix[[4-9]]*)
|
||||||
version_type=linux
|
version_type=linux
|
||||||
need_lib_prefix=no
|
need_lib_prefix=no
|
||||||
need_version=no
|
need_version=no
|
||||||
@@ -1471,7 +1593,14 @@ freebsd* | dragonfly*)
|
|||||||
*) objformat=elf ;;
|
*) objformat=elf ;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
version_type=freebsd-$objformat
|
# Handle Gentoo/FreeBSD as it was Linux
|
||||||
|
case $host_vendor in
|
||||||
|
gentoo)
|
||||||
|
version_type=linux ;;
|
||||||
|
*)
|
||||||
|
version_type=freebsd-$objformat ;;
|
||||||
|
esac
|
||||||
|
|
||||||
case $version_type in
|
case $version_type in
|
||||||
freebsd-elf*)
|
freebsd-elf*)
|
||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
|
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
|
||||||
@@ -1482,6 +1611,12 @@ freebsd* | dragonfly*)
|
|||||||
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
|
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
|
||||||
need_version=yes
|
need_version=yes
|
||||||
;;
|
;;
|
||||||
|
linux)
|
||||||
|
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
||||||
|
soname_spec='${libname}${release}${shared_ext}$major'
|
||||||
|
need_lib_prefix=no
|
||||||
|
need_version=no
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
shlibpath_var=LD_LIBRARY_PATH
|
shlibpath_var=LD_LIBRARY_PATH
|
||||||
case $host_os in
|
case $host_os in
|
||||||
@@ -1629,27 +1764,10 @@ linux* | k*bsd*-gnu)
|
|||||||
# before this can be enabled.
|
# before this can be enabled.
|
||||||
hardcode_into_libs=yes
|
hardcode_into_libs=yes
|
||||||
|
|
||||||
# find out which ABI we are using
|
|
||||||
libsuff=
|
|
||||||
case "$host_cpu" in
|
|
||||||
x86_64*|s390x*|powerpc64*)
|
|
||||||
echo '[#]line __oline__ "configure"' > conftest.$ac_ext
|
|
||||||
if AC_TRY_EVAL(ac_compile); then
|
|
||||||
case `/usr/bin/file conftest.$ac_objext` in
|
|
||||||
*64-bit*)
|
|
||||||
libsuff=64
|
|
||||||
sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
rm -rf conftest*
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# Append ld.so.conf contents to the search path
|
# Append ld.so.conf contents to the search path
|
||||||
if test -f /etc/ld.so.conf; then
|
if test -f /etc/ld.so.conf; then
|
||||||
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
||||||
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
|
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# We used to test for /lib/ld.so.1 and disable shared libraries on
|
# We used to test for /lib/ld.so.1 and disable shared libraries on
|
||||||
@@ -1841,6 +1959,13 @@ esac
|
|||||||
AC_MSG_RESULT([$dynamic_linker])
|
AC_MSG_RESULT([$dynamic_linker])
|
||||||
test "$dynamic_linker" = no && can_build_shared=no
|
test "$dynamic_linker" = no && can_build_shared=no
|
||||||
|
|
||||||
|
AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
|
||||||
|
[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
|
||||||
|
sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
|
||||||
|
AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
|
||||||
|
[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
|
||||||
|
sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
|
||||||
|
|
||||||
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
|
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
|
||||||
if test "$GCC" = yes; then
|
if test "$GCC" = yes; then
|
||||||
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
|
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
|
||||||
@@ -2340,7 +2465,7 @@ lt_cv_deplibs_check_method='unknown'
|
|||||||
# whether `pass_all' will *always* work, you probably want this one.
|
# whether `pass_all' will *always* work, you probably want this one.
|
||||||
|
|
||||||
case $host_os in
|
case $host_os in
|
||||||
aix4* | aix5*)
|
aix[[4-9]]*)
|
||||||
lt_cv_deplibs_check_method=pass_all
|
lt_cv_deplibs_check_method=pass_all
|
||||||
;;
|
;;
|
||||||
|
|
||||||
@@ -2776,7 +2901,7 @@ aix3*)
|
|||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
aix4* | aix5*)
|
aix[[4-9]]*)
|
||||||
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
|
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
|
||||||
test "$enable_shared" = yes && enable_static=no
|
test "$enable_shared" = yes && enable_static=no
|
||||||
fi
|
fi
|
||||||
@@ -2833,6 +2958,7 @@ _LT_AC_TAGVAR(postdep_objects, $1)=
|
|||||||
_LT_AC_TAGVAR(predeps, $1)=
|
_LT_AC_TAGVAR(predeps, $1)=
|
||||||
_LT_AC_TAGVAR(postdeps, $1)=
|
_LT_AC_TAGVAR(postdeps, $1)=
|
||||||
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
|
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
|
||||||
|
_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
|
||||||
|
|
||||||
# Source file extension for C++ test sources.
|
# Source file extension for C++ test sources.
|
||||||
ac_ext=cpp
|
ac_ext=cpp
|
||||||
@@ -2942,7 +3068,7 @@ case $host_os in
|
|||||||
# FIXME: insert proper C++ library support
|
# FIXME: insert proper C++ library support
|
||||||
_LT_AC_TAGVAR(ld_shlibs, $1)=no
|
_LT_AC_TAGVAR(ld_shlibs, $1)=no
|
||||||
;;
|
;;
|
||||||
aix4* | aix5*)
|
aix[[4-9]]*)
|
||||||
if test "$host_cpu" = ia64; then
|
if test "$host_cpu" = ia64; then
|
||||||
# On IA64, the linker does run time linking by default, so we don't
|
# On IA64, the linker does run time linking by default, so we don't
|
||||||
# have to do anything special.
|
# have to do anything special.
|
||||||
@@ -2955,7 +3081,7 @@ case $host_os in
|
|||||||
# Test if we are trying to use run time linking or normal
|
# Test if we are trying to use run time linking or normal
|
||||||
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
|
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
|
||||||
# need to do runtime linking.
|
# need to do runtime linking.
|
||||||
case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
|
case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
|
||||||
for ld_flag in $LDFLAGS; do
|
for ld_flag in $LDFLAGS; do
|
||||||
case $ld_flag in
|
case $ld_flag in
|
||||||
*-brtl*)
|
*-brtl*)
|
||||||
@@ -3101,51 +3227,23 @@ case $host_os in
|
|||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
darwin* | rhapsody*)
|
darwin* | rhapsody*)
|
||||||
case $host_os in
|
|
||||||
rhapsody* | darwin1.[[012]])
|
|
||||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
|
|
||||||
;;
|
|
||||||
*) # Darwin 1.3 on
|
|
||||||
if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
|
|
||||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
|
|
||||||
else
|
|
||||||
case ${MACOSX_DEPLOYMENT_TARGET} in
|
|
||||||
10.[[012]])
|
|
||||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
|
|
||||||
;;
|
|
||||||
10.*)
|
|
||||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
|
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
|
||||||
_LT_AC_TAGVAR(hardcode_direct, $1)=no
|
_LT_AC_TAGVAR(hardcode_direct, $1)=no
|
||||||
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
|
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
|
||||||
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
|
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
|
||||||
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
|
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
|
||||||
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
|
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
|
||||||
|
_LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
|
||||||
if test "$GXX" = yes ; then
|
if test "$GXX" = yes ; then
|
||||||
lt_int_apple_cc_single_mod=no
|
|
||||||
output_verbose_link_cmd='echo'
|
output_verbose_link_cmd='echo'
|
||||||
if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
|
_LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
|
||||||
lt_int_apple_cc_single_mod=yes
|
_LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
|
||||||
|
_LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
|
||||||
|
_LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
|
||||||
|
if test "$lt_cv_apple_cc_single_mod" != "yes"; then
|
||||||
|
_LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
|
||||||
|
_LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
|
||||||
fi
|
fi
|
||||||
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
|
|
||||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
|
|
||||||
else
|
|
||||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
|
|
||||||
fi
|
|
||||||
_LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
|
|
||||||
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
|
|
||||||
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
|
|
||||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
|
||||||
else
|
|
||||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
|
||||||
fi
|
|
||||||
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
|
||||||
else
|
else
|
||||||
case $cc_basename in
|
case $cc_basename in
|
||||||
xlc*)
|
xlc*)
|
||||||
@@ -3396,7 +3494,7 @@ case $host_os in
|
|||||||
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
|
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
|
||||||
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
|
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
|
||||||
;;
|
;;
|
||||||
pgCC*)
|
pgCC* | pgcpp*)
|
||||||
# Portland Group C++ compiler
|
# Portland Group C++ compiler
|
||||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
||||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
||||||
@@ -3831,7 +3929,8 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
|
|||||||
# compiler output when linking a shared library.
|
# compiler output when linking a shared library.
|
||||||
# Parse the compiler output and extract the necessary
|
# Parse the compiler output and extract the necessary
|
||||||
# objects, libraries and library flags.
|
# objects, libraries and library flags.
|
||||||
AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
|
AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
|
||||||
|
[AC_REQUIRE([LT_AC_PROG_SED])dnl
|
||||||
dnl we can't use the lt_simple_compile_test_code here,
|
dnl we can't use the lt_simple_compile_test_code here,
|
||||||
dnl because it contains code intended for an executable,
|
dnl because it contains code intended for an executable,
|
||||||
dnl not a library. It's possible we should let each
|
dnl not a library. It's possible we should let each
|
||||||
@@ -3956,6 +4055,11 @@ fi
|
|||||||
|
|
||||||
$rm -f confest.$objext
|
$rm -f confest.$objext
|
||||||
|
|
||||||
|
_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
|
||||||
|
if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
|
||||||
|
_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
|
||||||
|
fi
|
||||||
|
|
||||||
# PORTME: override above test on systems where it is broken
|
# PORTME: override above test on systems where it is broken
|
||||||
ifelse([$1],[CXX],
|
ifelse([$1],[CXX],
|
||||||
[case $host_os in
|
[case $host_os in
|
||||||
@@ -4012,7 +4116,6 @@ solaris*)
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
])
|
])
|
||||||
|
|
||||||
case " $_LT_AC_TAGVAR(postdeps, $1) " in
|
case " $_LT_AC_TAGVAR(postdeps, $1) " in
|
||||||
*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
|
*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
|
||||||
esac
|
esac
|
||||||
@@ -4097,7 +4200,7 @@ aix3*)
|
|||||||
postinstall_cmds='$RANLIB $lib'
|
postinstall_cmds='$RANLIB $lib'
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
aix4* | aix5*)
|
aix[[4-9]]*)
|
||||||
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
|
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
|
||||||
test "$enable_shared" = yes && enable_static=no
|
test "$enable_shared" = yes && enable_static=no
|
||||||
fi
|
fi
|
||||||
@@ -4162,7 +4265,6 @@ CC=${GCJ-"gcj"}
|
|||||||
compiler=$CC
|
compiler=$CC
|
||||||
_LT_AC_TAGVAR(compiler, $1)=$CC
|
_LT_AC_TAGVAR(compiler, $1)=$CC
|
||||||
_LT_CC_BASENAME([$compiler])
|
_LT_CC_BASENAME([$compiler])
|
||||||
_LT_AC_TAGVAR(LD, $1)="$LD"
|
|
||||||
|
|
||||||
# GCJ did not exist at the time GCC didn't implicitly link libc in.
|
# GCJ did not exist at the time GCC didn't implicitly link libc in.
|
||||||
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
|
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
|
||||||
@@ -4275,6 +4377,7 @@ if test -f "$ltmain"; then
|
|||||||
_LT_AC_TAGVAR(predeps, $1) \
|
_LT_AC_TAGVAR(predeps, $1) \
|
||||||
_LT_AC_TAGVAR(postdeps, $1) \
|
_LT_AC_TAGVAR(postdeps, $1) \
|
||||||
_LT_AC_TAGVAR(compiler_lib_search_path, $1) \
|
_LT_AC_TAGVAR(compiler_lib_search_path, $1) \
|
||||||
|
_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
|
||||||
_LT_AC_TAGVAR(archive_cmds, $1) \
|
_LT_AC_TAGVAR(archive_cmds, $1) \
|
||||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1) \
|
_LT_AC_TAGVAR(archive_expsym_cmds, $1) \
|
||||||
_LT_AC_TAGVAR(postinstall_cmds, $1) \
|
_LT_AC_TAGVAR(postinstall_cmds, $1) \
|
||||||
@@ -4337,7 +4440,7 @@ ifelse([$1], [],
|
|||||||
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
|
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
|
||||||
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
|
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
|
||||||
#
|
#
|
||||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
|
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
|
||||||
# Free Software Foundation, Inc.
|
# Free Software Foundation, Inc.
|
||||||
#
|
#
|
||||||
# This file is part of GNU Libtool:
|
# This file is part of GNU Libtool:
|
||||||
@@ -4427,9 +4530,6 @@ CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
|
|||||||
# Is the compiler the GNU C compiler?
|
# Is the compiler the GNU C compiler?
|
||||||
with_gcc=$_LT_AC_TAGVAR(GCC, $1)
|
with_gcc=$_LT_AC_TAGVAR(GCC, $1)
|
||||||
|
|
||||||
gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
|
|
||||||
gcc_ver=\`gcc -dumpversion\`
|
|
||||||
|
|
||||||
# An ERE matcher.
|
# An ERE matcher.
|
||||||
EGREP=$lt_EGREP
|
EGREP=$lt_EGREP
|
||||||
|
|
||||||
@@ -4563,11 +4663,11 @@ striplib=$lt_striplib
|
|||||||
|
|
||||||
# Dependencies to place before the objects being linked to create a
|
# Dependencies to place before the objects being linked to create a
|
||||||
# shared library.
|
# shared library.
|
||||||
predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
|
predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
|
||||||
|
|
||||||
# Dependencies to place after the objects being linked to create a
|
# Dependencies to place after the objects being linked to create a
|
||||||
# shared library.
|
# shared library.
|
||||||
postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
|
postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
|
||||||
|
|
||||||
# Dependencies to place before the objects being linked to create a
|
# Dependencies to place before the objects being linked to create a
|
||||||
# shared library.
|
# shared library.
|
||||||
@@ -4577,9 +4677,13 @@ predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
|
|||||||
# shared library.
|
# shared library.
|
||||||
postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
|
postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
|
||||||
|
|
||||||
|
# The directories searched by this compiler when creating a shared
|
||||||
|
# library
|
||||||
|
compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
|
||||||
|
|
||||||
# The library search path used internally by the compiler when linking
|
# The library search path used internally by the compiler when linking
|
||||||
# a shared library.
|
# a shared library.
|
||||||
compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
|
compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
|
||||||
|
|
||||||
# Method to check whether dependent libraries are shared objects.
|
# Method to check whether dependent libraries are shared objects.
|
||||||
deplibs_check_method=$lt_deplibs_check_method
|
deplibs_check_method=$lt_deplibs_check_method
|
||||||
@@ -4659,7 +4763,7 @@ variables_saved_for_relink="$variables_saved_for_relink"
|
|||||||
link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
|
link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
|
||||||
|
|
||||||
# Compile-time system search path for libraries
|
# Compile-time system search path for libraries
|
||||||
sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
|
sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
|
||||||
|
|
||||||
# Run-time system search path for libraries
|
# Run-time system search path for libraries
|
||||||
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
|
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
|
||||||
@@ -4926,7 +5030,7 @@ EOF
|
|||||||
echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
|
echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
|
||||||
cat conftest.$ac_ext >&5
|
cat conftest.$ac_ext >&5
|
||||||
fi
|
fi
|
||||||
rm -f conftest* conftst*
|
rm -rf conftest* conftst*
|
||||||
|
|
||||||
# Do not use the global_symbol_pipe unless it works.
|
# Do not use the global_symbol_pipe unless it works.
|
||||||
if test "$pipe_works" = yes; then
|
if test "$pipe_works" = yes; then
|
||||||
@@ -4983,7 +5087,8 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
|
|||||||
# built for inclusion in a dll (and should export symbols for example).
|
# built for inclusion in a dll (and should export symbols for example).
|
||||||
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
||||||
# (--disable-auto-import) libraries
|
# (--disable-auto-import) libraries
|
||||||
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
|
m4_if([$1], [GCJ], [],
|
||||||
|
[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
|
||||||
;;
|
;;
|
||||||
darwin* | rhapsody*)
|
darwin* | rhapsody*)
|
||||||
# PIC is the default on this platform
|
# PIC is the default on this platform
|
||||||
@@ -5020,7 +5125,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
|
|||||||
esac
|
esac
|
||||||
else
|
else
|
||||||
case $host_os in
|
case $host_os in
|
||||||
aix4* | aix5*)
|
aix[[4-9]]*)
|
||||||
# All AIX code is PIC.
|
# All AIX code is PIC.
|
||||||
if test "$host_cpu" = ia64; then
|
if test "$host_cpu" = ia64; then
|
||||||
# AIX 5 now supports IA64 processor
|
# AIX 5 now supports IA64 processor
|
||||||
@@ -5116,7 +5221,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
|
|||||||
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
|
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
|
||||||
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
|
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
|
||||||
;;
|
;;
|
||||||
pgCC*)
|
pgCC* | pgcpp*)
|
||||||
# Portland Group C++ compiler.
|
# Portland Group C++ compiler.
|
||||||
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
|
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
|
||||||
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
|
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
|
||||||
@@ -5267,7 +5372,8 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
|
|||||||
# built for inclusion in a dll (and should export symbols for example).
|
# built for inclusion in a dll (and should export symbols for example).
|
||||||
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
||||||
# (--disable-auto-import) libraries
|
# (--disable-auto-import) libraries
|
||||||
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
|
m4_if([$1], [GCJ], [],
|
||||||
|
[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
|
||||||
;;
|
;;
|
||||||
|
|
||||||
darwin* | rhapsody*)
|
darwin* | rhapsody*)
|
||||||
@@ -5337,7 +5443,8 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
|
|||||||
mingw* | cygwin* | pw32* | os2*)
|
mingw* | cygwin* | pw32* | os2*)
|
||||||
# This hack is so that the source file can tell whether it is being
|
# This hack is so that the source file can tell whether it is being
|
||||||
# built for inclusion in a dll (and should export symbols for example).
|
# built for inclusion in a dll (and should export symbols for example).
|
||||||
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
|
m4_if([$1], [GCJ], [],
|
||||||
|
[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
|
||||||
;;
|
;;
|
||||||
|
|
||||||
hpux9* | hpux10* | hpux11*)
|
hpux9* | hpux10* | hpux11*)
|
||||||
@@ -5474,7 +5581,7 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
|
|||||||
#
|
#
|
||||||
if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
|
if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
|
||||||
AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
|
AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
|
||||||
_LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
|
_LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
|
||||||
[$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
|
[$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
|
||||||
[case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
|
[case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
|
||||||
"" | " "*) ;;
|
"" | " "*) ;;
|
||||||
@@ -5498,7 +5605,7 @@ esac
|
|||||||
#
|
#
|
||||||
wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
|
wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
|
||||||
AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
|
AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
|
||||||
_LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
|
_LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
|
||||||
$lt_tmp_static_flag,
|
$lt_tmp_static_flag,
|
||||||
[],
|
[],
|
||||||
[_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
|
[_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
|
||||||
@@ -5514,7 +5621,7 @@ AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
|
|||||||
ifelse([$1],[CXX],[
|
ifelse([$1],[CXX],[
|
||||||
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
|
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
|
||||||
case $host_os in
|
case $host_os in
|
||||||
aix4* | aix5*)
|
aix[[4-9]]*)
|
||||||
# If we're using GNU nm, then we don't want the "-C" option.
|
# If we're using GNU nm, then we don't want the "-C" option.
|
||||||
# -C means demangle to AIX nm, but means don't demangle with GNU nm
|
# -C means demangle to AIX nm, but means don't demangle with GNU nm
|
||||||
if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
|
if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
|
||||||
@@ -5533,6 +5640,7 @@ ifelse([$1],[CXX],[
|
|||||||
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
|
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
_LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
|
||||||
],[
|
],[
|
||||||
runpath_var=
|
runpath_var=
|
||||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
|
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
|
||||||
@@ -5563,12 +5671,14 @@ ifelse([$1],[CXX],[
|
|||||||
# it will be wrapped by ` (' and `)$', so one must not match beginning or
|
# it will be wrapped by ` (' and `)$', so one must not match beginning or
|
||||||
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
|
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
|
||||||
# as well as any symbol that contains `d'.
|
# as well as any symbol that contains `d'.
|
||||||
_LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
|
_LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
|
||||||
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
|
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
|
||||||
# platforms (ab)use it in PIC code, but their linkers get confused if
|
# platforms (ab)use it in PIC code, but their linkers get confused if
|
||||||
# the symbol is explicitly referenced. Since portable code cannot
|
# the symbol is explicitly referenced. Since portable code cannot
|
||||||
# rely on this symbol name, it's probably fine to never include it in
|
# rely on this symbol name, it's probably fine to never include it in
|
||||||
# preloaded symbol tables.
|
# preloaded symbol tables.
|
||||||
|
# Exclude shared library initialization/finalization symbols.
|
||||||
|
dnl Note also adjust exclude_expsyms for C++ above.
|
||||||
extract_expsyms_cmds=
|
extract_expsyms_cmds=
|
||||||
# Just being paranoid about ensuring that cc_basename is set.
|
# Just being paranoid about ensuring that cc_basename is set.
|
||||||
_LT_CC_BASENAME([$compiler])
|
_LT_CC_BASENAME([$compiler])
|
||||||
@@ -5618,7 +5728,7 @@ ifelse([$1],[CXX],[
|
|||||||
|
|
||||||
# See if GNU ld supports shared libraries.
|
# See if GNU ld supports shared libraries.
|
||||||
case $host_os in
|
case $host_os in
|
||||||
aix3* | aix4* | aix5*)
|
aix[[3-9]]*)
|
||||||
# On AIX/PPC, the GNU linker is very broken
|
# On AIX/PPC, the GNU linker is very broken
|
||||||
if test "$host_cpu" != ia64; then
|
if test "$host_cpu" != ia64; then
|
||||||
_LT_AC_TAGVAR(ld_shlibs, $1)=no
|
_LT_AC_TAGVAR(ld_shlibs, $1)=no
|
||||||
@@ -5837,7 +5947,7 @@ _LT_EOF
|
|||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
aix4* | aix5*)
|
aix[[4-9]]*)
|
||||||
if test "$host_cpu" = ia64; then
|
if test "$host_cpu" = ia64; then
|
||||||
# On IA64, the linker does run time linking by default, so we don't
|
# On IA64, the linker does run time linking by default, so we don't
|
||||||
# have to do anything special.
|
# have to do anything special.
|
||||||
@@ -5857,7 +5967,7 @@ _LT_EOF
|
|||||||
# Test if we are trying to use run time linking or normal
|
# Test if we are trying to use run time linking or normal
|
||||||
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
|
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
|
||||||
# need to do runtime linking.
|
# need to do runtime linking.
|
||||||
case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
|
case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
|
||||||
for ld_flag in $LDFLAGS; do
|
for ld_flag in $LDFLAGS; do
|
||||||
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
|
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
|
||||||
aix_use_runtimelinking=yes
|
aix_use_runtimelinking=yes
|
||||||
@@ -6017,11 +6127,10 @@ _LT_EOF
|
|||||||
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
|
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
|
||||||
if test "$GCC" = yes ; then
|
if test "$GCC" = yes ; then
|
||||||
output_verbose_link_cmd='echo'
|
output_verbose_link_cmd='echo'
|
||||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
|
_LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
|
||||||
_LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
|
_LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
|
||||||
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
|
_LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
|
||||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
_LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
|
||||||
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
|
||||||
else
|
else
|
||||||
case $cc_basename in
|
case $cc_basename in
|
||||||
xlc*)
|
xlc*)
|
||||||
@@ -6602,7 +6711,7 @@ AC_SUBST([SED])
|
|||||||
AC_MSG_RESULT([$SED])
|
AC_MSG_RESULT([$SED])
|
||||||
])
|
])
|
||||||
|
|
||||||
# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
|
# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
|
||||||
#
|
#
|
||||||
# This file is free software; the Free Software Foundation
|
# This file is free software; the Free Software Foundation
|
||||||
# gives unlimited permission to copy and/or distribute it,
|
# gives unlimited permission to copy and/or distribute it,
|
||||||
@@ -6617,7 +6726,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
|
|||||||
[am__api_version='1.10'
|
[am__api_version='1.10'
|
||||||
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
|
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
|
||||||
dnl require some minimum version. Point them to the right macro.
|
dnl require some minimum version. Point them to the right macro.
|
||||||
m4_if([$1], [1.10], [],
|
m4_if([$1], [1.10.1], [],
|
||||||
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
|
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
|
||||||
])
|
])
|
||||||
|
|
||||||
@@ -6633,8 +6742,10 @@ m4_define([_AM_AUTOCONF_VERSION], [])
|
|||||||
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
|
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
|
||||||
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
|
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
|
||||||
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
|
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
|
||||||
[AM_AUTOMAKE_VERSION([1.10])dnl
|
[AM_AUTOMAKE_VERSION([1.10.1])dnl
|
||||||
_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
|
m4_ifndef([AC_AUTOCONF_VERSION],
|
||||||
|
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
|
||||||
|
_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
|
||||||
|
|
||||||
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
|
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
|
||||||
|
|
||||||
@@ -6906,7 +7017,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
|
|||||||
# each Makefile.in and add a new line on top of each file to say so.
|
# each Makefile.in and add a new line on top of each file to say so.
|
||||||
# Grep'ing the whole file is not good either: AIX grep has a line
|
# Grep'ing the whole file is not good either: AIX grep has a line
|
||||||
# limit of 2048, but all sed's we know have understand at least 4000.
|
# limit of 2048, but all sed's we know have understand at least 4000.
|
||||||
if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
|
if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
|
||||||
dirpart=`AS_DIRNAME("$mf")`
|
dirpart=`AS_DIRNAME("$mf")`
|
||||||
else
|
else
|
||||||
continue
|
continue
|
||||||
@@ -6954,13 +7065,13 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
|
|||||||
# Do all the work for Automake. -*- Autoconf -*-
|
# Do all the work for Automake. -*- Autoconf -*-
|
||||||
|
|
||||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
||||||
# 2005, 2006 Free Software Foundation, Inc.
|
# 2005, 2006, 2008 Free Software Foundation, Inc.
|
||||||
#
|
#
|
||||||
# This file is free software; the Free Software Foundation
|
# This file is free software; the Free Software Foundation
|
||||||
# gives unlimited permission to copy and/or distribute it,
|
# gives unlimited permission to copy and/or distribute it,
|
||||||
# with or without modifications, as long as this notice is preserved.
|
# with or without modifications, as long as this notice is preserved.
|
||||||
|
|
||||||
# serial 12
|
# serial 13
|
||||||
|
|
||||||
# This macro actually does too much. Some checks are only needed if
|
# This macro actually does too much. Some checks are only needed if
|
||||||
# your package does certain things. But this isn't really a big deal.
|
# your package does certain things. But this isn't really a big deal.
|
||||||
@@ -7065,16 +7176,17 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC],
|
|||||||
# our stamp files there.
|
# our stamp files there.
|
||||||
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
|
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
|
||||||
[# Compute $1's index in $config_headers.
|
[# Compute $1's index in $config_headers.
|
||||||
|
_am_arg=$1
|
||||||
_am_stamp_count=1
|
_am_stamp_count=1
|
||||||
for _am_header in $config_headers :; do
|
for _am_header in $config_headers :; do
|
||||||
case $_am_header in
|
case $_am_header in
|
||||||
$1 | $1:* )
|
$_am_arg | $_am_arg:* )
|
||||||
break ;;
|
break ;;
|
||||||
* )
|
* )
|
||||||
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
|
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
|
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
|
||||||
|
|
||||||
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
|
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
|
||||||
#
|
#
|
||||||
@@ -7346,7 +7458,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
|
|||||||
|
|
||||||
# _AM_SUBST_NOTMAKE(VARIABLE)
|
# _AM_SUBST_NOTMAKE(VARIABLE)
|
||||||
# ---------------------------
|
# ---------------------------
|
||||||
# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
|
# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
|
||||||
# This macro is traced by Automake.
|
# This macro is traced by Automake.
|
||||||
AC_DEFUN([_AM_SUBST_NOTMAKE])
|
AC_DEFUN([_AM_SUBST_NOTMAKE])
|
||||||
|
|
||||||
|
|||||||
+15
@@ -39,6 +39,18 @@
|
|||||||
/* Define to 1 if you have the <usb.h> header file. */
|
/* Define to 1 if you have the <usb.h> header file. */
|
||||||
#undef HAVE_USB_H
|
#undef HAVE_USB_H
|
||||||
|
|
||||||
|
/* Define if libusb implementation blocks on read or write */
|
||||||
|
#undef LIBUSB_BLOCKS
|
||||||
|
|
||||||
|
/* Target OS is Darwin */
|
||||||
|
#undef OSTYPE_DARWIN
|
||||||
|
|
||||||
|
/* Target OS is Linux */
|
||||||
|
#undef OSTYPE_LINUX
|
||||||
|
|
||||||
|
/* Target OS is Solaris */
|
||||||
|
#undef OSTYPE_SOLARIS
|
||||||
|
|
||||||
/* Name of package */
|
/* Name of package */
|
||||||
#undef PACKAGE
|
#undef PACKAGE
|
||||||
|
|
||||||
@@ -60,6 +72,9 @@
|
|||||||
/* Define to 1 if you have the ANSI C header files. */
|
/* Define to 1 if you have the ANSI C header files. */
|
||||||
#undef STDC_HEADERS
|
#undef STDC_HEADERS
|
||||||
|
|
||||||
|
/* Define to 1 for Sun version of libusb. */
|
||||||
|
#undef SUN_LIBUSB
|
||||||
|
|
||||||
/* Version number of package */
|
/* Version number of package */
|
||||||
#undef VERSION
|
#undef VERSION
|
||||||
|
|
||||||
|
|||||||
Vendored
+69
-40
@@ -1,10 +1,10 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# Attempt to guess a canonical system name.
|
# Attempt to guess a canonical system name.
|
||||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||||
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
|
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
|
||||||
# Inc.
|
# Free Software Foundation, Inc.
|
||||||
|
|
||||||
timestamp='2007-05-17'
|
timestamp='2008-01-23'
|
||||||
|
|
||||||
# This file is free software; you can redistribute it and/or modify it
|
# This file is free software; you can redistribute it and/or modify it
|
||||||
# under the terms of the GNU General Public License as published by
|
# under the terms of the GNU General Public License as published by
|
||||||
@@ -56,8 +56,8 @@ version="\
|
|||||||
GNU config.guess ($timestamp)
|
GNU config.guess ($timestamp)
|
||||||
|
|
||||||
Originally written by Per Bothner.
|
Originally written by Per Bothner.
|
||||||
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
|
||||||
Free Software Foundation, Inc.
|
2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This is free software; see the source for copying conditions. There is NO
|
This is free software; see the source for copying conditions. There is NO
|
||||||
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
||||||
@@ -139,6 +139,23 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
|
|||||||
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
|
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
|
||||||
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
|
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
|
||||||
|
|
||||||
|
if [ "${UNAME_SYSTEM}" = "Linux" ] ; then
|
||||||
|
eval $set_cc_for_build
|
||||||
|
cat << EOF > $dummy.c
|
||||||
|
#include <features.h>
|
||||||
|
#ifdef __UCLIBC__
|
||||||
|
# ifdef __UCLIBC_CONFIG_VERSION__
|
||||||
|
LIBC=uclibc __UCLIBC_CONFIG_VERSION__
|
||||||
|
# else
|
||||||
|
LIBC=uclibc
|
||||||
|
# endif
|
||||||
|
#else
|
||||||
|
LIBC=gnu
|
||||||
|
#endif
|
||||||
|
EOF
|
||||||
|
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'`
|
||||||
|
fi
|
||||||
|
|
||||||
# Note: order is significant - the case branches are not exclusive.
|
# Note: order is significant - the case branches are not exclusive.
|
||||||
|
|
||||||
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||||
@@ -330,7 +347,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
|||||||
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
|
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
|
||||||
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
||||||
exit ;;
|
exit ;;
|
||||||
i86pc:SunOS:5.*:* | ix86xen:SunOS:5.*:*)
|
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
|
||||||
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
||||||
exit ;;
|
exit ;;
|
||||||
sun4*:SunOS:6*:*)
|
sun4*:SunOS:6*:*)
|
||||||
@@ -532,7 +549,7 @@ EOF
|
|||||||
echo rs6000-ibm-aix3.2
|
echo rs6000-ibm-aix3.2
|
||||||
fi
|
fi
|
||||||
exit ;;
|
exit ;;
|
||||||
*:AIX:*:[45])
|
*:AIX:*:[456])
|
||||||
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
|
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
|
||||||
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
|
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
|
||||||
IBM_ARCH=rs6000
|
IBM_ARCH=rs6000
|
||||||
@@ -793,12 +810,15 @@ EOF
|
|||||||
exit ;;
|
exit ;;
|
||||||
*:Interix*:[3456]*)
|
*:Interix*:[3456]*)
|
||||||
case ${UNAME_MACHINE} in
|
case ${UNAME_MACHINE} in
|
||||||
x86)
|
x86)
|
||||||
echo i586-pc-interix${UNAME_RELEASE}
|
echo i586-pc-interix${UNAME_RELEASE}
|
||||||
exit ;;
|
exit ;;
|
||||||
EM64T | authenticamd)
|
EM64T | authenticamd)
|
||||||
echo x86_64-unknown-interix${UNAME_RELEASE}
|
echo x86_64-unknown-interix${UNAME_RELEASE}
|
||||||
exit ;;
|
exit ;;
|
||||||
|
IA64)
|
||||||
|
echo ia64-unknown-interix${UNAME_RELEASE}
|
||||||
|
exit ;;
|
||||||
esac ;;
|
esac ;;
|
||||||
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
|
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
|
||||||
echo i${UNAME_MACHINE}-pc-mks
|
echo i${UNAME_MACHINE}-pc-mks
|
||||||
@@ -833,28 +853,35 @@ EOF
|
|||||||
echo ${UNAME_MACHINE}-pc-minix
|
echo ${UNAME_MACHINE}-pc-minix
|
||||||
exit ;;
|
exit ;;
|
||||||
arm*:Linux:*:*)
|
arm*:Linux:*:*)
|
||||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
eval $set_cc_for_build
|
||||||
|
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
|
||||||
|
| grep -q __ARM_EABI__
|
||||||
|
then
|
||||||
|
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||||
|
else
|
||||||
|
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
|
||||||
|
fi
|
||||||
exit ;;
|
exit ;;
|
||||||
avr32*:Linux:*:*)
|
avr32*:Linux:*:*)
|
||||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||||
exit ;;
|
exit ;;
|
||||||
cris:Linux:*:*)
|
cris:Linux:*:*)
|
||||||
echo cris-axis-linux-gnu
|
echo cris-axis-linux-${LIBC}
|
||||||
exit ;;
|
exit ;;
|
||||||
crisv32:Linux:*:*)
|
crisv32:Linux:*:*)
|
||||||
echo crisv32-axis-linux-gnu
|
echo crisv32-axis-linux-${LIBC}
|
||||||
exit ;;
|
exit ;;
|
||||||
frv:Linux:*:*)
|
frv:Linux:*:*)
|
||||||
echo frv-unknown-linux-gnu
|
echo frv-unknown-linux-${LIBC}
|
||||||
exit ;;
|
exit ;;
|
||||||
ia64:Linux:*:*)
|
ia64:Linux:*:*)
|
||||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||||
exit ;;
|
exit ;;
|
||||||
m32r*:Linux:*:*)
|
m32r*:Linux:*:*)
|
||||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||||
exit ;;
|
exit ;;
|
||||||
m68*:Linux:*:*)
|
m68*:Linux:*:*)
|
||||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||||
exit ;;
|
exit ;;
|
||||||
mips:Linux:*:*)
|
mips:Linux:*:*)
|
||||||
eval $set_cc_for_build
|
eval $set_cc_for_build
|
||||||
@@ -877,7 +904,7 @@ EOF
|
|||||||
s: ::g
|
s: ::g
|
||||||
p
|
p
|
||||||
}'`"
|
}'`"
|
||||||
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
|
||||||
;;
|
;;
|
||||||
mips64:Linux:*:*)
|
mips64:Linux:*:*)
|
||||||
eval $set_cc_for_build
|
eval $set_cc_for_build
|
||||||
@@ -900,16 +927,16 @@ EOF
|
|||||||
s: ::g
|
s: ::g
|
||||||
p
|
p
|
||||||
}'`"
|
}'`"
|
||||||
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
|
||||||
;;
|
;;
|
||||||
or32:Linux:*:*)
|
or32:Linux:*:*)
|
||||||
echo or32-unknown-linux-gnu
|
echo or32-unknown-linux-${LIBC}
|
||||||
exit ;;
|
exit ;;
|
||||||
ppc:Linux:*:*)
|
ppc:Linux:*:*)
|
||||||
echo powerpc-unknown-linux-gnu
|
echo powerpc-unknown-linux-${LIBC}
|
||||||
exit ;;
|
exit ;;
|
||||||
ppc64:Linux:*:*)
|
ppc64:Linux:*:*)
|
||||||
echo powerpc64-unknown-linux-gnu
|
echo powerpc64-unknown-linux-${LIBC}
|
||||||
exit ;;
|
exit ;;
|
||||||
alpha:Linux:*:*)
|
alpha:Linux:*:*)
|
||||||
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
|
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
|
||||||
@@ -922,40 +949,40 @@ EOF
|
|||||||
EV68*) UNAME_MACHINE=alphaev68 ;;
|
EV68*) UNAME_MACHINE=alphaev68 ;;
|
||||||
esac
|
esac
|
||||||
objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
|
objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
|
||||||
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
|
if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
|
||||||
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
|
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||||
exit ;;
|
exit ;;
|
||||||
parisc:Linux:*:* | hppa:Linux:*:*)
|
parisc:Linux:*:* | hppa:Linux:*:*)
|
||||||
# Look for CPU level
|
# Look for CPU level
|
||||||
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
|
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
|
||||||
PA7*) echo hppa1.1-unknown-linux-gnu ;;
|
PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
|
||||||
PA8*) echo hppa2.0-unknown-linux-gnu ;;
|
PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
|
||||||
*) echo hppa-unknown-linux-gnu ;;
|
*) echo hppa-unknown-linux-${LIBC} ;;
|
||||||
esac
|
esac
|
||||||
exit ;;
|
exit ;;
|
||||||
parisc64:Linux:*:* | hppa64:Linux:*:*)
|
parisc64:Linux:*:* | hppa64:Linux:*:*)
|
||||||
echo hppa64-unknown-linux-gnu
|
echo hppa64-unknown-linux-${LIBC}
|
||||||
exit ;;
|
exit ;;
|
||||||
s390:Linux:*:* | s390x:Linux:*:*)
|
s390:Linux:*:* | s390x:Linux:*:*)
|
||||||
echo ${UNAME_MACHINE}-ibm-linux
|
echo ${UNAME_MACHINE}-ibm-linux
|
||||||
exit ;;
|
exit ;;
|
||||||
sh64*:Linux:*:*)
|
sh64*:Linux:*:*)
|
||||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||||
exit ;;
|
exit ;;
|
||||||
sh*:Linux:*:*)
|
sh*:Linux:*:*)
|
||||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||||
exit ;;
|
exit ;;
|
||||||
sparc:Linux:*:* | sparc64:Linux:*:*)
|
sparc:Linux:*:* | sparc64:Linux:*:*)
|
||||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||||
exit ;;
|
exit ;;
|
||||||
vax:Linux:*:*)
|
vax:Linux:*:*)
|
||||||
echo ${UNAME_MACHINE}-dec-linux-gnu
|
echo ${UNAME_MACHINE}-dec-linux-${LIBC}
|
||||||
exit ;;
|
exit ;;
|
||||||
x86_64:Linux:*:*)
|
x86_64:Linux:*:*)
|
||||||
echo x86_64-unknown-linux-gnu
|
echo x86_64-unknown-linux-${LIBC}
|
||||||
exit ;;
|
exit ;;
|
||||||
xtensa:Linux:*:*)
|
xtensa*:Linux:*:*)
|
||||||
echo xtensa-unknown-linux-gnu
|
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||||
exit ;;
|
exit ;;
|
||||||
i*86:Linux:*:*)
|
i*86:Linux:*:*)
|
||||||
# The BFD linker knows what the default object file format is, so
|
# The BFD linker knows what the default object file format is, so
|
||||||
@@ -970,20 +997,22 @@ EOF
|
|||||||
p'`
|
p'`
|
||||||
case "$ld_supported_targets" in
|
case "$ld_supported_targets" in
|
||||||
elf32-i386)
|
elf32-i386)
|
||||||
TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
|
TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}"
|
||||||
;;
|
;;
|
||||||
a.out-i386-linux)
|
a.out-i386-linux)
|
||||||
echo "${UNAME_MACHINE}-pc-linux-gnuaout"
|
echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout"
|
||||||
exit ;;
|
exit ;;
|
||||||
coff-i386)
|
coff-i386)
|
||||||
echo "${UNAME_MACHINE}-pc-linux-gnucoff"
|
echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff"
|
||||||
exit ;;
|
exit ;;
|
||||||
"")
|
"")
|
||||||
# Either a pre-BFD a.out linker (linux-gnuoldld) or
|
# Either a pre-BFD a.out linker (linux-gnuoldld) or
|
||||||
# one that does not give us useful --help.
|
# one that does not give us useful --help.
|
||||||
echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
|
echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld"
|
||||||
exit ;;
|
exit ;;
|
||||||
esac
|
esac
|
||||||
|
# This should get integrated into the C code below, but now we hack
|
||||||
|
if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi
|
||||||
# Determine whether the default compiler is a.out or elf
|
# Determine whether the default compiler is a.out or elf
|
||||||
eval $set_cc_for_build
|
eval $set_cc_for_build
|
||||||
sed 's/^ //' << EOF >$dummy.c
|
sed 's/^ //' << EOF >$dummy.c
|
||||||
@@ -1474,9 +1503,9 @@ This script, last modified $timestamp, has failed to recognize
|
|||||||
the operating system you are using. It is advised that you
|
the operating system you are using. It is advised that you
|
||||||
download the most up to date version of the config scripts from
|
download the most up to date version of the config scripts from
|
||||||
|
|
||||||
http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
|
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
|
||||||
and
|
and
|
||||||
http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
|
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
|
||||||
|
|
||||||
If the version you run ($0) is already up to date, please
|
If the version you run ($0) is already up to date, please
|
||||||
send the following data and any information you think might be
|
send the following data and any information you think might be
|
||||||
|
|||||||
Vendored
+62
-12
@@ -1,10 +1,10 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# Configuration validation subroutine script.
|
# Configuration validation subroutine script.
|
||||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||||
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
|
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
|
||||||
# Inc.
|
# Free Software Foundation, Inc.
|
||||||
|
|
||||||
timestamp='2007-04-29'
|
timestamp='2008-01-16'
|
||||||
|
|
||||||
# This file is (in principle) common to ALL GNU software.
|
# This file is (in principle) common to ALL GNU software.
|
||||||
# The presence of a machine in this file suggests that SOME GNU software
|
# The presence of a machine in this file suggests that SOME GNU software
|
||||||
@@ -72,8 +72,8 @@ Report bugs and patches to <config-patches@gnu.org>."
|
|||||||
version="\
|
version="\
|
||||||
GNU config.sub ($timestamp)
|
GNU config.sub ($timestamp)
|
||||||
|
|
||||||
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
|
||||||
Free Software Foundation, Inc.
|
2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This is free software; see the source for copying conditions. There is NO
|
This is free software; see the source for copying conditions. There is NO
|
||||||
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
||||||
@@ -244,7 +244,7 @@ case $basic_machine in
|
|||||||
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
|
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
|
||||||
| bfin \
|
| bfin \
|
||||||
| c4x | clipper \
|
| c4x | clipper \
|
||||||
| d10v | d30v | dlx | dsp16xx \
|
| d10v | d30v | dlx | dsp16xx | dvp \
|
||||||
| fido | fr30 | frv \
|
| fido | fr30 | frv \
|
||||||
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
|
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
|
||||||
| i370 | i860 | i960 | ia64 \
|
| i370 | i860 | i960 | ia64 \
|
||||||
@@ -277,7 +277,7 @@ case $basic_machine in
|
|||||||
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
|
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
|
||||||
| pyramid \
|
| pyramid \
|
||||||
| score \
|
| score \
|
||||||
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
|
| sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
|
||||||
| sh64 | sh64le \
|
| sh64 | sh64le \
|
||||||
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
|
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
|
||||||
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
|
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
|
||||||
@@ -358,7 +358,7 @@ case $basic_machine in
|
|||||||
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
|
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
|
||||||
| pyramid-* \
|
| pyramid-* \
|
||||||
| romp-* | rs6000-* \
|
| romp-* | rs6000-* \
|
||||||
| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
|
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
|
||||||
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
|
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
|
||||||
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
|
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
|
||||||
| sparclite-* \
|
| sparclite-* \
|
||||||
@@ -369,10 +369,14 @@ case $basic_machine in
|
|||||||
| v850-* | v850e-* | vax-* \
|
| v850-* | v850e-* | vax-* \
|
||||||
| we32k-* \
|
| we32k-* \
|
||||||
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
|
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
|
||||||
| xstormy16-* | xtensa-* \
|
| xstormy16-* | xtensa*-* \
|
||||||
| ymp-* \
|
| ymp-* \
|
||||||
| z8k-*)
|
| z8k-*)
|
||||||
;;
|
;;
|
||||||
|
# Recognize the basic CPU types without company name, with glob match.
|
||||||
|
xtensa*)
|
||||||
|
basic_machine=$basic_machine-unknown
|
||||||
|
;;
|
||||||
# Recognize the various machine names and aliases which stand
|
# Recognize the various machine names and aliases which stand
|
||||||
# for a CPU type and a company and sometimes even an OS.
|
# for a CPU type and a company and sometimes even an OS.
|
||||||
386bsd)
|
386bsd)
|
||||||
@@ -443,6 +447,14 @@ case $basic_machine in
|
|||||||
basic_machine=ns32k-sequent
|
basic_machine=ns32k-sequent
|
||||||
os=-dynix
|
os=-dynix
|
||||||
;;
|
;;
|
||||||
|
blackfin)
|
||||||
|
basic_machine=bfin-unknown
|
||||||
|
os=-linux
|
||||||
|
;;
|
||||||
|
blackfin-*)
|
||||||
|
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||||
|
os=-linux
|
||||||
|
;;
|
||||||
c90)
|
c90)
|
||||||
basic_machine=c90-cray
|
basic_machine=c90-cray
|
||||||
os=-unicos
|
os=-unicos
|
||||||
@@ -475,8 +487,8 @@ case $basic_machine in
|
|||||||
basic_machine=craynv-cray
|
basic_machine=craynv-cray
|
||||||
os=-unicosmp
|
os=-unicosmp
|
||||||
;;
|
;;
|
||||||
cr16c)
|
cr16)
|
||||||
basic_machine=cr16c-unknown
|
basic_machine=cr16-unknown
|
||||||
os=-elf
|
os=-elf
|
||||||
;;
|
;;
|
||||||
crds | unos)
|
crds | unos)
|
||||||
@@ -668,6 +680,14 @@ case $basic_machine in
|
|||||||
basic_machine=m68k-isi
|
basic_machine=m68k-isi
|
||||||
os=-sysv
|
os=-sysv
|
||||||
;;
|
;;
|
||||||
|
m68knommu)
|
||||||
|
basic_machine=m68k-unknown
|
||||||
|
os=-linux
|
||||||
|
;;
|
||||||
|
m68knommu-*)
|
||||||
|
basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||||
|
os=-linux
|
||||||
|
;;
|
||||||
m88k-omron*)
|
m88k-omron*)
|
||||||
basic_machine=m88k-omron
|
basic_machine=m88k-omron
|
||||||
;;
|
;;
|
||||||
@@ -694,6 +714,24 @@ case $basic_machine in
|
|||||||
basic_machine=m68k-atari
|
basic_machine=m68k-atari
|
||||||
os=-mint
|
os=-mint
|
||||||
;;
|
;;
|
||||||
|
mipsEE* | ee | ps2)
|
||||||
|
basic_machine=mips64r5900el-scei
|
||||||
|
case $os in
|
||||||
|
-linux*)
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
os=-elf
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
iop)
|
||||||
|
basic_machine=mipsel-scei
|
||||||
|
os=-irx
|
||||||
|
;;
|
||||||
|
dvp)
|
||||||
|
basic_machine=dvp-scei
|
||||||
|
os=-elf
|
||||||
|
;;
|
||||||
mips3*-*)
|
mips3*-*)
|
||||||
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
|
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
|
||||||
;;
|
;;
|
||||||
@@ -813,6 +851,14 @@ case $basic_machine in
|
|||||||
basic_machine=i860-intel
|
basic_machine=i860-intel
|
||||||
os=-osf
|
os=-osf
|
||||||
;;
|
;;
|
||||||
|
parisc)
|
||||||
|
basic_machine=hppa-unknown
|
||||||
|
os=-linux
|
||||||
|
;;
|
||||||
|
parisc-*)
|
||||||
|
basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||||
|
os=-linux
|
||||||
|
;;
|
||||||
pbd)
|
pbd)
|
||||||
basic_machine=sparc-tti
|
basic_machine=sparc-tti
|
||||||
;;
|
;;
|
||||||
@@ -1021,6 +1067,10 @@ case $basic_machine in
|
|||||||
basic_machine=tic6x-unknown
|
basic_machine=tic6x-unknown
|
||||||
os=-coff
|
os=-coff
|
||||||
;;
|
;;
|
||||||
|
tile*)
|
||||||
|
basic_machine=tile-unknown
|
||||||
|
os=-linux-gnu
|
||||||
|
;;
|
||||||
tx39)
|
tx39)
|
||||||
basic_machine=mipstx39-unknown
|
basic_machine=mipstx39-unknown
|
||||||
;;
|
;;
|
||||||
@@ -1226,7 +1276,7 @@ case $os in
|
|||||||
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
|
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
|
||||||
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
|
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
|
||||||
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
|
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
|
||||||
| -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
|
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -irx*)
|
||||||
# Remember, each alternative MUST END IN *, to match a version number.
|
# Remember, each alternative MUST END IN *, to match a version number.
|
||||||
;;
|
;;
|
||||||
-qnx*)
|
-qnx*)
|
||||||
|
|||||||
+19
-14
@@ -1,9 +1,9 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# depcomp - compile a program generating dependencies as side-effects
|
# depcomp - compile a program generating dependencies as side-effects
|
||||||
|
|
||||||
scriptversion=2006-10-15.18
|
scriptversion=2007-03-29.01
|
||||||
|
|
||||||
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
|
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
|
||||||
# Foundation, Inc.
|
# Foundation, Inc.
|
||||||
|
|
||||||
# This program is free software; you can redistribute it and/or modify
|
# This program is free software; you can redistribute it and/or modify
|
||||||
@@ -215,34 +215,39 @@ aix)
|
|||||||
# current directory. Also, the AIX compiler puts `$object:' at the
|
# current directory. Also, the AIX compiler puts `$object:' at the
|
||||||
# start of each line; $object doesn't have directory information.
|
# start of each line; $object doesn't have directory information.
|
||||||
# Version 6 uses the directory in both cases.
|
# Version 6 uses the directory in both cases.
|
||||||
stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
|
dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
|
||||||
tmpdepfile="$stripped.u"
|
test "x$dir" = "x$object" && dir=
|
||||||
|
base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
|
||||||
if test "$libtool" = yes; then
|
if test "$libtool" = yes; then
|
||||||
|
tmpdepfile1=$dir$base.u
|
||||||
|
tmpdepfile2=$base.u
|
||||||
|
tmpdepfile3=$dir.libs/$base.u
|
||||||
"$@" -Wc,-M
|
"$@" -Wc,-M
|
||||||
else
|
else
|
||||||
|
tmpdepfile1=$dir$base.u
|
||||||
|
tmpdepfile2=$dir$base.u
|
||||||
|
tmpdepfile3=$dir$base.u
|
||||||
"$@" -M
|
"$@" -M
|
||||||
fi
|
fi
|
||||||
stat=$?
|
stat=$?
|
||||||
|
|
||||||
if test -f "$tmpdepfile"; then :
|
|
||||||
else
|
|
||||||
stripped=`echo "$stripped" | sed 's,^.*/,,'`
|
|
||||||
tmpdepfile="$stripped.u"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test $stat -eq 0; then :
|
if test $stat -eq 0; then :
|
||||||
else
|
else
|
||||||
rm -f "$tmpdepfile"
|
rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
|
||||||
exit $stat
|
exit $stat
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
|
||||||
|
do
|
||||||
|
test -f "$tmpdepfile" && break
|
||||||
|
done
|
||||||
if test -f "$tmpdepfile"; then
|
if test -f "$tmpdepfile"; then
|
||||||
outname="$stripped.o"
|
|
||||||
# Each line is of the form `foo.o: dependent.h'.
|
# Each line is of the form `foo.o: dependent.h'.
|
||||||
# Do two passes, one to just change these to
|
# Do two passes, one to just change these to
|
||||||
# `$object: dependent.h' and one to simply `dependent.h:'.
|
# `$object: dependent.h' and one to simply `dependent.h:'.
|
||||||
sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
|
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
|
||||||
sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
|
# That's a tab and a space in the [].
|
||||||
|
sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
|
||||||
else
|
else
|
||||||
# The sourcefile does not contain any dependencies, so just
|
# The sourcefile does not contain any dependencies, so just
|
||||||
# store a dummy comment line, to avoid errors with the Makefile
|
# store a dummy comment line, to avoid errors with the Makefile
|
||||||
|
|||||||
+117
-105
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# install - install a program, script, or datafile
|
# install - install a program, script, or datafile
|
||||||
|
|
||||||
scriptversion=2006-10-14.15
|
scriptversion=2006-12-25.00
|
||||||
|
|
||||||
# This originates from X11R5 (mit/util/scripts/install.sh), which was
|
# This originates from X11R5 (mit/util/scripts/install.sh), which was
|
||||||
# later released in X11R6 (xc/config/util/install.sh) with the
|
# later released in X11R6 (xc/config/util/install.sh) with the
|
||||||
@@ -48,7 +48,7 @@ IFS=" "" $nl"
|
|||||||
# set DOITPROG to echo to test this script
|
# set DOITPROG to echo to test this script
|
||||||
|
|
||||||
# Don't use :- since 4.3BSD and earlier shells don't like it.
|
# Don't use :- since 4.3BSD and earlier shells don't like it.
|
||||||
doit="${DOITPROG-}"
|
doit=${DOITPROG-}
|
||||||
if test -z "$doit"; then
|
if test -z "$doit"; then
|
||||||
doit_exec=exec
|
doit_exec=exec
|
||||||
else
|
else
|
||||||
@@ -58,34 +58,49 @@ fi
|
|||||||
# Put in absolute file names if you don't have them in your path;
|
# Put in absolute file names if you don't have them in your path;
|
||||||
# or use environment vars.
|
# or use environment vars.
|
||||||
|
|
||||||
mvprog="${MVPROG-mv}"
|
chgrpprog=${CHGRPPROG-chgrp}
|
||||||
cpprog="${CPPROG-cp}"
|
chmodprog=${CHMODPROG-chmod}
|
||||||
chmodprog="${CHMODPROG-chmod}"
|
chownprog=${CHOWNPROG-chown}
|
||||||
chownprog="${CHOWNPROG-chown}"
|
cmpprog=${CMPPROG-cmp}
|
||||||
chgrpprog="${CHGRPPROG-chgrp}"
|
cpprog=${CPPROG-cp}
|
||||||
stripprog="${STRIPPROG-strip}"
|
mkdirprog=${MKDIRPROG-mkdir}
|
||||||
rmprog="${RMPROG-rm}"
|
mvprog=${MVPROG-mv}
|
||||||
mkdirprog="${MKDIRPROG-mkdir}"
|
rmprog=${RMPROG-rm}
|
||||||
|
stripprog=${STRIPPROG-strip}
|
||||||
|
|
||||||
|
posix_glob='?'
|
||||||
|
initialize_posix_glob='
|
||||||
|
test "$posix_glob" != "?" || {
|
||||||
|
if (set -f) 2>/dev/null; then
|
||||||
|
posix_glob=
|
||||||
|
else
|
||||||
|
posix_glob=:
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
'
|
||||||
|
|
||||||
posix_glob=
|
|
||||||
posix_mkdir=
|
posix_mkdir=
|
||||||
|
|
||||||
# Desired mode of installed file.
|
# Desired mode of installed file.
|
||||||
mode=0755
|
mode=0755
|
||||||
|
|
||||||
|
chgrpcmd=
|
||||||
chmodcmd=$chmodprog
|
chmodcmd=$chmodprog
|
||||||
chowncmd=
|
chowncmd=
|
||||||
chgrpcmd=
|
mvcmd=$mvprog
|
||||||
stripcmd=
|
|
||||||
rmcmd="$rmprog -f"
|
rmcmd="$rmprog -f"
|
||||||
mvcmd="$mvprog"
|
stripcmd=
|
||||||
|
|
||||||
src=
|
src=
|
||||||
dst=
|
dst=
|
||||||
dir_arg=
|
dir_arg=
|
||||||
dstarg=
|
dst_arg=
|
||||||
|
|
||||||
|
copy_on_change=false
|
||||||
no_target_directory=
|
no_target_directory=
|
||||||
|
|
||||||
usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
|
usage="\
|
||||||
|
Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
|
||||||
or: $0 [OPTION]... SRCFILES... DIRECTORY
|
or: $0 [OPTION]... SRCFILES... DIRECTORY
|
||||||
or: $0 [OPTION]... -t DIRECTORY SRCFILES...
|
or: $0 [OPTION]... -t DIRECTORY SRCFILES...
|
||||||
or: $0 [OPTION]... -d DIRECTORIES...
|
or: $0 [OPTION]... -d DIRECTORIES...
|
||||||
@@ -95,65 +110,55 @@ In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
|
|||||||
In the 4th, create DIRECTORIES.
|
In the 4th, create DIRECTORIES.
|
||||||
|
|
||||||
Options:
|
Options:
|
||||||
-c (ignored)
|
--help display this help and exit.
|
||||||
-d create directories instead of installing files.
|
--version display version info and exit.
|
||||||
-g GROUP $chgrpprog installed files to GROUP.
|
|
||||||
-m MODE $chmodprog installed files to MODE.
|
-c (ignored)
|
||||||
-o USER $chownprog installed files to USER.
|
-C install only if different (preserve the last data modification time)
|
||||||
-s $stripprog installed files.
|
-d create directories instead of installing files.
|
||||||
-t DIRECTORY install into DIRECTORY.
|
-g GROUP $chgrpprog installed files to GROUP.
|
||||||
-T report an error if DSTFILE is a directory.
|
-m MODE $chmodprog installed files to MODE.
|
||||||
--help display this help and exit.
|
-o USER $chownprog installed files to USER.
|
||||||
--version display version info and exit.
|
-s $stripprog installed files.
|
||||||
|
-t DIRECTORY install into DIRECTORY.
|
||||||
|
-T report an error if DSTFILE is a directory.
|
||||||
|
|
||||||
Environment variables override the default commands:
|
Environment variables override the default commands:
|
||||||
CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
|
CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
|
||||||
|
RMPROG STRIPPROG
|
||||||
"
|
"
|
||||||
|
|
||||||
while test $# -ne 0; do
|
while test $# -ne 0; do
|
||||||
case $1 in
|
case $1 in
|
||||||
-c) shift
|
-c) ;;
|
||||||
continue;;
|
|
||||||
|
|
||||||
-d) dir_arg=true
|
-C) copy_on_change=true;;
|
||||||
shift
|
|
||||||
continue;;
|
-d) dir_arg=true;;
|
||||||
|
|
||||||
-g) chgrpcmd="$chgrpprog $2"
|
-g) chgrpcmd="$chgrpprog $2"
|
||||||
shift
|
shift;;
|
||||||
shift
|
|
||||||
continue;;
|
|
||||||
|
|
||||||
--help) echo "$usage"; exit $?;;
|
--help) echo "$usage"; exit $?;;
|
||||||
|
|
||||||
-m) mode=$2
|
-m) mode=$2
|
||||||
shift
|
|
||||||
shift
|
|
||||||
case $mode in
|
case $mode in
|
||||||
*' '* | *' '* | *'
|
*' '* | *' '* | *'
|
||||||
'* | *'*'* | *'?'* | *'['*)
|
'* | *'*'* | *'?'* | *'['*)
|
||||||
echo "$0: invalid mode: $mode" >&2
|
echo "$0: invalid mode: $mode" >&2
|
||||||
exit 1;;
|
exit 1;;
|
||||||
esac
|
esac
|
||||||
continue;;
|
shift;;
|
||||||
|
|
||||||
-o) chowncmd="$chownprog $2"
|
-o) chowncmd="$chownprog $2"
|
||||||
shift
|
shift;;
|
||||||
shift
|
|
||||||
continue;;
|
|
||||||
|
|
||||||
-s) stripcmd=$stripprog
|
-s) stripcmd=$stripprog;;
|
||||||
shift
|
|
||||||
continue;;
|
|
||||||
|
|
||||||
-t) dstarg=$2
|
-t) dst_arg=$2
|
||||||
shift
|
shift;;
|
||||||
shift
|
|
||||||
continue;;
|
|
||||||
|
|
||||||
-T) no_target_directory=true
|
-T) no_target_directory=true;;
|
||||||
shift
|
|
||||||
continue;;
|
|
||||||
|
|
||||||
--version) echo "$0 $scriptversion"; exit $?;;
|
--version) echo "$0 $scriptversion"; exit $?;;
|
||||||
|
|
||||||
@@ -165,21 +170,22 @@ while test $# -ne 0; do
|
|||||||
|
|
||||||
*) break;;
|
*) break;;
|
||||||
esac
|
esac
|
||||||
|
shift
|
||||||
done
|
done
|
||||||
|
|
||||||
if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
|
if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
|
||||||
# When -d is used, all remaining arguments are directories to create.
|
# When -d is used, all remaining arguments are directories to create.
|
||||||
# When -t is used, the destination is already specified.
|
# When -t is used, the destination is already specified.
|
||||||
# Otherwise, the last argument is the destination. Remove it from $@.
|
# Otherwise, the last argument is the destination. Remove it from $@.
|
||||||
for arg
|
for arg
|
||||||
do
|
do
|
||||||
if test -n "$dstarg"; then
|
if test -n "$dst_arg"; then
|
||||||
# $@ is not empty: it contains at least $arg.
|
# $@ is not empty: it contains at least $arg.
|
||||||
set fnord "$@" "$dstarg"
|
set fnord "$@" "$dst_arg"
|
||||||
shift # fnord
|
shift # fnord
|
||||||
fi
|
fi
|
||||||
shift # arg
|
shift # arg
|
||||||
dstarg=$arg
|
dst_arg=$arg
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -224,7 +230,7 @@ for src
|
|||||||
do
|
do
|
||||||
# Protect names starting with `-'.
|
# Protect names starting with `-'.
|
||||||
case $src in
|
case $src in
|
||||||
-*) src=./$src ;;
|
-*) src=./$src;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if test -n "$dir_arg"; then
|
if test -n "$dir_arg"; then
|
||||||
@@ -242,22 +248,22 @@ do
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test -z "$dstarg"; then
|
if test -z "$dst_arg"; then
|
||||||
echo "$0: no destination specified." >&2
|
echo "$0: no destination specified." >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dst=$dstarg
|
dst=$dst_arg
|
||||||
# Protect names starting with `-'.
|
# Protect names starting with `-'.
|
||||||
case $dst in
|
case $dst in
|
||||||
-*) dst=./$dst ;;
|
-*) dst=./$dst;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# If destination is a directory, append the input filename; won't work
|
# If destination is a directory, append the input filename; won't work
|
||||||
# if double slashes aren't ignored.
|
# if double slashes aren't ignored.
|
||||||
if test -d "$dst"; then
|
if test -d "$dst"; then
|
||||||
if test -n "$no_target_directory"; then
|
if test -n "$no_target_directory"; then
|
||||||
echo "$0: $dstarg: Is a directory" >&2
|
echo "$0: $dst_arg: Is a directory" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
dstdir=$dst
|
dstdir=$dst
|
||||||
@@ -378,26 +384,19 @@ do
|
|||||||
# directory the slow way, step by step, checking for races as we go.
|
# directory the slow way, step by step, checking for races as we go.
|
||||||
|
|
||||||
case $dstdir in
|
case $dstdir in
|
||||||
/*) prefix=/ ;;
|
/*) prefix='/';;
|
||||||
-*) prefix=./ ;;
|
-*) prefix='./';;
|
||||||
*) prefix= ;;
|
*) prefix='';;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
case $posix_glob in
|
eval "$initialize_posix_glob"
|
||||||
'')
|
|
||||||
if (set -f) 2>/dev/null; then
|
|
||||||
posix_glob=true
|
|
||||||
else
|
|
||||||
posix_glob=false
|
|
||||||
fi ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
oIFS=$IFS
|
oIFS=$IFS
|
||||||
IFS=/
|
IFS=/
|
||||||
$posix_glob && set -f
|
$posix_glob set -f
|
||||||
set fnord $dstdir
|
set fnord $dstdir
|
||||||
shift
|
shift
|
||||||
$posix_glob && set +f
|
$posix_glob set +f
|
||||||
IFS=$oIFS
|
IFS=$oIFS
|
||||||
|
|
||||||
prefixes=
|
prefixes=
|
||||||
@@ -459,41 +458,54 @@ do
|
|||||||
# ignore errors from any of these, just make sure not to ignore
|
# ignore errors from any of these, just make sure not to ignore
|
||||||
# errors from the above "$doit $cpprog $src $dsttmp" command.
|
# errors from the above "$doit $cpprog $src $dsttmp" command.
|
||||||
#
|
#
|
||||||
{ test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
|
{ test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
|
||||||
&& { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
|
{ test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
|
||||||
&& { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
|
{ test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
|
||||||
&& { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
|
{ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
|
||||||
|
|
||||||
# Now rename the file to the real destination.
|
# If -C, don't bother to copy if it wouldn't change the file.
|
||||||
{ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
|
if $copy_on_change &&
|
||||||
|| {
|
old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
|
||||||
# The rename failed, perhaps because mv can't rename something else
|
new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
|
||||||
# to itself, or perhaps because mv is so ancient that it does not
|
|
||||||
# support -f.
|
|
||||||
|
|
||||||
# Now remove or move aside any old file at destination location.
|
eval "$initialize_posix_glob" &&
|
||||||
# We try this two ways since rm can't unlink itself on some
|
$posix_glob set -f &&
|
||||||
# systems and the destination file might be busy for other
|
set X $old && old=:$2:$4:$5:$6 &&
|
||||||
# reasons. In this case, the final cleanup might fail but the new
|
set X $new && new=:$2:$4:$5:$6 &&
|
||||||
# file should still install successfully.
|
$posix_glob set +f &&
|
||||||
{
|
|
||||||
if test -f "$dst"; then
|
|
||||||
$doit $rmcmd -f "$dst" 2>/dev/null \
|
|
||||||
|| { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
|
|
||||||
&& { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
|
|
||||||
|| {
|
|
||||||
echo "$0: cannot unlink or rename $dst" >&2
|
|
||||||
(exit 1); exit 1
|
|
||||||
}
|
|
||||||
else
|
|
||||||
:
|
|
||||||
fi
|
|
||||||
} &&
|
|
||||||
|
|
||||||
# Now rename the file to the real destination.
|
test "$old" = "$new" &&
|
||||||
$doit $mvcmd "$dsttmp" "$dst"
|
$cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
|
||||||
}
|
then
|
||||||
} || exit 1
|
rm -f "$dsttmp"
|
||||||
|
else
|
||||||
|
# Rename the file to the real destination.
|
||||||
|
$doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
|
||||||
|
|
||||||
|
# The rename failed, perhaps because mv can't rename something else
|
||||||
|
# to itself, or perhaps because mv is so ancient that it does not
|
||||||
|
# support -f.
|
||||||
|
{
|
||||||
|
# Now remove or move aside any old file at destination location.
|
||||||
|
# We try this two ways since rm can't unlink itself on some
|
||||||
|
# systems and the destination file might be busy for other
|
||||||
|
# reasons. In this case, the final cleanup might fail but the new
|
||||||
|
# file should still install successfully.
|
||||||
|
{
|
||||||
|
test ! -f "$dst" ||
|
||||||
|
$doit $rmcmd -f "$dst" 2>/dev/null ||
|
||||||
|
{ $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
|
||||||
|
{ $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
|
||||||
|
} ||
|
||||||
|
{ echo "$0: cannot unlink or rename $dst" >&2
|
||||||
|
(exit 1); exit 1
|
||||||
|
}
|
||||||
|
} &&
|
||||||
|
|
||||||
|
# Now rename the file to the real destination.
|
||||||
|
$doit $mvcmd "$dsttmp" "$dst"
|
||||||
|
}
|
||||||
|
fi || exit 1
|
||||||
|
|
||||||
trap '' 0
|
trap '' 0
|
||||||
fi
|
fi
|
||||||
|
|||||||
+63
-29
@@ -2,7 +2,7 @@
|
|||||||
# NOTE: Changing this file will not affect anything until you rerun configure.
|
# NOTE: Changing this file will not affect anything until you rerun configure.
|
||||||
#
|
#
|
||||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
|
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
|
||||||
# 2007 Free Software Foundation, Inc.
|
# 2007, 2008 Free Software Foundation, Inc.
|
||||||
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
|
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
|
||||||
#
|
#
|
||||||
# This program is free software; you can redistribute it and/or modify
|
# This program is free software; you can redistribute it and/or modify
|
||||||
@@ -33,9 +33,6 @@ basename="s,^.*/,,g"
|
|||||||
# function.
|
# function.
|
||||||
progpath="$0"
|
progpath="$0"
|
||||||
|
|
||||||
# define SED for historic ltconfig's generated by Libtool 1.3
|
|
||||||
test -z "$SED" && SED=sed
|
|
||||||
|
|
||||||
# The name of this program:
|
# The name of this program:
|
||||||
progname=`echo "$progpath" | $SED $basename`
|
progname=`echo "$progpath" | $SED $basename`
|
||||||
modename="$progname"
|
modename="$progname"
|
||||||
@@ -46,8 +43,8 @@ EXIT_FAILURE=1
|
|||||||
|
|
||||||
PROGRAM=ltmain.sh
|
PROGRAM=ltmain.sh
|
||||||
PACKAGE=libtool
|
PACKAGE=libtool
|
||||||
VERSION=1.5.24
|
VERSION=1.5.26
|
||||||
TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
|
TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
|
||||||
|
|
||||||
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
|
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
|
||||||
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
||||||
@@ -116,15 +113,21 @@ esac
|
|||||||
# These must not be set unconditionally because not all systems understand
|
# These must not be set unconditionally because not all systems understand
|
||||||
# e.g. LANG=C (notably SCO).
|
# e.g. LANG=C (notably SCO).
|
||||||
# We save the old values to restore during execute mode.
|
# We save the old values to restore during execute mode.
|
||||||
for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
|
lt_env=
|
||||||
|
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
|
||||||
do
|
do
|
||||||
eval "if test \"\${$lt_var+set}\" = set; then
|
eval "if test \"\${$lt_var+set}\" = set; then
|
||||||
save_$lt_var=\$$lt_var
|
save_$lt_var=\$$lt_var
|
||||||
|
lt_env=\"$lt_var=\$$lt_var \$lt_env\"
|
||||||
$lt_var=C
|
$lt_var=C
|
||||||
export $lt_var
|
export $lt_var
|
||||||
fi"
|
fi"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
if test -n "$lt_env"; then
|
||||||
|
lt_env="env $lt_env"
|
||||||
|
fi
|
||||||
|
|
||||||
# Make sure IFS has a sensible default
|
# Make sure IFS has a sensible default
|
||||||
lt_nl='
|
lt_nl='
|
||||||
'
|
'
|
||||||
@@ -278,7 +281,21 @@ func_infer_tag ()
|
|||||||
esac
|
esac
|
||||||
CC_quoted="$CC_quoted $arg"
|
CC_quoted="$CC_quoted $arg"
|
||||||
done
|
done
|
||||||
|
# user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc'
|
||||||
|
trimedcc=`echo ${CC} | $SED -e "s/${host}-//g"`
|
||||||
|
# and sometimes libtool has CC=<HOST>-gcc but user does CC=gcc
|
||||||
|
extendcc=${host}-${CC}
|
||||||
|
# and sometimes libtool has CC=<OLDHOST>-gcc but user has CC=<NEWHOST>-gcc
|
||||||
|
# (Gentoo-specific hack because we always export $CHOST)
|
||||||
|
mungedcc=${CHOST-${host}}-${trimedcc}
|
||||||
case "$@ " in
|
case "$@ " in
|
||||||
|
"cc "* | " cc "* | "${host}-cc "* | " ${host}-cc "*|\
|
||||||
|
"gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*)
|
||||||
|
tagname=CC
|
||||||
|
break ;;
|
||||||
|
"$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*|\
|
||||||
|
"$extendcc "* | " $extendcc "* | "`$echo $extendcc` "* | " `$echo $extendcc` "*|\
|
||||||
|
"$mungedcc "* | " $mungedcc "* | "`$echo $mungedcc` "* | " `$echo $mungedcc` "*|\
|
||||||
" $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
|
" $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
|
||||||
# The compiler in the base compile command matches
|
# The compiler in the base compile command matches
|
||||||
# the one in the tagged configuration.
|
# the one in the tagged configuration.
|
||||||
@@ -488,7 +505,7 @@ do
|
|||||||
echo "\
|
echo "\
|
||||||
$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
|
$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
|
||||||
|
|
||||||
Copyright (C) 2007 Free Software Foundation, Inc.
|
Copyright (C) 2008 Free Software Foundation, Inc.
|
||||||
This is free software; see the source for copying conditions. There is NO
|
This is free software; see the source for copying conditions. There is NO
|
||||||
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
||||||
exit $?
|
exit $?
|
||||||
@@ -791,6 +808,7 @@ if test -z "$show_help"; then
|
|||||||
*.for) xform=for ;;
|
*.for) xform=for ;;
|
||||||
*.java) xform=java ;;
|
*.java) xform=java ;;
|
||||||
*.obj) xform=obj ;;
|
*.obj) xform=obj ;;
|
||||||
|
*.sx) xform=sx ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
|
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
|
||||||
@@ -884,7 +902,7 @@ if test -z "$show_help"; then
|
|||||||
# Lock this critical section if it is needed
|
# Lock this critical section if it is needed
|
||||||
# We use this script file to make the link, it avoids creating a new file
|
# We use this script file to make the link, it avoids creating a new file
|
||||||
if test "$need_locks" = yes; then
|
if test "$need_locks" = yes; then
|
||||||
until $run ln "$progpath" "$lockfile" 2>/dev/null; do
|
until $run ln "$srcfile" "$lockfile" 2>/dev/null; do
|
||||||
$show "Waiting for $lockfile to be removed"
|
$show "Waiting for $lockfile to be removed"
|
||||||
sleep 2
|
sleep 2
|
||||||
done
|
done
|
||||||
@@ -959,7 +977,7 @@ EOF
|
|||||||
$run $rm "$lobj" "$output_obj"
|
$run $rm "$lobj" "$output_obj"
|
||||||
|
|
||||||
$show "$command"
|
$show "$command"
|
||||||
if $run eval "$command"; then :
|
if $run eval $lt_env "$command"; then :
|
||||||
else
|
else
|
||||||
test -n "$output_obj" && $run $rm $removelist
|
test -n "$output_obj" && $run $rm $removelist
|
||||||
exit $EXIT_FAILURE
|
exit $EXIT_FAILURE
|
||||||
@@ -1031,7 +1049,7 @@ EOF
|
|||||||
command="$command$suppress_output"
|
command="$command$suppress_output"
|
||||||
$run $rm "$obj" "$output_obj"
|
$run $rm "$obj" "$output_obj"
|
||||||
$show "$command"
|
$show "$command"
|
||||||
if $run eval "$command"; then :
|
if $run eval $lt_env "$command"; then :
|
||||||
else
|
else
|
||||||
$run $rm $removelist
|
$run $rm $removelist
|
||||||
exit $EXIT_FAILURE
|
exit $EXIT_FAILURE
|
||||||
@@ -1164,6 +1182,7 @@ EOF
|
|||||||
thread_safe=no
|
thread_safe=no
|
||||||
vinfo=
|
vinfo=
|
||||||
vinfo_number=no
|
vinfo_number=no
|
||||||
|
single_module="${wl}-single_module"
|
||||||
|
|
||||||
func_infer_tag $base_compile
|
func_infer_tag $base_compile
|
||||||
|
|
||||||
@@ -1649,6 +1668,11 @@ EOF
|
|||||||
continue
|
continue
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
-multi_module)
|
||||||
|
single_module="${wl}-multi_module"
|
||||||
|
continue
|
||||||
|
;;
|
||||||
|
|
||||||
-module)
|
-module)
|
||||||
module=yes
|
module=yes
|
||||||
continue
|
continue
|
||||||
@@ -2152,7 +2176,12 @@ EOF
|
|||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
|
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
|
for search_ext in .la $std_shrext .so .a; do
|
||||||
# Search the libtool library
|
# Search the libtool library
|
||||||
lib="$searchdir/lib${name}${search_ext}"
|
lib="$searchdir/lib${name}${search_ext}"
|
||||||
@@ -2948,12 +2977,18 @@ EOF
|
|||||||
# we do not want to link against static libs,
|
# we do not want to link against static libs,
|
||||||
# but need to link against shared
|
# but need to link against shared
|
||||||
eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
|
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
|
if test -n "$deplibrary_names" ; then
|
||||||
for tmp in $deplibrary_names ; do
|
for tmp in $deplibrary_names ; do
|
||||||
depdepl=$tmp
|
depdepl=$tmp
|
||||||
done
|
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"
|
depdepl="$path/$depdepl"
|
||||||
|
else
|
||||||
|
# Can't find it, oh well...
|
||||||
|
depdepl=
|
||||||
fi
|
fi
|
||||||
# do not add paths which are already there
|
# do not add paths which are already there
|
||||||
case " $newlib_search_path " in
|
case " $newlib_search_path " in
|
||||||
@@ -3101,9 +3136,10 @@ EOF
|
|||||||
|
|
||||||
case $linkmode in
|
case $linkmode in
|
||||||
oldlib)
|
oldlib)
|
||||||
if test -n "$deplibs"; then
|
case " $deplibs" in
|
||||||
$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
|
*\ -l* | *\ -L*)
|
||||||
fi
|
$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
|
||||||
|
esac
|
||||||
|
|
||||||
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
|
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
|
||||||
$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
|
$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
|
||||||
@@ -4018,23 +4054,15 @@ EOF
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
tmp_deplibs=
|
tmp_deplibs=
|
||||||
inst_prefix_arg=
|
|
||||||
for test_deplib in $deplibs; do
|
for test_deplib in $deplibs; do
|
||||||
case " $convenience " in
|
case " $convenience " in
|
||||||
*" $test_deplib "*) ;;
|
*" $test_deplib "*) ;;
|
||||||
*)
|
*)
|
||||||
if test -n "$inst_prefix_dir" && (echo "$test_deplib" | grep -- "$inst_prefix_dir" >/dev/null); then
|
tmp_deplibs="$tmp_deplibs $test_deplib"
|
||||||
inst_prefix_arg="$inst_prefix_arg $test_deplib"
|
|
||||||
else
|
|
||||||
tmp_deplibs="$tmp_deplibs $test_deplib"
|
|
||||||
fi
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
deplibs="$tmp_deplibs"
|
deplibs="$tmp_deplibs"
|
||||||
if test -n "$inst_prefix_arg"; then
|
|
||||||
deplibs="$inst_prefix_arg $deplibs"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test -n "$convenience"; then
|
if test -n "$convenience"; then
|
||||||
if test -n "$whole_archive_flag_spec"; then
|
if test -n "$whole_archive_flag_spec"; then
|
||||||
@@ -4248,9 +4276,10 @@ EOF
|
|||||||
;;
|
;;
|
||||||
|
|
||||||
obj)
|
obj)
|
||||||
if test -n "$deplibs"; then
|
case " $deplibs" in
|
||||||
$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
|
*\ -l* | *\ -L*)
|
||||||
fi
|
$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
|
||||||
|
esac
|
||||||
|
|
||||||
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
|
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
|
||||||
$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
|
$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
|
||||||
@@ -5453,6 +5482,11 @@ else
|
|||||||
$echo >> $output "\
|
$echo >> $output "\
|
||||||
if test \"\$libtool_execute_magic\" != \"$magic\"; then
|
if test \"\$libtool_execute_magic\" != \"$magic\"; then
|
||||||
# Run the actual program with our arguments.
|
# Run the actual program with our arguments.
|
||||||
|
|
||||||
|
# Make sure env LD_LIBRARY_PATH does not mess us up
|
||||||
|
if test -n \"\${LD_LIBRARY_PATH+set}\"; then
|
||||||
|
export LD_LIBRARY_PATH=\$progdir:\$LD_LIBRARY_PATH
|
||||||
|
fi
|
||||||
"
|
"
|
||||||
case $host in
|
case $host in
|
||||||
# Backslashes separate directories on plain windows
|
# Backslashes separate directories on plain windows
|
||||||
@@ -6489,7 +6523,7 @@ relink_command=\"$relink_command\""
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Restore saved environment variables
|
# Restore saved environment variables
|
||||||
for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
|
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
|
||||||
do
|
do
|
||||||
eval "if test \"\${save_$lt_var+set}\" = set; then
|
eval "if test \"\${save_$lt_var+set}\" = set; then
|
||||||
$lt_var=\$save_$lt_var; export $lt_var
|
$lt_var=\$save_$lt_var; export $lt_var
|
||||||
|
|||||||
+23
-1
@@ -2,9 +2,11 @@
|
|||||||
# Process this file with autoconf to produce a configure script.
|
# Process this file with autoconf to produce a configure script.
|
||||||
|
|
||||||
AC_PREREQ(2.59)
|
AC_PREREQ(2.59)
|
||||||
AC_INIT(libg15, 1.2.4, mlampard@users.sourceforge.net)
|
AC_INIT(libg15, 1.2.7, mlampard@users.sourceforge.net)
|
||||||
AC_PREFIX_DEFAULT(/usr)
|
AC_PREFIX_DEFAULT(/usr)
|
||||||
AC_CONFIG_AUX_DIR(config)
|
AC_CONFIG_AUX_DIR(config)
|
||||||
|
AC_CANONICAL_TARGET()
|
||||||
|
|
||||||
AM_INIT_AUTOMAKE()
|
AM_INIT_AUTOMAKE()
|
||||||
AC_CONFIG_SRCDIR([libg15.c])
|
AC_CONFIG_SRCDIR([libg15.c])
|
||||||
AC_CONFIG_HEADER([config.h])
|
AC_CONFIG_HEADER([config.h])
|
||||||
@@ -13,9 +15,29 @@ AC_CONFIG_HEADER([config.h])
|
|||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
AC_PROG_LIBTOOL
|
AC_PROG_LIBTOOL
|
||||||
|
|
||||||
|
case $host_os in
|
||||||
|
*linux*)
|
||||||
|
AC_DEFINE([OSTYPE_LINUX], [1],[Target OS is Linux])
|
||||||
|
;;
|
||||||
|
*darwin*)
|
||||||
|
AC_DEFINE([OSTYPE_DARWIN], [1],[Target OS is Darwin])
|
||||||
|
;;
|
||||||
|
*solaris*)
|
||||||
|
AC_DEFINE([OSTYPE_SOLARIS], [1],[Target OS is Solaris])
|
||||||
|
AC_SEARCH_LIBS([nanosleep],rt,[],[],[])
|
||||||
|
AC_DEFINE(SUN_LIBUSB, 1, [Define to 1 for Sun version of libusb.])
|
||||||
|
libusb_blocks=true
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
# Checks for libraries.
|
# Checks for libraries.
|
||||||
AC_CHECK_LIB([usb], [main], ,AC_MSG_ERROR(["libusb not found. please install it"]))
|
AC_CHECK_LIB([usb], [main], ,AC_MSG_ERROR(["libusb not found. please install it"]))
|
||||||
|
|
||||||
|
dnl Some versions of libusb do not honour timeout and block. Suns' version is one of them.
|
||||||
|
if test "x$libusb_blocks" == "xtrue"; then
|
||||||
|
AC_DEFINE([LIBUSB_BLOCKS], [1],[Define if libusb implementation blocks on read or write])
|
||||||
|
fi
|
||||||
|
|
||||||
# Checks for header files.
|
# Checks for header files.
|
||||||
AC_HEADER_STDC
|
AC_HEADER_STDC
|
||||||
AC_CHECK_HEADERS([string.h])
|
AC_CHECK_HEADERS([string.h])
|
||||||
|
|||||||
Vendored
+10
@@ -0,0 +1,10 @@
|
|||||||
|
libg15 for Debian
|
||||||
|
-----------------
|
||||||
|
|
||||||
|
Notes about hardware
|
||||||
|
|
||||||
|
Notes about configuration of other packages
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
-- Giacomo Catenazzi <cate@debian.org> Mon, 27 Aug 2007 07:56:10 +0200
|
||||||
Vendored
+29
-27
@@ -1,34 +1,36 @@
|
|||||||
libg15 (1.2.1) edgy; urgency=low
|
libg15 (1.2.7-1) unstable; urgency=low
|
||||||
* Add debugging function to enable/disable extra output
|
|
||||||
* All debugging output is now prefixed with libg15 to aid localising
|
|
||||||
problems.
|
|
||||||
* debugging function now also controls libusb debugging output.
|
|
||||||
* Try to claim usb interface up to 10 times before failing
|
|
||||||
* Slow down initialisation, to allow keyboard to come out of usb
|
|
||||||
auto-suspend on newer kernels.
|
|
||||||
* Attempt to combat ENOSPC by slowing down writes to the lcd if ENOSPC is
|
|
||||||
received. Unless that error occurs at least once, transfers are sent as normal.
|
|
||||||
* Add function to change keyboard backlight (independant of lcd backlight).
|
|
||||||
* Add re-initialising function, which will attempt to reconnect a keyboard
|
|
||||||
that was previously removed and replugged.
|
|
||||||
* libg15 now uses pthread mutexes to force sequential access to the bus via
|
|
||||||
libusb. Control message URBs are no longer being lost if sent by a different
|
|
||||||
thread in the middle of a screen transfer etc.
|
|
||||||
* Reset the keyboard before init to ensure correct initialisation on
|
|
||||||
kernels > 2.6.19
|
|
||||||
|
|
||||||
libg15 (1.1.1-1) edgy; urgency=low
|
* New upstream release
|
||||||
|
|
||||||
* Add basic support for the G11 keyboard
|
-- Giacomo Catenazzi <cate@debian.org> Wed, 22 Apr 2009 07:24:53 +0200
|
||||||
* revert all bulk transfers - bulk transfers are illegal for low-speed
|
|
||||||
devices, and cause -22 (EINVAL) warnings on new kernels.
|
|
||||||
* pass most errors to the client app.
|
|
||||||
|
|
||||||
-- Anthony J. Mirabella <mirabeaj@gmail.com> Fri, 15 Dec 2006 05:17:49 -0500
|
libg15 (1.2.6-1) unstable; urgency=low
|
||||||
|
|
||||||
libg15 (1.0-1) breezy; urgency=low
|
* New upstream release
|
||||||
|
|
||||||
* Initial release
|
-- Giacomo Catenazzi <cate@debian.org> Mon, 28 Jan 2008 07:58:11 +0100
|
||||||
|
|
||||||
-- Anthony J. Mirabella <mirabeaj@gmail.com> Sun, 24 Sep 2006 22:57:06 -0400
|
libg15 (1.2.5-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* New upstream release
|
||||||
|
|
||||||
|
-- Giacomo Catenazzi <cate@debian.org> Wed, 09 Jan 2008 08:06:33 +0100
|
||||||
|
|
||||||
|
libg15 (1.2.4-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* New upstream release
|
||||||
|
|
||||||
|
-- Giacomo Catenazzi <cate@debian.org> Tue, 18 Dec 2007 08:08:43 +0100
|
||||||
|
|
||||||
|
libg15 (1.2.3-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* New upstrem version: add support of new g15 keyboards
|
||||||
|
|
||||||
|
-- Giacomo Catenazzi <cate@debian.org> Thu, 15 Nov 2007 07:44:43 +0100
|
||||||
|
|
||||||
|
libg15 (1.2.2-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* Initial release
|
||||||
|
|
||||||
|
-- Giacomo Catenazzi <cate@debian.org> Mon, 27 Aug 2007 07:56:10 +0200
|
||||||
|
|
||||||
Vendored
+1
-1
@@ -1 +1 @@
|
|||||||
4
|
5
|
||||||
Vendored
+22
-15
@@ -1,21 +1,28 @@
|
|||||||
Source: libg15
|
Source: libg15
|
||||||
Priority: optional
|
|
||||||
Maintainer: Anthony J. Mirabella <mirabeaj@gmail.com>
|
|
||||||
Build-Depends: debhelper (>= 4.0.0), autotools-dev, libusb-dev
|
|
||||||
Standards-Version: 3.6.2
|
|
||||||
Section: libs
|
Section: libs
|
||||||
|
Priority: optional
|
||||||
|
Maintainer: Giacomo Catenazzi <cate@debian.org>
|
||||||
|
Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libusb-dev
|
||||||
|
Standards-Version: 3.8.1
|
||||||
|
Homepage: http://www.g15tools.com/
|
||||||
|
|
||||||
Package: libg15-dev
|
Package: libg15-1
|
||||||
Section: libdevel
|
|
||||||
Architecture: any
|
|
||||||
Depends: libg15 (= ${Source-Version})
|
|
||||||
Description: Development packages for libg15
|
|
||||||
Includes the files needed for developing software that uses libg15.
|
|
||||||
|
|
||||||
Package: libg15
|
|
||||||
Section: libs
|
Section: libs
|
||||||
Architecture: any
|
Architecture: any
|
||||||
Depends: ${shlibs:Depends}, ${misc:Depends}
|
Depends: ${shlibs:Depends}, ${misc:Depends}
|
||||||
Description: Library for interfacing with the Logitech G15 Keyboard
|
Description: Library for interfacing with the Logitech G15 keyboards
|
||||||
Provides for low-level control of the lcd and extra keys on the
|
libg15 provides an API for low level control of the LCD display and
|
||||||
Logitech G15 keyboard.
|
the extra keys on some Logitech keyboards (G11, G15)
|
||||||
|
.
|
||||||
|
This package contains the shared library and the runtime data.
|
||||||
|
|
||||||
|
Package: libg15-dev
|
||||||
|
Section: libdevel
|
||||||
|
Depends: libg15-1 (= ${binary:Version}), ${misc:Depends}
|
||||||
|
Architecture: any
|
||||||
|
Description: Library for interfacing with the Logitech G15 keyboards
|
||||||
|
libg15 provides an API for low level control of the LCD display and
|
||||||
|
the extra keys on some Logitech keyboards (G11, G15).
|
||||||
|
.
|
||||||
|
This package contains the header files and the static library.
|
||||||
|
|
||||||
Vendored
+25
-7
@@ -1,12 +1,30 @@
|
|||||||
This package was debianized by Anthony J. Mirabella <mirabeaj@gmail.com> on
|
This package was debianized by Giacomo A. Catenazzi <cate@debian.org> on
|
||||||
Sun, 24 Sep 2006 22:57:06 -0400.
|
Mon, 27 Aug 2007 07:56:10 +0200.
|
||||||
|
|
||||||
It was downloaded from sourceforge.net
|
It was downloaded from http://g15tools.sourceforge.net/
|
||||||
|
|
||||||
Copyright Holders: Philip Lawatsch <philip@lawatsch.at>
|
Upstream Authors:
|
||||||
Alex Ibrado <alex@ibrado.org>
|
|
||||||
Autotools support added by Anthony J. Mirabella <mirabeaj@gmail.com>
|
Philip Lawatsch <philip@lawatsch.at>
|
||||||
|
Alex Ibrado <alex@ibrado.org>
|
||||||
|
Anthony J. Mirabella <mirabeaj@gmail.com>
|
||||||
|
|
||||||
|
Copyright:
|
||||||
|
|
||||||
|
Copyright (C) 2006,2007 Philip Lawatsch <philip@lawatsch.at>
|
||||||
|
Alex Ibrado <alex@ibrado.org>
|
||||||
|
Anthony J. Mirabella <mirabeaj@gmail.com>
|
||||||
|
|
||||||
License:
|
License:
|
||||||
|
|
||||||
GPL
|
g15tools is free software; you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation; either version 2 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
License can be found in the file `/usr/share/common-licenses/GPL-2'.
|
||||||
|
|
||||||
|
|
||||||
|
The Debian packaging is (C) 2007, Giacomo A. Catenazzi <cate@debian.org> and
|
||||||
|
is licensed under the GPL v2 (or later), see `/usr/share/common-licenses/GPL-2'.
|
||||||
|
|
||||||
Vendored
+1
@@ -0,0 +1 @@
|
|||||||
|
debian/tmp/usr/lib/lib*.so.* usr/lib/
|
||||||
Vendored
+5
-6
@@ -1,6 +1,5 @@
|
|||||||
usr/include/*
|
debian/tmp/usr/include/* usr/include/
|
||||||
usr/lib/lib*.a
|
debian/tmp/usr/lib/lib*.a usr/lib/
|
||||||
usr/lib/lib*.so
|
debian/tmp/usr/lib/lib*.so usr/lib/
|
||||||
usr/lib/pkgconfig/*
|
debian/tmp/usr/lib/*.la usr/lib/
|
||||||
usr/lib/*.la
|
|
||||||
usr/share/pkgconfig/*
|
|
||||||
Vendored
+5
-112
@@ -1,115 +1,8 @@
|
|||||||
#!/usr/bin/make -f
|
#!/usr/bin/make -f
|
||||||
# -*- makefile -*-
|
|
||||||
# Sample debian/rules that uses debhelper.
|
DEB_DH_MAKESHLIBS_ARGS_libg15 := --version-info
|
||||||
# This file was originally written by Joey Hess and Craig Small.
|
|
||||||
# As a special exception, when this file is copied by dh-make into a
|
|
||||||
# dh-make output file, you may use that output file without restriction.
|
|
||||||
# This special exception was added by Craig Small in version 0.37 of dh-make.
|
|
||||||
|
|
||||||
# Uncomment this to turn on verbose mode.
|
include /usr/share/cdbs/1/rules/debhelper.mk
|
||||||
#export DH_VERBOSE=1
|
include /usr/share/cdbs/1/class/autotools.mk
|
||||||
|
|
||||||
|
DEB_CONFIGURE_EXTRA_FLAGS = --quiet
|
||||||
# These are used for cross-compiling and for saving the configure script
|
|
||||||
# from having to guess our platform (since we know it already)
|
|
||||||
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
|
|
||||||
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
|
|
||||||
|
|
||||||
|
|
||||||
CFLAGS = -Wall -g
|
|
||||||
|
|
||||||
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
|
|
||||||
CFLAGS += -O0
|
|
||||||
else
|
|
||||||
CFLAGS += -O2
|
|
||||||
endif
|
|
||||||
|
|
||||||
# shared library versions, option 1
|
|
||||||
version=1.0.0
|
|
||||||
major=1
|
|
||||||
# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
|
|
||||||
#version=`ls src/.libs/lib*.so.* | \
|
|
||||||
# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
|
|
||||||
#major=`ls src/.libs/lib*.so.* | \
|
|
||||||
# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
|
|
||||||
|
|
||||||
config.status: configure
|
|
||||||
dh_testdir
|
|
||||||
# Add here commands to configure the package.
|
|
||||||
CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
|
|
||||||
|
|
||||||
|
|
||||||
build: build-stamp
|
|
||||||
build-stamp: config.status
|
|
||||||
dh_testdir
|
|
||||||
|
|
||||||
# Add here commands to compile the package.
|
|
||||||
$(MAKE)
|
|
||||||
|
|
||||||
touch build-stamp
|
|
||||||
|
|
||||||
clean:
|
|
||||||
dh_testdir
|
|
||||||
dh_testroot
|
|
||||||
rm -f build-stamp
|
|
||||||
|
|
||||||
# Add here commands to clean up after the build process.
|
|
||||||
-$(MAKE) distclean
|
|
||||||
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
|
|
||||||
cp -f /usr/share/misc/config.sub config.sub
|
|
||||||
endif
|
|
||||||
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
|
|
||||||
cp -f /usr/share/misc/config.guess config.guess
|
|
||||||
endif
|
|
||||||
|
|
||||||
|
|
||||||
dh_clean
|
|
||||||
|
|
||||||
install: build
|
|
||||||
dh_testdir
|
|
||||||
dh_testroot
|
|
||||||
dh_clean -k
|
|
||||||
dh_installdirs -plibg15
|
|
||||||
dh_installdirs -plibg15-dev
|
|
||||||
|
|
||||||
# Add here commands to install the package into debian/tmp
|
|
||||||
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
|
|
||||||
|
|
||||||
|
|
||||||
# Build architecture-independent files here.
|
|
||||||
binary-indep: build install
|
|
||||||
# We have nothing to do by default.
|
|
||||||
|
|
||||||
# Build architecture-dependent files here.
|
|
||||||
binary-arch: build install
|
|
||||||
dh_testdir -a
|
|
||||||
dh_testroot -a
|
|
||||||
dh_installchangelogs ChangeLog -a
|
|
||||||
dh_installdocs -a
|
|
||||||
dh_installexamples -a
|
|
||||||
dh_install -a --sourcedir=debian/tmp
|
|
||||||
dh_installmenu -a
|
|
||||||
dh_installdebconf -a
|
|
||||||
dh_installlogrotate -a
|
|
||||||
dh_installemacsen -a
|
|
||||||
dh_installpam -a
|
|
||||||
dh_installmime -a
|
|
||||||
dh_installinit -a
|
|
||||||
dh_installcron -a
|
|
||||||
dh_installinfo -a
|
|
||||||
dh_installman -a
|
|
||||||
dh_link -a
|
|
||||||
dh_strip -a
|
|
||||||
dh_compress -a
|
|
||||||
dh_fixperms -a
|
|
||||||
# dh_perl -a
|
|
||||||
# dh_python -a
|
|
||||||
dh_makeshlibs -a
|
|
||||||
dh_installdeb -a
|
|
||||||
dh_shlibdeps -a
|
|
||||||
dh_gencontrol -a
|
|
||||||
dh_md5sums -a
|
|
||||||
dh_builddeb -a
|
|
||||||
|
|
||||||
binary: binary-indep binary-arch
|
|
||||||
.PHONY: build clean binary-indep binary-arch binary install
|
|
||||||
Vendored
+7
@@ -0,0 +1,7 @@
|
|||||||
|
# See uscan(1) for format
|
||||||
|
|
||||||
|
# Compulsory line, this is a version 3 file
|
||||||
|
version=3
|
||||||
|
|
||||||
|
http://sf.net/g15tools libg15-(.*)\.tar\.gz
|
||||||
|
|
||||||
@@ -12,12 +12,12 @@
|
|||||||
GNU General Public License for more details.
|
GNU General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with g15lcd; if not, write to the Free Software
|
along with libg15; if not, write to the Free Software
|
||||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
|
||||||
(c) 2006 - 2007 The G15tools Project - g15tools.sf.net
|
(c) 2006-2007 The G15tools Project - g15tools.sf.net
|
||||||
|
|
||||||
$Revision: 270 $ - $Date: 2007-11-25 15:32:03 +1030 (Sun, 25 Nov 2007) $ $Author: mlampard $
|
$Revision: 292 $ - $Date: 2008-11-11 08:51:25 -0500 (Tue, 11 Nov 2008) $ $Author: aneurysm9 $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
@@ -27,6 +27,7 @@
|
|||||||
#include <usb.h>
|
#include <usb.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
static usb_dev_handle *keyboard_device = 0;
|
static usb_dev_handle *keyboard_device = 0;
|
||||||
static int libg15_debugging_enabled = 0;
|
static int libg15_debugging_enabled = 0;
|
||||||
@@ -38,7 +39,6 @@ static int g15_keys_endpoint = 0;
|
|||||||
static int g15_lcd_endpoint = 0;
|
static int g15_lcd_endpoint = 0;
|
||||||
static pthread_mutex_t libusb_mutex;
|
static pthread_mutex_t libusb_mutex;
|
||||||
|
|
||||||
|
|
||||||
/* to add a new device, simply create a new DEVICE() in this list */
|
/* to add a new device, simply create a new DEVICE() in this list */
|
||||||
/* Fields are: "Name",VendorID,ProductID,Capabilities */
|
/* Fields are: "Name",VendorID,ProductID,Capabilities */
|
||||||
const libg15_devices_t g15_devices[] = {
|
const libg15_devices_t g15_devices[] = {
|
||||||
@@ -46,6 +46,7 @@ const libg15_devices_t g15_devices[] = {
|
|||||||
DEVICE("Logitech G11",0x46d,0xc225,G15_KEYS),
|
DEVICE("Logitech G11",0x46d,0xc225,G15_KEYS),
|
||||||
DEVICE("Logitech Z-10",0x46d,0x0a07,G15_LCD|G15_KEYS|G15_DEVICE_IS_SHARED),
|
DEVICE("Logitech Z-10",0x46d,0x0a07,G15_LCD|G15_KEYS|G15_DEVICE_IS_SHARED),
|
||||||
DEVICE("Logitech G15 v2",0x46d,0xc227,G15_LCD|G15_KEYS|G15_DEVICE_5BYTE_RETURN),
|
DEVICE("Logitech G15 v2",0x46d,0xc227,G15_LCD|G15_KEYS|G15_DEVICE_5BYTE_RETURN),
|
||||||
|
DEVICE("Logitech Gamepanel",0x46d,0xc251,G15_LCD|G15_KEYS|G15_DEVICE_IS_SHARED),
|
||||||
DEVICE(NULL,0,0,0)
|
DEVICE(NULL,0,0,0)
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -301,7 +302,13 @@ int initLibG15()
|
|||||||
retval = initLibUsb();
|
retval = initLibUsb();
|
||||||
if (retval)
|
if (retval)
|
||||||
return retval;
|
return retval;
|
||||||
|
|
||||||
|
g15_log(stderr,G15_LOG_INFO,"%s\n",PACKAGE_STRING);
|
||||||
|
|
||||||
|
#ifdef SUN_LIBUSB
|
||||||
|
g15_log(stderr,G15_LOG_INFO,"Using Sun libusb.\n");
|
||||||
|
#endif
|
||||||
|
|
||||||
g15NumberOfConnectedDevices();
|
g15NumberOfConnectedDevices();
|
||||||
|
|
||||||
keyboard_device = findAndOpenG15();
|
keyboard_device = findAndOpenG15();
|
||||||
@@ -317,8 +324,10 @@ int exitLibG15()
|
|||||||
{
|
{
|
||||||
int retval = G15_NO_ERROR;
|
int retval = G15_NO_ERROR;
|
||||||
if (keyboard_device){
|
if (keyboard_device){
|
||||||
|
#ifndef SUN_LIBUSB
|
||||||
retval = usb_release_interface (keyboard_device, 0);
|
retval = usb_release_interface (keyboard_device, 0);
|
||||||
usleep(50*1000);
|
usleep(50*1000);
|
||||||
|
#endif
|
||||||
#if 0
|
#if 0
|
||||||
retval = usb_reset(keyboard_device);
|
retval = usb_reset(keyboard_device);
|
||||||
usleep(50*1000);
|
usleep(50*1000);
|
||||||
@@ -411,6 +420,7 @@ static void dumpPixmapIntoLCDFormat(unsigned char *lcd_buffer, unsigned char con
|
|||||||
}
|
}
|
||||||
|
|
||||||
int handle_usb_errors(const char *prefix, int ret) {
|
int handle_usb_errors(const char *prefix, int ret) {
|
||||||
|
|
||||||
switch (ret){
|
switch (ret){
|
||||||
case -ETIMEDOUT:
|
case -ETIMEDOUT:
|
||||||
return G15_ERROR_READING_USB_DEVICE; /* backward-compatibility */
|
return G15_ERROR_READING_USB_DEVICE; /* backward-compatibility */
|
||||||
@@ -425,7 +435,7 @@ int handle_usb_errors(const char *prefix, int ret) {
|
|||||||
case -EAGAIN: /* try again */
|
case -EAGAIN: /* try again */
|
||||||
case -EFBIG: /* too many frames to handle */
|
case -EFBIG: /* too many frames to handle */
|
||||||
case -EMSGSIZE: /* msgsize is invalid */
|
case -EMSGSIZE: /* msgsize is invalid */
|
||||||
g15_log(stderr,G15_LOG_INFO,"usb error: %s (%i)\n",prefix,ret);
|
g15_log(stderr,G15_LOG_INFO,"usb error: %s %s (%i)\n",prefix,usb_strerror(),ret);
|
||||||
break;
|
break;
|
||||||
case -EPIPE: /* endpoint is stalled */
|
case -EPIPE: /* endpoint is stalled */
|
||||||
g15_log(stderr,G15_LOG_INFO,"usb error: %s EPIPE! clearing...\n",prefix);
|
g15_log(stderr,G15_LOG_INFO,"usb error: %s EPIPE! clearing...\n",prefix);
|
||||||
@@ -434,7 +444,7 @@ int handle_usb_errors(const char *prefix, int ret) {
|
|||||||
pthread_mutex_unlock(&libusb_mutex);
|
pthread_mutex_unlock(&libusb_mutex);
|
||||||
break;
|
break;
|
||||||
default: /* timed out */
|
default: /* timed out */
|
||||||
g15_log(stderr,G15_LOG_INFO,"Unknown usb error: %s !! (err is %i)\n",prefix,ret);
|
g15_log(stderr,G15_LOG_INFO,"Unknown usb error: %s !! (err is %i (%s))\n",prefix,ret,usb_strerror());
|
||||||
}
|
}
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
@@ -461,7 +471,9 @@ int writePixmapToLCD(unsigned char const *data)
|
|||||||
I'm not sure how successful this will be in combatting ENOSPC, but we'll give it try in the real-world. */
|
I'm not sure how successful this will be in combatting ENOSPC, but we'll give it try in the real-world. */
|
||||||
|
|
||||||
if(enospc_slowdown != 0){
|
if(enospc_slowdown != 0){
|
||||||
|
#ifndef LIBUSB_BLOCKS
|
||||||
pthread_mutex_lock(&libusb_mutex);
|
pthread_mutex_lock(&libusb_mutex);
|
||||||
|
#endif
|
||||||
for(transfercount = 0;transfercount<=31;transfercount++){
|
for(transfercount = 0;transfercount<=31;transfercount++){
|
||||||
ret = usb_interrupt_write(keyboard_device, g15_lcd_endpoint, (char*)lcd_buffer+(32*transfercount), 32, 1000);
|
ret = usb_interrupt_write(keyboard_device, g15_lcd_endpoint, (char*)lcd_buffer+(32*transfercount), 32, 1000);
|
||||||
if (ret != 32)
|
if (ret != 32)
|
||||||
@@ -471,12 +483,18 @@ int writePixmapToLCD(unsigned char const *data)
|
|||||||
}
|
}
|
||||||
usleep(100);
|
usleep(100);
|
||||||
}
|
}
|
||||||
|
#ifndef LIBUSB_BLOCKS
|
||||||
pthread_mutex_unlock(&libusb_mutex);
|
pthread_mutex_unlock(&libusb_mutex);
|
||||||
|
#endif
|
||||||
}else{
|
}else{
|
||||||
/* transfer entire buffer in one hit */
|
/* transfer entire buffer in one hit */
|
||||||
|
#ifdef LIBUSB_BLOCKS
|
||||||
|
ret = usb_interrupt_write(keyboard_device, g15_lcd_endpoint, (char*)lcd_buffer, G15_BUFFER_LEN, 1000);
|
||||||
|
#else
|
||||||
pthread_mutex_lock(&libusb_mutex);
|
pthread_mutex_lock(&libusb_mutex);
|
||||||
ret = usb_interrupt_write(keyboard_device, g15_lcd_endpoint, (char*)lcd_buffer, G15_BUFFER_LEN, 1000);
|
ret = usb_interrupt_write(keyboard_device, g15_lcd_endpoint, (char*)lcd_buffer, G15_BUFFER_LEN, 1000);
|
||||||
pthread_mutex_unlock(&libusb_mutex);
|
pthread_mutex_unlock(&libusb_mutex);
|
||||||
|
#endif
|
||||||
if (ret != G15_BUFFER_LEN)
|
if (ret != G15_BUFFER_LEN)
|
||||||
{
|
{
|
||||||
handle_usb_errors ("LCDPixmap Write",ret);
|
handle_usb_errors ("LCDPixmap Write",ret);
|
||||||
@@ -593,7 +611,7 @@ static unsigned char g15KeyToLogitechKeyCode(int key)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void processKeyEvent8Byte(unsigned int *pressed_keys, unsigned char *buffer)
|
static void processKeyEvent9Byte(unsigned int *pressed_keys, unsigned char *buffer)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
@@ -747,33 +765,28 @@ static void processKeyEvent5Byte(unsigned int *pressed_keys, unsigned char *buff
|
|||||||
|
|
||||||
int getPressedKeys(unsigned int *pressed_keys, unsigned int timeout)
|
int getPressedKeys(unsigned int *pressed_keys, unsigned int timeout)
|
||||||
{
|
{
|
||||||
unsigned char buffer[9];
|
unsigned char buffer[G15_KEY_READ_LENGTH];
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
#ifdef LIBUSB_BLOCKS
|
||||||
|
ret = usb_interrupt_read(keyboard_device, g15_keys_endpoint, (char*)buffer, G15_KEY_READ_LENGTH, timeout);
|
||||||
|
#else
|
||||||
pthread_mutex_lock(&libusb_mutex);
|
pthread_mutex_lock(&libusb_mutex);
|
||||||
ret = usb_interrupt_read(keyboard_device, g15_keys_endpoint, (char*)buffer, 9, timeout);
|
ret = usb_interrupt_read(keyboard_device, g15_keys_endpoint, (char*)buffer, G15_KEY_READ_LENGTH, timeout);
|
||||||
pthread_mutex_unlock(&libusb_mutex);
|
pthread_mutex_unlock(&libusb_mutex);
|
||||||
|
#endif
|
||||||
|
if(ret>0) {
|
||||||
|
if(buffer[0] == 1)
|
||||||
|
return G15_ERROR_TRY_AGAIN;
|
||||||
|
}
|
||||||
|
|
||||||
if(g15DeviceCapabilities() & G15_DEVICE_5BYTE_RETURN) { /* new 5byte protocol */
|
switch(ret) {
|
||||||
if (buffer[0] == 1)
|
case 5:
|
||||||
return G15_ERROR_TRY_AGAIN;
|
processKeyEvent5Byte(pressed_keys, buffer);
|
||||||
if (ret == 5) {
|
|
||||||
|
|
||||||
processKeyEvent5Byte(pressed_keys, buffer);
|
|
||||||
|
|
||||||
return G15_NO_ERROR;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (ret == 9)
|
|
||||||
{
|
|
||||||
if (buffer[0] == 1)
|
|
||||||
return G15_ERROR_TRY_AGAIN;
|
|
||||||
|
|
||||||
processKeyEvent8Byte(pressed_keys, buffer);
|
|
||||||
|
|
||||||
return G15_NO_ERROR;
|
return G15_NO_ERROR;
|
||||||
}
|
case 9:
|
||||||
|
processKeyEvent9Byte(pressed_keys, buffer);
|
||||||
|
return G15_NO_ERROR;
|
||||||
|
default:
|
||||||
|
return handle_usb_errors("Keyboard Read", ret); /* allow the app to deal with errors */
|
||||||
}
|
}
|
||||||
return handle_usb_errors("Keyboard Read", ret); /* allow the app to deal with errors */
|
|
||||||
}
|
}
|
||||||
@@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
(c) 2006 - 2007 The G15tools Project - g15tools.sf.net
|
(c) 2006 - 2007 The G15tools Project - g15tools.sf.net
|
||||||
|
|
||||||
$Revision: 266 $ - $Date: 2007-11-25 13:32:23 +1030 (Sun, 25 Nov 2007) $ $Author: mlampard $
|
$Revision: 292 $ - $Date: 2008-11-11 08:51:25 -0500 (Tue, 11 Nov 2008) $ $Author: aneurysm9 $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _LIBG15_H_
|
#ifndef _LIBG15_H_
|
||||||
@@ -33,6 +33,8 @@ extern "C"
|
|||||||
#define G15_DEVICE_IS_SHARED 4
|
#define G15_DEVICE_IS_SHARED 4
|
||||||
#define G15_DEVICE_5BYTE_RETURN 8
|
#define G15_DEVICE_5BYTE_RETURN 8
|
||||||
|
|
||||||
|
#define G15_KEY_READ_LENGTH 9
|
||||||
|
|
||||||
typedef struct libg15_devices_t libg15_devices_t;
|
typedef struct libg15_devices_t libg15_devices_t;
|
||||||
|
|
||||||
struct libg15_devices_t {
|
struct libg15_devices_t {
|
||||||
|
|||||||
+2
-2
@@ -3,11 +3,11 @@
|
|||||||
%define prefix /usr
|
%define prefix /usr
|
||||||
Summary: library to control logitech G15 keyboards
|
Summary: library to control logitech G15 keyboards
|
||||||
Name: libg15
|
Name: libg15
|
||||||
Version: 1.2.4
|
Version: 1.2.7
|
||||||
Release: 1
|
Release: 1
|
||||||
Copyright: GPL
|
Copyright: GPL
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
Source: http://prdownloads.sourceforge.net/g15tools/libg15-1.2.4.tar.bz2
|
Source: http://prdownloads.sourceforge.net/g15tools/libg15-1.2.7.tar.bz2
|
||||||
URL: http://sourceforge.net/projects/g15tools
|
URL: http://sourceforge.net/projects/g15tools
|
||||||
Distribution: Linux
|
Distribution: Linux
|
||||||
Vendor: NONE
|
Vendor: NONE
|
||||||
|
|||||||
Reference in new issue
Block a user