[Fedora-directory-commits] coolkey/src/libckyapplet Makefile.in, 1.6, 1.7
by Doctor Conrad
Author: rrelyea
Update of /cvs/dirsec/coolkey/src/libckyapplet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8489/src/libckyapplet
Modified Files:
Makefile.in
Log Message:
windows build
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/coolkey/src/libckyapplet/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.in 18 Aug 2006 16:04:43 -0000 1.6
+++ Makefile.in 18 Aug 2006 16:11:09 -0000 1.7
@@ -240,7 +240,7 @@
dynlink.c
quote = \"
-libckyapplet_la_LDFLAGS = -version-info 1:0:0
+libckyapplet_la_LDFLAGS = -version-info 1:0:0 -no-undefined
libckyapplet_la_CFLAGS = $(CFLAGS) -DSCARD_LIB_NAME=$(quote)$(SCARD_LIB_NAME)$(quote) $(PCSC_CFLAGS)
nobase_include_HEADERS = \
cky_base.h \
17 years, 8 months
[Fedora-directory-commits] coolkey/src/libckyapplet Makefile.am, 1.2, 1.3
by Doctor Conrad
Author: rrelyea
Update of /cvs/dirsec/coolkey/src/libckyapplet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8438
Modified Files:
Makefile.am
Log Message:
Windows build changes.
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/coolkey/src/libckyapplet/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am 10 Jun 2006 00:51:09 -0000 1.2
+++ Makefile.am 18 Aug 2006 16:08:59 -0000 1.3
@@ -35,7 +35,7 @@
quote=\"
-libckyapplet_la_LDFLAGS = -version-info 1:0:0
+libckyapplet_la_LDFLAGS = -version-info 1:0:0 -no-undefined
libckyapplet_la_CFLAGS = $(CFLAGS) -DSCARD_LIB_NAME=$(quote)$(SCARD_LIB_NAME)$(quote) $(PCSC_CFLAGS)
nobase_include_HEADERS = \
17 years, 8 months
[Fedora-directory-commits] coolkey/src/libckyapplet Makefile.in, 1.5, 1.6
by Doctor Conrad
Author: rrelyea
Update of /cvs/dirsec/coolkey/src/libckyapplet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8350/src/libckyapplet
Modified Files:
Makefile.in
Log Message:
Windows build stuff
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/coolkey/src/libckyapplet/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.in 18 Aug 2006 00:54:39 -0000 1.5
+++ Makefile.in 18 Aug 2006 16:04:43 -0000 1.6
@@ -177,6 +177,8 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
+ZLIB_LIBS = @ZLIB_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
17 years, 8 months
[Fedora-directory-commits] coolkey Makefile.in, 1.3, 1.4 config.status, 1.3, 1.4 coolkey.spec, 1.5, 1.6
by Doctor Conrad
Author: rrelyea
Update of /cvs/dirsec/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8350
Modified Files:
Makefile.in config.status coolkey.spec
Log Message:
Windows build stuff
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/coolkey/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.in 10 Jun 2006 00:51:08 -0000 1.3
+++ Makefile.in 18 Aug 2006 16:04:42 -0000 1.4
@@ -157,6 +157,8 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
+ZLIB_LIBS = @ZLIB_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
Index: config.status
===================================================================
RCS file: /cvs/dirsec/coolkey/config.status,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config.status 10 Jun 2006 00:51:08 -0000 1.3
+++ config.status 18 Aug 2006 16:04:42 -0000 1.4
@@ -303,8 +303,8 @@
Report bugs to <bug-autoconf(a)gnu.org>."
ac_cs_version="\
coolkey config.status "1.1.0"
-configured by configure, generated by GNU Autoconf 2.59,
- with options \"'--disable-dependency-tracking'\"
+configured by ./configure, generated by GNU Autoconf 2.59,
+ with options \"\"
Copyright (C) 2003 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
@@ -383,15 +383,15 @@
fi
if $ac_cs_recheck; then
- echo "running /bin/sh configure " '--disable-dependency-tracking' $ac_configure_extra_args " --no-create --no-recursion" >&6
- exec /bin/sh configure '--disable-dependency-tracking' $ac_configure_extra_args --no-create --no-recursion
+ 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
fi
#
# INIT-COMMANDS section.
#
-AMDEP_TRUE="#" ac_aux_dir="."
+AMDEP_TRUE="" ac_aux_dir="."
for ac_config_target in $ac_config_targets
do
@@ -532,18 +532,18 @@
s,@DEPDIR(a),.deps,;t t
s,@am__include@,include,;t t
s,@am__quote@,,;t t
-s,@AMDEP_TRUE@,#,;t t
-s,@AMDEP_FALSE@,,;t t
-s,@AMDEPBACKSLASH@,,;t t
-s,@CCDEPMODE@,depmode=none,;t t
-s,@am__fastdepCC_TRUE@,#,;t t
-s,@am__fastdepCC_FALSE@,,;t t
+s,@AMDEP_TRUE@,,;t t
+s,@AMDEP_FALSE@,#,;t t
+s,@AMDEPBACKSLASH@,\,;t t
+s,@CCDEPMODE@,depmode=gcc3,;t t
+s,@am__fastdepCC_TRUE@,,;t t
+s,@am__fastdepCC_FALSE@,#,;t t
s,@CXX@,g++,;t t
s,@CXXFLAGS@,-g -O2,;t t
s,@ac_ct_CXX@,g++,;t t
-s,@CXXDEPMODE@,depmode=none,;t t
-s,@am__fastdepCXX_TRUE@,#,;t t
-s,@am__fastdepCXX_FALSE@,,;t t
+s,@CXXDEPMODE@,depmode=gcc3,;t t
+s,@am__fastdepCXX_TRUE@,,;t t
+s,@am__fastdepCXX_FALSE@,#,;t t
s,@EGREP@,grep -E,;t t
s,@LN_S@,ln -s,;t t
s,@ECHO@,echo,;t t
Index: coolkey.spec
===================================================================
RCS file: /cvs/dirsec/coolkey/coolkey.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- coolkey.spec 13 Jul 2006 21:32:39 -0000 1.5
+++ coolkey.spec 18 Aug 2006 16:04:42 -0000 1.6
@@ -19,7 +19,7 @@
Name: coolkey
Version: 1.0.1
-Release: 1
+Release: 2
Summary: CoolKey PKCS #11 module
License: LGPL
URL: http://directory.fedora.redhat.com/wiki/CoolKey
@@ -33,7 +33,8 @@
Requires: ccid
Provides: CoolKey Openkey
Obsoletes: CoolKey Openkey
-ExcludeArch: s390 s390x # 390 does not have libusb or smartCards
+# 390 does not have libusb or smartCards
+ExcludeArch: s390 s390x
%description
Linux Driver support for the CoolKey and CAC products.
@@ -83,6 +84,9 @@
%changelog
+* Sun Jul 16 2006 Florian La Roche <laroche(a)redhat.com> - 1.0.1-2
+- fix excludearch line
+
* Mon Jul 10 2006 Bob Relyea <rrelyea(a)redhat.com> - 1.0.1-1
- Don't require pthread library in coolkey
17 years, 8 months
[Fedora-directory-commits] coolkey/src/coolkey Makefile.in,1.3,1.4
by Doctor Conrad
Author: rrelyea
Update of /cvs/dirsec/coolkey/src/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8350/src/coolkey
Modified Files:
Makefile.in
Log Message:
Windows build stuff
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.in 18 Aug 2006 00:54:38 -0000 1.3
+++ Makefile.in 18 Aug 2006 16:04:43 -0000 1.4
@@ -177,6 +177,8 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
+ZLIB_LIBS = @ZLIB_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
17 years, 8 months
[Fedora-directory-commits] coolkey configure.in,1.3,1.4
by Doctor Conrad
Author: rrelyea
Update of /cvs/dirsec/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8249
Modified Files:
configure.in
Log Message:
Windows build
Index: configure.in
===================================================================
RCS file: /cvs/dirsec/coolkey/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- configure.in 10 Jun 2006 00:51:08 -0000 1.3
+++ configure.in 18 Aug 2006 16:03:31 -0000 1.4
@@ -41,134 +41,85 @@
AC_DEFINE(DEBUG, 1, [Define to 1 if you want to include debugging code.])
fi
-# Checks for programs.
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_LIBTOOL
-AC_PROG_INSTALL
-AC_PROG_LN_S
-
-# Checks for libraries.
-AC_CHECK_LIB(z, uncompress, , AC_MSG_ERROR(could not locate libz compression library))
-AC_CHECK_LIB(dl, dlopen, , AC_MSG_ERROR(could not locate dynamic library services library))
-
-# add our compiled static libraries
-AC_SUBST(LIBCKYAPPLET)
-LIBCKYAPPLET="\${top_builddir}/src/libckyapplet/libckyapplet.la"
-
-PCSC_MSG=no
-pcsc_path=/usr
-AC_SUBST(PCSC_CFLAGS)
-AC_SUBST(PCSC_LIBS)
-AC_SUBST(SCARD_LIB_NAME)
+#
+# ./config does a poor job of dealing with native OS stuff other than
+# unix, detect Windows and mac and do something a little more OS
+# friendly
+WINDOWS=0
+MAC=0
+UNIX=0
+AC_MSG_CHECKING([platform type: ])
case "$host" in
-*-*-win*)
+*-*-win*|*-*-cygwin*)
+ AC_MSG_RESULT([Windows])
+ WINDOWS=1
+ ZLIB_CFLAGS=-Ic:/zlib
+ ZLIB_LIB=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"
+ AC_MSG_WARN([changing CPPFLAGS = $CPPFLAGS ] );
SCARD_LIB_NAME="winscard.dll"
+ # override config defaults for windows
+ CC=cl
+ CXX=cl
+ CXXFLAGS="$CXXFLAGS /EHsc"
;;
*-*-darwin*)
+ AC_MSG_RESULT([MAC])
+ MAC=1
SCARD_LIB_NAME="PCSC.Framework/PCSC"
PCSC_MSG=yes
PCSC_CFLAGS=""
PCSC_LIBS="-Wl,-framework,PCSC"
;;
*)
+ AC_MSG_RESULT([UNIX/LINUX])
+ UNIX=1
# should look it up on the local system
SCARD_LIB_NAME="libpcsclite.so.1"
;;
esac
-saved_LIBS="$LIBS"
-saved_CFLAGS="$CFLAGS"
-saved_LDFLAGS="$LDFLAGS"
-saved_CPPFLAGS="$CPPFLAGS"
-AC_ARG_WITH(pcsclite,
- [ --with-pcsclite=PATH use PC/SC Lite in PATH],
- [pcsc_path=$withval])
-if test "x$pcsc_path" = "xno"; then
- PCSC_MSG="no"
-fi
-if test "x$pcsc_path" != "xno" -a "x$PCSC_MSG" != "xyes"; then
- PKG_CHECK_MODULES(PCSC, libpcsclite, [
- PCSC_MSG="yes"
- AC_MSG_RESULT($PCSC_MSG)
- ],[
- AC_MSG_CHECKING(for PC/SC Lite support (old style))
- for pcscdir in "" /PCSC; do
- CPPFLAGS="$saved_CPPFLAGS"
- LDFLAGS="$saved_LDFLAGS"
- LIBS="-lpcsclite $saved_LIBS"
- PCSC_CFLAGS=""
-
- for pcsc_libdir in $pcsc_path/lib$pcscdir \
- $pcsc_path$pcscdir/lib \
- $pcsc_path$pcscdir; do
- if test -d $pcsc_libdir; then
- if test -n "${need_dash_r}"; then
- LDFLAGS="-R${pcsc_libdir}/ ${LDFLAGS}"
- fi
- LDFLAGS="-L${pcsc_libdir} ${LDFLAGS}"
- fi
- done
-
- for pcsc_incdir in $pcsc_path/include$pcscdir \
- $pcsc_path$pcscdir/include \
- $pcsc_path$pcscdir; do
- if test -d $pcsc_incdir; then
- PCSC_CFLAGS="-I${pcsc_incdir}"
- break;
- fi
- done
-
- CPPFLAGS="${PCSC_CFLAGS} ${CPPFLAGS}"
- AC_TRY_LINK([#include <stdlib.h>
-#include <winscard.h>],[SCardEstablishContext(0, NULL, NULL, NULL);], ac_cv_lib_pcsclite_SCardEstablishContext=yes)
- if test "x$ac_cv_lib_pcsclite_SCardEstablishContext" = "xyes"; then
- PCSC_MSG=yes
- break;
- fi
- CPPFLAGS="$saved_CPPFLAGS"
- LDFLAGS="$saved_LDFLAGS"
- LIBS="$saved_LIBS"
- PCSC_CFLAGS=""
- done
- AC_MSG_RESULT($PCSC_MSG)
- if test "x$PCSC_MSG" = "xyes" ; then
- PCSC_LIBS="-lpcsclite"
- CPPFLAGS="$saved_CPPFLAGS"
- LIBS="$saved_LIBS"
- fi
- ])
-fi
-AM_CONDITIONAL(HAVE_PCSC, test "x$PCSC_MSG" = "xyes")
-if test "x$PCSC_MSG" = "xyes"; then
- AC_DEFINE(HAVE_PCSC, 1, [Have PC/SC implementation])
-else
- PCSC_LIBS=""
- PCSC_CFLAGS=""
+# Checks for programs.
+AC_PROG_CC
+AC_PROG_CXX
+AC_PROG_LIBTOOL
+AC_PROG_INSTALL
+AC_PROG_LN_S
+
+# Checks for libraries.
+if test $WINDOWS -ne 1; then
+AC_CHECK_LIB(z, uncompress, , AC_MSG_ERROR(could not locate libz compression library))
+AC_CHECK_LIB(dl, dlopen, , AC_MSG_ERROR(could not locate dynamic library services library))
fi
-if test "x$PCSC_MSG" = "xyes"; then
- CPPFLAGS="${PCSC_CFLAGS} $saved_CPPFLAGS"
- CFLAGS="$PCSC_CFLAGS $saved_CFLAGS"
- LIBS="$PCSC_LIBS $saved_LIBS"
- AC_TRY_LINK([
-#include <stdlib.h>
-#ifdef __APPLE__
-#include <PCSC/wintypes.h>
-#include <PCSC/winscard.h>
-#else
-#include <winscard.h>
-#endif
- ], [
-SCardControl(NULL, NULL, 0, NULL, NULL);
- ], [
- AC_DEFINE(HAVE_PCSC_OLD, 1, [old version of pc/sc-lite])
- ])
- CPPFLAGS="$saved_CPPFLAGS"
- CFLAGS="$saved_CFLAGS"
- LIBS="$saved_LIBS"
+# add our compiled static libraries
+AC_SUBST(LIBCKYAPPLET)
+LIBCKYAPPLET="\${top_builddir}/src/libckyapplet/libckyapplet.la"
+
+AC_ARG_WITH(pcsclite,
+ [ --with-pcsclite Use pcsc-lite (default=yes)])
+if test "$with_pcsclite" = "no" -o "$with_pcsclite" = "false"
+then
+ with_pcsclite=no
+else
+ PKG_CHECK_MODULES(PCSC, libpcsclite, [ with_pcsclite=yes ],
+ [ if test -f /usr/local/lib/pkgconfig/libpcsclite.pc ; then
+ AC_MSG_ERROR([use PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./configure])
+ else
+ AC_MSG_WARN([pcsc-lite not found])
+ with_pcsclite=no
+ fi
+ ])
fi
+AC_SUBST(ZLIB_CFLAGS)
+AC_SUBST(ZLIB_LIBS)
+AC_SUBST(PCSC_CFLAGS)
+AC_SUBST(PCSC_LIBS)
+AC_SUBST(SCARD_LIB_NAME)
+AM_CONDITIONAL(HAVE_PCSC, test x$with_pcsclite = xyes)
AC_DEFINE(DEBUG, 1, [Define to 1 if you want to include debugging code.])
# Checks for header files.
17 years, 8 months