Changeset 142

Timestamp:

04/04/08 22:16:16 (4 years ago)

Author:

alonbl

Message:

New build system

Merge new build system:

1. Support mingw.
2. Sync with latest opensc.
3. Remove api documents from distribution.

merge -r 127:141  https://www.opensc-project.org/svn/libp11/branches/alonbl/mingw

_M .
M configure.ac
_M doc
D doc/changelog.sh
M doc/doxygen.conf.in
D doc/export-wiki.xsl
M doc/Makefile.am
A doc/opensc-logo.gif
D doc/generate-api.sh
D doc/export-wiki.sh
AM doc/nonpersistent
A doc/nonpersistent/export-wiki.xsl
A doc/nonpersistent/Makefile.am
A doc/nonpersistent/export-wiki.sh
A doc/nonpersistent/svn2cl.xsl
D doc/svn2cl.xsl
A doc/doxygen-footer.html
_M src
M src/p11_load.c
M src/p11_slot.c
M src/p11_rsa.c
M src/p11_err.c
M src/p11_key.c
A src/libp11.exports
M src/p11_misc.c
M src/p11_cert.c
M src/p11_ops.c
M src/Makefile.am
A src/versioninfo.rc.in
M src/libpkcs11.c
M src/p11_attr.c
M Makefile.am
A svnignore
D aclocal
_M examples

Location:

trunk

Files:

• . (modified) (1 prop)
• Makefile.am (modified) (1 diff)
• aclocal (deleted)
• configure.ac (modified) (2 diffs)
• doc (modified) (1 prop)
• doc/Makefile.am (modified) (1 diff)
• doc/changelog.sh (deleted)
• doc/doxygen-footer.html (copied) (copied from branches/alonbl/mingw/doc/doxygen-footer.html)
• doc/doxygen.conf.in (modified) (27 diffs)
• doc/export-wiki.sh (deleted)
• doc/export-wiki.xsl (deleted)
• doc/generate-api.sh (deleted)
• doc/nonpersistent (copied) (copied from branches/alonbl/mingw/doc/nonpersistent)
• doc/nonpersistent/Makefile.am (copied) (copied from branches/alonbl/mingw/doc/nonpersistent/Makefile.am)
• doc/nonpersistent/export-wiki.sh (copied) (copied from branches/alonbl/mingw/doc/nonpersistent/export-wiki.sh)
• doc/nonpersistent/export-wiki.xsl (copied) (copied from branches/alonbl/mingw/doc/nonpersistent/export-wiki.xsl)
• doc/nonpersistent/svn2cl.xsl (copied) (copied from branches/alonbl/mingw/doc/nonpersistent/svn2cl.xsl)
• doc/opensc-logo.gif (copied) (copied from branches/alonbl/mingw/doc/opensc-logo.gif)
• doc/svn2cl.xsl (deleted)
• examples (modified) (1 prop)
• src (modified) (1 prop)
• src/Makefile.am (modified) (1 diff)
• src/libp11.exports (copied) (copied from branches/alonbl/mingw/src/libp11.exports)
• src/libpkcs11.c (modified) (1 diff)
• src/p11_attr.c (modified) (1 diff)
• src/p11_cert.c (modified) (1 diff)
• src/p11_err.c (modified) (1 diff)
• src/p11_key.c (modified) (1 diff)
• src/p11_load.c (modified) (1 diff)
• src/p11_misc.c (modified) (1 diff)
• src/p11_ops.c (modified) (1 diff)
• src/p11_rsa.c (modified) (1 diff)
• src/p11_slot.c (modified) (1 diff)
• src/versioninfo.rc.in (copied) (copied from branches/alonbl/mingw/src/versioninfo.rc.in)
• svnignore (copied) (copied from branches/alonbl/mingw/svnignore)

trunk/Makefile.am

@@ -1 @@
-# Process this file with automake to create Makefile.in
-
-SUBDIRS = . aclocal src 
-DIST_SUBDIRS = . aclocal doc src
-
-EXTRA_DIST = COPYING NEWS bootstrap depcomp $(shell ls examples/{README,Makefile,*.c})
+AUTOMAKE_OPTIONS = foreign 1.10
 
 MAINTAINERCLEANFILES = \
