Permalink
Browse files

Load /tmp/tmp.L3oKef/opensc-0.9.6 into

branches/opensc/upstream/current.
  • Loading branch information...
zedinosaur committed Apr 26, 2005
1 parent e5d7cfe commit 1714cfbf56a26a5cc64e806c1f927d5280641f61
Showing with 2,120 additions and 7,652 deletions.
  1. +42 −64 ANNOUNCE
  2. +5 −2 Makefile.am
  3. +9 −3 Makefile.in
  4. +32 −11 NEWS
  5. +7 −4 PAM_README
  6. +11 −11 QUICKSTART
  7. +57 −0 acinclude.m4
  8. +57 −58 aclocal.m4
  9. +1 −1 aclocal/Makefile.am
  10. +3 −1 aclocal/Makefile.in
  11. +57 −0 aclocal/pkg.m4
  12. +26 −6 config.guess
  13. +3 −0 config.h.in
  14. +22 −8 config.sub
  15. +272 −170 configure
  16. +178 −123 configure.in
  17. +2 −0 docs/Makefile.in
  18. +1 −1 docs/doxygen.conf
  19. +1 −1 docs/pkcs-15v1_1.asn
  20. +0 −475 docs/usbtoken.html
  21. +0 −390 docs/usbtoken.xml
  22. +6 −2 etc/Makefile.am
  23. +15 −27 etc/Makefile.in
  24. +18 −1 etc/{opensc.conf.example → opensc.conf.in}
  25. 0 etc/{scldap.conf.example → scldap.conf.in}
  26. +4 −8 ltmain.sh
  27. +2 −0 macos/Makefile.in
  28. +1 −1 macos/libtool-bundle
  29. +39 −0 solaris/Makefile
  30. +13 −0 solaris/README
  31. +9 −0 solaris/checkinstall.in
  32. +286 −0 solaris/opensc.conf-dist
  33. +12 −0 solaris/pkginfo.in
  34. +137 −0 solaris/proto
  35. +1 −1 src/Makefile.am
  36. +3 −1 src/Makefile.in
  37. +2 −0 src/common/Makefile.in
  38. +2 −0 src/include/Makefile.in
  39. +2 −0 src/include/opensc/Makefile.in
  40. +2 −0 src/include/opensc/rsaref/Makefile.in
  41. +1 −8 src/include/winconfig.h
  42. +7 −4 src/libopensc/Makefile.am
  43. +31 −11 src/libopensc/Makefile.in
  44. +1 −0 src/libopensc/Makefile.mak
  45. +9 −7 src/libopensc/asn1.c
  46. +4 −0 src/libopensc/card-etoken.c
  47. +4 −0 src/libopensc/card-flex.c
  48. +2 −2 src/libopensc/card-mcrd.c
  49. +43 −24 src/libopensc/ctx.c
  50. +1 −1 src/libopensc/libopensc.pc.in
  51. +11 −0 src/libopensc/libpkcs15init.pc.in
  52. +11 −0 src/libopensc/libscam.pc.in
  53. +11 −0 src/libopensc/libscconf.pc.in
  54. +11 −0 src/libopensc/libscldap.pc.in
  55. +4 −2 src/libopensc/opensc.h
  56. +2 −1 src/libopensc/padding.c
  57. +155 −0 src/libopensc/pinpad-ccid.c
  58. +32 −0 src/libopensc/pinpad-ccid.h
  59. +1 −0 src/libopensc/pkcs15-cert.c
  60. +6 −6 src/libopensc/pkcs15-esteid.c
  61. +1 −1 src/libopensc/pkcs15-infocamere.c
  62. +2 −3 src/libopensc/pkcs15-netkey.c
  63. +1 −1 src/libopensc/pkcs15-openpgp.c
  64. +2 −2 src/libopensc/pkcs15-pubkey.c
  65. +1 −2 src/libopensc/pkcs15-starcert.c
  66. +7 −8 src/libopensc/pkcs15-syn.c
  67. +1 −1 src/libopensc/reader-ctapi.c
  68. +2 −2 src/libopensc/reader-openct.c
  69. +68 −26 src/libopensc/reader-pcsc.c
  70. +0 −351 src/libopensc/reader-usbtoken.c
  71. +0 −15 src/openscd/Makefile.am
  72. +0 −487 src/openscd/Makefile.in
  73. +0 −361 src/openscd/commands.c
  74. +0 −103 src/openscd/mkdtemp.c
  75. +0 −156 src/openscd/openscd.c
  76. +0 −53 src/openscd/openscd.h
  77. +0 −45 src/openscd/test.c
  78. +2 −0 src/openssh/Makefile.in
  79. +1 −1 src/pam/Makefile.am
  80. +5 −2 src/pam/Makefile.in
  81. +1 −1 src/pam/misc_conv.c
  82. +1 −1 src/pam/pam_opensc.c
  83. +1 −1 src/pam/pam_support.c
  84. +1 −1 src/pam/pam_support.h
  85. +1 −1 src/pam/test-pam.c
  86. +2 −0 src/pkcs11/Makefile.in
  87. +68 −22 src/pkcs11/framework-pkcs15.c
  88. +2 −2 src/pkcs11/pkcs11-global.c
  89. +1 −0 src/pkcs11/pkcs11-spy.c
  90. +2 −0 src/pkcs11/rsaref/Makefile.in
  91. +2 −2 src/pkcs15init/Makefile.am
  92. +7 −3 src/pkcs15init/Makefile.in
  93. +0 −5 src/pkcs15init/TODO
  94. +3 −3 src/pkcs15init/etoken.profile
  95. +0 −108 src/pkcs15init/flex_onepin.profile
  96. +0 −106 src/pkcs15init/flex_so.profile
  97. +5 −5 src/pkcs15init/gpk.profile
  98. +0 −98 src/pkcs15init/pkcs15-small.profile
  99. +35 −59 src/pkcs15init/profile.c
  100. +0 −3 src/pkcs15init/profile.h
  101. +2 −0 src/scam/Makefile.in
  102. +1 −1 src/scam/cert_support.c
  103. +1 −1 src/scam/cert_support.h
  104. +1 −1 src/scam/p15_eid.c
  105. +1 −1 src/scam/p15_ldap.c
  106. +1 −1 src/scam/scam.c
  107. +1 −1 src/scam/scam.h
  108. +2 −0 src/scconf/Makefile.in
  109. +1 −1 src/scconf/internal.h
  110. +0 −1,632 src/scconf/lex-parse.c
  111. +1 −1 src/scconf/lex-parse.l
  112. +1 −1 src/scconf/parse.c
  113. +1 −1 src/scconf/scconf.c
  114. +1 −1 src/scconf/scconf.h
  115. +1 −1 src/scconf/sclex.c
  116. +1 −1 src/scconf/test-conf.c
  117. +1 −1 src/scconf/write.c
  118. +2 −0 src/scdl/Makefile.in
  119. +2 −0 src/scldap/Makefile.in
  120. +1 −1 src/scldap/scldap.c
  121. +1 −1 src/scldap/scldap.h
  122. +1 −1 src/scldap/test-ldap.c
  123. +2 −0 src/scrandom/Makefile.in
  124. +1 −1 src/scrandom/scrandom.c
  125. +1 −1 src/scrandom/scrandom.h
  126. +1 −1 src/scrandom/test-random.c
  127. +1 −1 src/sia/Makefile.am
  128. +5 −2 src/sia/Makefile.in
  129. +1 −1 src/sia/sia_opensc.c
  130. +1 −1 src/sia/sia_support.c
  131. +1 −1 src/sia/sia_support.h
  132. +1 −1 src/sia/test-sia.c
  133. +2 −0 src/signer/Makefile.in
  134. +2 −0 src/signer/npinclude/Makefile.in
  135. +1 −1 src/signer/npinclude/npapi.h
  136. +1 −1 src/signer/npinclude/npupp.h
  137. +14 −4 src/signer/opensc-crypto.c
  138. +2 −0 src/sslengines/Makefile.in
  139. +39 −12 src/sslengines/engine_opensc.c
  140. +3 −0 src/sslengines/engine_opensc.h
  141. +2 −1 src/sslengines/engine_pkcs11.c
  142. +4 −4 src/sslengines/engine_pkcs11.def
  143. +7 −0 src/sslengines/hw_opensc.c
  144. +1 −1 src/tests/Makefile.am
  145. +5 −2 src/tests/Makefile.in
  146. +2 −0 src/tests/regression/Makefile.in
  147. +1 −1 src/tools/Makefile.am
  148. +5 −2 src/tools/Makefile.in
  149. +40 −12 src/tools/pkcs11-tool.c
  150. +0 −12 src/usbtoken/DEPRECATED
  151. +0 −12 src/usbtoken/Makefile.am
  152. +0 −399 src/usbtoken/Makefile.in
  153. +0 −274 src/usbtoken/atr.c
  154. +0 −158 src/usbtoken/etoken.c
  155. +0 −148 src/usbtoken/eutron.c
  156. +0 −182 src/usbtoken/ikey2k.c
  157. +0 −160 src/usbtoken/ikey3k.c
  158. +0 −152 src/usbtoken/main.c
  159. +0 −50 src/usbtoken/pid.c
  160. +0 −184 src/usbtoken/socket.c
  161. +0 −545 src/usbtoken/t1.c
  162. +0 −91 src/usbtoken/usb.c
  163. +0 −73 src/usbtoken/usbtoken.h
  164. 0 stamp-h.in
  165. +2 −0 win32/Makefile.in
  166. +35 −35 win32/version.rc
