Merge pull request #1 from HerculesWS/master

Hercules Merge.

1 files changed, 184 insertions, 39 deletions

diff --git a/configure b/configure
index 712fe8dfc..abba75ea1 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in c1dca64.
+# From configure.in d26927e.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69.
 #
@@ -624,6 +624,8 @@ ac_includes_default="\
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
 DLLEXT
+HAVE_PERL
+HAVE_DOXYGEN
 PCRE_CFLAGS
 PCRE_LIBS
 HAVE_PCRE
@@ -2162,6 +2164,8 @@ ac_config_files="$ac_config_files src/map/Makefile src/plugins/Makefile src/tool
 
 ac_config_files="$ac_config_files src/test/Makefile"
 
+ac_config_files="$ac_config_files tools/HPMHookGen/Makefile"
+
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -5003,6 +5007,7 @@ CFLAGS="$OLD_CFLAGS"
 $as_echo_n "checking how to make shared objects... " >&6; }
 OLD_CFLAGS="$CFLAGS"
 compiler_shared_objects=""
+compiler_supports_shared_objects="no"
 if test "$compiler_supports_pic" = "yes" ; then
 	my_shared_test_flags="$CFLAGS -fPIC"
 fi
@@ -5022,6 +5027,7 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
 		compiler_shared_objects="-shared"
+		compiler_supports_shared_objects="yes"
 
 
 fi
@@ -5043,12 +5049,12 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
 		compiler_shared_objects="-nostart"
+		compiler_supports_shared_objects="yes"
 
 
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-my_shared_test_flags=""
 CFLAGS="$OLD_CFLAGS"
 if test "$compiler_supports_shared_objects" = "no" ; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not supported" >&5
@@ -5057,77 +5063,133 @@ $as_echo "not supported" >&6; }
 $as_echo "$as_me: compiler is unable to generate shared objects, disabled plugins (optional)" >&6;}
 	WITH_PLUGINS="no"
 else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $compiler_shared_objects" >&5
-$as_echo "$compiler_shared_objects" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $compiler_shared_objects $compiler_supports_shared_objects" >&5
+$as_echo "$compiler_shared_objects $compiler_supports_shared_objects" >&6; }
 	SOFLAGS="$SOFLAGS $compiler_shared_objects"
 
 
-#
-# shared objects need position independent code; some platforms emit
-# it always, others need -fPIC
-#
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -fPIC for shared objects" >&5
+	#
+	# On certain platforms, undefined references on shared libraries won't be checked
+	# unless explicitly required with the --no-undefined linker option
+	#
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -Wl,--no-undefined to check for undefined references in shared objects" >&5
+$as_echo_n "checking whether $CC needs -Wl,--no-undefined to check for undefined references in shared objects... " >&6; }
+	OLD_CFLAGS="$CFLAGS"
+	CFLAGS="$SOFLAGS"
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+			void foo(void) {
+				foobar();
+			}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+			CFLAGS="$SOFLAGS -Wl,--no-undefined"
+			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+					int bar = 0;
+
+					int foo(void) {
+						return bar;
+					}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+					SOFLAGS="$SOFLAGS -Wl,--no-undefined"
+
+else
+
+					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported (undefined references check will be ignored)" >&5
+$as_echo "unsupported (undefined references check will be ignored)" >&6; }
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+else
+
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+	CFLAGS="$OLD_CFLAGS"
+
+	#
+	# shared objects need position independent code; some platforms emit
+	# it always, others need -fPIC
+	#
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -fPIC for shared objects" >&5
 $as_echo_n "checking whether $CC needs -fPIC for shared objects... " >&6; }
-OLD_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $SOFLAGS"
-WITH_PLUGINS="yes"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	OLD_CFLAGS="$CFLAGS"
+	CFLAGS="$CFLAGS $SOFLAGS"
+	WITH_PLUGINS="yes"
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-		int bar = 0;
+			int bar = 0;
 
