A Dilluns, 22 de març de 2010, Jan Engelhardt va escriure: > On Monday 2010-03-22 21:34, Albert Astals Cid wrote: > >Hi, sorry for the late answer, i would appreciate if you did not change > >the Makefile.am > > > >> @@ -2,7 +2,7 @@ INCLUDES = \ > >> > >> -I$(top_srcdir) \ > >> -I$(top_srcdir)/poppler \ > >> $(cairo_includes) \ > >> > >> - $(POPPLER_QT_CXXFLAGS) \ > >> + $(libqt3_CFLAGS) \ > >> > >> $(FREETYPE_CFLAGS) \ > >> $(FONTCONFIG_CFLAGS) > > Have to. PKG_CHECK_MODULES([foobar], [boing]) > will check for libboing and put the results in foobar_CFLAGS > and foobar_LIBS, so I can't use POPPLER_QT_CXXFLAGS anymore > as it's now at least _CFLAGS. > > >and i also would appreciate if you explained all those ifelse > >inside the PKG_CHECK_MODULES call. > > It's simply what has been there before in the file, > and apparently required for the POPPLET_QT_CHECK macro > and its invocation from configure.ac. > > >> - qtpthread='' > >> - if test "x$pthread_needed" = "xyes"; then > >> - qtpthread="-pthread" > >> - fi > >> - > >> - $1[]_CXXFLAGS="-I$qt_incdir" > >> - $1[]_LIBS="$qtpthread -L$qt_libdir -lqt-mt" > >> - ifelse([$2], , :, [$2]) > >> -else > >> - ifelse([$3], , [AC_MSG_FAILURE(dnl > >> -[Qt development libraries not found])], > >> - [$3]) > >> -fi > >> +PKG_CHECK_MODULES([libqt3], [qt-mt], [ > >> + ifelse([$2], , :, [$2]) > >> +], [ > >> + ifelse([$3], , > >> + [AC_MSG_FAILURE([Qt development libraries not found])], > >> + [$3]) > >> > >> ]) > >> > >> -
Pushed. Albert > > _______________________________________________ > poppler mailing list > [email protected] > http://lists.freedesktop.org/mailman/listinfo/poppler _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
