--- pam-krb5-migrate-0.0.8.orig/Makefile +++ pam-krb5-migrate-0.0.8/Makefile @@ -1,6 +1,7 @@ include Makefile.settings LDFLAGS += -Bsymbolic -x -shared CFLAGS += `$(KRB5CONFIG) --cflags krb5 kadm-client` +CFLAGS += $(COM_ERR_CFLAGS) CFLAGS += -fPIC # Uncomment these lines to build the module with local db support. @@ -10,12 +11,13 @@ # Uncomment these lines to build the module with remote kadmin support. KLOCAL = LIBS += `$(KRB5CONFIG) --libs krb5 kadm-client` +LIBS += $(COM_ERR_LIBS) LIBS += -lc all: pam_krb5_migrate.so pam_krb5_migrate.so: pam_krb5_migrate.o - $(LD) -Bsymbolic -x -shared -o pam_krb5_migrate.so \ + $(LD) -z defs -Bsymbolic -x -shared -o pam_krb5_migrate.so \ pam_krb5_migrate.o $(LIBS) pam_krb5_migrate.o: pam_krb5_migrate.c --- pam-krb5-migrate-0.0.8.orig/Makefile.settings.in +++ pam-krb5-migrate-0.0.8/Makefile.settings.in @@ -3,6 +3,8 @@ DEFS = @DEFS@ LIBS = @LIBS@ KRB5CONFIG = @KRB5CONFIG@ +COM_ERR_CFLAGS = @COM_ERR_CFLAGS@ +COM_ERR_LIBS = @COM_ERR_LIBS@ prefix = @prefix@ datarootdir = @datarootdir@ mandir = @mandir@ --- pam-krb5-migrate-0.0.8.orig/configure.ac +++ pam-krb5-migrate-0.0.8/configure.ac @@ -1,10 +1,11 @@ -AC_INIT(pam-krb5-migrate, 0.0.8, [jelmer@samba.org]) +AC_INIT(pam-krb5-migrate, 0.0.7, [jelmer@samba.org]) AC_PROG_CC AC_PATH_PROG(KRB5CONFIG, krb5-config, no) AC_CHECK_LIB(pam, pam_get_item, [], [AC_MSG_ERROR([pam not found])]) save_LIBS="$LIBS" LIBS="$LIBS `$ac_cv_path_KRB5CONFIG --libs kadm-client`" AC_CHECK_FUNCS(kadm5_get_policy) +PKG_CHECK_MODULES(COM_ERR, com_err) LIBS="$save_LIBS" AC_CONFIG_FILES([Makefile.settings]) AC_OUTPUT --- pam-krb5-migrate-0.0.8.orig/configure +++ pam-krb5-migrate-0.0.8/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for pam-krb5-migrate 0.0.8. +# Generated by GNU Autoconf 2.61 for pam-krb5-migrate 0.0.7. # # Report bugs to . # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='pam-krb5-migrate' PACKAGE_TARNAME='pam-krb5-migrate' -PACKAGE_VERSION='0.0.8' -PACKAGE_STRING='pam-krb5-migrate 0.0.8' +PACKAGE_VERSION='0.0.7' +PACKAGE_STRING='pam-krb5-migrate 0.0.7' PACKAGE_BUGREPORT='jelmer@samba.org' ac_subst_vars='SHELL @@ -623,6 +623,9 @@ EXEEXT OBJEXT KRB5CONFIG +PKG_CONFIG +COM_ERR_CFLAGS +COM_ERR_LIBS LIBOBJS LTLIBOBJS' ac_subst_files='' @@ -633,7 +636,10 @@ CFLAGS LDFLAGS LIBS -CPPFLAGS' +CPPFLAGS +PKG_CONFIG +COM_ERR_CFLAGS +COM_ERR_LIBS' # Initialize some variables set by options. @@ -1136,7 +1142,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures pam-krb5-migrate 0.0.8 to adapt to many kinds of systems. +\`configure' configures pam-krb5-migrate 0.0.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1197,7 +1203,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pam-krb5-migrate 0.0.8:";; + short | recursive ) echo "Configuration of pam-krb5-migrate 0.0.7:";; esac cat <<\_ACEOF @@ -1209,6 +1215,11 @@ LIBS libraries to pass to the linker, e.g. -l CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if you have headers in a nonstandard directory + PKG_CONFIG path to pkg-config utility + COM_ERR_CFLAGS + C compiler flags for COM_ERR, overriding pkg-config + COM_ERR_LIBS + linker flags for COM_ERR, 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. @@ -1274,7 +1285,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pam-krb5-migrate configure 0.0.8 +pam-krb5-migrate configure 0.0.7 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1288,7 +1299,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pam-krb5-migrate $as_me 0.0.8, which was +It was created by pam-krb5-migrate $as_me 0.0.7, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2773,6 +2784,237 @@ fi done + + +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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 +IFS=$as_save_IFS + + ;; +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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 +IFS=$as_save_IFS + + ;; +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 + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +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 COM_ERR" >&5 +echo $ECHO_N "checking for COM_ERR... $ECHO_C" >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$COM_ERR_CFLAGS"; then + pkg_cv_COM_ERR_CFLAGS="$COM_ERR_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"com_err\"") >&5 + ($PKG_CONFIG --exists --print-errors "com_err") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_COM_ERR_CFLAGS=`$PKG_CONFIG --cflags "com_err" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$COM_ERR_LIBS"; then + pkg_cv_COM_ERR_LIBS="$COM_ERR_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"com_err\"") >&5 + ($PKG_CONFIG --exists --print-errors "com_err") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_COM_ERR_LIBS=`$PKG_CONFIG --libs "com_err" 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 + COM_ERR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "com_err"` + else + COM_ERR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "com_err"` + fi + # Put the nasty error message in config.log where it belongs + echo "$COM_ERR_PKG_ERRORS" >&5 + + { { echo "$as_me:$LINENO: error: Package requirements (com_err) were not met: + +$COM_ERR_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables COM_ERR_CFLAGS +and COM_ERR_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&5 +echo "$as_me: error: Package requirements (com_err) were not met: + +$COM_ERR_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables COM_ERR_CFLAGS +and COM_ERR_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&2;} + { (exit 1); exit 1; }; } +elif test $pkg_failed = untried; then + { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables COM_ERR_CFLAGS +and COM_ERR_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details." >&5 +echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables COM_ERR_CFLAGS +and COM_ERR_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +else + COM_ERR_CFLAGS=$pkg_cv_COM_ERR_CFLAGS + COM_ERR_LIBS=$pkg_cv_COM_ERR_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + : +fi LIBS="$save_LIBS" ac_config_files="$ac_config_files Makefile.settings" @@ -3202,7 +3444,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by pam-krb5-migrate $as_me 0.0.8, which was +This file was extended by pam-krb5-migrate $as_me 0.0.7, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3245,7 +3487,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -pam-krb5-migrate config.status 0.0.8 +pam-krb5-migrate config.status 0.0.7 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -3449,11 +3691,14 @@ EXEEXT!$EXEEXT$ac_delim OBJEXT!$OBJEXT$ac_delim KRB5CONFIG!$KRB5CONFIG$ac_delim +PKG_CONFIG!$PKG_CONFIG$ac_delim +COM_ERR_CFLAGS!$COM_ERR_CFLAGS$ac_delim +COM_ERR_LIBS!$COM_ERR_LIBS$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 47; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 50; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 --- pam-krb5-migrate-0.0.8.orig/debian/control +++ pam-krb5-migrate-0.0.8/debian/control @@ -0,0 +1,20 @@ +Source: pam-krb5-migrate +Section: net +Priority: optional +Maintainer: Jelmer Vernooij +Standards-Version: 3.7.3.0 +Build-Depends: debhelper (>= 5.0.2), heimdal-dev (>= 1.0.0), libpam-dev, pkg-config, comerr-dev +Vcs-Bzr: http://people.samba.org/bzr/jelmer/pam_krb5_migrate/debian +XS-DM-Upload-Allowed: yes + +Package: libpam-krb5-migrate-heimdal +Architecture: any +Depends: ${shlibs:Depends} +Description: PAM module for migrating to Kerberos + A stackable authentication module that takes a username and password from an + earlier module in the stack and attempts to transparently add the user to a + Kerberos realm using the Kerberos 5 kadmin service. The module can be used to + ease the administrative burdens of migrating a large installed userbase from + pre-existing authentication methods to a Kerberos-based setup. + . + This package allows updating the database of a remote Heimdal server. --- pam-krb5-migrate-0.0.8.orig/debian/install +++ pam-krb5-migrate-0.0.8/debian/install @@ -0,0 +1,2 @@ +usr/share/man/man7/pam_krb5_migrate.7 +lib/security/pam_krb5_migrate.so --- pam-krb5-migrate-0.0.8.orig/debian/README.Debian +++ pam-krb5-migrate-0.0.8/debian/README.Debian @@ -0,0 +1,51 @@ +pam-krb5-migrate for Debian +--------------------------- +This package has been built with support for accessing the Kerberos +administration over the network. + +SETTING UP THE PAM_KRB5_MIGRATE MODULE + +If you do not already have a KDC, you will need to set up a Kerberos +database for your realm. See the Kerberos V5 Installation Guide for +details. + +If you will be updating against a live database from a machine other than +the KDC, or if you intend to run the migration module on more than one +machine at a time, you will need to use kadmin (or kadmin.local) to create +a special Kerberos principal called pam_migrate/, where + is the full domain name (FQDN) of the host where you're +deploying the pam module. + +% kadmin +Authenticating as principal admin/admin@REALM with password. +kadmin.local: add --use-defaults -r pam_migrate/hostname@REALM +WARNING: no policy specified for pam_migrate/hostname@REALM; defaulting to no policy +Principal "pam_migrate/hostname@REALM" created. + +Then extract the key for this principal to a keytab for use on the host: + +kadmin.local: ext -k /var/kerberos/krb5kdc/hostname.keytab pam_migrate/hostname +Entry for principal pam_migrate/hostname with kvno 4, encryption type DES cbc mode with CRC-32 added to keytab +WRFILE:/var/kerberos/krb5kdc/hostname.keytab. +Entry for principal pam_migrate/hostname with kvno 4, encryption type Triple DES cbc mode raw added to keytab +WRFILE:/var/kerberos/krb5kdc/hostname.keytab. + + +This principal should *only* have permission to add principals to the +database and should have no other permissions. To give the principal +permission to add to the database, add this line to the top of your +kadmind.acl file: + +pam_migrate/hostname@REALM add + +You can also give all principals of the form pam_migrate/ +permission to add by using the line + +pam_migrate/*@REALM add + +You will then need to copy your new keytab (securely!) to the appropriate +machine and install it as /etc/security/pam_krb5.keytab. Like all +keytabs, this file should be readable only by root and should be treated +with the utmost care when transferring it to the destination host. +*Anyone with access to this keytab will be able to create new Kerberos +principals in your realm.* --- pam-krb5-migrate-0.0.8.orig/debian/copyright +++ pam-krb5-migrate-0.0.8/debian/copyright @@ -0,0 +1,22 @@ +This package was Debianized by Jelmer Vernooij +on Sat Nov 11 14:01:19 CET 2006. + +The upstream source was downloaded from http://samba.org/~jelmer/pam_krb5_migrate. + +Copyright (c) Steve Langasek + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + MA 02110-1301, USA. + +The GPL is available on Debian systems in /usr/share/common-licenses/GPL. --- pam-krb5-migrate-0.0.8.orig/debian/rules +++ pam-krb5-migrate-0.0.8/debian/rules @@ -0,0 +1,51 @@ +#!/usr/bin/make -f +# Based on debian/rules from libpam-heimdal + +DESTDIR=$(CURDIR)/debian/tmp + +configure: configure-stamp +configure-stamp: + dh_testdir + ./configure --prefix=/usr + touch configure-stamp + +build: build-stamp +build-stamp: configure + dh_testdir + $(MAKE) CFLAGS=-fPIC + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + [ ! -f Makefile.settings ] || $(MAKE) distclean + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + $(MAKE) install DESTDIR=$(DESTDIR) + dh_install --list-missing --fail-missing --sourcedir=$(DESTDIR) + +binary-indep: build install +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs -a README + dh_installchangelogs -a CHANGELOG + dh_installexamples -a + dh_installman -a pam_krb5_migrate.7 + dh_strip -a + dh_compress -a + dh_fixperms -a + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch +.PHONY: configure build clean binary-indep binary-arch binary install --- pam-krb5-migrate-0.0.8.orig/debian/watch +++ pam-krb5-migrate-0.0.8/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://samba.org/~jelmer/pam_krb5_migrate/pam-krb5-migrate-(.*).tar.gz --- pam-krb5-migrate-0.0.8.orig/debian/compat +++ pam-krb5-migrate-0.0.8/debian/compat @@ -0,0 +1 @@ +5 --- pam-krb5-migrate-0.0.8.orig/debian/changelog +++ pam-krb5-migrate-0.0.8/debian/changelog @@ -0,0 +1,28 @@ +pam-krb5-migrate (0.0.8-1) unstable; urgency=low + + * New upstream release. + + Fixes compatibility with newer Heimdal versions. (Closes: #445579) + * Link with -z defs to force build failure in the future when there are + missing symbols. + * Allow Debian Maintainer uploads. + + -- Jelmer Vernooij Mon, 10 Dec 2007 20:59:40 +0100 + +pam-krb5-migrate (0.0.7-1) unstable; urgency=low + + * Include syslog.h. (Closes: #441683) + * Fix building twice in a row. (Closes: #424346) + + -- Jelmer Vernooij Thu, 13 Sep 2007 18:29:08 +0200 + +pam-krb5-migrate (0.0.6-1) unstable; urgency=low + + * New upstream release. + + -- Jelmer Vernooij Fri, 27 Apr 2007 22:15:01 +0200 + +pam-krb5-migrate (0.0.5-1) unstable; urgency=low + + * Initial release. (Closes: #413820) + + -- Jelmer Vernooij Sat, 11 Nov 2006 13:58:49 +0100 --- pam-krb5-migrate-0.0.8.orig/aclocal.m4 +++ pam-krb5-migrate-0.0.8/aclocal.m4 @@ -0,0 +1,171 @@ +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005 Free Software Foundation, Inc. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# +# Copyright © 2004 Scott James Remnant . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi + +fi[]dnl +])# PKG_PROG_PKG_CONFIG + +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# +# Similar to PKG_CHECK_MODULES, make sure that the first instance of +# this or PKG_CHECK_MODULES is called, or make sure to call +# PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_ifval([$2], [$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$PKG_CONFIG"; then + if test -n "$$1"; then + pkg_cv_[]$1="$$1" + else + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + fi +else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG + +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED + + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +if test $pkg_failed = yes; then + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + + ifelse([$4], , [AC_MSG_ERROR(dnl +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT +])], + [AC_MSG_RESULT([no]) + $4]) +elif test $pkg_failed = untried; then + ifelse([$4], , [AC_MSG_FAILURE(dnl +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +_PKG_TEXT + +To get pkg-config, see .])], + [$4]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + ifelse([$3], , :, [$3]) +fi[]dnl +])# PKG_CHECK_MODULES +