Changeset 56

Timestamp:

08/29/08 16:32:39 (3 months ago)

Author:

alonbl

Message:

New build system

Location:

trunk

Files:

• . (modified) (1 prop)
• Makefile.am (modified) (1 diff)
• NEWS (modified) (1 diff)
• aclocal (deleted)
• bootstrap (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• doc (modified) (1 prop)
• doc/Makefile.am (modified) (1 diff)
• doc/changelog.sh (deleted)
• doc/export-wiki.sh (deleted)
• doc/export-wiki.xsl (deleted)
• doc/nonpersistent (added)
• doc/nonpersistent/Makefile.am (added)
• doc/nonpersistent/export-wiki.sh (added)
• doc/nonpersistent/export-wiki.xsl (added)
• doc/nonpersistent/svn2cl.xsl (added)
• doc/svn2cl.xsl (deleted)
• m4 (added)
• src (modified) (1 prop)
• src/Makefile.am (modified) (1 diff)
• src/pam_p11.exports (added)
• svnignore (added)

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
+AUTOMAKE_OPTIONS = foreign 1.10
+ACLOCAL_AMFLAGS = -I m4
 
 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)/m4/ltsugar.m4 $(srcdir)/m4/libtool.m4 \
+        $(srcdir)/m4/ltversion.m4 $(srcdir)/m4/lt~obsolete.m4 \
+        $(srcdir)/m4/ltoptions.m4 \
+        $(srcdir)/packaged
+EXTRA_DIST = svnignore
 
-DEPCLEANFILES = config.log configure
+SUBDIRS = src doc
 
-AUTOMAKE_OPTIONS = foreign 1.5
-ACLOCAL_AMFLAGS = -I aclocal
+dist_noinst_SCRIPTS = bootstrap
+dist_doc_DATA = NEWS
+
+# Allow detection of packaged tarball
+dist-hook:
+        $(MKDIR_P) "$(distdir)/m4"
+        echo > "$(distdir)/packaged"

trunk/NEWS

@@ -1 +1 @@
 NEWS for Pam_p11 -- History of user visible changes
+
+New in 0.1.6; ????-??-??; Andreas Jellinghaus
+* Build system rewritten (NOTICE: configure options was modified). 
 
 New in 0.1.5; 2008-08-27; Andreas Jellinghaus

trunk/bootstrap

@@ -8 +8 @@
 rm -rf *~ *.cache *.m4 config.guess config.log \
         config.status config.sub depcomp ltmain.sh
-autoreconf --verbose --install
+autoreconf --verbose --install --force

trunk/configure.ac

@@ -1 @@
-# $Id$
-
-# Require autoconf 2.52
-AC_PREREQ(2.52)
-
-# Process this file with autoconf to produce a configure script.
-AC_INIT(pam_p11,[0.1.5-svn])
+
+AC_PREREQ(2.60)
+
+define([PACKAGE_VERSION_MAJOR], [0])
+define([PACKAGE_VERSION_MINOR], [1])
+define([PACKAGE_VERSION_FIX], [5])
+
+AC_INIT([pam_p11],[PACKAGE_VERSION_MAJOR.PACKAGE_VERSION_MINOR.PACKAGE_VERSION_FIX-svn])
+AC_CONFIG_AUX_DIR([.])
+AM_CONFIG_HEADER([config.h])
+AC_CONFIG_MACRO_DIR([m4])
+AM_INIT_AUTOMAKE([${PACKAGE_NAME}], [${PACKAGE_VERSION}])
+
 AC_CONFIG_SRCDIR([src/pam_p11.c])
-AC_CANONICAL_TARGET([])
-AM_INIT_AUTOMAKE
-
-AM_MAINTAINER_MODE
-
-# Checks for programs.
+
+AC_CANONICAL_HOST
 AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_LIBTOOL
