diff --git a/configure.ac b/configure.ac
index f09f67e96..1023d5302 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ CORE_CONFIG_NICE(config.nice)
 
 dnl Must come before AM_INIT_AUTOMAKE.
 AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE([1.10 -Wall -Werror foreign])
+AM_INIT_AUTOMAKE([1.10 -Wall -Werror foreign subdir-objects])
 
 # Where to generate output; srcdir location.
 AC_CONFIG_HEADERS([config.h:config.in])dnl Keep filename to 8.3 for MS-DOS.
@@ -72,7 +72,7 @@ AC_PROG_MKDIR_P
 AC_PROG_CC
 AC_PROG_INSTALL
 AM_PROG_AR
-LT_INIT
+LT_INIT([pic-only disable-static])
 
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 if test "x$PKG_CONFIG" = "xno"; then
diff --git a/lib/core/src/Makefile.am b/lib/core/src/Makefile.am
index 0aa9dc5ac..28abba62d 100644
--- a/lib/core/src/Makefile.am
+++ b/lib/core/src/Makefile.am
@@ -1,6 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = subdir-objects
 pkglib_LTLIBRARIES = libcore.la
 
 libcore_la_SOURCES = \
diff --git a/lib/fd/Makefile.am b/lib/fd/Makefile.am
index 6506a9509..d2598a380 100644
--- a/lib/fd/Makefile.am
+++ b/lib/fd/Makefile.am
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = subdir-objects
-
 pkglib_LTLIBRARIES = libfd.la
 
 libfd_la_SOURCES = \
diff --git a/lib/freeDiameter-1.2.1/configure.ac b/lib/freeDiameter-1.2.1/configure.ac
index 887ed53f5..0fadbf9d3 100644
--- a/lib/freeDiameter-1.2.1/configure.ac
+++ b/lib/freeDiameter-1.2.1/configure.ac
@@ -72,7 +72,7 @@ AC_PROG_INSTALL
 AC_PROG_YACC
 AC_PROG_LEX
 AM_PROG_AR
-LT_INIT([dlopen])
+LT_INIT([dlopen pic-only disable-static])
 
 dnl Check Endian
 AC_C_BIGENDIAN