- add internal Venema libskey (from logdaemon) to be able to compile …

…where

  there is no such library available any more (most current systems)
- configure and Makefile cleanups

INSTALL

@@ -1,5 +1,3 @@
-$Id$
-
 Required
 --------
 For building this package you will probably need original Wietse Venema's

Makefile.in

@@ -1,7 +1,3 @@
-# $Id$
-#
-# This is too simple Makefile template. I think some things could be
-# rewritten -kre
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 #$(DESTDIR) should suffice for packaging
@@ -11,6 +7,7 @@ CC=@CC@
 CFLAGS=@CFLAGS@ -Wall -fPIC -DPIC -pedantic
 LIBS=@LIBS@ @SKEYLIB@ @PAMLIB@
 LDFLAGS=@LDFLAGS@
+INTERNAL_SKEYLIB=@INTERNAL_SKEYLIB@
 
 INSTALL=@INSTALL@ -m 644
 RM=@RM@ -f
@@ -20,7 +17,7 @@ AWK=@AWK@
 
 PAM_FILES=pam_skey.so.1 pam_skey_access.so.1
 
-all: $(PAM_FILES)
+all: lib $(PAM_FILES)
 
 pam_skey.so.1: pam_skey.o
 	$(CC) $(CFLAGS) -o $@ $< $(LIBS) $(LDFLAGS)
@@ -49,7 +46,13 @@ install:
 	done \
 
 clean:
+	$(MAKE) -C libskey clean
 	$(RM) a.out core *.so.1 *.o *.bak
 
 distclean: clean
 	$(RM) config.status config.cache config.log defs.h misc.h Makefile
+
+lib:
+ifeq ($(INTERNAL_SKEYLIB),yes)
+	$(MAKE) -C libskey libskey.a
+endif

README

@@ -1,5 +1,3 @@
-$Id$
-
 About
 -----
 This is complete pam_skey modul as interface to existing S/Key

TODO

@@ -1,5 +1,3 @@
-$Id$
-
 TODO/worklist:
 (NOTICE: not necessarily in "right" order)
 

autoconf/configure.in

@@ -67,10 +67,20 @@ AC_ARG_WITH(skey-inc, [  --with-skey-inc=DIR     Directory containing skey inclu
 dnl Check for skey library
 AC_CHECK_LIB(socket, socket)
 AC_CHECK_LIB(nsl, gethostbyname)
-AC_CHECK_LIB(skey, skeyverify, SKEYLIB="-lskey", AC_MSG_ERROR(skey library not found or unknown interface))
-AC_CHECK_LIB(skey, skeyaccess, AC_DEFINE(HAVE_SKEYACCESS))
-AC_CHECK_LIB(skey, skeyinfo, AC_DEFINE(HAVE_SKEYINFO),
-  AC_CHECK_LIB(skey, skeylookup, AC_DEFINE(HAVE_SKEYLOOKUP))
+AC_CHECK_LIB(skey, skeyverify,
+    [SKEYLIB="-lskey"
+    AC_CHECK_LIB(skey, skeyaccess, AC_DEFINE(HAVE_SKEYACCESS))
+    AC_CHECK_LIB(skey, skeyinfo, AC_DEFINE(HAVE_SKEYINFO),
+        AC_CHECK_LIB(skey, skeylookup, AC_DEFINE(HAVE_SKEYLOOKUP)))
+    ],
+    [AC_MSG_WARN(skey library not found or unknown interface)
+    INTERNAL_SKEYLIB="yes"
+    SKEYLIB="-lskey -Llibskey"
+    CFLAGS="${CFLAGS} -Ilibskey"
+    AC_DEFINE(HAVE_SKEYACCESS)
+    AC_DEFINE(HAVE_SKEYINFO)
+    AC_DEFINE(HAVE_SKEYLOOKUP)
+    ]
 )
 
 dnl Check against -G linker flag
@@ -100,6 +110,7 @@ fi
 
 AC_SUBST(LDFLAGS)
 AC_SUBST(SKEYLIB)
+AC_SUBST(INTERNAL_SKEYLIB)
 AC_SUBST(PAMLIB)
 AC_SUBST(MYHOST)
 AC_SUBST(PACKAGE)