From aa3b52a5f318e49344d7260333c241f51df1f740 Mon Sep 17 00:00:00 2001
From: Stef Walter <stef@memberwebs.com>
Date: Wed, 5 May 2004 22:34:15 +0000
Subject: - Build process fixes

---
 .cvsignore         |  1 +
 Makefile.am        |  2 +-
 configure.in       |  6 ++++--
 daemon/Makefile.am | 14 ++++++++++----
 doc/.cvsignore     |  2 ++
 5 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 doc/.cvsignore

diff --git a/.cvsignore b/.cvsignore
index c3101e3..a5fe708 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -18,3 +18,4 @@ stamp-*
 *~
 compile
 config.h.in
+*.tar.gz
diff --git a/Makefile.am b/Makefile.am
index 47af21f..3f6293e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 
-EXTRA_DIST = apache1x common config.sub
+EXTRA_DIST = apache1x common config.sub acsite.m4
 SUBDIRS = daemon doc
 
 dist-hook:
diff --git a/configure.in b/configure.in
index c70ae2b..9937e2f 100644
--- a/configure.in
+++ b/configure.in
@@ -71,8 +71,10 @@ ACX_PTHREAD( , [echo "ERROR: Pthread support not found."; exit 1] )
 LIBS="$PTHREAD_LIBS $LIBS"
 CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
 
-AC_CHECK_LIB([crypt], [crypt], ,
-		[ echo "ERROR: Crypt library required."; exit 1] )
+AC_CHECK_LIB([crypt_r], [crypt], , [
+	AC_CHECK_LIB([crypt], [crypt], ,
+			[ echo "ERROR: Crypt library required."; exit 1] )
+	])
 
 AC_CHECK_LIB([ldap], [ldap_init], ,
 		[ echo "ERROR: Open LDAP 2.x library required."; exit 1] )
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 6c9ef72..9e8292a 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -1,15 +1,21 @@
 
-bin_PROGRAMS = httpauthd
+sbin_PROGRAMS = httpauthd
 
 httpauthd_SOURCES = httpauthd.c httpauthd.h usuals.h compat.h compat.c \
 	buffer.c misc.c basic.h basic.c ntlm.c hash.c hash.h ntlmssp.h ntlmssp.c \
     md5.c md5.h sha1.c sha1.h digest.h digest.c ldap.c defaults.h simple.c \
     ../common/sock_any.c ../common/sock_any.h \
-  smblib/smblib.c smblib/smblib-util.c smblib/file.c smblib/smb-errors.c smblib/exper.c smblib/smblib-api.c \
-  rfcnb/rfcnb-io.c rfcnb/rfcnb-util.c rfcnb/session.c
+    \
+    smblib/smblib.c smblib/smblib-util.c smblib/file.c smblib/smb-errors.c \
+    smblib/exper.c smblib/smblib-api.c smblib/smblib.h smblib/std-defines.h \
+    smblib/smblib-priv.h smblib/smblib-common.h \
+   	\
+    rfcnb/rfcnb-io.c rfcnb/rfcnb-util.c rfcnb/session.c rfcnb/byteorder.h \
+    rfcnb/rfcnb-common.h rfcnb/rfcnb-error.h rfcnb/rfcnb.h rfcnb/rfcnb-io.h \
+    rfcnb/rfcnb-priv.h rfcnb/rfcnb-util.h rfcnb/std-includes.h
 
 httpauthd_CFLAGS = -D_THREAD_SAFE -pthread -DLinux \
 				   -I${top_srcdir}/common/ -I${top_srcdir}
 httpauthd_LDFLAGS = -pthread
 
-EXTRA_DIST = smblib rfcnb
+EXTRA_DIST =
diff --git a/doc/.cvsignore b/doc/.cvsignore
new file mode 100644
index 0000000..282522d
--- /dev/null
+++ b/doc/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
-- 
cgit v1.2.3