--- ircd-hybrid/branches/8.0.x/configure	2013/04/01 11:56:24	1803
+++ ircd-hybrid/branches/8.0.x/configure	2013/04/14 12:36:55	1822
@@ -806,6 +806,7 @@ with_ltdl_include
 with_ltdl_lib
 enable_ltdl_install
 enable_libpcre
+enable_libGeoIP
 enable_openssl
 enable_assert
 enable_kqueue
@@ -1462,6 +1463,7 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-ltdl-install   install libltdl
   --disable-libpcre       Disable PCRE support
+  --disable-libgeoip      Disable GeoIP support
   --enable-openssl=DIR       Enable OpenSSL support (DIR optional).
   --disable-openssl            Disable OpenSSL support.
   --enable-assert         Enable assert() statements
@@ -13723,6 +13725,76 @@ $as_echo "#define HAVE_LIBPCRE 1" >>conf
 
 fi
 
+fi
+
+
+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_lib_version" >&5
+$as_echo_n "checking for library containing GeoIP_lib_version... " >&6; }
+if ${ac_cv_search_GeoIP_lib_version+:} 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_lib_version ();
+int
+main ()
+{
+return GeoIP_lib_version ();
+  ;
+  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_lib_version=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_GeoIP_lib_version+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_GeoIP_lib_version+:} false; then :
+
+else
+  ac_cv_search_GeoIP_lib_version=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_lib_version" >&5
+$as_echo "$ac_cv_search_GeoIP_lib_version" >&6; }
+ac_res=$ac_cv_search_GeoIP_lib_version
+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