Skip to content

Commit b50c6eb

Browse files
pnormanpnorman
committed
Merge branch 'master' into nocolumn
2 parents 7ba6ea1 + ef39ca4 commit b50c6eb

59 files changed

Lines changed: 1729 additions & 2517 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile.am‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ bin_PROGRAMS = osm2pgsql nodecachefilereader
55
noinst_LTLIBRARIES = libosm2pgsql.la
66

77
osm2pgsql_SOURCES = osm2pgsql.cpp \
8-
binarysearcharray.hpp \
98
geometry-builder.hpp \
109
expire-tiles.hpp \
1110
input.hpp \
@@ -32,14 +31,12 @@ osm2pgsql_SOURCES = osm2pgsql.cpp \
3231
sanitizer.hpp \
3332
sprompt.hpp \
3433
table.hpp \
35-
text-tree.hpp \
3634
util.hpp
3735

3836
osm2pgsql_LDADD = libosm2pgsql.la
3937

4038
libosm2pgsql_la_SOURCES = \
4139
UTF8sanitizer.cpp \
42-
binarysearcharray.cpp \
4340
expire-tiles.cpp \
4441
geometry-builder.cpp \
4542
geometry-processor.cpp \
@@ -73,7 +70,6 @@ libosm2pgsql_la_SOURCES = \
7370
table.cpp \
7471
taginfo.cpp \
7572
tagtransform.cpp \
76-
text-tree.cpp \
7773
util.cpp \
7874
wildcmp.cpp
7975

‎README.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,14 @@ sudo yum install gcc-c++ boost-devel libxml2-devel geos-devel \
6262
postgresql-devel bzip2-devel proj-devel protobuf-compiler
6363
```
6464

65+
To install on a FreeBSD system, use
66+
67+
```sh
68+
pkg install devel/git devel/autoconf devel/automake devel/gmake devel/libtool \
69+
textproc/libxml2 graphics/geos graphics/proj databases/postgresql94-client \
70+
devel/boost-libs devel/protobuf-c lang/lua52 devel/pkgconf
71+
```
72+
6573
Then you should be able to bootstrap the build system:
6674

6775
./autogen.sh
@@ -73,6 +81,10 @@ And then run the standard GNU build install:
7381
Please see `./configure --help` for more options on how to control the build
7482
process.
7583

84+
On FreeBSD instead bootstrap and then run
85+
86+
LUA_LIB=`pkg-config --libs lua-5.2` ./configure --without-lockfree && gmake && gmake install
87+
7688
## Usage ##
7789

7890
Osm2pgsql has one program, the executable itself, which has **43** command line

‎binarysearcharray.cpp‎

Lines changed: 0 additions & 118 deletions
This file was deleted.

‎binarysearcharray.hpp‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎building.lua‎

Lines changed: 0 additions & 124 deletions
This file was deleted.

‎configure.ac‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
AC_INIT(osm2pgsql, 0.87.1)
2+
AC_INIT(osm2pgsql, 0.87.2-dev)
33

44
dnl Required autoconf version
55
AC_PREREQ(2.61)
@@ -49,17 +49,6 @@ AC_SUBST(LFS_CFLAGS)
4949
AC_CHECK_FUNC(lseek64,[AC_DEFINE(HAVE_LSEEK64, [1], [lseek64 is present])],[AX_COMPILE_CHECK_SIZEOF(off_t)])
5050
AC_CHECK_FUNCS([posix_fallocate posix_fadvise sync_file_range fork])
5151

52-
53-
dnl legacy 32bit ID mode
54-
AC_ARG_ENABLE([64bit-ids],
55-
AS_HELP_STRING([--disable-64bit-ids], [Disable 64bit IDs for OSM IDs]),
56-
[ if test "$enableval" = "yes"
57-
then
58-
AC_DEFINE(OSMID64, [1], [Enable 64bit OSM IDs])
59-
fi
60-
], [ AC_DEFINE(OSMID64, [1], [Enable 64bit OSM IDs])])
61-
62-
6352
dnl Check for libxml2 library
6453
AX_LIB_XML2
6554
if test "$HAVE_XML2" = "no"
@@ -82,11 +71,7 @@ then
8271
fi
8372

8473
dnl Check for Geos library
85-
AX_LIB_GEOS
86-
if test "x$GEOS_VERSION" = "x"
87-
then
88-
AC_MSG_ERROR([geos library not found]);
89-
fi
74+
AX_LIB_GEOS([3.1])
9075

9176
dnl Check for Proj library
9277
AX_LIB_PROJ
@@ -128,6 +113,18 @@ AX_BOOST_SYSTEM
128113
AX_BOOST_FILESYSTEM
129114
AX_BOOST_THREAD
130115

116+
dnl Check if Boost is recent enough for lockfree, and if it hasn't been overridden
117+
AC_ARG_WITH([lockfree],
118+
[AS_HELP_STRING([--without-lockfree],
119+
[disable lockfree queue])],
120+
[],
121+
[with_lockfree=yes])
122+
123+
if test "x$with_lockfree" = "xyes"
124+
then
125+
AX_BOOST_BASE([1.53], AC_DEFINE([HAVE_LOCKFREE], [1], [Using lockfree queue]), [])
126+
fi
127+
131128
dnl Check for Lua libraries and headers
132129
AX_PROG_LUA([5.0],[],[
133130
AX_LUA_HEADERS([

0 commit comments

Comments
 (0)