[Fedora-directory-commits] esc/src/app/xul/esc/chrome/content/esc settings.xul, 1.4, 1.5
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1400
Modified Files:
settings.xul
Log Message:
Send parameter to function that format's the card.
Index: settings.xul
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/settings.xul,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- settings.xul 25 Oct 2006 04:03:35 -0000 1.4
+++ settings.xul 9 Feb 2007 21:39:22 -0000 1.5
@@ -132,7 +132,7 @@
<spacer class="verticalSpacer"/>
</description>
- <button class="buttonText" id="formatbtn" label="&doFormat;" oncommand="DoFormatCoolKey()" disabled="true" hidden = "false"/>
+ <button class="buttonText" id="formatbtn" label="&doFormat;" oncommand="DoFormatCoolKey('userKey')" disabled="true" hidden = "false"/>
<button class="buttonText" id="enrollbtn" label="&doEnroll;" oncommand="DoCollectPassword('enroll');" disabled="true" hidden="false"/>
17 years, 3 months
[Fedora-directory-commits] esc/src/app/xpcom rhICoolKey.idl, 1.3, 1.4
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xpcom
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1366
Modified Files:
rhICoolKey.idl
Log Message:
Add method to get card's ATR.
Index: rhICoolKey.idl
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/rhICoolKey.idl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rhICoolKey.idl 27 Sep 2006 17:22:20 -0000 1.3
+++ rhICoolKey.idl 9 Feb 2007 21:37:33 -0000 1.4
@@ -65,6 +65,8 @@
string GetCoolKeyIssuedTo(in unsigned long aKeyType, in string aKeyID);
+ string GetCoolKeyATR(in unsigned long aKeyType, in string aKeyID);
+
boolean GetCoolKeyRequiresAuthentication(in unsigned long aKeyType,in string aKeyID);
boolean GetCoolKeyIsAuthenticated(in unsigned long aKeyType,in string aKeyID);
17 years, 3 months
[Fedora-directory-commits] esc/src/app/xpcom rhCoolKey.cpp,1.4,1.5
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xpcom
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1334
Modified Files:
rhCoolKey.cpp
Log Message:
Add method to get card's ATR.
Index: rhCoolKey.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/rhCoolKey.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rhCoolKey.cpp 25 Oct 2006 03:58:16 -0000 1.4
+++ rhCoolKey.cpp 9 Feb 2007 21:36:47 -0000 1.5
@@ -1167,6 +1167,21 @@
return NS_OK;
}
+/* string GetCoolKeyATR (in unsigned long aKeyType, in string aKeyID); */
+ NS_IMETHODIMP rhCoolKey::GetCoolKeyATR(PRUint32 aKeyType, const char *aKeyID, char **_retval)
+ {
+ *_retval = NULL;
+ AutoCoolKey key(aKeyType, aKeyID);
+ char atr[128];
+ HRESULT res = CoolKeyGetATR(&key, (char *)&atr,sizeof(atr));
+ PR_LOG( coolKeyLog, PR_LOG_ALWAYS, ("Attempting to get the key's ATR: Key: %s, ATR %s. \n",aKeyID, (char *) atr));
+ if(res == S_OK)
+ {
+ char *temp = (char *) nsMemory::Clone(atr,sizeof(char) * strlen((char *)atr) + 1);
+ *_retval = temp;
+ }
+ return NS_OK;
+ }
/* string GetCoolKeyIssuerInfo (in unsigned long aKeyType, in string aKeyID); */ NS_IMETHODIMP rhCoolKey::GetCoolKeyIssuerInfo(PRUint32 aKeyType, const char *aKeyID, char **_retval)
{
17 years, 3 months
[Fedora-directory-commits] esc/src/app/xpcom Makefile.moz,1.6,1.7
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xpcom
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1288
Modified Files:
Makefile.moz
Log Message:
Cleanup linker flags.
Index: Makefile.moz
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/Makefile.moz,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.moz 2 Feb 2007 22:13:54 -0000 1.6
+++ Makefile.moz 9 Feb 2007 21:35:00 -0000 1.7
@@ -80,7 +80,7 @@
TESTCPPSRCS = CoolKeyCSP.cpp
MOZ_NO_DEBUG_RTL=1
else
-COOLKEY_LIBS = -L$(CORE_DIST)/lib -lhttpchunked -lckymanager $(CKY_LIB_LDD) -lckyapplet
+COOLKEY_LIBS = -L$(CORE_DIST)/lib -lckymanager -lhttpchunked $(CKY_LIB_LDD) -lckyapplet
endif
ifeq ($(OS_ARCH),Darwin)
17 years, 3 months
[Fedora-directory-commits] esc/src/xulrunner Makefile,1.4,1.5
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/xulrunner
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1249
Modified Files:
Makefile
Log Message:
Add flag to control whether or not to build with the system NSS and NSPR for Linux.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/esc/src/xulrunner/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile 25 Jan 2007 22:37:42 -0000 1.4
+++ Makefile 9 Feb 2007 21:33:40 -0000 1.5
@@ -67,9 +67,11 @@
echo "ac_add_options --enable-default-toolkit=gtk2" >> $@.$(TYPE)
echo "ac_add_options --enable-xft" >> $@.$(TYPE)
echo "ac_add_options --disable-freetype2" >> $@.$(TYPE)
+ifndef NO_SYSTEM_NSS
echo "ac_add_options --with-system-nspr" >> $@.$(TYPE)
echo "ac_add_options --with-system-nss" >> $@.$(TYPE)
endif
+endif
ifeq ($(OS_ARCH),Darwin)
echo ". \$$topsrcdir/build/macosx/universal/mozconfig" >> $@.$(TYPE)
echo "ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.4u.sdk" >> $@.$(TYPE)
17 years, 3 months
[Fedora-directory-commits] coolkey/src/coolkey object.cpp,1.1,1.2
by Doctor Conrad
Author: rrelyea
Update of /cvs/dirsec/coolkey/src/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22388
Modified Files:
object.cpp
Log Message:
CK_ULONG is platform dependent, where the number of bytes used to store a
CK_ULONG in the token is not.
Index: object.cpp
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/object.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- object.cpp 9 Jun 2006 18:39:11 -0000 1.1
+++ object.cpp 9 Feb 2007 18:53:21 -0000 1.2
@@ -105,7 +105,9 @@
if ((attrib.getType() == CKA_CLASS) ||
(attrib.getType() == CKA_CERTIFICATE_TYPE) ||
(attrib.getType() == CKA_KEY_TYPE)) {
- if (attrLen != sizeof (CK_ULONG)) {
+ /* ulongs are 4 bytes on the token, even if they are 8 or
+ * more in the pkcs11 module */
+ if (attrLen != 4) {
throw PKCS11Exception(CKR_DEVICE_ERROR,
"Invalid attribute length %d\n", attrLen);
}
@@ -183,7 +185,7 @@
if (!attributeExists(CKA_CLASS)) {
PKCS11Attribute attrib;
attrib.setType(CKA_CLASS);
- attrib.setValue((CKYByte *)&objectType, 4);
+ attrib.setValue((CKYByte *)&objectType, sizeof(CK_ULONG));
attributes.push_back(attrib);
}
17 years, 3 months
[Fedora-directory-commits] coolkey configure.in, 1.9, 1.10 configure, 1.7, 1.8 config.status, 1.6, 1.7
by Doctor Conrad
Author: rrelyea
Update of /cvs/dirsec/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22218
Modified Files:
configure.in configure config.status
Log Message:
Move optional enable-pk11install line so linux compiles correctly.
Index: configure.in
===================================================================
RCS file: /cvs/dirsec/coolkey/configure.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- configure.in 6 Feb 2007 19:47:30 -0000 1.9
+++ configure.in 9 Feb 2007 18:47:42 -0000 1.10
@@ -85,20 +85,6 @@
;;
esac
-# Add argument for pk11install
-AC_ARG_ENABLE(pk11install,
- [ --enable-pk11install build an installer for legacy user apps(default=no)])
-if test "$enable_pk11install" = "yes" -o "$enable_pk11install" = "true"
-then
-if test $WINDOWS -ne 1; then
- PKG_CHECK_MODULES(NSS, nss, true, [ AC_MSG_ERROR(could not find NSS Crypto libraries) ])
-fi
- enable_pk11install = "yes"
-else
- enable_pk11install = "no"
- AC_MSG_WARN([skipping pk11install])
-fi
-
# Checks for programs.
AC_PROG_CC
@@ -132,6 +118,21 @@
fi
])
fi
+
+# Add argument for pk11install
+AC_ARG_ENABLE(pk11install,
+ [ --enable-pk11install build an installer for legacy user apps(default=no)])
+if test "$enable_pk11install" = "yes" -o "$enable_pk11install" = "true"
+then
+if test $WINDOWS -ne 1; then
+ PKG_CHECK_MODULES(NSS, nss, true, [ AC_MSG_ERROR(could not find NSS Crypto libraries) ])
+fi
+ enable_pk11install = "yes"
+else
+ enable_pk11install = "no"
+ AC_MSG_WARN([skipping pk11install])
+fi
+
AC_SUBST(NSS_CFLAGS)
AC_SUBST(ZLIB_CFLAGS)
AC_SUBST(ZLIB_LIBS)
Index: configure
===================================================================
RCS file: /cvs/dirsec/coolkey/configure,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- configure 30 Nov 2006 22:35:22 -0000 1.7
+++ configure 9 Feb 2007 18:47:42 -0000 1.8
@@ -463,7 +463,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT PKG_CONFIG ac_pt_PKG_CONFIG NSS_CFLAGS NSS_LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__f!
astdepCXX_TRUE am__fastdepCXX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBCKYAPPLET PCSC_CFLAGS PCSC_LIBS ZLIB_CFLAGS ZLIB_LIBS SCARD_LIB_NAME HAVE_PCSC_TRUE HAVE_PCSC_FALSE BUILD_PK11INSTALL_TRUE BUILD_PK11INSTALL_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE EGREP LN_S E!
CHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBCKYAPPLET PKG_CONFIG ac_pt_PKG_CONFIG PCSC_CFLAGS PCSC_LIBS NSS_CFLAGS NSS_LIBS ZLIB_CFLAGS ZLIB_LIBS SCARD_LIB_NAME HAVE_PCSC_TRUE HAVE_PCSC_FALSE BUILD_PK11INSTALL_TRUE BUILD_PK11INSTALL_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -904,18 +904,6 @@
ac_env_target_alias_value=$target_alias
ac_cv_env_target_alias_set=${target_alias+set}
ac_cv_env_target_alias_value=$target_alias
-ac_env_PKG_CONFIG_set=${PKG_CONFIG+set}
-ac_env_PKG_CONFIG_value=$PKG_CONFIG
-ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set}
-ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG
-ac_env_NSS_CFLAGS_set=${NSS_CFLAGS+set}
-ac_env_NSS_CFLAGS_value=$NSS_CFLAGS
-ac_cv_env_NSS_CFLAGS_set=${NSS_CFLAGS+set}
-ac_cv_env_NSS_CFLAGS_value=$NSS_CFLAGS
-ac_env_NSS_LIBS_set=${NSS_LIBS+set}
-ac_env_NSS_LIBS_value=$NSS_LIBS
-ac_cv_env_NSS_LIBS_set=${NSS_LIBS+set}
-ac_cv_env_NSS_LIBS_value=$NSS_LIBS
ac_env_CC_set=${CC+set}
ac_env_CC_value=$CC
ac_cv_env_CC_set=${CC+set}
@@ -956,6 +944,10 @@
ac_env_FFLAGS_value=$FFLAGS
ac_cv_env_FFLAGS_set=${FFLAGS+set}
ac_cv_env_FFLAGS_value=$FFLAGS
+ac_env_PKG_CONFIG_set=${PKG_CONFIG+set}
+ac_env_PKG_CONFIG_value=$PKG_CONFIG
+ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set}
+ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG
ac_env_PCSC_CFLAGS_set=${PCSC_CFLAGS+set}
ac_env_PCSC_CFLAGS_value=$PCSC_CFLAGS
ac_cv_env_PCSC_CFLAGS_set=${PCSC_CFLAGS+set}
@@ -964,6 +956,14 @@
ac_env_PCSC_LIBS_value=$PCSC_LIBS
ac_cv_env_PCSC_LIBS_set=${PCSC_LIBS+set}
ac_cv_env_PCSC_LIBS_value=$PCSC_LIBS
+ac_env_NSS_CFLAGS_set=${NSS_CFLAGS+set}
+ac_env_NSS_CFLAGS_value=$NSS_CFLAGS
+ac_cv_env_NSS_CFLAGS_set=${NSS_CFLAGS+set}
+ac_cv_env_NSS_CFLAGS_value=$NSS_CFLAGS
+ac_env_NSS_LIBS_set=${NSS_LIBS+set}
+ac_env_NSS_LIBS_value=$NSS_LIBS
+ac_cv_env_NSS_LIBS_set=${NSS_LIBS+set}
+ac_cv_env_NSS_LIBS_value=$NSS_LIBS
#
# Report the --help message.
@@ -1049,7 +1049,6 @@
--enable-maintainer-mode enable make rules and dependencies not useful
(and sometimes confusing) to the casual installer
--enable-debug add debugging code (default=yes)
- --enable-pk11install build an installer for legacy user apps(default=no)
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
--enable-shared[=PKGS]
@@ -1059,6 +1058,7 @@
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
+ --enable-pk11install build an installer for legacy user apps(default=no)
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -1071,9 +1071,6 @@
--with-pcsclite Use pcsc-lite (default=yes)
Some influential environment variables:
- PKG_CONFIG path to pkg-config utility
- NSS_CFLAGS C compiler flags for NSS, overriding pkg-config
- NSS_LIBS linker flags for NSS, overriding pkg-config
CC C compiler command
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
@@ -1086,8 +1083,11 @@
CXXCPP C++ preprocessor
F77 Fortran 77 compiler command
FFLAGS Fortran 77 compiler flags
+ PKG_CONFIG path to pkg-config utility
PCSC_CFLAGS C compiler flags for PCSC, overriding pkg-config
PCSC_LIBS linker flags for PCSC, overriding pkg-config
+ NSS_CFLAGS C compiler flags for NSS, overriding pkg-config
+ NSS_LIBS linker flags for NSS, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -2118,8 +2118,8 @@
echo "$as_me:$LINENO: result: Windows" >&5
echo "${ECHO_T}Windows" >&6
WINDOWS=1
- ZLIB_CFLAGS=-Ic:/zlib
- ZLIB_LIBS=c:/zlib/zlib.dll
+ #ZLIB_CFLAGS=-Ic:/zlib
+ #ZLIB_LIBS=c:/zlib/zlib.dll
#OS_FLAGS=`echo $INCLUDE | tr '[[:upper:]]' '[[:lower:]]' | sed -e 's;\\\\;/;g' -e 's;.:;/cygdrive/&/;g' -e 's;:;;g' -e 's;//;/;g' -e 's/;/\" -I\"/g' -e 's;^;-I\";' -e 's;$;\";'`
CPPFLAGS="$CPPFLAGS $OS_FLAGS -DWIN32"
LDFLAGS="$LDFLAGS"
@@ -2137,8 +2137,11 @@
MAC=1
SCARD_LIB_NAME="PCSC.Framework/PCSC"
PCSC_MSG=yes
- PCSC_CFLAGS=""
+ PCSC_CFLAGS="-I/System/Library/Frameworks/PCSC.framework/Versions/Current/Headers"
PCSC_LIBS="-Wl,-framework,PCSC"
+ CFLAGS="-DMAC -I/System/Library/Frameworks/Security.framework/Versions/Current/Headers -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386"
+ LDFLAGS="-L/System/Library/Frameworks/Security.framework/Versions/Current/Security -arch ppc -arch i386"
+ CXXFLAGS="-DMAC -I/System/Library/Frameworks/Security.framework/Versions/Current/Headers -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386"
;;
*)
echo "$as_me:$LINENO: result: UNIX/LINUX" >&5
@@ -2149,201 +2152,6 @@
;;
esac
-# Add argument for pk11install
-# Check whether --enable-pk11install or --disable-pk11install was given.
-if test "${enable_pk11install+set}" = set; then
- enableval="$enable_pk11install"
-
-fi;
-if test "$enable_pk11install" = "yes" -o "$enable_pk11install" = "true"
-then
-if test $WINDOWS -ne 1; then
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
- ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
-if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
- ac_pt_PKG_CONFIG=$PKG_CONFIG
- # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $ac_pt_PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
- ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-
-if test -n "$ac_pt_PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- PKG_CONFIG=$ac_pt_PKG_CONFIG
-else
- PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
- _pkg_min_version=0.9.0
- echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- PKG_CONFIG=""
- fi
-
-fi
-
-pkg_failed=no
-echo "$as_me:$LINENO: checking for NSS" >&5
-echo $ECHO_N "checking for NSS... $ECHO_C" >&6
-
-if test -n "$PKG_CONFIG"; then
- if test -n "$NSS_CFLAGS"; then
- pkg_cv_NSS_CFLAGS="$NSS_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nss\"") >&5
- ($PKG_CONFIG --exists --print-errors "nss") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_NSS_CFLAGS=`$PKG_CONFIG --cflags "nss" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
- pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$NSS_LIBS"; then
- pkg_cv_NSS_LIBS="$NSS_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nss\"") >&5
- ($PKG_CONFIG --exists --print-errors "nss") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_NSS_LIBS=`$PKG_CONFIG --libs "nss" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "nss"`
- else
- NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nss"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$NSS_PKG_ERRORS" >&5
-
- { { echo "$as_me:$LINENO: error: could not find NSS Crypto libraries" >&5
-echo "$as_me: error: could not find NSS Crypto libraries" >&2;}
- { (exit 1); exit 1; }; }
-elif test $pkg_failed = untried; then
- { { echo "$as_me:$LINENO: error: could not find NSS Crypto libraries" >&5
-echo "$as_me: error: could not find NSS Crypto libraries" >&2;}
- { (exit 1); exit 1; }; }
-else
- NSS_CFLAGS=$pkg_cv_NSS_CFLAGS
- NSS_LIBS=$pkg_cv_NSS_LIBS
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- true
-fi
-fi
- enable_pk11install = "yes"
-else
- enable_pk11install = "no"
- { echo "$as_me:$LINENO: WARNING: skipping pk11install" >&5
-echo "$as_me: WARNING: skipping pk11install" >&2;}
-fi
-
# Checks for programs.
ac_ext=c
@@ -4480,7 +4288,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4483 "configure"' > conftest.$ac_ext
+ echo '#line 4291 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5615,7 +5423,7 @@
# Provide some information about the compiler.
-echo "$as_me:5618:" \
+echo "$as_me:5426:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6678,11 +6486,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6681: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6489: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6685: \$? = $ac_status" >&5
+ echo "$as_me:6493: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6946,11 +6754,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6949: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6757: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6953: \$? = $ac_status" >&5
+ echo "$as_me:6761: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7050,11 +6858,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7053: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6861: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7057: \$? = $ac_status" >&5
+ echo "$as_me:6865: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8519,7 +8327,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 8522 "configure"' > conftest.$ac_ext
+ echo '#line 8330 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9416,7 +9224,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9419 "configure"
+#line 9227 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9516,7 +9324,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9519 "configure"
+#line 9327 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10741,10 +10549,7 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- #
- # Hack... gcc and lc are quite different, we can use either for cygwin
- # try to get a line that both are happy with...
- #
+
$CC -LD -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker '
else
ld_shlibs_CXX=no
@@ -11860,11 +11665,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11863: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11668: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11867: \$? = $ac_status" >&5
+ echo "$as_me:11672: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11964,11 +11769,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11967: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11772: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11971: \$? = $ac_status" >&5
+ echo "$as_me:11776: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12500,7 +12305,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 12503 "configure"' > conftest.$ac_ext
+ echo '#line 12308 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -13555,11 +13360,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13558: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13363: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13562: \$? = $ac_status" >&5
+ echo "$as_me:13367: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13659,11 +13464,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13662: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13467: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13666: \$? = $ac_status" >&5
+ echo "$as_me:13471: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15108,7 +14913,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 15111 "configure"' > conftest.$ac_ext
+ echo '#line 14916 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -15883,11 +15688,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15886: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15691: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15890: \$? = $ac_status" >&5
+ echo "$as_me:15695: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16151,11 +15956,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16154: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15959: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16158: \$? = $ac_status" >&5
+ echo "$as_me:15963: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16255,11 +16060,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16258: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16063: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16262: \$? = $ac_status" >&5
+ echo "$as_me:16067: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17724,7 +17529,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 17727 "configure"' > conftest.$ac_ext
+ echo '#line 17532 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -19209,6 +19014,111 @@
with_pcsclite=no
else
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+if test -n "$PKG_CONFIG"; then
+ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+ ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+
+if test -n "$ac_pt_PKG_CONFIG"; then
+ echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.9.0
+ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ PKG_CONFIG=""
+ fi
+
+fi
+
pkg_failed=no
echo "$as_me:$LINENO: checking for PCSC" >&5
echo $ECHO_N "checking for PCSC... $ECHO_C" >&6
@@ -19297,6 +19207,97 @@
fi
fi
+# Add argument for pk11install
+# Check whether --enable-pk11install or --disable-pk11install was given.
+if test "${enable_pk11install+set}" = set; then
+ enableval="$enable_pk11install"
+
+fi;
+if test "$enable_pk11install" = "yes" -o "$enable_pk11install" = "true"
+then
+if test $WINDOWS -ne 1; then
+
+pkg_failed=no
+echo "$as_me:$LINENO: checking for NSS" >&5
+echo $ECHO_N "checking for NSS... $ECHO_C" >&6
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$NSS_CFLAGS"; then
+ pkg_cv_NSS_CFLAGS="$NSS_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nss\"") >&5
+ ($PKG_CONFIG --exists --print-errors "nss") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_NSS_CFLAGS=`$PKG_CONFIG --cflags "nss" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$NSS_LIBS"; then
+ pkg_cv_NSS_LIBS="$NSS_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nss\"") >&5
+ ($PKG_CONFIG --exists --print-errors "nss") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_NSS_LIBS=`$PKG_CONFIG --libs "nss" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "nss"`
+ else
+ NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nss"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$NSS_PKG_ERRORS" >&5
+
+ { { echo "$as_me:$LINENO: error: could not find NSS Crypto libraries" >&5
+echo "$as_me: error: could not find NSS Crypto libraries" >&2;}
+ { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+ { { echo "$as_me:$LINENO: error: could not find NSS Crypto libraries" >&5
+echo "$as_me: error: could not find NSS Crypto libraries" >&2;}
+ { (exit 1); exit 1; }; }
+else
+ NSS_CFLAGS=$pkg_cv_NSS_CFLAGS
+ NSS_LIBS=$pkg_cv_NSS_LIBS
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ true
+fi
+fi
+ enable_pk11install = "yes"
+else
+ enable_pk11install = "no"
+ { echo "$as_me:$LINENO: WARNING: skipping pk11install" >&5
+echo "$as_me: WARNING: skipping pk11install" >&2;}
+fi
+
+
@@ -21598,10 +21599,6 @@
s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
s,@MAINT@,$MAINT,;t t
-s,@PKG_CONFIG@,$PKG_CONFIG,;t t
-s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
-s,@NSS_CFLAGS@,$NSS_CFLAGS,;t t
-s,@NSS_LIBS@,$NSS_LIBS,;t t
s,@CC@,$CC,;t t
s,@CFLAGS@,$CFLAGS,;t t
s,@LDFLAGS@,$LDFLAGS,;t t
@@ -21638,8 +21635,12 @@
s,@ac_ct_F77@,$ac_ct_F77,;t t
s,@LIBTOOL@,$LIBTOOL,;t t
s,@LIBCKYAPPLET@,$LIBCKYAPPLET,;t t
+s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
s,@PCSC_CFLAGS@,$PCSC_CFLAGS,;t t
s,@PCSC_LIBS@,$PCSC_LIBS,;t t
+s,@NSS_CFLAGS@,$NSS_CFLAGS,;t t
+s,@NSS_LIBS@,$NSS_LIBS,;t t
s,@ZLIB_CFLAGS@,$ZLIB_CFLAGS,;t t
s,@ZLIB_LIBS@,$ZLIB_LIBS,;t t
s,@SCARD_LIB_NAME@,$SCARD_LIB_NAME,;t t
Index: config.status
===================================================================
RCS file: /cvs/dirsec/coolkey/config.status,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- config.status 13 Oct 2006 01:16:20 -0000 1.6
+++ config.status 9 Feb 2007 18:47:42 -0000 1.7
@@ -304,7 +304,7 @@
ac_cs_version="\
coolkey config.status "1.1.0"
configured by configure, generated by GNU Autoconf 2.59,
- with options \"\"
+ with options \"'--enable-pk11install'\"
Copyright (C) 2003 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
@@ -383,8 +383,8 @@
fi
if $ac_cs_recheck; then
- echo "running /bin/sh configure " $ac_configure_extra_args " --no-create --no-recursion" >&6
- exec /bin/sh configure $ac_configure_extra_args --no-create --no-recursion
+ echo "running /bin/sh configure " '--enable-pk11install' $ac_configure_extra_args " --no-create --no-recursion" >&6
+ exec /bin/sh configure '--enable-pk11install' $ac_configure_extra_args --no-create --no-recursion
fi
#
@@ -558,18 +558,20 @@
s,@FFLAGS@,,;t t
s,@ac_ct_F77@,,;t t
s,@LIBTOOL@,$(SHELL) $(top_builddir)/libtool,;t t
+s,@LIBCKYAPPLET(a),${top_builddir}/src/libckyapplet/libckyapplet.la,;t t
s,@PKG_CONFIG@,/usr/bin/pkg-config,;t t
s,@ac_pt_PKG_CONFIG@,/usr/bin/pkg-config,;t t
-s,@NSS_CFLAGS@,-I/usr/include/nss3 -I/usr/include/nspr4 ,;t t
-s,@NSS_LIBS@,-lssl3 -lsmime3 -lnss3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl ,;t t
-s,@LIBCKYAPPLET(a),${top_builddir}/src/libckyapplet/libckyapplet.la,;t t
s,@PCSC_CFLAGS@,-pthread -I/usr/include/PCSC ,;t t
s,@PCSC_LIBS@,-lpcsclite ,;t t
+s,@NSS_CFLAGS@,-I/usr/include/nss3 -I/usr/include/nspr4 ,;t t
+s,@NSS_LIBS@,-lssl3 -lsmime3 -lnss3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl ,;t t
s,@ZLIB_CFLAGS@,,;t t
s,@ZLIB_LIBS@,,;t t
s,@SCARD_LIB_NAME(a),libpcsclite.so.1,;t t
s,@HAVE_PCSC_TRUE@,,;t t
s,@HAVE_PCSC_FALSE@,#,;t t
+s,@BUILD_PK11INSTALL_TRUE@,,;t t
+s,@BUILD_PK11INSTALL_FALSE@,#,;t t
s,@LIBOBJS@,,;t t
s,@LTLIBOBJS@,,;t t
CEOF
17 years, 3 months
[Fedora-directory-commits] coolkey README,1.1,1.2
by Doctor Conrad
Author: rrelyea
Update of /cvs/dirsec/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30618
Modified Files:
README
Log Message:
Update README from the latest information from the wiki
Index: README
===================================================================
RCS file: /cvs/dirsec/coolkey/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README 25 Aug 2006 00:31:39 -0000 1.1
+++ README 8 Feb 2007 19:25:12 -0000 1.2
@@ -1,55 +1,185 @@
-Building:
+How to build on various platforms.
+A more up to date version of this may be found at
+http://directory.fedora.redhat.com/wiki/BuildCoolKey
+
+
+Linux/Unix
+---------------------------------------------------------------------------
+Prerequisites
+
+You will need the following packages installed (or equivalent for your OS):
+
+ * pcsc-lite-devel
+ * xlib-devel
+ * glibc
+ * gcc
+ * autoconf
+
+Building
+
+In the root directory run the following commands:
-Linux/Unix:
autoconf
./configure
+make
If you need to modify the Makefiles, automake 1.9.6 was used. Makefile.am is
included in the source.
-------------------------------------------------------------------------------
+Installing
+
+In the root directory run:
+
+make install
+
+or
+
+make install DEST=/my/destination/tree
+
+
+
+Mac OS X
+---------------------------------------------------------------------------
+
+CoolKey can be compiled as a universal binary on the Mac.
+
+Prerequisites
+
+ * Intel or PPC Mac
+ * OS X Tiger
+ * Version 2.59 of autoconf
+ * XCode 2.2 and later
+ * Make sure the framework "/Developer/SDKs/MacOSX10.4u.sdk" is present
+
+Building
+
+ 1. checkout coolkey source
+ 2. proceed to the coolkey directory
+ 3. Type the following:
+
+autoconf
+./configure --disable-dependency-tracking
+make
+
+If the autoconf step fails, an outdated version of autoconf may be installed.
+Perform "autoconf --version" to make sure 2.59 is the version present.
+
+As of right now, the above will build CoolKey dynamic libraries as only the
+native binary of the build machine. For instance, performing this build on an
+Intel Mac will build universal object files but leave the dynamic libraries as
+Intel only. Until this problem can be resolved, the following can be done to
+complete an actual universal binary build of everything.
+
+After the configure step and prior to the actual Make, do the following:
-Mac OS X:
+ 1. edit the file "libtool". Be sure to back up the original copy.
+ 2. search for lines with instances of the strings "archive_cmds" and
+ "module_expsym_cmds".
+ 3. Between the strings "\$deplibs" and "\$compiler_flags",
+ place the following:
-------------------------------------------------------------------------------
+ -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386
-Windows:
+Example:
-Prereqs -
-Microsoft Visual C++ and Platform SDK.
-Install as normal. Make sure INCLUDE and LIB are set appropriately.
-These are available at (http://msdn.microsoft.com/visualc/)
+#Commands used to build and install a shared archive.
+archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs
+-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386
+\$compiler_flags -install_name \$rpath/\$soname \$verstring"
-Cygwin
-Install as normal. You'll need base, the shell, autoconf-2.5x, cvs*...
-This can be downloaded at (http://www.cygwin.com)
-ZLib
-Download ZLib source an binaries from here (http://www.zlib.org)
-Unzip into a known directory (like c:/zlib)
-Set ZLIB_INCLUDE to the location of the include files (e.g. c:/zlib/include)
-and ZLIB_LIB to the location of the export libraries (e.g. c:/zlib/lib)
+ * At this point, performing a "make" will result in universal binary
+ versions of each dynamic library associated with CoolKey.
+
+It is also possible to build the utility "pk11install" on the Mac. This
+utility can be used to automatically install CoolKey into Mozilla browsers on
+the user's system.
+
+ * Building "pk11install" will requre the configure script to be launched
+with the following two environment variables:
+
+NSS_CFLAGS=
+NSS_LIBS=
+
+ * NSS_CFLAGS has to be set to the include paths of NSS and NSPR currently
+installed on the system.
+ * NSS_LIBS has to be set to the search path of the NSS and NSPR shared
+libraries.
+ * Example invocation:
+
+./configure --disable-dependency-tracking NSS_CFLAGS="-I /usr/local/include/nspr -I /usr/local/include/nss" NSS_LIBS="-L/usr/local/lib/nss" --enable-pkinstall
+ make
+
+Installing
+
+ * After a successful build of CoolKey, the Makefile can be used to perform
+ a simple install of the software on the system if desired.
+
+ 1. Within the build directory perform the following:
+
+make install
+
+ * By default, everything will be placed in "/usr/local/lib" and
+ "/usr/local/lib/pkcs11".
+ * An alternate prefix directory, instead of "/usr/local" can be selected
+ at configure time as demonstrated below:
+
+./configure --prefix=/usr/local/CoolKey --disable-dependency-tracking
+
+ * In the above example the install will result in everything being located
+ in "/usr/local/CoolKey/lib" and "/usr/local/CoolKey/lib/pkcs11".
+
+ * If desired the following example demonstartes how to install everything
+ in an alternate base location:
+
+make DESTDIR=/build/staging-area install
+
+ * The above will install the previous example in
+ "/build/staging/usr/local/CoolKey".
+
+
+
+Windows
+---------------------------------------------------------------------------
+
+Prerequisites
+
+ * Microsoft Visual C++ and Platform SDK: Install as normal.
+ Make sure INCLUDE and LIB are set appropriately. These are available at
+ (http://msdn.microsoft.com/visualc/)
+ * Cygwin: Install as normal. You'll need base, the shell, autoconf-2.5x,
+ make, cvs*... This can be downloaded at (http://www.cygwin.com)
+
+* This may not be a full list. If you discover additional packages which are
+needed please let us know, or update the wiki
+(http://directory/fedora.redhat.com/wiki/BuildCoolKey).
+
+ * ZLib Download ZLib source an binaries from here (http://www.zlib.org)
+ 1. Unzip into a known directory (like c:/zlib)
+ 2. Set ZLIB_INCLUDE to the location of the include files
+ (e.g. c:/zlib/include)
+ 3. Set ZLIB_LIB to the location of the export libraries
+ (e.g. c:/zlib/lib)
+
+Building
Once everything is installed, start a cygwin shell.
-1. checkout the coolkey source
-2. Make sure the environment variables INCLUDE, LIB, ZLIB_INCLUDE, and ZLIB_LIB
-are defined.
-3. Make sure the Visual C++ tools are in your path.
-In the root directory type:
+ 1. checkout the coolkey source
+ 2. Make sure the environment variables INCLUDE, LIB, ZLIB_INCLUDE, and
+ ZLIB_LIB are defined as described above in Prerequisites.
+ 3. Make sure the Visual C++ tools are in your path.
+ 4. In the root directory type:
autoconf-2.5x
./configure
make
+Installing
-NOTE: Make install does not work on windows. You'll need to fetch
-src/libckyapplet/.lib/libckyapplet-1.dll
-src/coolkeypk11/.lib/libcookeypk11.dll
-and
-zlib1.dll from your zlibdirectory and install it in your windows system32
-directory.
+Make install does not work on windows. You'll need to fetch
+src/libckyapplet/.lib/libckyapplet-1.dll,
+src/coolkeypk11/.lib/libcookeypk11.dll and zlib1.dll from your zlibdirectory
+and install it in your windows system32 directory.
-* This may not be a full list. If you discover additional packages which are
-needed please let us know.
17 years, 3 months
[Fedora-directory-commits] ldapserver/ldap/admin/src create_instance.c, 1.42, 1.43
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26722/ldapserver/ldap/admin/src
Modified Files:
create_instance.c
Log Message:
Resolves: bug 227771
Bug Description: FHS: use sysconfdir (/etc) as config file location
Reviewed by: nhosoi (Thanks!)
Fix Description: After much deliberation, we have decided that it is ok that our dynamic config files are under /etc/fedora-ds/slapd-instance.
So the config_dir will be /etc/fedora-ds/slapd-instance and the security and schema files will go there as well. Since the FHS is ambiguous about this issue, and it will be very confusing if the configuration files are not under /etc, and there are some agents (webmin, cfengine) that do "dynamically" modify config files under /etc, this outweighs any considerations about having the server using it's config file like an "ascii database".
In addition, the presence of repl-monitor-cgi causes rpm to complain, and since we only support CGIs in the Admin Server, this file has been removed from the core fedora-ds package.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: no
Index: create_instance.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- create_instance.c 7 Feb 2007 23:57:39 -0000 1.42
+++ create_instance.c 8 Feb 2007 18:40:12 -0000 1.43
@@ -1737,8 +1737,10 @@
gen_script_auto(mysroot, mycs_path, "verify-db.pl", cf)
/* tentatively moved to mycs_path */
+#ifdef MOVE_TO_ADMIN_SERVER
#define CREATE_REPL_MONITOR_CGI() \
gen_script_auto(mysroot, mycs_path, "repl-monitor-cgi.pl", cf)
+#endif
#define CREATE_ACCOUNT_INACT(_commandName) \
gen_script_auto(mysroot, cs_path, _commandName, cf)
@@ -1897,8 +1899,10 @@
t = CREATE_VERIFYDB();
if(t) return t;
+#ifdef MOVE_TO_ADMIN_SERVER
t = CREATE_REPL_MONITOR_CGI();
if(t) return t;
+#endif
t = CREATE_ACCOUNT_INACT("ns-inactivate.pl");
if(t) return t;
@@ -2410,8 +2414,10 @@
t = CREATE_VERIFYDB();
if(t) return t;
+#ifdef MOVE_TO_ADMIN_SERVER
t = CREATE_REPL_MONITOR_CGI();
if(t) return t;
+#endif
t = gen_script(cs_path, "suffix2instance.bat",
"@if not \"%%echo%%\" == \"on\" echo off\n\n"
@@ -4479,8 +4485,8 @@
temp = ds_a_get_cgi_var("config_dir", NULL, NULL);
if (NULL == temp) {
- cf->config_dir = PR_smprintf("%s%clib%c%s%c%s-%s",
- cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
+ cf->config_dir = PR_smprintf("%s%c%s%c%s-%s",
+ cf->sysconfdir, FILE_PATHSEP,
cf->brand_ds, FILE_PATHSEP,
PRODUCT_NAME, cf->servid);
} else {
@@ -4492,8 +4498,8 @@
cf->schema_dir = ds_a_get_cgi_var("schema_dir", NULL, NULL);
temp = ds_a_get_cgi_var("schema_dir", NULL, NULL);
if (NULL == temp) {
- cf->schema_dir = PR_smprintf("%s%clib%c%s%c%s-%s%cschema",
- cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
+ cf->schema_dir = PR_smprintf("%s%c%s%c%s-%s%cschema",
+ cf->sysconfdir, FILE_PATHSEP,
cf->brand_ds, FILE_PATHSEP,
PRODUCT_NAME, cf->servid, FILE_PATHSEP);
} else {
17 years, 3 months