1 --- fontforge-20100501/configure.in.orig 2009-12-27 00:18:48.000000000 +0100
2 +++ fontforge-20100501/configure.in 2010-10-07 09:20:42.775738529 +0200
4 AC_SUBST(LINK_WITH_GDRAW)
7 +dnl this is abused later: originally contains -lSM -lICE, which are not needed
9 exeOBJECTS=fontforge_UIOBJECTS
10 LINK_WITH_GDRAW=../libgdraw.la
11 if test "$no_x" = "yes"; then
13 oldCPPFLAGS="$CPPFLAGS"
16 -LDFLAGS="$LDFLAGS -L/usr/local/lib"
22 PyLib=`$python_prog -c "import distutils.sysconfig ; print(distutils.sysconfig.get_config_var('LIBPL') + '/' + distutils.sysconfig.get_config_var('LDLIBRARY'))"`
23 if test "$py_lib" != "" ; then
24 - LIBS="$LIBS $py_lib"
26 elif test "$PyLib" != "" -a -e "$PyLib" ; then
32 AC_SEARCH_LIBS(Py_Main, $PyName python, : , python="no")
36 + AC_SUBST([LIBPYTHON])
40 --- fontforge-20100501/fontforge/Makefile.dynamic.in.orig 2010-10-07 09:25:42.675742720 +0200
41 +++ fontforge-20100501/fontforge/Makefile.dynamic.in 2010-10-07 20:30:48.611745234 +0200
43 X_EXTRA_LIBS = @X_EXTRA_LIBS@
44 X_PRE_LIBS = @X_PRE_LIBS@
45 STATIC_LIBS = @STATIC_LIBS@
46 +LIBPYTHON = @LIBPYTHON@
52 $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -lm
53 LIBLIBS = -rpath $(libdir) ../libgutils.la ../libgunicode.la \
54 - @LIBS@ $(STATIC_LIBS) -lm
55 + @LIBS@ $(STATIC_LIBS) $(LIBPYTHON) -lm
56 DLIBS = -rpath $(libdir) ../libfontforge.la ../libgutils.la ../libgunicode.la @LIBS@ $(STATIC_LIBS) -lm
58 all: @FINAL_TARGET@ @MACAPP@ sfddiff fontimage fontlint
59 --- fontforge-20110222/configure.in~ 2012-02-11 18:18:03.000000000 +0100
60 +++ fontforge-20110222/configure.in 2012-02-11 18:25:25.604323722 +0100
62 if test "$ac_cv_lib_png14_png_create_read_struct" = "yes"; then
63 STATIC_LIBS="$STATIC_LIBS -lpng14 -lz"
65 + if test "$ac_cv_lib_png15_png_create_read_struct" = "yes"; then
66 + STATIC_LIBS="$STATIC_LIBS -lpng15 -lz"
68 if test "$ac_cv_lib_tiff_TIFFOpen" = "yes"; then
69 STATIC_LIBS="$STATIC_LIBS -ltiff"
71 --- fontforge-20120731-b/configure.in.orig 2012-10-07 17:41:49.342851423 +0200
72 +++ fontforge-20120731-b/configure.in 2012-10-07 18:59:16.455989734 +0200
74 dnl /usr/share/doc/XFree86-doc-4.2.0/Xi/lib.PS
76 AC_CHECK_LIB(Xi, XOpenDevice, X_11LIB="-lXi -lX11" ,AC_DEFINE(_NO_XINPUT), $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS -lX11 )
77 - AC_CHECK_LIB(xkbui, XkbQueryExtension, X_11LIB="$X_11LIB -lxkbui" ,AC_DEFINE(_NO_XKB), $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS -lX11 -lm )
78 + AC_CHECK_LIB(X11, XkbQueryExtension, X_11LIB="$X_11LIB -lX11" ,AC_DEFINE(_NO_XKB), $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS -lX11 -lm )
81 gww_define_caps_for_alt="dontknow"