+PKG_PROG_PKG_CONFIG
+AC_C_BIGENDIAN
+
+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_ENABLE(
+        [strict],
+        [AS_HELP_STRING([--enable-strict],[enable strict compile mode @<:@disabled@:>@])],
+        ,
+        [enable_strict="no"]
+)
+
+AC_ARG_ENABLE(
+        [pedantic],
+        [AS_HELP_STRING([--enable-pedantic],[enable pedantic compile mode @<:@disabled@:>@])],
+        ,
+        [enable_pedantic="no"]
+)
+
+AC_ARG_ENABLE(
+        [doc],
+        [AS_HELP_STRING([--enable-doc],[enable installation of documents @<:@disabled@:>@])],
+        ,
+        [enable_doc="no"]
+)
+
+AC_ARG_WITH(
+        [pamdir],
+        [AS_HELP_STRING([--with-pamdir=PATH],[Specify the directory where PAM modules are stored])],
+        [pamdir="${withval}"],
+        [
+                if test "${prefix}" = "/usr"; then
+                        pamdir="/lib${libdir##*/lib}/security"
+                else
+                        pamdir="\$(libdir)/security"
+                fi
+        ]
+)
+
+dnl Checks for programs.
+AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_LN_S
-
-# Checks for header files.
+AC_PROG_MKDIR_P
+AC_PROG_SED
+AC_PROG_MAKE_SET
+
+dnl Add libtool support.
+ifdef(
+        [LT_INIT],
+        [LT_INIT],
+        [AC_PROG_LIBTOOL]
+)
+
+dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([string.h syslog.h fcntl.h unistd.h security/pam_ext.h])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
+AC_HEADER_SYS_WAIT
+AC_CHECK_HEADERS([ \
+        string.h syslog.h fcntl.h unistd.h security/pam_ext.h \
+])
 AC_TYPE_SIZE_T
-
-# Checks for library functions.
 AC_FUNC_MALLOC
 AC_FUNC_REALLOC
@@ -34 +89 @@
 AC_CHECK_FUNCS([memset strdup strerror])
 
-# Checks for libraries.
-AC_CHECK_LIB(pam, pam_get_item, , AC_MSG_ERROR(could not locate pam libraries))
-
-# Check and set OpenSSL paths
-PKG_CHECK_MODULES(OPENSSL, openssl, [], [ AC_MSG_ERROR(openssl not found) ])
-PKG_CHECK_MODULES(LIBP11, libp11, [], [ AC_MSG_ERROR(libp11 not found) ])
-
-AC_CONFIG_FILES([ 
-Makefile
-aclocal/Makefile
-doc/Makefile
-src/Makefile
+PKG_CHECK_MODULES([LIBP11], [libp11 >= 0.2.4],, [AC_MSG_ERROR([libp11 is required])])
+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])]
+                )]
+        )]
+)
+
+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
+
+if test -z "${PAM_LIBS}"; then
+        AC_ARG_VAR([PAM_CFLAGS], [C compiler flags for pam])
+        AC_ARG_VAR([PAM_LIBS], [linker flags for pam])
+        AC_CHECK_LIB(
+                [pam],
+                [pam_authenticate],
+                [PAM_LIBS="-lpam"],
+                [AC_MSG_ERROR([Cannot find pam])]
+        )
+fi
+
+AC_SUBST([pamdir])
+
+AM_CONDITIONAL([SVN_CHECKOUT], [test "${svn_checkout}" = "yes"])
+AM_CONDITIONAL([ENABLE_DOC], [test "${enable_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_CONFIG_FILES([
+        Makefile
+        doc/Makefile
+        doc/nonpersistent/Makefile
+        src/Makefile
 ])
 AC_OUTPUT
