From: hno <>
Date: Fri, 6 May 2005 00:50:42 +0000 (+0000)
Subject: #define VERSION conflicts with autoconf. Use PROGRAM_VERSION
X-Git-Tag: SQUID_3_0_PRE4~783
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=248109d21d059db89fe2dc255c75ebe177594919;p=thirdparty%2Fsquid.git

#define VERSION conflicts with autoconf. Use PROGRAM_VERSION
---

diff --git a/helpers/external_acl/ldap_group/squid_ldap_group.c b/helpers/external_acl/ldap_group/squid_ldap_group.c
index 5151ccedfe..d5209438b0 100644
--- a/helpers/external_acl/ldap_group/squid_ldap_group.c
+++ b/helpers/external_acl/ldap_group/squid_ldap_group.c
@@ -79,7 +79,7 @@ PFldap_start_tls_s Win32_ldap_start_tls_s;
 #endif
 
 #define PROGRAM_NAME "squid_ldap_group"
-#define VERSION "2.17"
+#define PROGRAM_VERSION "2.17"
 
 /* Globals */
 
@@ -393,7 +393,7 @@ main(int argc, char **argv)
 	ldapServer = "localhost";
 
     if (!basedn || !searchfilter) {
-	fprintf(stderr, "\n" PROGRAM_NAME " version " VERSION "\n\n");
+	fprintf(stderr, "\n" PROGRAM_NAME " version " PROGRAM_VERSION "\n\n");
 	fprintf(stderr, "Usage: " PROGRAM_NAME " -b basedn -f filter [options] ldap_server_name\n\n");
 	fprintf(stderr, "\t-b basedn (REQUIRED)\tbase dn under where to search for groups\n");
 	fprintf(stderr, "\t-f filter (REQUIRED)\tgroup search filter pattern. %%v = user,\n\t\t\t\t%%a = group\n");