Check in 1.5.0rc6

Author: davidlst

ax_check_openssl.m4

@@ -39,7 +39,7 @@ AU_ALIAS([CHECK_SSL], [AX_CHECK_OPENSSL])
 AC_DEFUN([AX_CHECK_OPENSSL], [
     AC_ARG_WITH([openssl],
         [AS_HELP_STRING([--with-openssl=DIR],
-            [root of the OpenSSL directory])],
+            [set root of the OpenSSL directory for MAC OS only])],
         [
             case "$withval" in
             "" | y | ye | yes | n | no)
@@ -50,7 +50,7 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
             esac
         ], [
             # use some default ssldirs
-            ssldirs="/usr/local /usr/local/ssl /usr /usr/ssl /usr/lib/ssl /usr/pkg "
+            ssldirs="/usr/local /usr/local/ssl /usr /usr/ssl /usr/lib/ssl /usr/pkg /opt/local/"
         ]
         )
 

configure

@@ -831,8 +831,8 @@ enable_http2
 enable_debug
 enable_profiling
 with_lua
-enable_brotli
-enable_iptogeo2
+with_brotli
+with_iptogeo2
 with_bssl
 with_ip2loc
 enable_rpath
@@ -1497,11 +1497,6 @@ Optional Features:
                           default)
   --enable-profiling      Enable cpu profiling (profiling is disabled by
                           default)
-  --enable-brotli=[yes/no]
-                          enable brotli compression [default=no]
-  --enable-iptogeo2=[yes/no]
-                          enable iptogeo2, need to build maxminddb which need
-                          to have autotool installed [default=no]
   --disable-rpath         Disable rpath (It is 'no' by default)
 
 Optional Packages:
@@ -1529,14 +1524,16 @@ Optional Packages:
   --with-lscpd            Set to build lscpd instead of openlitespeed[default:
                           yes]
   --with-lua[=DIR]        use liblua (located in directory DIR, if supplied) for compiling mod_lua module.  [default=no]
+  --with-brotli[=DIR]   Set to enable brotli compression [default=no]
+  --with-iptogeo2[=DIR]   Set to enable iptogeo2, if need to build maxminddb which need to have autotool installed [default=no]
   --with-bssl[=DIR]       Set to use BoringSSL instead of OpenSSL [default=no]
   --with-ip2loc[=DIR]        enable ip2location (located in directory DIR, if supplied).  [default=no]
   --with-libdir           Set system lib directory. It is lib or lib64 and
                           will be automatically checked by default
   --with-zlib=DIR root directory path of zlib installation defaults to
                     /usr/local or /usr if not found in /usr/local
   --without-zlib to disable zlib usage completely
-  --with-openssl=DIR      root of the OpenSSL directory
+  --with-openssl=DIR      set root of the OpenSSL directory for MAC OS only
   --with-pcre[=prefix]    compile xmlpcre part (via libpcre check)
   --with-udns=DIR root directory path of udns installation (defaults to
                     /usr/local or /usr if not found in /usr/local)
@@ -15871,11 +15868,11 @@ fi
 if test "${enable_debug+set}" = set; then :
   enableval=$enable_debug; OPENLSWS_DEBUG="$enableval"
                 if test "$OPENLSWS_DEBUG" = "yes" ; then
-                    CFLAGS="-g3 -O0"
-                    CXXFLAGS="-g3 -O0"
+                    CFLAGS="$CFLAGS -g3 -O0"
+                    CXXFLAGS="$CXXFLAGS -g3 -O0"
                 else
-                    CFLAGS="-g -O3"
-                    CXXFLAGS="-g -O3"
+                    CFLAGS="$CFLAGS -g -O3"
+                    CXXFLAGS="$CXXFLAGS -g -O3"
                 fi
                 echo "OPENLSWS_DEBUG='$OPENLSWS_DEBUG'"
 
@@ -15993,31 +15990,46 @@ echo "Lua inlcude = $LUA_INCLUDES, need_lua = $need_lua"
 CFLAGS="$CFLAGS -D_GLIBCXX_USE_CXX11_ABI=0 -fstack-protector $(getconf LFS_CFLAGS) "
 CXXFLAGS="$CXXFLAGS -D_GLIBCXX_USE_CXX11_ABI=0 -fstack-protector $(getconf LFS_CFLAGS) "
 
-
 LIBBROTLI=
-# Check whether --enable-brotli was given.
-if test "${enable_brotli+set}" = set; then :
-  enableval=$enable_brotli; OPENLSWS_BROTLI="$enableval"
+OPENLSWS_BROTLI=no
+
+# Check whether --with-brotli was given.
+if test "${with_brotli+set}" = set; then :
+  withval=$with_brotli;
+                if test "x$withval" = "x"
+                then
+                    OPENLSWS_BROTLI=no
+                elif test $withval = no
+                then
+                    OPENLSWS_BROTLI=no
+                elif test $withval = yes
+                then
+                    echo "Brotli start to build ..."
+                    BUILDBROTLI=`. $srcdir/dlbrotli.sh`
+                    OPENLSWS_BROTLI="$TOPDIR/brotli-master"
+                else
+                    echo "Use defined brotli directory $withval."
+                    OPENLSWS_BROTLI="$withval"
+                fi
+
 else
   OPENLSWS_BROTLI=no
 fi
 
