diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-01-19 21:01:09 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-01-20 09:43:28 +0000 |
| commit | 82cdcc392ae07fd230ac3f0ec2c4850681f49c39 (patch) | |
| tree | 2aedb10d10ff3cec10ea8bb443789048b4e610ee /configure.ac | |
| parent | 4ebe24910441e7f382cff4ccc899515910c74c2c (diff) | |
can now drop external dependency vigra
Change-Id: I3babe33ab5be1c3521ccb8bee71239e3d8893a2f
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/configure.ac b/configure.ac index 7bdea6f7333b..d5ae425cbbdc 100644 --- a/configure.ac +++ b/configure.ac @@ -1619,7 +1619,7 @@ AC_ARG_WITH(system-headers, AS_HELP_STRING([--with-system-headers], [Use headers already on system -- enables all --with-system-* flags for external packages whose headers are the only entities used i.e. - boost/vigra/odbc/sane-header(s).]),, + boost/odbc/sane-header(s).]),, [with_system_headers="$with_system_libs"]) AC_ARG_WITH(system-jars, @@ -1920,11 +1920,6 @@ AC_ARG_WITH(system-glm, [Use glm already on system.]),, [with_system_glm="$with_system_headers"]) -AC_ARG_WITH(system-vigra, - AS_HELP_STRING([--with-system-vigra], - [Use vigra already on system.]),, - [with_system_vigra="$with_system_headers"]) - AC_ARG_WITH(system-hunspell, AS_HELP_STRING([--with-system-hunspell], [Use libhunspell already on system.]),, @@ -8830,24 +8825,6 @@ if test $_os = WINNT; then fi dnl =================================================================== -dnl Check for system vigra -dnl =================================================================== -AC_MSG_CHECKING([which vigra to use]) -if test "$with_system_vigra" = "yes"; then - AC_MSG_RESULT([external]) - SYSTEM_VIGRA=TRUE - AC_LANG_PUSH([C++]) - AC_CHECK_HEADER(vigra/copyimage.hxx, [], - [AC_MSG_ERROR(vigra/copyimage.hxx not found. install vigra)], []) - AC_LANG_POP([C++]) -else - AC_MSG_RESULT([internal]) - BUILD_TYPE="$BUILD_TYPE VIGRA" - SYSTEM_VIGRA= -fi -AC_SUBST(SYSTEM_VIGRA) - -dnl =================================================================== dnl Check for system odbc dnl =================================================================== AC_MSG_CHECKING([which odbc headers to use]) |