-        Makefile.in config.h.in configure \
-        install-sh ltmain.sh missing mkinstalldirs \
-        compile depcomp config.log config.status \
-        config.guess config.sub acinclude.m4 aclocal.m4
+        config.log config.status \
+        $(srcdir)/Makefile.in \
+        $(srcdir)/config.h.in $(srcdir)/config.h.in~ $(srcdir)/configure \
+        $(srcdir)/install-sh $(srcdir)/ltmain.sh $(srcdir)/missing \
+        $(srcdir)/depcomp $(srcdir)/aclocal.m4 \
+        $(srcdir)/config.guess $(srcdir)/config.sub \
+        $(srcdir)/packaged
+EXTRA_DIST = svnignore
 
-DEPCLEANFILES = config.log configure
+dist_noinst_DATA = COPYING bootstrap \
+        $(srcdir)/examples/Makefile $(srcdir)/examples/*.c $(srcdir)/examples/README
+dist_doc_DATA = NEWS
 
-AUTOMAKE_OPTIONS = foreign 1.5
-ACLOCAL_AMFLAGS = -I aclocal
+SUBDIRS = src doc
+
+# Allow detection of packaged tarball
+dist-hook:
+        echo > "$(distdir)/packaged"

trunk/configure.ac

@@ -1 +1 @@
 dnl -*- mode: m4; -*-
-dnl Process this file with autoconf to produce a configure script.
-
-# Require autoconf 2.52
-AC_PREREQ(2.52)
-
-AC_INIT(libp11, [0.2.3-svn])
-
-AM_INIT_AUTOMAKE
-
-AC_CONFIG_SRCDIR(src/libp11.h)
+
+AC_PREREQ([2.60])
+
+define([PACKAGE_VERSION_MAJOR], [0])
+define([PACKAGE_VERSION_MINOR], [2])
+define([PACKAGE_VERSION_FIX], [3])
+
+AC_INIT([libp11], [PACKAGE_VERSION_MAJOR.PACKAGE_VERSION_MINOR.PACKAGE_VERSION_FIX-svn])
+AC_CONFIG_AUX_DIR([.])
+AM_CONFIG_HEADER([config.h])
+AM_INIT_AUTOMAKE([${PACKAGE_NAME}], [${PACKAGE_VERSION}])
+
+LIBP11_VERSION_MAJOR="PACKAGE_VERSION_MAJOR"
+LIBP11_VERSION_MINOR="PACKAGE_VERSION_MINOR"
+LIBP11_VERSION_FIX="PACKAGE_VERSION_FIX"
 
 # LT Version numbers, remember to change them just *before* a release.
 #   (Code changed:                      REVISION++)
-#   (Interfaces added/removed/changed:  CURRENT++, REVISION=0)
-#   (Interfaces added:                  AGE++)
-#   (Interfaces removed:                AGE=0)
-LIBP11_VERSION=1:1:1
-
-AC_SUBST(LIBP11_VERSION)
+#   (Oldest interface removed:          OLDEST++)
+#   (Interfaces added:                  CURRENT++, REVISION=0)
+LIBP11_LT_CURRENT="1"
+LIBP11_LT_OLDEST="0"
+LIBP11_LT_REVISION="1"
+LIBP11_LT_AGE="$((${LIBP11_LT_CURRENT}-${LIBP11_LT_OLDEST}))"
+
+AC_CONFIG_SRCDIR([src/libp11.h])
 
 AC_CANONICAL_HOST
 AC_PROG_CC
+PKG_PROG_PKG_CONFIG
 AC_C_BIGENDIAN
 
-dnl Options
-AM_MAINTAINER_MODE
+AC_MSG_CHECKING([svn checkout])
+if test -e packaged; then
+        svn_checkout="no"
+else
+        svn_checkout="yes"
+fi
+AC_MSG_RESULT([${svn_checkout}])
+
+AC_ARG_WITH(
+        [cygwin-native],
+        [AC_HELP_STRING([--with-cygwin-native], [compile native win32])],
+        ,
+        [with_cygwin_native="no"]
+)
+
+dnl Check for some target-specific stuff
+test -z "${WIN32}" && WIN32="no"
+test -z "${CYGWIN}" && CYGWIN="no"
+case "${host}" in
+        *-mingw32*|*-winnt*)
+                WIN32="yes"
+                CPPFLAGS="${CPPFLAGS} -DWIN32_LEAN_AND_MEAN"
+                WIN_LIBPREFIX="lib"
+        ;;
+        *-cygwin*)
+                AC_MSG_CHECKING([cygwin mode to use])
+                CYGWIN="yes"
+                if test "${with_cygwin_native}" = "yes"; then
+                        AC_MSG_RESULT([Using native win32])
+                        CPPFLAGS="${CPPFLAGS} -DWIN32_LEAN_AND_MEAN"
+                        CFLAGS="${CFLAGS} -mno-cygwin"
+                        WIN32="yes"
+                else
+                        AC_MSG_RESULT([Using cygwin])
+                        CPPFLAGS="${CPPFLAGS} -DCRYPTOKI_FORCE_WIN32"
+                        WIN_LIBPREFIX="cyg"
+                        AC_DEFINE([USE_CYGWIN], [1], [Define if you are on Cygwin])
+                fi
+        ;;
+esac
+
+AC_ARG_ENABLE(
+        [strict],
+        [AC_HELP_STRING([--enable-strict], [enable strict compile mode @<:@disabled@:>@])],
+        ,
+        [enable_strict="no"]
+)
+
+AC_ARG_ENABLE(
+        [pedantic],
+        [AC_HELP_STRING([--enable-pedantic], [enable pedantic compile mode @<:@disabled@:>@])],
+        ,
+        [enable_pedantic="no"]
+)
+
+AC_ARG_ENABLE(
+        [doc],
+        [AC_HELP_STRING([--enable-doc], [enable installation of documents. @<:@disabled@:>@])],
+        ,
+        [enable_doc="no"]
+)
+
+AC_ARG_ENABLE(
+        [api-doc],
+        [AC_HELP_STRING([--enable-api-doc], [enable generation and installation of api documents. @<:@disabled@:>@])],
+        ,
+        [enable_api_doc="no"]
+)
+
+AC_ARG_WITH(
+        [apidocdir],
+        [AC_HELP_STRING([--with-apidocdir], [put API documents at this directory, default HTMLDIR/api])],
+        [apidocdir="${with_apidocdir}"],
+        [apidocdir="\$(htmldir)/api"]
+)
 
 dnl Checks for programs.
 AC_PROG_CPP
 AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MKDIR_P
+AC_PROG_SED
+AC_PROG_MAKE_SET
 
 dnl Add libtool support.
+AC_LIBTOOL_WIN32_DLL
+AC_LIBTOOL_RC
 AC_PROG_LIBTOOL
 
@@ -37 +124 @@
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([errno.h fcntl.h malloc.h stdlib.h inttypes.h string.h strings.h sys/time.h unistd.h locale.h getopt.h dlfcn.h utmp.h])
-
-dnl use ltdl
-AC_LIB_LINKFLAGS(ltdl)
-
-saved_LIBS="$LIBS"
-LIBS="$saved_LIBS $LIBLTDL"
-AC_CHECK_HEADER([ltdl.h], [AC_MSG_RESULT([yes])],
-   [ AC_MSG_ERROR([ltdl.h not found, please install libltdl and/or libtool]) ])
-LIBS="$saved_LIBS"
-
-PKG_CHECK_MODULES(OPENSSL, [openssl])
+AC_CHECK_HEADERS([ \
+        errno.h fcntl.h malloc.h stdlib.h \
+        inttypes.h string.h strings.h sys/time.h \
+        unistd.h locale.h getopt.h dlfcn.h utmp.h \
+])
+
+AC_CHECK_PROGS([DOXYGEN],[doxygen])
+test "${enable_api_doc}" = "yes" -a -z "${DOXYGEN}" && AC_MSG_ERROR([doxygen is required for api doc])
+
+dnl These required for svn checkout
+AC_ARG_VAR([XSLTPROC], [xsltproc utility])
+AC_ARG_VAR([SVN], [subversion utility])
+AC_ARG_VAR([WGET], [wget utility])
+AC_ARG_VAR([WGET_OPTS], [wget options])
+AC_ARG_VAR([TR], [tr utility])
+AC_CHECK_PROGS([XSLTPROC],[xsltproc])
+AC_CHECK_PROGS([SVN],[svn])
+AC_CHECK_PROGS([WGET],[wget])
+AC_CHECK_PROGS([TR],[tr])
+test -z "${WGET_OPTS}" && WGET_OPTS="-nv"
+
+dnl svn checkout dependencies
+if test "${svn_checkout}" = "yes"; then
+        AC_MSG_CHECKING([XSLTPROC requirement])
+        if test -n "${XSLTPROC}"; then
+                AC_MSG_RESULT([ok])
+        else
+                if test "${enable_doc}" = "yes"; then
+                        AC_MSG_ERROR([Missing XSLTPROC svn build with doc])
+                else
+                        AC_MSG_WARN(["make dist" will not work])
+                fi
+        fi
+
+        AC_MSG_CHECKING([svn doc build dependencies])
+        if test -n "${SVN}" -a -n "${TR}" -a -n "${WGET}"; then
+                AC_MSG_RESULT([ok])
+        else
+                if test "${enable_doc}" = "yes"; then
+                        AC_MSG_ERROR([Missing SVN, TR or WGET for svn doc build])
+                else
+                        AC_MSG_WARN(["make dist" will not work])
+                fi
+        fi
+fi
+
+AC_ARG_VAR([LTLIB_CFLAGS], [C compiler flags for libltdl])
+AC_ARG_VAR([LTLIB_LIBS], [linker flags for libltdl])
+if test -z "${LTLIB_LIBS}"; then
+        AC_CHECK_LIB(
+                [ltdl],
+                [lt_dlopen],
+                [LTLIB_LIBS="-lltdl"],
+                [AC_MSG_ERROR([ltdl not found, please install libltdl and/or libtool])]
+        )
+
+fi
+saved_CFLAGS="${CFLAGS}"
+CFLAGS="${CFLAGS} ${LTLIB_CFLAGS}"
+AC_CHECK_HEADER(
+        [ltdl.h],
+        ,
+        [AC_MSG_ERROR([ltdl.h not found, please install libltdl and/or libtool])]
+)
+CFLAGS="${saved_CFLAGS}"
+
+PKG_CHECK_MODULES(
+        [OPENSSL],
+        [libcrypto >= 0.9.7],
+        ,
+        [PKG_CHECK_MODULES(
+                [OPENSSL],
+                [openssl >= 0.9.7],
+                ,
+                [AC_CHECK_LIB(
+                        [crypto],
+                        [RSA_version],
+                        [OPENSSL_LIBS="-lcrypto"],
+                        [AC_MSG_ERROR([Cannot find OpenSSL])]
+                )]
+        )]
+)
+
+pkgconfigdir="\$(libdir)/pkgconfig"
+
+AC_SUBST([pkgconfigdir])
+AC_SUBST([apidocdir])
+AC_SUBST([LIBP11_VERSION_MAJOR])
+AC_SUBST([LIBP11_VERSION_MINOR])
+AC_SUBST([LIBP11_VERSION_FIX])
+AC_SUBST([LIBP11_LT_CURRENT])
+AC_SUBST([LIBP11_LT_REVISION])
+AC_SUBST([LIBP11_LT_AGE])
+AC_SUBST([LIBP11_LT_OLDEST])
+AC_SUBST([WIN_LIBPREFIX])
+
+AM_CONDITIONAL([SVN_CHECKOUT], [test "${svn_checkout}" = "yes"])
+AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"])
+AM_CONDITIONAL([CYGWIN], [test "${CYGWIN}" = "yes"])
+AM_CONDITIONAL([ENABLE_DOC], [test "${enable_doc}" = "yes"])
+AM_CONDITIONAL([ENABLE_API_DOC], [test "${enable_api_doc}" = "yes"])
+
+if test "${enable_pedantic}" = "yes"; then
+        enable_strict="yes";
+        CFLAGS="${CFLAGS} -pedantic"
+fi
+if test "${enable_strict}" = "yes"; then
+        CFLAGS="${CFLAGS} -Wall -Wextra"
+fi
 
 AC_OUTPUT([
-Makefile
-aclocal/Makefile
-doc/Makefile
-doc/doxygen.conf
-src/Makefile
-src/libp11.pc
+        Makefile
+        src/Makefile
+        src/libp11.pc
+        src/versioninfo.rc
+        doc/Makefile
+        doc/doxygen.conf
+        doc/nonpersistent/Makefile
 ])
+
+cat <<EOF
+
+libp11 has been configured with the following options:
+
+
+Version:                 ${PACKAGE_VERSION}
+Libraries:               $(eval eval eval echo "${libdir}")
+
+doc support:             ${enable_doc}
+api doc support:         ${enable_api_doc}
+
+Host:                    ${host}
+Compiler:                ${CC}
+Preprocessor flags:      ${CPPFLAGS}
+Compiler flags:          ${CFLAGS}
+Linker flags:            ${LDFLAGS}
+Libraries:               ${LIBS}
+
+LTLIB_CFLAGS:            ${LTLIB_CFLAGS}
+LTLIB_LIBS:              ${LTLIB_LIBS}
+OPENSSL_CFLAGS:          ${OPENSSL_CFLAGS}
+OPENSSL_LIBS:            ${OPENSSL_LIBS}
+
+EOF

trunk/doc/Makefile.am

@@ -1 @@
-# Process this file with automake to create Makefile.in
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 
-MAINTAINERCLEANFILES = Makefile.in $(HTML) ChangeLog
+if ENABLE_DOC
+SUBDIRS = nonpersistent
+endif
+DIST_SUBDIRS = nonpersistent
 
-EXTRA_DIST = README export-wiki.sh export-wiki.xsl \
-        generate-api.sh doxygen.conf.in $(HTML) index.html ChangeLog
+dist_doc_DATA = README
+dist_noinst_DATA = $(srcdir)/doxygen-footer.html $(srcdir)/*.gif
 
-HTML= $(shell ls $(srcdir)/*.html $(srcdir)/*.css $(srcdir)/api/*)
+if ENABLE_API_DOC
 
-index.html:
-        sh $(srcdir)/export-wiki.sh $(srcdir)
-        sh $(srcdir)/generate-api.sh $(srcdir)
+apidoc_DATA=api.out/html/*
 
-ChangeLog:
-        sh $(srcdir)/changelog.sh $(srcdir)
+
+api.out/html/*: \
+                $(top_srcdir)/src/*.h \
+                $(srcdir)/*.gif \
+                doxygen.conf
+        -rm -fr api.out
+        $(DOXYGEN) doxygen.conf
+        cp "$(srcdir)"/*.gif api.out/html
+
+endif
+
+clean-local:
+        -rm -fr api.out

trunk/doc/doxygen.conf.in

@@ -1 @@
-# Doxyfile 1.4.2
+# Doxyfile 1.5.4
 
 # This file describes the settings to be used by the documentation system
@@ -15 +15 @@
 #---------------------------------------------------------------------------
 
+# This tag specifies the encoding used for all characters in the config file that 
+# follow. The default is UTF-8 which is also the encoding used for all text before 
+# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into 
+# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of 
+# possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
 # by quotes) that should identify the project.
@@ -31 +39 @@
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = doc
+OUTPUT_DIRECTORY       = api.out
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
@@ -46 +54 @@
 # information to generate all constant output in the proper language. 
 # The default language is English, other supported languages are: 
-# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, 
-# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese, 
-# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian, 
-# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, 
-# Swedish, and Ukrainian.
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
+# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, 
+# Italian, Japanese, Japanese-en (Japanese with English messages), Korean, 
+# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, 
+# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
 
 OUTPUT_LANGUAGE        = English
-
-# This tag can be used to specify the encoding used in the generated output. 
-# The encoding is not always determined by the language that is chosen, 
-# but also whether or not the output is meant for Windows or non-Windows users. 
-# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES 
-# forces the Windows encoding (this is the default for the Windows binary), 
-# whereas setting the tag to NO uses a Unix-style encoding (the default for 
-# all platforms other than Windows).
-
-USE_WINDOWS_ENCODING   = NO
 
 # If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
@@ -116 +114 @@
 # path to strip.
 
-STRIP_FROM_PATH        = 
+STRIP_FROM_PATH        = @top_srcdir@/src
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
@@ -136 +134 @@
 # will interpret the first line (until the first dot) of a JavaDoc-style 
 # comment as the brief description. If set to NO, the JavaDoc 
-# comments will behave just like the Qt-style comments (thus requiring an 
-# explicit @brief command for a brief description.
+# comments will behave just like regular Qt-style comments 
+# (thus requiring an explicit @brief command for a brief description.)
 
 JAVADOC_AUTOBRIEF      = YES
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
+# interpret the first line (until the first dot) of a Qt-style 
+# comment as the brief description. If set to NO, the comments 
+# will behave just like regular Qt-style comments (thus requiring 
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF           = NO
 
 # The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
@@ -161 +167 @@
 
 INHERIT_DOCS           = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
-# tag is set to YES, then doxygen will reuse the documentation of the first 
-# member in the group (if any) for the other members of the group. By default 
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC   = NO
 
 # If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
@@ -196 +195 @@
 OPTIMIZE_OUTPUT_FOR_C  = YES
 
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources 
-# only. Doxygen will then generate output that is more tailored for Java. 
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
+# sources only. Doxygen will then generate output that is more tailored for Java. 
 # For instance, namespaces will be presented as packages, qualified scopes 
 # will look different, etc.
 
 OPTIMIZE_OUTPUT_JAVA   = NO
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to 
+# include (a tag file for) the STL sources as input, then you should 
+# set this tag to YES in order to let doxygen match functions declarations and 
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
+# func(std::string) {}). This also make the inheritance and collaboration 
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. 
+# Doxygen will parse them like normal C++ but will assume all classes use public 
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT            = NO
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
+# tag is set to YES, then doxygen will reuse the documentation of the first 
+# member in the group (if any) for the other members of the group. By default 
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
 
 # Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
@@ -211 +237 @@
 SUBGROUPING            = YES
 
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct (or union) is 
+# documented as struct with the name of the typedef. So 
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct 
+# with name TypeT. When disabled the typedef will appear as a member of a file, 
+# namespace, or class. And the struct will be named TypeS. This can typically 
+# be useful for C code where the coding convention is that all structs are 
+# typedef'ed and only the typedef is referenced never the struct's name.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
 #---------------------------------------------------------------------------
 # Build related configuration options
@@ -244 +280 @@
 
 EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be extracted 
+# and appear in the documentation as a namespace called 'anonymous_namespace{file}', 
+# where file will be replaced with the base name of the file that contains the anonymous 
+# namespace. By default anonymous namespace are hidden.
+
+EXTRACT_ANON_NSPACES   = NO
 
 # If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
@@ -377 +420 @@
 # If the sources in your project are distributed over multiple directories 
 # then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
-# in the documentation.
+# in the documentation. The default is NO.
 
 SHOW_DIRECTORIES       = YES
@@ -386 +429 @@
 # popen()) the command <command> <input-file>, where <command> is the value of 
 # the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
-# provided by doxygen. Whatever the progam writes to standard output 
+# provided by doxygen. Whatever the program writes to standard output 
 # is used as the file version. See the manual for examples.
 
@@ -434 +477 @@
 # be obtained via FILE_VERSION_FILTER)
 
-WARN_FORMAT            = "$file:$line: $text"
+WARN_FORMAT            = "$file:$line: $text  "
 
 # The WARN_LOGFILE tag can be used to specify a file to which warning 
@@ -451 +494 @@
 # with spaces.
 
-INPUT                  = src/
+INPUT                  = @top_srcdir@/src
+
+# This tag can be used to specify the character encoding of the source files that 
+# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default 
+# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding. 
+# See http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+INPUT_ENCODING         = UTF-8
 
 # If the value of the INPUT tag contains directories, you can use the 
@@ -458 +508 @@
 # blank the following patterns are tested: 
 # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
 
 FILE_PATTERNS          = libp11.h
@@ -482 +532 @@
 # If the value of the INPUT tag contains directories, you can use the 
 # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
-# certain files from those directories.
-
-EXCLUDE_PATTERNS       = 
+# certain files from those directories. Note that the wildcards are matched 
+# against the file with absolute path, so to exclude all test directories 
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       = */.svn/*
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
+# (namespaces, classes, functions, etc.) that should be excluded from the output. 
+# The symbol name can be a fully qualified name, a word, or if the wildcard * is used, 
+# a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        = 
 
 # The EXAMPLE_PATH tag can be used to specify one or more files or 
@@ -544 +603 @@
 # be generated. Documented entities will be cross-referenced with these sources. 
 # Note: To get rid of all source code in the generated output, make sure also 
-# VERBATIM_HEADERS is set to NO.
+# VERBATIM_HEADERS is set to NO. If you have enabled CALL_GRAPH or CALLER_GRAPH 
+# then you must also enable this option. If you don't then doxygen will produce 
+# a warning and turn it on anyway
 
 SOURCE_BROWSER         = YES
@@ -570 +631 @@
 
 REFERENCES_RELATION    = YES
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.  Otherwise they will link to the documentstion.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code 
+# will point to the HTML generated by the htags(1) tool instead of doxygen 
+# built-in source browser. The htags tool is part of GNU's global source 
+# tagging system (see http://www.gnu.org/software/global/global.html). You 
+# will need version 4.8.6 or higher.
+
+USE_HTAGS              = NO
 
 # If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
@@ -613 +689 @@
 # put in front of it. If left blank `html' will be used as the default path.
 
-HTML_OUTPUT            = api
+HTML_OUTPUT            = html
 
 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
@@ -631 +707 @@
 # standard footer.
 
-HTML_FOOTER            = 
+HTML_FOOTER            = @srcdir@/doxygen-footer.html
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
@@ -655 +731 @@
 GENERATE_HTMLHELP      = NO
 
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
+# documentation will contain sections that can be hidden and shown after the 
+# page has loaded. For this to work a browser that supports 
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox 
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS  = NO
+
 # If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
 # be used to specify the file name of the resulting .chm file. You 
@@ -957 +1041 @@
 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
 # then the macro expansion is limited to the macros specified with the 
-# PREDEFINED and EXPAND_AS_PREDEFINED tags.
+# PREDEFINED and EXPAND_AS_DEFINED tags.
 
 EXPAND_ONLY_PREDEF     = NO
@@ -1060 +1144 @@
 CLASS_DIAGRAMS         = YES
 
+# You can define message sequence charts within doxygen comments using the \msc 
+# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to 
+# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to 
+# specify the directory where the mscgen tool resides. If left empty the tool is assumed to 
+# be found in the default search path.
+
+MSCGEN_PATH            = 
+
 # If set to YES, the inheritance and collaboration graphs will hide 
 # inheritance and usage relations if the target is undocumented 
@@ -1117 +1209 @@
 INCLUDED_BY_GRAPH      = YES
 
-# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will 
+# If the CALL_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will 
 # generate a call dependency graph for every global function or class method. 
 # Note that enabling this option will significantly increase the time of a run. 
@@ -1125 +1217 @@
 CALL_GRAPH             = NO
 
+# If the CALLER_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will 
+# generate a caller dependency graph for every global function or class method. 
+# Note that enabling this option will significantly increase the time of a run. 
+# So in most cases it will be better to enable caller graphs for selected 
+# functions only using the \callergraph command.
+
+CALLER_GRAPH           = NO
+
 # If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
 # will graphical hierarchy of all classes instead of a textual one.
@@ -1154 +1254 @@
 DOTFILE_DIRS           = 
 
-# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot cope with very 
-# large images.
-
-MAX_DOT_GRAPH_WIDTH    = 1024
-
-# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot cope with very 
-# large images.
-
-MAX_DOT_GRAPH_HEIGHT   = 1024
+# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
+# nodes that will be shown in the graph. If the number of nodes in a graph 
+# becomes larger than this value, doxygen will truncate the graph, which is 
+# visualized by representing a node as a red box. Note that doxygen if the number 
+# of direct children of the root node in a graph is already larger than 
+# MAX_DOT_GRAPH_NOTES then the graph will not be shown at all. Also note 
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+
+DOT_GRAPH_MAX_NODES    = 50
 
 # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
@@ -1175 +1269 @@
 # that lay further from the root node will be omitted. Note that setting this 
 # option to 1 or 2 may greatly reduce the computation time needed for large 
-# code bases. Also note that a graph may be further truncated if the graph's 
-# image dimensions are not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH 
-# and MAX_DOT_GRAPH_HEIGHT). If 0 is used for the depth value (the default), 
-# the graph is not depth-constrained.
+# code bases. Also note that the size of a graph can be further restricted by 
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
 
 MAX_DOT_GRAPH_DEPTH    = 0

trunk/src/Makefile.am

@@ -1 @@
-# Process this file with automake to create Makefile.in
-
-MAINTAINERCLEANFILES = Makefile.in
-DISTCLEANFILES= libp11.pc
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+CLEANFILES = libp11.pc
 EXTRA_DIST = Makefile.mak makedef.pl
-
-INCLUDES = $(OPENSSL_CFLAGS)
 
 noinst_HEADERS= libp11-int.h pkcs11.h
 include_HEADERS= libp11.h
-
 lib_LTLIBRARIES = libp11.la
+pkgconfig_DATA = libp11.pc
 
 libp11_la_SOURCES = libpkcs11.c p11_attr.c p11_cert.c p11_err.c p11_key.c \
-        p11_load.c p11_misc.c p11_ops.c p11_rsa.c p11_slot.c 
+        p11_load.c p11_misc.c p11_ops.c p11_rsa.c p11_slot.c \
+        libp11.exports
+if WIN32
+nodist_libp11_la_SOURCES = versioninfo.rc
+endif
+libp11_la_CFLAGS = $(AM_CFLAGS) $(OPENSSL_CFLAGS) $(LTLIB_CFLAGS)
+libp11_la_LIBADD = $(OPENSSL_LIBS) $(LTLIB_LIBS)
+libp11_la_LDFLAGS = $(AM_LDFLAGS) \
+        -version-info @LIBP11_LT_CURRENT@:@LIBP11_LT_REVISION@:@LIBP11_LT_AGE@ \
+        -export-symbols "$(srcdir)/libp11.exports" \
+        -no-undefined
 
-libp11_la_LDFLAGS = -version-info $(LIBP11_VERSION)
-libp11_la_LIBADD = $(OPENSSL_LIBS) $(LTLIBLTDL)
+if WIN32
+# def file required for MS users to build library
+mylibdir=$(libdir)
+mylib_DATA=.libs/@WIN_LIBPREFIX@p11-@LIBP11_LT_OLDEST@.dll.def
+.libs/@WIN_LIBPREFIX@p11-@LIBP11_LT_OLDEST@.dll.def:    libp11.la
+endif
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libp11.pc
+RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+        $(AM_CPPFLAGS) $(CPPFLAGS)
+LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RCCOMPILE)
+
+.rc.lo:
+        $(LTRCCOMPILE) -i "$<" -o "$@"
+
+.rc.o:
+        $(RCCOMPILE) -i "$<" -o "$@"
+

trunk/src/libpkcs11.c

@@ -24 +24 @@
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <stdio.h>

trunk/src/p11_attr.c

@@ -26 +26 @@
  */
 