+
 if test "$OPENLSWS_BROTLI" = "no" ; then
     echo "Brotli compression disabled!!!"
 else
-    echo "Brotli start to build ..."
-    BUILDBROTLI=`. $srcdir/dlbrotli.sh`
-
-    LIBBROTLI=" $TOPDIR/brotli-master/out/libbrotlidec-static.a $TOPDIR/brotli-master/out/libbrotlienc-static.a $TOPDIR/brotli-master/out/libbrotlicommon-static.a "
-    as_ac_File=`$as_echo "ac_cv_file_$TOPDIR/brotli-master/out/libbrotlidec-static.a" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $TOPDIR/brotli-master/out/libbrotlidec-static.a" >&5
-$as_echo_n "checking for $TOPDIR/brotli-master/out/libbrotlidec-static.a... " >&6; }
+    LIBBROTLI=" $OPENLSWS_BROTLI/out/libbrotlidec-static.a $OPENLSWS_BROTLI/out/libbrotlienc-static.a $OPENLSWS_BROTLI/out/libbrotlicommon-static.a "
+    as_ac_File=`$as_echo "ac_cv_file_$OPENLSWS_BROTLI/out/libbrotlidec-static.a" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $OPENLSWS_BROTLI/out/libbrotlidec-static.a" >&5
+$as_echo_n "checking for $OPENLSWS_BROTLI/out/libbrotlidec-static.a... " >&6; }
 if eval \${$as_ac_File+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
   as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$TOPDIR/brotli-master/out/libbrotlidec-static.a"; then
+if test -r "$OPENLSWS_BROTLI/out/libbrotlidec-static.a"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
@@ -16029,21 +16041,21 @@ $as_echo "$ac_res" >&6; }
 if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
 
 cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$TOPDIR/brotli-master/out/libbrotlidec-static.a" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$OPENLSWS_BROTLI/out/libbrotlidec-static.a" | $as_tr_cpp` 1
 _ACEOF
 
 else
   LIBBROTLI=
 fi
-as_ac_File=`$as_echo "ac_cv_file_$TOPDIR/brotli-master/c/include/brotli/decode.h" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $TOPDIR/brotli-master/c/include/brotli/decode.h" >&5
-$as_echo_n "checking for $TOPDIR/brotli-master/c/include/brotli/decode.h... " >&6; }
+as_ac_File=`$as_echo "ac_cv_file_$OPENLSWS_BROTLI/c/include/brotli/decode.h" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $OPENLSWS_BROTLI/c/include/brotli/decode.h" >&5
+$as_echo_n "checking for $OPENLSWS_BROTLI/c/include/brotli/decode.h... " >&6; }
 if eval \${$as_ac_File+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
   as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$TOPDIR/brotli-master/c/include/brotli/decode.h"; then
+if test -r "$OPENLSWS_BROTLI/c/include/brotli/decode.h"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
@@ -16055,53 +16067,71 @@ $as_echo "$ac_res" >&6; }
 if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
 
 cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$TOPDIR/brotli-master/c/include/brotli/decode.h" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$OPENLSWS_BROTLI/c/include/brotli/decode.h" | $as_tr_cpp` 1
 _ACEOF
 
 else
   LIBBROTLI=
 fi
 
-
     if test "x$LIBBROTLI" = x ; then
-        echo "Brotli built failed. If continue, brotli compression will be disabled."
+        echo "Brotli files check failed. If continue, brotli compression will be disabled."
     else
-        echo "Brotli built and enabled!!!"
-        CPPFLAGS="$CPPFLAGS -I$TOPDIR/brotli-master/c/include "
-        LIBBROTLI=" $TOPDIR/brotli-master/out/libbrotlidec-static.a $TOPDIR/brotli-master/out/libbrotlienc-static.a $TOPDIR/brotli-master/out/libbrotlicommon-static.a "
+        echo "Brotli checked and enabled!!!"
+        CPPFLAGS="$CPPFLAGS -I$OPENLSWS_BROTLI/c/include "
+        LIBBROTLI=" $OPENLSWS_BROTLI/out/libbrotlidec-static.a $OPENLSWS_BROTLI/out/libbrotlienc-static.a $OPENLSWS_BROTLI/out/libbrotlicommon-static.a "
 
 cat >>confdefs.h <<_ACEOF
 #define USE_BROTLI 1
 _ACEOF
 
     fi
 fi
+echo "LIBBROTLI=$LIBBROTLI"
+
+
 
 
 LIBMMDB=
