From cbcbac2cc60f86e0de6a6b49c95a5fe473ff1ed8 Mon Sep 17 00:00:00 2001
From: srittau <srittau>
Date: Sun, 16 Dec 2001 18:39:34 +0000
Subject: [PATCH] Use conditional compilation for cnid_didname_verify instead
 of an #ifdef in the code.

---
 bin/cnid/Makefile.am           |  4 ++++
 bin/cnid/cnid_didname_verify.c | 14 +-------------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/bin/cnid/Makefile.am b/bin/cnid/Makefile.am
index 33d3e3a4..6f3fb13d 100644
--- a/bin/cnid/Makefile.am
+++ b/bin/cnid/Makefile.am
@@ -3,6 +3,10 @@
 CFLAGS = @CFLAGS@ @DB3_CFLAGS@
 LIBS = @LIBS@ @DB3_LIBS@
 
+if COMPILE_CNID
 bin_PROGRAMS = cnid_didname_verify
+else
+bin_PROGRAMS =
+endif
 
 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 b97a7d34..84b8036b 100644
--- a/bin/cnid/cnid_didname_verify.c
+++ b/bin/cnid/cnid_didname_verify.c
@@ -7,7 +7,7 @@
  * Modified to check the consistency of didname.db by
  * Joe Clarke <marcus@marcuscom.com>
  *
- * $Id: cnid_didname_verify.c,v 1.6 2001-12-10 23:45:53 jmarcus Exp $
+ * $Id: cnid_didname_verify.c,v 1.7 2001-12-16 18:39:34 srittau Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -22,7 +22,6 @@
 #endif /* HAVE_UNISTD_H */
 #include <sys/param.h>
 
-#ifdef CNID_DB
 #include <db.h>
 
 #include <atalk/cnid.h>
@@ -219,14 +218,3 @@ version_check()
         exit (1);
     }
 }
-#else /* CNID_DB */
-int
-main(argc, argv)
-int argc;
-char *argv[];
-{
-    printf("Netatalk must be compiled with Berkeley DB to use this program.\n");
-
-    return 0;
-}
-#endif /* CNID_DB */
-- 
2.39.2