Fix up cnid_didname_verify so that it works with automake/autoconf.

diff --git a/bin/cnid/Makefile.am b/bin/cnid/Makefile.am
index a57644956581e77c8ee3c05845f4bd337666e4f6..33d3e3a4ef0d4aadbf4ab9580aa2ce5b9e968be8 100644 (file)
--- a/bin/cnid/Makefile.am
+++ b/bin/cnid/Makefile.am
@@ -5,4 +5,4 @@ LIBS = @LIBS@ @DB3_LIBS@
 
 bin_PROGRAMS = cnid_didname_verify
 
-cnid_SOURCES = cnid_didname_verify.c
+cnid_didname_verify_SOURCES = cnid_didname_verify.c

diff --git a/bin/cnid/cnid_didname_verify.c b/bin/cnid/cnid_didname_verify.c
index c83f1a6cf9fa90ba5c4fc847b88ce84d465e236c..663dd2887e9ed1179e697959074d7dbb1498ff6b 100644 (file)
--- a/bin/cnid/cnid_didname_verify.c
+++ b/bin/cnid/cnid_didname_verify.c
@@ -7,16 +7,27 @@
  * Modified to check the consistency of didname.db by
  * Joe Clarke <marcus@marcuscom.com>
  *
- * $Id: cnid_didname_verify.c,v 1.1 2001-12-10 07:04:27 jmarcus Exp $
+ * $Id: cnid_didname_verify.c,v 1.2 2001-12-10 07:20:38 jmarcus Exp $
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
+#ifdef CNID_DB
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#include <sys/types.h>
+#endif /* HAVE_UNISTD_H */
+#include <sys/param.h>
+
 #include <db.h>
 
+#include <atalk/cnid.h>
+#include <atalk/util.h>
+
 #ifndef MIN
 #define MIN(a, b)  ((a) < (b) ? (a) : (b))
 #endif /* ! MIN */
@@ -26,7 +37,7 @@ void  usage __P((void));
 void   version_check __P((void));
 
 const char
-       *progname = "db_verify";                        /* Program name. */
+       *progname = "cnid_didname_verify";                      /* Program name. */
 
 static __inline__ int compare_did(const DBT *a, const DBT *b) {
        u_int32_t dida, didb;
@@ -200,3 +211,4 @@ version_check()
                exit (1);
        }
 }
+#endif /* CNID_DB */

diff --git a/configure.in b/configure.in
index 72a47295cbebbd707fd5f938615320876f5cf3ee..6b78c4f264bd148b9b0437606bf71ef2c6002624 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.138 2001-12-03 15:50:06 jmarcus Exp $
+dnl $Id: configure.in,v 1.139 2001-12-10 07:20:37 jmarcus Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -648,6 +648,7 @@ AC_OUTPUT([Makefile
        bin/aecho/Makefile
        bin/afile/Makefile
        bin/afppasswd/Makefile
+       bin/cnid/Makefile
        bin/getzones/Makefile
        bin/megatron/Makefile
        bin/nbp/Makefile