diff --git a/build/libgeoip.m4 b/build/libgeoip.m4 index f0a8865c..2b612420 100644 --- a/build/libgeoip.m4 +++ b/build/libgeoip.m4 @@ -19,12 +19,12 @@ GEOIP_CPPFLAGS="" GEOIP_LDADD="" GEOIP_LDFLAGS="" GEOIP_CONFIG=${PKG_CONFIG} -GEOIP_PKGNAMES="geoip2 geoip GeoIP libGeoIP" +GEOIP_PKGNAMES="geoip2 geoip GeoIP" GEOIP_SONAMES="so la sl dll dylib" AC_ARG_WITH( geoip, - [AC_HELP_STRING([--with-geoip=PATH],[Path to geoip prefix])] + [AC_HELP_STRING([--with-geoip=PATH],[Path to geoip prefix or config script])] ,, with_geoip=yes) AS_CASE(["${with_geoip}"], diff --git a/src/parser/driver.cc b/src/parser/driver.cc index b555c599..b4db0800 100644 --- a/src/parser/driver.cc +++ b/src/parser/driver.cc @@ -167,7 +167,9 @@ void Driver::error(const yy::location& l, const std::string& m, const std::string& c) { if (parserError.tellp() == 0) { parserError << "Rules error. "; - parserError << "File: " << ref.back() << ". "; + if (ref.empty() == false) { + parserError << "File: " << ref.back() << ". "; + } parserError << "Line: " << l.end.line << ". "; parserError << "Column: " << l.end.column << ". "; } diff --git a/test/optimization/optimization.cc b/test/optimization/optimization.cc deleted file mode 100644 index cd43e072..00000000 --- a/test/optimization/optimization.cc +++ /dev/null @@ -1,8 +0,0 @@ -#include - - -int main(int argc, char **argv) { - - return 0; -} -