diff --git a/configure.ac b/configure.ac
index ad6d849..02e5b14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,6 +9,7 @@ AC_CONFIG_MACRO_DIR([m4])
 
 
 AM_INIT_AUTOMAKE([1.9 foreign])
+AC_MINGW32
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_LIBTOOL
@@ -36,6 +37,20 @@ AC_ARG_ENABLE([compile-demo],
 
 AM_CONDITIONAL([COMPILE_DEMO], [test x${compile_demo} = xyes])
 
+dnl - check if the macro WIN32 is defined on this compiler.
+AC_MSG_CHECKING(for WIN32)
+
+if test "$MINGW32" = yes; then
+  bwin32=true
+  AC_MSG_RESULT(compile in mingw32)
+fi
+
+dnl
+if test "$bwin32" = true; then
+  LIB_PYTHON=-lpython26
+fi
+AC_SUBST(LIB_PYTHON)
+
 # option: compile-python
 # default: no
 AC_ARG_ENABLE([compile-python],
@@ -68,7 +83,7 @@ AC_SUBST(JSON_GLIB_LIBS)
 
 # conditinally check python and subst
 if test x${compile_python} = xyes; then
-   AM_PATH_PYTHON([2.4]) 
+   AM_PATH_PYTHON([2.4])
    AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
    PKG_CHECK_MODULES(PYGOBJECT, [pygobject-2.0 >= $PYGOBJECT_REQUIRED])
    AC_SUBST(PYGOBJECT_CFLAGS)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5351c45..e53dd81 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -35,8 +35,7 @@ libsearpc_la_SOURCES = searpc-client.c searpc-server.c $(generated_sources)
 
 libsearpc_la_LDFLAGS =  -version-info 1:1:0  -no-undefined
 
-libsearpc_la_LIBADD = @GLIB2_LIBS@  @GOBJECT_LIBS@ @JSON_GLIB_LIBS@ \
-                     -lglib-2.0 -lgobject-2.0 -ljson-glib-1.0
+libsearpc_la_LIBADD = @GLIB2_LIBS@  @GOBJECT_LIBS@ @JSON_GLIB_LIBS@
 
 genrpc_files = gencode.py rpc_table.py
 
diff --git a/pysearpc/Makefile.am b/pysearpc/Makefile.am
index 0bf39ab..986a102 100644
--- a/pysearpc/Makefile.am
+++ b/pysearpc/Makefile.am
@@ -17,9 +17,9 @@ BUILT_SOURCES = fcallfret.h
 # generating the fcallfret module
 pysearpc_LTLIBRARIES = fcallfret.la
 
-fcallfret_la_LDFLAGS = -module -avoid-version -export-symbols-regex initfcallfret
+fcallfret_la_LDFLAGS = -module -avoid-version -export-symbols-regex initfcallfret  -no-undefined
 fcallfret_la_SOURCES = fcallfret.c fcallfret.h
-fcallfret_la_LIBADD = @GLIB2_LIBS@ @GOBJECT_LIBS@ $(top_builddir)/lib/libsearpc.la
+fcallfret_la_LIBADD = @GLIB2_LIBS@ @GOBJECT_LIBS@ $(top_builddir)/lib/libsearpc.la @LIB_PYTHON@
 
 EXTRA_DIST = ${genrpc_files}