-		int foo(void)
-		{
-			return bar;
-		}
+			int foo(void)
+			{
+				return bar;
+			}
 
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-		CFLAGS="$OLD_CFLAGS"
+			CFLAGS="$OLD_CFLAGS"
 
 else
 
-		if test "$compiler_supports_pic" = "yes" ; then
-			# Verify if -shared really fails due to lack of -fPIC or something else
-			CFLAGS="$CFLAGS -fPIC"
-			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+			if test "$compiler_supports_pic" = "yes" ; then
+				# Verify if -shared really fails due to lack of -fPIC or something else
+				CFLAGS="$CFLAGS -fPIC"
+				cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-					int bar = 0;
+						int bar = 0;
 
-					int foo(void)
-					{
-						return bar;
-					}
+						int foo(void)
+						{
+							return bar;
+						}
 
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
-					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+						{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-					CFLAGS="$OLD_CFLAGS -fPIC"
+						CFLAGS="$OLD_CFLAGS -fPIC"
 
 else
 
-					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no, but fails for another reason" >&5
+						{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no, but fails for another reason" >&5
 $as_echo "no, but fails for another reason" >&6; }
-					as_fn_error $? "compiler is unable to compile shared objects for an unhandled reason, please report this with attached config.log... stopping" "$LINENO" 5
+						as_fn_error $? "compiler is unable to compile shared objects for an unhandled reason, please report this with attached config.log... stopping" "$LINENO" 5
 
 
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-		else
-			# Disable compilation of plugins (optional), so 'make all' does not fail
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, but unsupported" >&5
+			else
+				# Disable compilation of plugins (optional), so 'make all' does not fail
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, but unsupported" >&5
 $as_echo "yes, but unsupported" >&6; }
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: compiler is unable to generate position independent code, disabled plugins (optional)" >&5
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: compiler is unable to generate position independent code, disabled plugins (optional)" >&5
 $as_echo "$as_me: compiler is unable to generate position independent code, disabled plugins (optional)" >&6;}
-			WITH_PLUGINS="no"
-		fi
+				WITH_PLUGINS="no"
+			fi
 
 
 fi
@@ -5135,6 +5197,7 @@ rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 fi
+my_shared_test_flags=""
 
 
 
@@ -6192,6 +6255,87 @@ fi
 
 
 
+#
+# Doxygen, perl (for HPMHookGen)
+#
+
+# Extract the first word of "doxygen", so it can be a program name with args.
+set dummy doxygen; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_HAVE_DOXYGEN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$HAVE_DOXYGEN"; then
+  ac_cv_prog_HAVE_DOXYGEN="$HAVE_DOXYGEN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_HAVE_DOXYGEN="yes"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_prog_HAVE_DOXYGEN" && ac_cv_prog_HAVE_DOXYGEN="no"
+fi
+fi
+HAVE_DOXYGEN=$ac_cv_prog_HAVE_DOXYGEN
+if test -n "$HAVE_DOXYGEN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_DOXYGEN" >&5
+$as_echo "$HAVE_DOXYGEN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+# Extract the first word of "perl", so it can be a program name with args.
+set dummy perl; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_HAVE_PERL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$HAVE_PERL"; then
+  ac_cv_prog_HAVE_PERL="$HAVE_PERL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_HAVE_PERL="yes"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_prog_HAVE_PERL" && ac_cv_prog_HAVE_PERL="no"
+fi
+fi
+HAVE_PERL=$ac_cv_prog_HAVE_PERL
+if test -n "$HAVE_PERL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_PERL" >&5
+$as_echo "$HAVE_PERL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
 
 #
 # Host specific stuff
@@ -6958,6 +7102,7 @@ do
     "src/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/Makefile" ;;
     "src/tool/Makefile") CONFIG_FILES="$CONFIG_FILES src/tool/Makefile" ;;
     "src/test/Makefile") CONFIG_FILES="$CONFIG_FILES src/test/Makefile" ;;
+    "tools/HPMHookGen/Makefile") CONFIG_FILES="$CONFIG_FILES tools/HPMHookGen/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac