Permalink
Browse files

* remove the check for geoip data

  • Loading branch information...
1 parent 5b363bc commit 7287940e0e3e5a9dbe02d61094cdbfb2afb9de2c @apg apg committed Feb 11, 2011
Showing with 1,834 additions and 2,760 deletions.
  1. +2 −2 aclocal.m4
  2. +1,796 −2,725 configure
  3. +33 −33 configure.ac
  4. +1 −0 src/Makefile.in
  5. +1 −0 test/Makefile.in
  6. +1 −0 vcl/Makefile.in
View
4 aclocal.m4
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
-[m4_warning([this file was generated for autoconf 2.63.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+[m4_warning([this file was generated for autoconf 2.65.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
View
4,521 configure
1,796 additions, 2,725 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
66 configure.ac
@@ -16,39 +16,39 @@ AC_CHECK_LIB([dl], [dlsym])
AC_CHECK_HEADERS([stdlib.h stdio.h GeoIP.h GeoIPCity.h])
-AC_MSG_CHECKING([GeoIP City Data])
-if test -z "$GEOIP_CITY_DATA"
-then
- for f in /usr/share/GeoIP /usr/local/share/GeoIP
- do
- if test -e "$f/GeoLiteCity.dat"
- then
- GEOIP_CITY_DATA="$fGeoLiteCity.dat"
- fi
- done
-
- for f in /usr/share/GeoIP /usr/local/share/GeoIP
- do
- if test -e "$f/GeoIPCity.dat"
- then
- GEOIP_CITY_DATA="$fGeoIPCity.dat"
- fi
- done
-
- if test -z "$GEOIP_CITY_DATA"
- then
- AC_MSG_ERROR([not found], [1])
- else
- AC_MSG_RESULT([yes])
- fi
-else
- if test -e "$GEOIP_CITY_DATA"
- then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_ERROR([not found], [1])
- fi
-fi
+dnl AC_MSG_CHECKING([GeoIP City Data])
+dnl if test -z "$GEOIP_CITY_DATA"
+dnl then
+dnl for f in /usr/share/GeoIP /usr/local/share/GeoIP
+dnl do
+dnl if test -e "$f/GeoLiteCity.dat"
+dnl then
+dnl GEOIP_CITY_DATA="$fGeoLiteCity.dat"
+dnl fi
+dnl done
+
+dnl for f in /usr/share/GeoIP /usr/local/share/GeoIP
+dnl do
+dnl if test -e "$f/GeoIPCity.dat"
+dnl then
+dnl GEOIP_CITY_DATA="$fGeoIPCity.dat"
+dnl fi
+dnl done
+
+dnl if test -z "$GEOIP_CITY_DATA"
+dnl then
+dnl AC_MSG_ERROR([not found], [1])
+dnl else
+dnl AC_MSG_RESULT([yes])
+dnl fi
+dnl else
+dnl if test -e "$GEOIP_CITY_DATA"
+dnl then
+dnl AC_MSG_RESULT([yes])
+dnl else
+dnl AC_MSG_ERROR([not found], [1])
+dnl fi
+dnl fi
AC_SUBST([GEOIP_CITY_DATA], ["$GEOIP_CITY_DATA"])
View
1 src/Makefile.in
@@ -144,6 +144,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
View
1 test/Makefile.in
@@ -125,6 +125,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
View
1 vcl/Makefile.in
@@ -121,6 +121,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@

0 comments on commit 7287940

Please sign in to comment.