summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ksvg/impl/libs/libtext2path/configure.in.in18
-rw-r--r--ksvg/impl/libs/libtext2path/src/Converter.cpp7
2 files changed, 25 insertions, 0 deletions
diff --git a/ksvg/impl/libs/libtext2path/configure.in.in b/ksvg/impl/libs/libtext2path/configure.in.in
index 2198ab52..3d501591 100644
--- a/ksvg/impl/libs/libtext2path/configure.in.in
+++ b/ksvg/impl/libs/libtext2path/configure.in.in
@@ -39,3 +39,21 @@ dnl Check for fontconfig
# PKG_CHECK_MODULES(DEPS, fontconfig >= 2.2.0)
#AC_SUBST(DEPS_CFLAGS)
#AC_SUBST(DEPS_LIBS)
+
+dnl Check fribidi include location
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+cxx_flags_safe="$CXXFLAGS"
+cflags_safe="$CFLAGS"
+CXXFLAGS="$CXXFLAGS -I$ac_cv_sword_incdir"
+CFLAGS="$CFLAGS -I$ac_cv_sword_incdir"
+AC_MSG_CHECKING([for old fribidi header file])
+AC_TRY_COMPILE([#include <fribidi/fribidi_types.h>
+],[return 0;],
+AC_MSG_RESULT(yes),
+[AC_MSG_RESULT(no)
+AC_DEFINE(FRIBIDI_NEW_FILENAME,1,[no])])
+CXXFLAGS="$cxx_flags_safe"
+CFLAGS="$cflags_safe"
+AC_LANG_RESTORE
+
diff --git a/ksvg/impl/libs/libtext2path/src/Converter.cpp b/ksvg/impl/libs/libtext2path/src/Converter.cpp
index 30ce4409..59ab8e5c 100644
--- a/ksvg/impl/libs/libtext2path/src/Converter.cpp
+++ b/ksvg/impl/libs/libtext2path/src/Converter.cpp
@@ -18,12 +18,19 @@
Boston, MA 02110-1301, USA.
*/
+#include "config.h"
+
#include <math.h>
#include "myboost/shared_ptr.hpp"
#include <fontconfig/fontconfig.h>
#include <fribidi/fribidi.h>
+
+#ifdef FRIBIDI_NEW_FILENAME
#include <fribidi/fribidi-types.h>
+#else
+#include <fribidi/fribidi_types.h>
+#endif
#include "Font.h"
#include "Glyph.h"