+#include <config.h>
 #include <assert.h>
 #include <string.h>

trunk/src/p11_cert.c

@@ -23 +23 @@
  */
 
+#include <config.h>
 #include <string.h>
 #include "libp11-int.h"

trunk/src/p11_err.c

@@ -17 +17 @@
  */
 
+#include <config.h>
 #include "libp11-int.h"
 

trunk/src/p11_key.c

@@ -17 +17 @@
  */
 
+#include <config.h>
 #include <string.h>
 #include "libp11-int.h"

trunk/src/p11_load.c

@@ -17 +17 @@
  */
 
+#include <config.h>
 #include <string.h>
 #include "libp11-int.h"

trunk/src/p11_misc.c

@@ -17 +17 @@
  */
 
+#include <config.h>
 #include <string.h>
 #include <openssl/crypto.h>

trunk/src/p11_ops.c

@@ -21 +21 @@
 /* this file does certain cryptographic operations via the pkcs11 library */
 
+#include <config.h>
 #include <string.h>
 #include "libp11-int.h"

trunk/src/p11_rsa.c

@@ -22 +22 @@
  */
 
+#include <config.h>
 #include <string.h>
 #include <openssl/evp.h>

trunk/src/p11_slot.c

@@ -17 +17 @@
  */
 
+#include <config.h>
 #include <string.h>
 #include <openssl/buffer.h>