Merge pull request #3275 from lemenkov/guard_versiontype

Ensure VERSIONTYPE is always defined

Author: liviuchircu

Makefile.defs

@@ -507,6 +507,8 @@ else
   VERSIONTYPE = $(shell [ -f "${TOP_SRCDIR}/.gitrevision" ] && echo "git")
   ifneq ($(VERSIONTYPE),)
     THISREVISION = $(shell cat ${TOP_SRCDIR}/.gitrevision)
+  else
+    VERSIONTYPE = unknown
   endif
   OLDREVISION = "$(THISREVISION)"
 endif

main.c

@@ -192,9 +192,7 @@ static void print_ct_constants(void)
 		MAX_RECV_BUFFER_SIZE, MAX_LISTEN, MAX_URI_SIZE,
 		BUF_SIZE );
 	printf("poll method support: %s.\n", poll_support);
-#ifdef VERSIONTYPE
 	printf("%s revision: %s\n", core_scm_ver.type, core_scm_ver.rev);
-#endif
 }
 
 static int

mi/mi_core.c

@@ -138,13 +138,11 @@ static mi_response_t *mi_version_1(const mi_params_t *params,
 		return 0;
 	}
 
-#ifdef VERSIONTYPE
 	if (add_mi_string(resp_obj, MI_SSTR(VERSIONTYPE), MI_SSTR(THISREVISION))<0) {
 		LM_ERR("failed to add mi item\n");
 		free_mi_response(resp);
 		return 0;
 	}
-#endif
 
 	return resp;
 }