--- configure.ac.orig
+++ configure.ac
@@ -40,8 +40,9 @@ esac
 AC_MSG_RESULT([$os_cygwin])
 AC_SUBST([XTRA_LDFLAGS])
 
-AC_PROG_CC
-AM_PROG_CC_STDC
+AC_PROG_CC_STDC
+AC_USE_SYSTEM_EXTENSIONS
+AC_SYS_LARGEFILE
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
 AC_PROG_LN_S
--- Makefile.am.orig
+++ Makefile.am
@@ -3,6 +3,8 @@ AUTOMAKE_OPTIONS = foreign 1.7
 
 ACLOCAL_AMFLAGS = -I config
 
+AM_CPPFLAGS = -include $(top_builddir)/config.h
+
 SUBDIRS = config test
 
 bin_PROGRAMS = annotate gdparttopng gdtopng gd2copypal gd2topng pngtogd pngtogd2 webpng gd2togif gdcmpgif giftogd2
@@ -19,7 +21,7 @@ lib_LTLIBRARIES = libgd.la
 
 libgd_la_SOURCES = gd.c gdfx.c gd_security.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_gif_in.c gd_gif_out.c gd_io_file.c gd_io_ss.c gd_jpeg.c gd_png.c gd_ss.c gd_topal.c gd_wbmp.c gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c gdft.c gdhelpers.c gdhelpers.h gdkanji.c gdtables.c gdxpm.c jisx0208.h wbmp.c wbmp.h
 
-libgd_la_LDFLAGS = -version-info 2:0:0 $(XTRA_LDFLAGS)
+libgd_la_LDFLAGS = -no-undefined -version-info 2:0:0 $(XTRA_LDFLAGS)
 
 libgd_la_LIBADD = $(LTLIBICONV)