-# Check whether --enable-iptogeo2 was given.
-if test "${enable_iptogeo2+set}" = set; then :
-  enableval=$enable_iptogeo2; OPENLSWS_IPTOGEO2="$enableval"
+OPENLSWS_IPTOGEO2=no
+
+# Check whether --with-iptogeo2 was given.
+if test "${with_iptogeo2+set}" = set; then :
+  withval=$with_iptogeo2;
+                if test "x$withval" = "x"
+                then
+                    OPENLSWS_IPTOGEO2=no
+                elif test $withval = no
+                then
+                    OPENLSWS_IPTOGEO2=no
+                elif test $withval = yes
+                then
+                    echo "libmaxminddb start to build ..."
+                    BUILDMAXMINDDB=`. $srcdir/dlmaxminddb.sh`
+                    OPENLSWS_IPTOGEO2="$TOPDIR/libmaxminddb"
+                else
+                    echo "Use defined iptogeo2 directory $withval."
+                    OPENLSWS_IPTOGEO2="$withval"
+                fi
+
 else
   OPENLSWS_IPTOGEO2=no
 fi
 
+
 if test "$OPENLSWS_IPTOGEO2" = "no" ; then
     echo "iptogeo2 disabled!!!"
 else
-    echo "iptogeo2 enabled, libmaxminddb start to build ..."
-    BUILDMAXMINDDB=`. $srcdir/dlmaxminddb.sh`
-
     LIBMMDBEXIST=
-    as_ac_File=`$as_echo "ac_cv_file_$TOPDIR/libmaxminddb/src/.libs/libmaxminddb.a" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $TOPDIR/libmaxminddb/src/.libs/libmaxminddb.a" >&5
-$as_echo_n "checking for $TOPDIR/libmaxminddb/src/.libs/libmaxminddb.a... " >&6; }
+    as_ac_File=`$as_echo "ac_cv_file_$OPENLSWS_IPTOGEO2/src/.libs/libmaxminddb.a" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $OPENLSWS_IPTOGEO2/src/.libs/libmaxminddb.a" >&5
+$as_echo_n "checking for $OPENLSWS_IPTOGEO2/src/.libs/libmaxminddb.a... " >&6; }
 if eval \${$as_ac_File+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
   as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$TOPDIR/libmaxminddb/src/.libs/libmaxminddb.a"; then
+if test -r "$OPENLSWS_IPTOGEO2/src/.libs/libmaxminddb.a"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
@@ -16121,15 +16151,16 @@ fi
         echo Or you can continue to make and iptogeo2 will be disabled.
         echo
     else
-        LIBMMDB=" $TOPDIR/libmaxminddb/src/.libs/libmaxminddb.a "
-        CPPFLAGS="$CPPFLAGS -I$TOPDIR/libmaxminddb/include/ "
+        LIBMMDB=" $OPENLSWS_IPTOGEO2/src/.libs/libmaxminddb.a "
+        CPPFLAGS="$CPPFLAGS -I$OPENLSWS_IPTOGEO2/include/ "
 
 cat >>confdefs.h <<_ACEOF
 #define ENABLE_IPTOGEO2 1
 _ACEOF
 
     fi
 fi
+echo "LIBMMDB=$LIBMMDB"
 
 
 
@@ -16548,7 +16579,7 @@ if test "${with_openssl+set}" = set; then :
 else
 
             # use some default ssldirs
-            ssldirs="/usr/local /usr/local/ssl /usr /usr/ssl /usr/lib/ssl /usr/pkg "
+            ssldirs="/usr/local /usr/local/ssl /usr /usr/ssl /usr/lib/ssl /usr/pkg /opt/local/"
 
 
 fi
@@ -17307,51 +17338,7 @@ $as_echo "$as_me: WARNING: Expat XML Parser support requested but headers or lib
         fi
     fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GeoIP_id_by_addr in -lGeoIP" >&5
-$as_echo_n "checking for GeoIP_id_by_addr in -lGeoIP... " >&6; }
-if ${ac_cv_lib_GeoIP_GeoIP_id_by_addr+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lGeoIP  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char GeoIP_id_by_addr ();
-int
-main ()
-{
-return GeoIP_id_by_addr ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_GeoIP_GeoIP_id_by_addr=yes
-else
-  ac_cv_lib_GeoIP_GeoIP_id_by_addr=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GeoIP_GeoIP_id_by_addr" >&5
-$as_echo "$ac_cv_lib_GeoIP_GeoIP_id_by_addr" >&6; }
-if test "x$ac_cv_lib_GeoIP_GeoIP_id_by_addr" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBGEOIP 1
-_ACEOF
-
-  LIBS="-lGeoIP $LIBS"
-
-fi
-
+#AC_CHECK_LIB([GeoIP], [GeoIP_id_by_addr])
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
 $as_echo_n "checking for crypt in -lcrypt... " >&6; }
 if ${ac_cv_lib_crypt_crypt+:} false; then :