Bläddra i källkod

Run autoconf2.69

Bryan Drewery 2 år sedan
förälder
incheckning
932f0995d8
3 ändrade filer med 37 tillägg och 13 borttagningar
  1. 1 1
      build/autotools/Makefile
  2. 22 5
      configure
  3. 14 7
      src/config.h.in

+ 1 - 1
build/autotools/Makefile

@@ -17,7 +17,7 @@ autoheader:
 autoconf: 
 	@rm -rf ../../configure
 	@echo "Autoconf...."
-	@autoconf
+	@autoconf2.69
 	@echo "Fixing configure temp paths"
 	@(if ! sed \
 	  -e 's:config\.log:build/config.log:g' \

+ 22 - 5
configure

@@ -635,9 +635,9 @@ TCLINCFN
 TCL_INCLUDES
 TCLLIBFN
 TCLLIB
-SSL_LIBDIR
 SSL_LIBS
 SSL_INCLUDES
+SSL_LIBDIR
 LIBELF_LIB
 LIBELF_BUNDLED
 EGREP
@@ -1343,6 +1343,7 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-openssl=PATH     Path to OpenSSL
+  --with-openssl=PATH     Path to OpenSSL Lib
   --with-tcllib=PATH      full path to Tcl library
   --with-tclinc=PATH      full path to Tcl header
 
@@ -3819,6 +3820,11 @@ EOF
 if [ "${ax_cv_prog_cc_Og}" = "no" ]; then
   DEBCXXFLAGS="${DEBCXXFLAGS} -O0"
 fi
+#CXX_FLAG_CHECK_LINK([DEBCXXFLAGS], [-fsanitize=address], [fsanitize_address])
+#if [[ "${ax_cv_prog_cc_fsanitize_address}" = "yes" ]]; then
+#  DEBLDFLAGS="${DEBLDFLAGS} -fsanitize=address"
+#  DEBCXXFLAGS="${DEBCXXFLAGS} -D__SANITIZE_ADDRESS__"
+#fi
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler understands -fstack-protector-all" >&5
 $as_echo_n "checking whether the compiler understands -fstack-protector-all... " >&6; }
@@ -6099,16 +6105,16 @@ cf_openssl_basedir=""
 cf_openssl_libdir=""
 if test "$with_openssl_path" != "auto"; then
     cf_openssl_basedir="`echo ${with_openssl_path} | sed 's/\/$//'`"
-    cf_openssl_libdir="${cf_openssl_basedir}/lib"
+  cf_openssl_libdir="${cf_openssl_basedir}/lib"
 else
-  if test -f "/usr/include/openssl/opensslv.h" && test -f "/usr/lib64/libssl.so"; then
+    if test -f "/usr/include/openssl/opensslv.h" && test -f "/usr/lib64/libssl.so"; then
       cf_openssl_libdir="/usr/lib64"
       cf_openssl_basedir="/usr"
   else
     for dirs in /usr/local/ssl /usr/pkg /usr/local /usr/local/openssl; do
       if test -f "${dirs}/include/openssl/opensslv.h" && test -f "${dirs}/lib/libssl.so"; then
         cf_openssl_basedir="${dirs}"
-	cf_openssl_libdir="${cf_openssl_basedir}/lib"
+        cf_openssl_libdir="${cf_openssl_basedir}/lib"
         break
       fi
     done
@@ -6120,7 +6126,7 @@ if test ! -z "$cf_openssl_basedir"; then
     SSL_INCLUDES="-I${cf_openssl_basedir}/include"
     SSL_LIBS="-L${cf_openssl_libdir}"
   else
-    cf_openssl_basedir=""
+        cf_openssl_basedir=""
     cf_openssl_libdir=""
   fi
 else
@@ -6141,6 +6147,16 @@ $as_echo "not found" >&6; }
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for path to OpenSSL Lib" >&5
 $as_echo_n "checking for path to OpenSSL Lib... " >&6; }
+
+
+# Check whether --with-openssl was given.
+if test "${with_openssl+set}" = set; then :
+  withval=$with_openssl; with_openssl_path=$withval
+else
+  with_openssl_path=auto
+fi
+
+
 if test ! -z "${cf_openssl_libdir}"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${cf_openssl_libdir}" >&5
 $as_echo "${cf_openssl_libdir}" >&6; }
@@ -6252,6 +6268,7 @@ LIBS="$save_LIBS"
 
 
 
+
 cat >>build/confdefs.h <<_ACEOF
 #define EGG_SSL_EXT 1
 _ACEOF

+ 14 - 7
src/config.h.in

@@ -93,9 +93,6 @@
 /* Define to 1 if you have the `memmem' function. */
 #undef HAVE_MEMMEM
 
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
 /* Define to 1 if you have a working `mmap' system call. */
 #undef HAVE_MMAP
 
@@ -138,6 +135,9 @@
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
+/* Define to 1 if you have the <stdio.h> header file. */
+#undef HAVE_STDIO_H
+
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
@@ -188,6 +188,9 @@
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
+/* Define to 1 if you have the <sys/time.h> header file. */
+#undef HAVE_SYS_TIME_H
+
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
@@ -270,13 +273,16 @@
 /* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
 #undef STAT_MACROS_BROKEN
 
-/* Define to 1 if you have the ANSI C header files. */
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
 #undef STDC_HEADERS
 
 /* Define if running on OSF/1 platform */
 #undef STOP_UAC
 
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. This
+   macro is obsolete. */
 #undef TIME_WITH_SYS_TIME
 
 /* Define to 1 if your <sys/time.h> declares `struct tm'. */
@@ -315,7 +321,8 @@
    #define below would cause a syntax error. */
 #undef _UINT8_T
 
-/* Define to 1 if type `char' is unsigned and you are not using gcc.  */
+/* Define to 1 if type `char' is unsigned and your compiler does not
+   predefine this macro.  */
 #ifndef __CHAR_UNSIGNED__
 # undef __CHAR_UNSIGNED__
 #endif
@@ -339,7 +346,7 @@
    a type exists and the standard includes do not define it. */
 #undef int8_t
 
-/* Define to `int' if <sys/types.h> does not define. */
+/* Define as a signed integer type capable of holding a process identifier. */
 #undef pid_t
 
 /* Define to `unsigned int' if <sys/types.h> does not define. */