From a1e0cf75baac6eb174fd034c595acfe8a1d9c1ce Mon Sep 17 00:00:00 2001 From: William Kendrick Date: Fri, 2 Jan 2009 09:24:05 +0000 Subject: [PATCH] Preferred way of checking for FriBidi. --- Makefile | 6 +++--- src/tuxpaint.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 3865aada1..9f026b442 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ # bill@newbreedsoftware.com # http://www.tuxpaint.org/ -# June 14, 2002 - December 3, 2008 +# June 14, 2002 - January 2, 2009 # The version number, for release: @@ -74,8 +74,8 @@ PAPER_LIB:=$(call linktest,-lpaper,) PNG:=$(call linktest,-lpng,) PNG:=$(if $(PNG),$(PNG),$(call linktest,-lpng12,)) -FRIBIDI_LIB:=$(shell fribidi-config --libs) -FRIBIDI_CFLAGS:=$(shell fribidi-config --cflags) +FRIBIDI_LIB:=$(shell pkg-config --libs fribidi) +FRIBIDI_CFLAGS:=$(shell pkg-config --cflags fribidi) windows_ARCH_LINKS:=-lintl $(PNG) -lwinspool -lshlwapi $(FRIBIDI_LIB) osx_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB) diff --git a/src/tuxpaint.c b/src/tuxpaint.c index 35a894af7..09d5a9392 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA (See COPYING.txt) - June 14, 2002 - December 7, 2008 + June 14, 2002 - January 2, 2009 $Id$ */ @@ -965,7 +965,7 @@ char *papersize = NULL; #if 1 /* FIXME: ifdef for platforms that lack fribidi? */ #include -#if !defined(FRIBIDI_H) +#if !defined(_FRIBIDI_H) && !defined(FRIBIDI_H) #error "---------------------------------------------------" #error "If you installed libfribidi from a package, be sure" #error "to get the development package, as well!" @@ -15498,7 +15498,7 @@ static void do_render_cur_text(int do_blit) if (texttool_len > 0) { - #ifdef FRIBIDI_H + #if defined(_FRIBIDI_H) || defined(FRIBIDI_H) FriBidiCharType baseDir = FRIBIDI_TYPE_LTR; FriBidiChar *unicodeIn, *unicodeOut; unsigned int i;