Renamed android profiler flag to WITH_GPROF

CMakeLists.txt

@@ -274,7 +274,7 @@ if(ANDROID)
 		else()
 			message(STATUS "FREERDP_ANDROID_EXTERNAL_SSL_PATH not set! - Needs to be set if openssl is not found in the android NDK (which usually isn't)")
 		endif()
-		if(WITH_PROFILER)
+		if(WITH_GPROF)
 			if (NOT FREERDP_ANDROID_EXTERNAL_PROFILER_PATH)
 			if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/external/android-ndk-profiler")
 				set(FREERDP_ANDROID_EXTERNAL_PROFILER_PATH
@@ -460,7 +460,7 @@ set(CMAKE_INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:\$ORIGIN/..")
 
 # Android profiling
 if(ANDROID)
-	if(WITH_PROFILER)
+	if(WITH_GPROF)
 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pg")
 		set(PROFILER_LIBRARIES
 			"${FREERDP_ANDROID_EXTERNAL_PROFILER_PATH}/obj/local/${ANDROID_ABI}/libandroid-ndk-profiler.a")

client/Android/FreeRDPCore/jni/android_freerdp.c

@@ -34,7 +34,7 @@
 #include "android_debug.h"
 #include "android_cliprdr.h"
 
-#if defined(WITH_PROFILER)
+#if defined(WITH_GPROF)
 #include "jni/prof.h"
 #endif
 
@@ -382,7 +382,7 @@ JNIEXPORT jint JNICALL jni_freerdp_new(JNIEnv *env, jclass cls)
 {
 	freerdp* instance;
 
-#if defined(WITH_PROFILER)
+#if defined(WITH_GPROF)
 	monstartup("libfreerdp-android.so");
 #endif
 
@@ -410,7 +410,7 @@ JNIEXPORT void JNICALL jni_freerdp_free(JNIEnv *env, jclass cls, jint instance)
 	freerdp* inst = (freerdp*)instance;
 	freerdp_free(inst);
 
-#if defined(WITH_PROFILER)
+#if defined(WITH_GPROF)
 	moncleanup();
 #endif
 }

cmake/ConfigOptions.cmake

@@ -12,6 +12,7 @@ endif()
 
 option(WITH_MANPAGES "Generate manpages." ON)
 option(WITH_PROFILER "Compile profiler." OFF)
+option(WITH_GPROF "Compile with GProf profiler." OFF)
 
 if((TARGET_ARCH MATCHES "x86|x64") AND (NOT DEFINED WITH_SSE2))
 	option(WITH_SSE2 "Enable SSE2 optimization." ON)

config.h.in

@@ -37,6 +37,7 @@
 
 /* Options */
 #cmakedefine WITH_PROFILER
+#cmakedefine WITH_GPROF
 #cmakedefine WITH_SSE2
 #cmakedefine WITH_NEON
 #cmakedefine WITH_IPP