+
+cat <<EOF
+
+pam_p11 has been configured with the following options:
+
+
+Version:                 ${PACKAGE_VERSION}
+Libraries:               $(eval eval eval echo "${libdir}")
+
+doc support:             ${enable_doc}
+
+Host:                    ${host}
+Compiler:                ${CC}
+Preprocessor flags:      ${CPPFLAGS}
+Compiler flags:          ${CFLAGS}
+Linker flags:            ${LDFLAGS}
+Libraries:               ${LIBS}
+
+pamdir                   ${pamdir}
+
+PAM_CFLAGS:              ${PAM_CFLAGS}
+PAM_LIBS:                ${PAM_LIBS}
+LIBP11_CFLAGS:           ${LIBP11_CFLAGS}
+LIBP11_LIBS:             ${LIBP11_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 $(HTML) index.html ChangeLog
-
-HTML= $(shell ls $(srcdir)/*.html $(srcdir)/*.css)
-
-index.html:
-        sh $(srcdir)/export-wiki.sh $(srcdir)
-
-ChangeLog:
-        sh $(srcdir)/changelog.sh $(srcdir)
+dist_doc_DATA = README

trunk/src/Makefile.am

@@ -1 @@
-# Process this file with automake to create Makefile.in
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 
-MAINTAINERCLEANFILES = Makefile.in
+EXTRA_DIST = test.c
 
-AM_CFLAGS = -Wall -fno-strict-aliasing $(OPENSSL_CFLAGS) $(LIBP11_CFLAGS)
-AM_LDFLAGS = -module -avoid-version
+AM_CFLAGS = $(OPENSSL_CFLAGS) $(LIBP11_CFLAGS) $(PAM_CFLAGS)
+LIBS = $(OPENSSL_LIBS) $(LIBP11_LIBS) $(PAM_LIBS)
+AM_LDFLAGS = -module -avoid-version -shared -no-undefined \
+        -export-symbols "$(srcdir)/pam_p11.exports"
 
-lib_LTLIBRARIES = pam_p11_openssh.la  pam_p11_opensc.la 
+pam_LTLIBRARIES = pam_p11_openssh.la  pam_p11_opensc.la 
 
-pam_p11_openssh_la_SOURCES =  pam_p11.c base64.c match_openssh.c
-pam_p11_openssh_la_LIBADD = $(OPENSSL_LIBS) $(LIBP11_LIBS) 
+# Needed until libtool-2
+install-data-hook:      install-pamLTLIBRARIES
+        rm -f "$(DESTDIR)$(pamdir)/pam_p11_openssh.la"
+        rm -f "$(DESTDIR)$(pamdir)/pam_p11_openssh.a"
+        rm -f "$(DESTDIR)$(pamdir)/pam_p11_opensc.la"
+        rm -f "$(DESTDIR)$(pamdir)/pam_p11_opensc.a"
+uninstall-local:
+        rm -f "$(DESTDIR)$(pamdir)/pam_p11_openssh.so"
+        rm -f "$(DESTDIR)$(pamdir)/pam_p11_opensc.so"
 
-pam_p11_opensc_la_SOURCES =  pam_p11.c match_opensc.c
-pam_p11_opensc_la_LIBADD = $(OPENSSL_LIBS) $(LIBP11_LIBS) 
-
-noinst_PROGRAMS= test
-
-test_SOURCES=test.c
-test_LDADD=pam_p11_openssh.la
+pam_p11_openssh_la_SOURCES =  pam_p11.c base64.c match_openssh.c \
+        pam_p11.exports
+pam_p11_opensc_la_SOURCES =  pam_p11.c match_opensc.c \
+        pam_p11.exports
 
 format:
         indent -kr -i8 -ts8 -sob -l80 -ss -ncs *.c *.h
-
-install:       
-        $(mkinstalldirs) $(DESTDIR)/$(libdir)/security
-        $(libLTLIBRARIES_INSTALL) $(top_builddir)/src/.libs/pam_p11_openssh.so $(DESTDIR)/$(libdir)/security
-        $(libLTLIBRARIES_INSTALL) $(top_builddir)/src/.libs/pam_p11_opensc.so $(DESTDIR)/$(libdir)/security
-
-uninstall:       
-        $(RM) $(DESTDIR)/$(libdir)/security/pam_p11_openssh.so 
-        $(RM) $(DESTDIR)/$(libdir)/security/pam_p11_opensc.so 
-        @ rmdir $(DESTDIR)/$(libdir)/security