diff options
| author | Rene Engelhard <rene@debian.org> | 2020-10-17 11:24:42 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-10-17 14:19:44 +0200 |
| commit | d0601cd3812cbcdaa0decf81c81d73d41a6ccb91 (patch) | |
| tree | 5e1884a2759487591a207eef629f008110c6cdad /configure.ac | |
| parent | 31373fa085b9985f315b10f008eca5e1a15cc6c7 (diff) | |
fix build with box2d 2.4.0
Change-Id: I60f25f04e2bfcdabf832f42b44ba3d945f4ec169
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104456
Tested-by: Jenkins
Tested-by: René Engelhard <rene@debian.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 08c4e39cbe64..894efc1b7eaa 100644 --- a/configure.ac +++ b/configure.ac @@ -10724,11 +10724,21 @@ if test "$with_system_box2d" = "yes"; then AC_MSG_RESULT([external]) SYSTEM_BOX2D=TRUE AC_LANG_PUSH([C++]) - AC_CHECK_HEADER(Box2D/Box2D.h, [], - [AC_MSG_ERROR(box2d headers not found.)], []) - AC_CHECK_LIB([Box2D], [main], [:], - [ AC_MSG_ERROR(box2d library not found.) ], []) - BOX2D_LIBS=-lBox2D + AC_CHECK_HEADER(box2d/box2d.h, [BOX2D_H_FOUND='TRUE'], + [BOX2D_H_FOUND='FALSE']) + if test "$BOX2D_H_FOUND" = "TRUE"; then # 2.4.0+ + _BOX2D_LIB=box2d + AC_DEFINE(BOX2D_HEADER,<box2d/box2d.h>) + else + # fail this. there's no other alternative to check when we are here. + AC_CHECK_HEADER([Box2D/Box2D.h], [], + [AC_MSG_ERROR(box2d headers not found.)]) + _BOX2D_LIB=Box2D + AC_DEFINE(BOX2D_HEADER,<Box2D/Box2D.h>) + fi + AC_CHECK_LIB([$_BOX2D_LIB], [main], [:], + [ AC_MSG_ERROR(box2d library not found.) ], []) + BOX2D_LIBS=-l$_BOX2D_LIB AC_LANG_POP([C++]) BOX2D_CFLAGS=$(printf '%s' "$BOX2D_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "${BOX2D_LIBS}" @@ -13946,6 +13956,7 @@ AC_CONFIG_FILES([config_host.mk instsetoo_native/util/openoffice.lst sysui/desktop/macosx/Info.plist]) AC_CONFIG_HEADERS([config_host/config_buildid.h]) +AC_CONFIG_HEADERS([config_host/config_box2d.h]) AC_CONFIG_HEADERS([config_host/config_clang.h]) AC_CONFIG_HEADERS([config_host/config_dconf.h]) AC_CONFIG_HEADERS([config_host/config_eot.h]) |