[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdegraphics/kpdf
From:       Albert Astals Cid <tsdgeos () terra ! es>
Date:       2005-03-21 20:57:30
Message-ID: 20050321205730.4BF955FA () office ! kde ! org
[Download RAW message or body]

CVS commit by aacid: 

Fix compile problem due to the non-standard location of Xft2 header files.


  M +2 -0      configure.in.in   1.21
  M +1 -1      xpdf/xpdf/Makefile.am   1.5


--- kdegraphics/kpdf/configure.in.in  #1.20:1.21
@@ -40,7 +40,9 @@
 
 if test -n "$XFT_CONFIG"; then
+  XFT_CFLAGS="`$XFT_CONFIG --cflags`"
   XFT_LIBS="`$XFT_CONFIG --libs`"
 fi
 
+AC_SUBST(XFT_CFLAGS)
 AC_SUBST(XFT_LIBS)
 

--- kdegraphics/kpdf/xpdf/xpdf/Makefile.am  #1.4:1.5
@@ -1,3 +1,3 @@
-INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../fofi -I$(srcdir)/../splash \
-I$(srcdir)/../goo $(all_includes) $(LIBFREETYPE_CFLAGS) $(X_INCLUDES) $(QT_INCLUDES) \
+INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../fofi -I$(srcdir)/../splash \
-I$(srcdir)/../goo $(all_includes) $(LIBFREETYPE_CFLAGS) $(XFT_CFLAGS) $(X_INCLUDES) \
$(QT_INCLUDES)  
 libxpdf_la_LDFLAGS = $(all_libraries)


[prev in list] [next in list] [prev in thread] [next in thread]