diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-09-11 12:56:39 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-09-22 08:13:41 +0200 |
| commit | bb6c5a5443e2124d18686b87ac1a87f867d2d056 (patch) | |
| tree | 4ff7b135b447f7426af9f8fdfb5fdb1d5031f42d /configure.in | |
| parent | allow Library to disable hidden visibility (diff) | |
| download | core-bb6c5a5443e2124d18686b87ac1a87f867d2d056.tar.gz core-bb6c5a5443e2124d18686b87ac1a87f867d2d056.zip | |
neon: convert to gbuild
Change-Id: I1cca0e3be7e148c835af26d2c001878b849e8432
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 8180ac401d6a..2e1feecac9f3 100644 --- a/configure.in +++ b/configure.in @@ -8606,7 +8606,6 @@ if test "$with_system_neon" = "yes"; then AC_MSG_RESULT([external]) PKG_CHECK_MODULES(NEON, neon >= 0.26.0, , AC_MSG_ERROR([you need neon >= 0.26.x for system-neon])) NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`" - NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1" SYSTEM_NEON=YES libo_MINGW_CHECK_DLL([NEON], [libneon]) libo_MINGW_TRY_DLL([TASN1], [libtasn1]) @@ -8614,14 +8613,15 @@ if test "$with_system_neon" = "yes"; then else AC_MSG_RESULT([internal]) SYSTEM_NEON=NO - NEON_LIBS=-lneon - NEON_CFLAGS= BUILD_TYPE="$BUILD_TYPE NEON" + NEON_TARBALL=ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz + NEON_VERSION=0295 fi AC_SUBST(SYSTEM_NEON) -AC_SUBST(NEON_VERSION) AC_SUBST(NEON_LIBS) AC_SUBST(NEON_CFLAGS) +AC_SUBST(NEON_TARBALL) +AC_SUBST(NEON_VERSION) AC_SUBST([MINGW_GNUTLS_DLL]) AC_SUBST([MINGW_NEON_DLL]) AC_SUBST([MINGW_TASN1_DLL]) |