--- origsrc/glpk-4.36/Makefile.am	2009-02-06 10:00:00.000000000 +0100
+++ src/glpk-4.36/Makefile.am	2009-03-24 14:12:09.699097700 +0100
@@ -1,5 +1,7 @@
 ## Process this file with automake to produce Makefile.in ##
 
+ACLOCAL_AMFLAGS=-I m4
+
 SUBDIRS = include src examples
 
 ## eof ##
--- origsrc/glpk-4.36/configure.ac	2009-02-06 10:00:00.000000000 +0100
+++ src/glpk-4.36/configure.ac	2009-03-24 14:32:55.434432100 +0100
@@ -1,11 +1,19 @@
 dnl Process this file with autoconf to produce a configure script
 
 AC_INIT([GLPK], [4.36], address@hidden)
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([include/glpk.h])
 
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS([config.h])
 
+AH_TEMPLATE([HAVE_GMP], [], [GMP lib])
+AH_TEMPLATE([HAVE_ZLIB], [], [ZLIB lib])
+AH_TEMPLATE([HAVE_LTDL], [], [LTDL lib])
+AH_TEMPLATE([HAVE_DLFCN], [], [DLFCN lib])
+AH_TEMPLATE([ODBC_DLNAME], [], [OBDC dlname])
+AH_TEMPLATE([MYSQL_DLNAME], [], [MYSQL dlname])
+
 AC_ARG_WITH(gmp,
 AC_HELP_STRING([--with-gmp],
    [use GNU MP bignum library [[default=no]]]),
--- origsrc/glpk-4.36/examples/Makefile.am	2009-02-06 10:00:00.000000000 +0100
+++ src/glpk-4.36/examples/Makefile.am	2009-03-24 14:58:34.602908900 +0100
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in ##
 
-INCLUDES = -I../include
+INCLUDES = -I$(srcdir)/../include
 
 LDADD = ../src/libglpk.la
 
@@ -10,6 +10,6 @@ glpsol_SOURCES = glpsol.c
 
 check: glpsol$(EXEEXT)
 	./glpsol$(EXEEXT) --version
-	./glpsol$(EXEEXT) --mps ./plan.mps
+	./glpsol$(EXEEXT) --mps $(srcdir)/plan.mps
 
 ## eof ##
--- origsrc/glpk-4.36/src/Makefile.am	2009-02-06 10:00:00.000000000 +0100
+++ src/glpk-4.36/src/Makefile.am	2009-03-24 14:52:36.854796900 +0100
@@ -1,11 +1,10 @@
 ## Process this file with automake to produce Makefile.in ##
 
-INCLUDES = -I../include
+INCLUDES = -I$(srcdir)/../include
 
 lib_LTLIBRARIES = libglpk.la
 
-libglpk_la_LDFLAGS = -version-info 21:0:21 \
--export-symbols-regex '^(glp_|_glp_lpx_).*'
+libglpk_la_LDFLAGS = -version-info 21:0:21
 
 libglpk_la_SOURCES = \
 glpapi01.c \