diff options
| -rw-r--r-- | configure.ac | 34 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | test/unit/Makefile.am | 6 |
3 files changed, 8 insertions, 36 deletions
diff --git a/configure.ac b/configure.ac index 95d587c6..180f34d9 100644 --- a/configure.ac +++ b/configure.ac @@ -309,37 +309,9 @@ dnl --------------------------------------------------------------------------- dnl Check for sqlite3 library and binary dnl --------------------------------------------------------------------------- -AC_ARG_WITH(sqlite3-include, - [ --with-sqlite3-include=ARG sqlite3 include directory],,,) - -if test "x$with_sqlite3_include" = "x" ; then -SQLITE3_FLAGS="" -if test -z "`uname | grep Darwin`" ; then - AC_CHECK_HEADERS([sqlite3.h]) - if test "$ac_cv_header_sqlite3_h" = "no" ; then - AC_MSG_ERROR([Please install sqlite3 development package.]) - fi -fi -else - SQLITE3_FLAGS="-I$with_sqlite3_include" -fi -AC_SUBST(SQLITE3_FLAGS,$SQLITE3_FLAGS) - -AC_ARG_WITH(sqlite3-ldflags, - [ --with-sqlite3-ldflags=ARG sqlite3 link flags (i.e. -L/xxx -lsqlite3)],,,) - -SQLITE3_LDFLAGS="" -if test "x$with_sqlite3_ldflags" = "x" ; then - AC_CHECK_LIB(sqlite3,sqlite3_open,SQLITE3_LIB_FOUND=yes,SQLITE3_LIB_FOUND=no,) - if test x"$SQLITE3_LIB_FOUND" != x"yes"; then - AC_MSG_ERROR([Please install sqlite3 development package.]) - fi - SQLITE3_LDFLAGS="-lsqlite3" -else - SQLITE3_LDFLAGS="$with_sqlite3_ldflags" -fi -AC_SUBST(SQLITE3_LDFLAGS,$SQLITE3_LDFLAGS) - +PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= 3.7]) +AC_SUBST(SQLITE3_CFLAGS,$SQLITE3_CFLAGS) +AC_SUBST(SQLITE3_LIBS,$SQLITE3_LIBS) AC_CHECK_PROG(SQLITE3_CHECK,sqlite3,yes) if test x"$SQLITE3_CHECK" != x"yes" ; then diff --git a/src/Makefile.am b/src/Makefile.am index fabea4bf..e60cd3c5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,7 +7,7 @@ TESTS = geodtest check_PROGRAMS = geodtest AM_CPPFLAGS = -DPROJ_LIB=\"$(pkgdatadir)\" \ - -DMUTEX_@MUTEX_SETTING@ @JNI_INCLUDE@ -I$(top_srcdir)/include @SQLITE3_FLAGS@ + -DMUTEX_@MUTEX_SETTING@ @JNI_INCLUDE@ -I$(top_srcdir)/include @SQLITE3_CFLAGS@ AM_CXXFLAGS = @CXX_WFLAGS@ @FLTO_FLAG@ -DPROJ_COMPILATION include_HEADERS = proj.h proj_experimental.h proj_constants.h proj_api.h geodesic.h \ @@ -45,7 +45,7 @@ geodtest_LDADD = libproj.la lib_LTLIBRARIES = libproj.la libproj_la_LDFLAGS = -no-undefined -version-info 14:1:1 -libproj_la_LIBADD = @SQLITE3_LDFLAGS@ +libproj_la_LIBADD = @SQLITE3_LIBS@ libproj_la_SOURCES = \ pj_list.h proj_internal.h proj_math.h \ diff --git a/test/unit/Makefile.am b/test/unit/Makefile.am index 34624b0d..c0a05997 100644 --- a/test/unit/Makefile.am +++ b/test/unit/Makefile.am @@ -4,7 +4,7 @@ EXTRA_DIST = CMakeLists.txt noinst_HEADERS = gtest_include.h -AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_srcdir)/test -I$(top_srcdir)/test/googletest/include @SQLITE3_FLAGS@ +AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_srcdir)/test -I$(top_srcdir)/test/googletest/include @SQLITE3_CFLAGS@ AM_CXXFLAGS = @CXX_WFLAGS@ @NO_ZERO_AS_NULL_POINTER_CONSTANT_FLAG@ PROJ_LIB ?= ../../data @@ -49,13 +49,13 @@ proj_context_test-check: proj_context_test ./proj_context_test test_cpp_api_SOURCES = test_util.cpp test_common.cpp test_crs.cpp test_metadata.cpp test_io.cpp test_operation.cpp test_datum.cpp test_factory.cpp test_c_api.cpp main.cpp -test_cpp_api_LDADD = ../../src/libproj.la ../../test/googletest/libgtest.la @SQLITE3_LDFLAGS@ +test_cpp_api_LDADD = ../../src/libproj.la ../../test/googletest/libgtest.la @SQLITE3_LIBS@ test_cpp_api-check: test_cpp_api PROJ_LIB=$(PROJ_LIB) ./test_cpp_api gie_self_tests_SOURCES = gie_self_tests.cpp main.cpp -gie_self_tests_LDADD = ../../src/libproj.la ../../test/googletest/libgtest.la @SQLITE3_LDFLAGS@ +gie_self_tests_LDADD = ../../src/libproj.la ../../test/googletest/libgtest.la @SQLITE3_LIBS@ gie_self_tests-check: gie_self_tests PROJ_LIB=$(PROJ_LIB) ./gie_self_tests |