--- gdraw/Makefile.dynamic.in.orig	2007-12-06 04:32:55 +0300
+++ gdraw/Makefile.dynamic.in	2007-12-12 22:34:29 +0300
@@ -41,7 +41,7 @@ CFLAGS = @CFLAGS@ @CPPFLAGS@ $(Incs) @WF
 ../libgdraw.la: $(libgdraw_OBJECTS)
 	$(LIBTOOL) --mode=link $(CC) -no-undefined $(CFLAGS) @LDFLAGS@ -o ../libgdraw.la $(libgdraw_OBJECTS) \
 	    ../libgutils.la ../libgunicode.la @LIBS@ \
-	    $(STATIC_LIBS) $(X_LIBS) $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS)  \
+	    $(STATIC_LIBS) $(X_LIBS) $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) -lm \
 	    -rpath $(libdir) -version-info $(GD_VERSION):$(GD_REVISION):$(GD_AGE)
 
 %.lo: %.c

--- gdraw/Makefile.static.in.orig	2007-10-29 01:10:38 +0300
+++ gdraw/Makefile.static.in		2007-10-29 01:11:51 +0300
@@ -34,7 +34,7 @@
 all: ../libs/libgdraw.a
 
 ../libs/libgdraw.a: $(libgdraw_OBJECTS)
-	ar cr ../libs/libgdraw.a $(libgdraw_OBJECTS)
+	ar cr ../libs/libgdraw.a $(libgdraw_OBJECTS) -lm
 	$(RANLIB) ../libs/libgdraw.a
 
 #../libs/libgdraw.so.1.0: $(libgdraw_OBJECTS)

--- fontforge/Makefile.dynamic.in.orig	2007-12-07 22:01:38 +0300
+++ fontforge/Makefile.dynamic.in	2007-12-12 22:36:24 +0300
@@ -69,7 +69,7 @@ LIBS = -rpath $(libdir) $(X_LIBS) @LINK_
     $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -lm
 LIBLIBS = -rpath $(libdir) ../libgutils.la ../libgunicode.la \
     @LIBS@ $(STATIC_LIBS) -lm
-DLIBS = -rpath $(libdir) ../libgunicode.la @LIBS@ $(STATIC_LIBS) -lm
+DLIBS = -rpath $(libdir) ../libgunicode.la ../libgdraw.la @LIBS@ $(STATIC_LIBS) -lm
 
 all: @FINAL_TARGET@ sfddiff fontimage fontlint
 

--- fontforge/Makefile.static.in.orig	2007-10-29 01:07:37 +0300
+++ fontforge/Makefile.static.in	2007-10-29 01:07:54 +0300
@@ -51,7 +51,7 @@
 LDFLAGS = @LDFLAGS@
 LIBS = -L../libs $(X_LIBS) ../libs/libgdraw.a ../libs/libgunicode.a \
     $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -lm
-DLIBS = ../libs/libgunicode.a @LIBS@ $(STATIC_LIBS) -lm
+DLIBS = ../libs/libgunicode.a ../libs/libgdraw.a @LIBS@ $(STATIC_LIBS) -lm
 
 all: fontforge sfddiff fontimage fontlint