View
106 ANNOUNCE
@@ -1,66 +1,44 @@
-OpenSC Release 0.9.4
+OpenSC Release 0.9.6
====================
-We are pleased to announce the availability of OpenSC 0.9.4.
-
-OpenSC provides a set of libraries and utilities to access smart
-cards. Its main focus is on cards that support cryptographic operations,
-and facilitate their use in security applications such as mail encryption,
-authentication, and digital signature.
-
-OpenSC can be used with the following applications and libraries:
-
- - Netscape Communicator and Mozilla (through its PKCS#11 module),
- for secure email (S/MIME) and SSL authentication
- - OpenSSH, for user authentication
- - FreeSWAN, StrongSWAN and OpenSWAN,
- for authentication and key management
- - OpenSSL, for key and certificate storage, key generation and
- signing of certificate requests
- - GNUpg 1.9 (experimental), for key storage
- - Smart card login, through a PAM module
- - Using the included utilities, to perform RSA decryption and
- digital signing
-
-OpenSC is capable of personalizing various types of smart cards, but
-also works with personalized cards such as the Finnish FINEID.
-
-OpenSC can currently be used on Linux, Windows and MacOS X. It supports
-PC/SC, CT-API and OpenCT to talk to card terminals.
-
-
-
-Supported Hardware
-==================
-
-The following card operating systems are supported at the moment (where
-read-only means that personalized cards can be used, but OpenSC does not
-provide personalization support for these).
-
- - CardOS/M4 (Aladdin eToken PRO, etc)
- - Schlumberger/Axalto Cryptoflex and Cyberflex
- - IBM JCOP
- - Starcos SPK
- - Oberthur AuthentIC v5
- - Estonian ID card (read-only)
- - MioCOS (read-only)
- - Setcos (read-only)
- - TCOS (read-only)
-
-
-
-
-Download
-========
-Source code is available from http://www.opensc.org/
-
-A binary package for Windows is available as well.
-
-
-
-Mailing List
-============
-
-There is a mailing list (opensc-devel) for users and developers of
-OpenSC. For subscription instructions, please visit http://www.opensc.org.
-
+We are pleased to announce the availability of OpenSC 0.9.6.
+
+This new releases fixes many small issues found in the last six months.
+The bigger changes are:
+ - you need to have an opensc.conf config file. On Unix this is
+ $(sysconfdir)/opensc.conf depending on your --configure option.
+ Users can have their own config file by setting the OPENSC_CONF
+ evironment variable. On windows either the registry key
+ HKLM\Software\OpenSC\ConfigFile or HKLU\Software\OpenSC\ConfigFile
+ needs to be set and point to your config file.
+ - your config file needs to have a "profile_dir" setting pointing
+ to the installation directory with the "*.profile" files.
+ Under Unix/Linux the configure script will create an etc/opensc.conf
+ file for your with the right directory in it, simply copy it to
+ your $(sysconfdir).
+ - There is a new project "smart card bundle" to create a simple windows
+ installer package containing OpenSSL, OpenSC and Putty with smart card
+ patches, so you can simply download, install, and start using smart cards.
+ For more information, visit our new webpage for this project
+ http://www.opensc.org/scb/
+
+Also in the last few months opensc.org moved to subversion.
+Our repository is available at
+ http://www.opensc.org/svn/opensc/releases/opensc-0.9.6
+ http://www.opensc.org/svn/opensc/trunk
+
+In addition you can browse the repository, edit our wiki and report bugs at
+ http://www.opensc.org/opensc/
+
+OpenSC has now these mailing lists:
+ opensc-announce
+ opensc-user
+ opensc-devel
+ opensc-commits
+
+We consider OpenSC 0.9.6 to be the best version of OpenSC available and
+recommend to update to this version. OpenSC 0.9.6 is available at
+ http://www.opensc.org/files/opensc-0.9.6.tar.gz
+
+Yours,
+The OpenSC Project Team...
View
@@ -2,7 +2,10 @@
SUBDIRS = . aclocal docs etc macos src win32
-EXTRA_DIST = ANNOUNCE CodingStyle PAM_README QUICKSTART README bootstrap Makefile.mak depcomp
+EXTRA_DIST = ANNOUNCE CodingStyle PAM_README QUICKSTART README \
+ bootstrap Makefile.mak depcomp \
+ solaris/Makefile solaris/README solaris/checkinstall.in \
+ solaris/opensc.conf-dist solaris/pkginfo.in solaris/proto
MAINTAINERCLEANFILES = \
Makefile.in config.h.in configure \
@@ -12,4 +15,4 @@ MAINTAINERCLEANFILES = \
DEPCLEANFILES = config.log configure
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.5
View
@@ -89,6 +89,8 @@ HAVE_PCSC_FALSE = @HAVE_PCSC_FALSE@
HAVE_PCSC_TRUE = @HAVE_PCSC_TRUE@
HAVE_SIA_FALSE = @HAVE_SIA_FALSE@
HAVE_SIA_TRUE = @HAVE_SIA_TRUE@
+HAVE_SSLHACK_FALSE = @HAVE_SSLHACK_FALSE@
+HAVE_SSLHACK_TRUE = @HAVE_SSLHACK_TRUE@
HAVE_SSL_FALSE = @HAVE_SSL_FALSE@
HAVE_SSL_TRUE = @HAVE_SSL_TRUE@
INSTALL_DATA = @INSTALL_DATA@
@@ -195,7 +197,11 @@ target_alias = @target_alias@
SUBDIRS = . aclocal docs etc macos src win32
-EXTRA_DIST = ANNOUNCE CodingStyle PAM_README QUICKSTART README bootstrap Makefile.mak depcomp
+EXTRA_DIST = ANNOUNCE CodingStyle PAM_README QUICKSTART README \
+ bootstrap Makefile.mak depcomp \
+ solaris/Makefile solaris/README solaris/checkinstall.in \
+ solaris/opensc.conf-dist solaris/pkginfo.in solaris/proto
+
MAINTAINERCLEANFILES = \
Makefile.in config.h.in configure \
@@ -206,7 +212,7 @@ MAINTAINERCLEANFILES = \
DEPCLEANFILES = config.log configure
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.5
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -413,7 +419,7 @@ distcleancheck_listfiles = find . -type f -print
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
- $(mkinstalldirs) $(distdir)/docs $(distdir)/src/libopensc
+ $(mkinstalldirs) $(distdir)/docs $(distdir)/solaris $(distdir)/src/libopensc
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
View
43 NEWS
@@ -1,25 +1,46 @@
NEWS for OpenSC -- History of user visible changes
-New in 0.9.4; 2004-10-31; Andreas Jellinghaus
-* library version was broken in 0.9.3
-* update library version to 1:0:0, as we are no longer
+New in 0.9.6; not yet released;
+* undo user_content changes to retain compatibility with 0.9.4.
+* add solaris/ files for easier installation on solaris.
+* Makefile.am: require automake 1.5
+* free() fixes in some card drivers.
+* fix autoconf configure code.
+
+New in 0.9.5; 2005-01-11; Andreas Jellinghaus:
+* Big rewrite of the autoconf code for openssl. This fixes bugs on Mac OS X
+ and we hope it doesn't break any other system. Feedback is very welcome.
+* The flags object attribute changed to a bitfield.
+* Many small bugfixes, including memory leaks.
+* Changes to the etoken and gpk profiles to eleminate overlapping file ids.
+* pinpad code by Martin Paljak
+* add user_consent parameter to pkcs15emu add object/add prkey functions.
+* estid provide user_consent parameter.
+* add fflush to pkcs11-spy.c
+* set version in configure.in, src/pkcs11/pkcs11-global.c,
+ win32/version.rc and src/include/winconfig.h
+
+New in 0.9.4; 2004-10-31; Andreas Jellinghaus:
+* Library version was broken in 0.9.3.
+* Update library version to 1:0:0, as we are no longer
compatible with the 0:*:* line, I fear.
-New in 0.9.3; 2004-10-31; Andreas Jellinghaus
-* fix some LDFLAGS/LDADD issues for parallel build.
+New in 0.9.3; 2004-10-31; Andreas Jellinghaus:
+* Fix some LDFLAGS/LDADD issues for parallel build.
New in 0.9.2; 2004-07-24; Andreas Jellinghaus:
* This is an beta test version. Please be careful.
Do not use in production environments.
-* Fix sslengine, link those dynamicaly with libcrypto
+* Fix sslengine, link those dynamically with libcrypto
for openssl 0.9.7d and later.
-* fixed small bug in pkcs11-tool
-* link pkcs11-toll and pkcs15-crypt with -lcrypto
+* Fixed small bug in pkcs11-tool
+* Link pkcs11-tool and pkcs15-crypt with -lcrypto
* New driver for estonian ID card.
-* bumped version number to opensc 0.9.2
+* Bumped version number to opensc 0.9.2
* New card supported: Oberthur AuthentIC v5
-* eid pam module now checks permissions, and supports several
- certificates in ~/.eid/authorized_certificates
+* Pam_opensc's eid module now checks permissions,
+ and supports several certificates in
+ ~/.eid/authorized_certificates
Thanks to Fritz Elfert <fritz.elfert@millenux.com>
* Upgrade library version to 0.9, since incompatible changes
are very likely somewhere.
View
@@ -9,7 +9,7 @@ b) "ldap" - store the certificate for a user in a central ldap
This guide only deals with flavor a). If you want to add documentation
on using pam with ldap, please send a patch to the opensc-devel mailing
-list.
+list. See also the PAM section in the OpenSC HTML docs.
First initialize the token, create a user with a pin, create a key
and create a certificate, all as documented in the QUICKSTART file.
@@ -36,16 +36,19 @@ auth required pam_unix.so nullok
Note the first line is marked as "sufficient", so successful smart card
authentication will let a user in. If both lines read "required", a user
would have to use a smart card with the right key and certificate on it,
-enter the right pin *AND* have the right passwort for the normal login
+enter the right pin *AND* have the right password for the normal login
procedure.
Now every user needs to create a directory ".eid" in his or her home
directory and put the certificate in a file called "authorized_certificates".
-To do this, enter the command
+To do this, enter the command (beware, this will overwrite the file):
$ pkcs15-tool -r 45 -o ~/.eid/authorized_certificates
Now try to login using the smart card. Remember to first insert your
smart card into the reader, then enter your username, and then the
pin on your key.
-
+As of OpenSC version 0.9.2, ~/.eid/authorized_certificates can contain
+multiple certificates. To use multiple certificates there, simply
+concatenate them, for example like
+$ pkcs15-tool -r 45 >> ~/.eid/authorized_certificates
View
@@ -3,9 +3,9 @@ A quick installation guide to opensc
To install opensc, please do as user,
-$ wget http://www.opensc.org/files/opensc-0.9.4.tar.gz
-$ tar xfvz opensc-0.9.4.tar.gz
-$ cd opensc-0.9.4
+$ wget http://www.opensc.org/files/opensc-x.y.z.tar.gz
+$ tar xfvz opensc-x.y.z.tar.gz
+$ cd opensc-x.y.z
nothing special so far.
@@ -87,7 +87,7 @@ GnuPG, the Assuan support is not needed.
PAM support allowes you to use a smart card and the opensc PAM module
to log into your system. If enabled, the pam module has two flavors:
-it can compare a key on a smart card to a certificate stored localy,
+it can compare a key on a smart card to a certificate stored locally,
or it can communicate with an LDAP server to check the key and
certificate stored on a smart card. The former mode requires only
PAM support, the later is only available, if OpenSC is compiled with
@@ -101,10 +101,10 @@ $ su root
and install the software as root
# make install
-usualy opensc is fine without any config file, still you can install it:
+usually opensc is fine without any config file, still you can install it:
-# cp etc/opensc.conf.example /etc/opensc.conf
-# cp etc/scldap.conf.example /etc/scladp.conf
+# cp etc/opensc.conf /etc/opensc.conf
+# cp etc/scldap.conf /etc/scldap.conf
If you have some reason to edit the config file, feel free to do so.
But most users are fine without.
@@ -130,9 +130,9 @@ via openct. In theory both should work fine, but if you have
some problems, please test this.
$ opensc-tool --reader 1 --atr
-3B E2 00 FF C1 10 31 FE 55 C8 02 9C ;.....1.U...
+3b:e2:00:ff:c1:10:31:fe:55:c8:02:9c
-OpenCT can give you the atr as well.
+OpenCT can give you the ATR as well.
$ opensc-explorer
@@ -164,7 +164,7 @@ Please type again to verify:
This created an empty pkcs15 structure. You can't do much without it.
Also I entered a pin for the security officer, and an unblocking pin.
-As a general rule, the SO pin is required everytime you change the
+As a general rule, the SO pin is required every time you change the
card, but only the user pin is required to use it.
$ pkcs15-init --store-pin --auth-id 01 --label "Andreas Jellinghaus"
@@ -208,7 +208,7 @@ Loaded: (pkcs11) pkcs11 engine
OpenSSL>
It is important to enter the whole long command in one single command
-line. I usualy copy&paste the command, to make sure I don't mistype
+line. I usually copy&paste the command, to make sure I don't mistype
anything. This command loads the opensc engine, so openssl can delegate
some work from your computers cpu to the smart card.
View
@@ -188,3 +188,60 @@ else
fi
AC_LANG_RESTORE
])dnl ACX_PTHREAD
+
+dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
+dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
+dnl also defines GSTUFF_PKG_ERRORS on error
+AC_DEFUN(PKG_CHECK_MODULES, [
+ succeeded=no
+
+ if test -z "$PKG_CONFIG"; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+ fi
+
+ if test "$PKG_CONFIG" = "no" ; then
+ echo "*** The pkg-config script could not be found. Make sure it is"
+ echo "*** in your path, or set the PKG_CONFIG environment variable"
+ echo "*** to the full path to pkg-config."
+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+ else
+ PKG_CONFIG_MIN_VERSION=0.9.0
+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+ AC_MSG_CHECKING(for $2)
+
+ if $PKG_CONFIG --exists "$2" ; then
+ AC_MSG_RESULT(yes)
+ succeeded=yes
+
+ AC_MSG_CHECKING($1_CFLAGS)
+ $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
+ AC_MSG_RESULT($$1_CFLAGS)
+
+ AC_MSG_CHECKING($1_LIBS)
+ $1_LIBS=`$PKG_CONFIG --libs "$2"`
+ AC_MSG_RESULT($$1_LIBS)
+ else
+ $1_CFLAGS=""
+ $1_LIBS=""
+ ## If we have a custom action on failure, don't print errors, but
+ ## do set a variable so people can do so.
+ $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+ ifelse([$4], ,echo $$1_PKG_ERRORS,)
+ fi
+
+ AC_SUBST($1_CFLAGS)
+ AC_SUBST($1_LIBS)
+ else
+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+ echo "*** See http://www.freedesktop.org/software/pkgconfig"
+ fi
+ fi
+
+ if test $succeeded = yes; then
+ ifelse([$3], , :, [$3])
+ else
+ ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
+ fi
+])
+
+
Oops, something went wrong.

0 comments on commit 1714cfb

Please sign in to comment.