From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Sun, 8 Sep 2013 03:23:20 +0000 (-0600)
Subject: Ensure that the SQUID_BUILD_INFO macro is always defined
X-Git-Tag: SQUID_3_4_0_2~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba9e9a109e4c7567f9bf15fc112af55edfb227f5;p=thirdparty%2Fsquid.git

Ensure that the SQUID_BUILD_INFO macro is always defined
---

diff --git a/acinclude/squid-util.m4 b/acinclude/squid-util.m4
index 768bcd5d0d..b41f67b6ef 100644
--- a/acinclude/squid-util.m4
+++ b/acinclude/squid-util.m4
@@ -216,10 +216,8 @@ AC_DEFUN([SQUID_EMBED_BUILD_INFO],[
       ;;
   esac
   ])
-  if test "x${squid_build_info:=no}" != "xno"; then
-    AC_DEFINE_UNQUOTED([SQUID_BUILD_INFO],["$squid_build_info"],
-       [Squid extended build info field for "squid -v" output])
-  fi
+  AC_DEFINE_UNQUOTED([SQUID_BUILD_INFO],["$squid_build_info"],
+     [Squid extended build info field for "squid -v" output])
 ])
 
 dnl like AC_SEARCH_LIBS, with an extra argument which is
diff --git a/src/main.cc b/src/main.cc
index f6f0343821..469c5d6184 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -163,10 +163,6 @@ void WIN32_svcstatusupdate(DWORD, DWORD);
 void WINAPI WIN32_svcHandler(DWORD);
 #endif
 
-#if !defined(SQUID_BUILD_INFO)
-#define SQUID_BUILD_INFO ""
-#endif
-
 static char *opt_syslog_facility = NULL;
 static int icpPortNumOverride = 1;	/* Want to detect "-u 0" */
 static int configured_once = 0;