--- ircd-hybrid/trunk/configure	2014/12/05 14:16:27	4979
+++ ircd-hybrid/trunk/configure	2014/12/05 14:31:27	4981
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Id: configure.ac 4906 2014-11-22 21:40:31Z michael .
+# From configure.ac Id: configure.ac 4979 2014-12-05 14:16:27Z michael .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69 for ircd-hybrid 8.2.1.
 #
@@ -806,7 +806,6 @@ with_included_ltdl
 with_ltdl_include
 with_ltdl_lib
 enable_ltdl_install
-enable_libgeoip
 enable_kqueue
 enable_epoll
 enable_devpoll
@@ -815,6 +814,7 @@ enable_assert
 enable_debugging
 enable_warnings
 enable_openssl
+enable_libgeoip
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1460,7 +1460,6 @@ Optional Features:
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-ltdl-install   install libltdl
-  --disable-libgeoip      Disable GeoIP support
   --enable-kqueue         Force kqueue usage.
   --enable-epoll          Force epoll usage.
   --enable-devpoll        Force devpoll usage.
@@ -1470,6 +1469,7 @@ Optional Features:
   --enable-warnings       Enable compiler warnings.
   --enable-openssl=DIR       Enable LibreSSL/OpenSSL support (DIR optional).
   --disable-openssl            Disable LibreSSL/OpenSSL support.
+  --disable-libgeoip      Disable GeoIP support
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -14212,76 +14212,6 @@ if test "$ac_res" != no; then :
 fi
 
 
-# Check whether --enable-libgeoip was given.
-if test "${enable_libgeoip+set}" = set; then :
-  enableval=$enable_libgeoip;
-else
-  ac_fn_c_check_header_mongrel "$LINENO" "GeoIP.h" "ac_cv_header_GeoIP_h" "$ac_includes_default"
-if test "x$ac_cv_header_GeoIP_h" = xyes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing GeoIP_id_by_ipnum_v6_gl" >&5
-$as_echo_n "checking for library containing GeoIP_id_by_ipnum_v6_gl... " >&6; }
-if ${ac_cv_search_GeoIP_id_by_ipnum_v6_gl+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$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_ipnum_v6_gl ();
-int
-main ()
-{
-return GeoIP_id_by_ipnum_v6_gl ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' GeoIP; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_GeoIP_id_by_ipnum_v6_gl=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_GeoIP_id_by_ipnum_v6_gl+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_GeoIP_id_by_ipnum_v6_gl+:} false; then :
-
-else
-  ac_cv_search_GeoIP_id_by_ipnum_v6_gl=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_GeoIP_id_by_ipnum_v6_gl" >&5
-$as_echo "$ac_cv_search_GeoIP_id_by_ipnum_v6_gl" >&6; }
-ac_res=$ac_cv_search_GeoIP_id_by_ipnum_v6_gl
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-$as_echo "#define HAVE_LIBGEOIP 1" >>confdefs.h
-
-fi
-
-fi
-
-
-fi
-
-
 
 $as_echo "#define NICKNAMEHISTORYLENGTH 32768" >>confdefs.h
 
@@ -16381,6 +16311,77 @@ else
 fi
 
 
+
+  # Check whether --enable-libgeoip was given.
+if test "${enable_libgeoip+set}" = set; then :
+  enableval=$enable_libgeoip;
+else
+  ac_fn_c_check_header_mongrel "$LINENO" "GeoIP.h" "ac_cv_header_GeoIP_h" "$ac_includes_default"
+if test "x$ac_cv_header_GeoIP_h" = xyes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing GeoIP_id_by_ipnum_v6_gl" >&5
+$as_echo_n "checking for library containing GeoIP_id_by_ipnum_v6_gl... " >&6; }
+if ${ac_cv_search_GeoIP_id_by_ipnum_v6_gl+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$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_ipnum_v6_gl ();
+int
+main ()
+{
+return GeoIP_id_by_ipnum_v6_gl ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' GeoIP; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_GeoIP_id_by_ipnum_v6_gl=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_GeoIP_id_by_ipnum_v6_gl+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_GeoIP_id_by_ipnum_v6_gl+:} false; then :
+
+else
+  ac_cv_search_GeoIP_id_by_ipnum_v6_gl=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_GeoIP_id_by_ipnum_v6_gl" >&5
+$as_echo "$ac_cv_search_GeoIP_id_by_ipnum_v6_gl" >&6; }
+ac_res=$ac_cv_search_GeoIP_id_by_ipnum_v6_gl
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+$as_echo "#define HAVE_LIBGEOIP 1" >>confdefs.h
+
+fi
+
+fi
+
+
+fi
+
+
 
 
   prefix_NONE=