diff --git a/Makefile.am b/Makefile.am
index e02628b..1abea77 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,6 +7,6 @@ SUBDIRS = src include testsuite doc bindings tools
 
 EXTRA_DIST = configure.ac CHANGES libemu.pc.in
 
-pkgconfigdir = @pkgconfigdir@
+pkgconfigdir = @PKGCONFIGDIR@
 pkgconfig_DATA = libemu.pc
 
diff --git a/configure.ac b/configure.ac
index 8771c14..fbd0c49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,24 +22,25 @@ case "$host" in
 *-*-freebsd*)
   CPPFLAGS="$CPPFLAGS -I/usr/local/include -I/usr/src/contrib/file/ -Wno-unused-local-typedefs"
   LDFLAGS="$LDFLAGS -L/usr/local/lib -Wl,-rpath,/usr/local/lib"
-  pkgconfigdir="/usr/lib/pkgconfig"
+  PKGCONFIGDIR="/usr/lib/pkgconfig"
   ;;
 *-*-linux*)
-  CPPFLAGS="$CPPFLAGS -D _GNU_SOURCE -I/usr/local/include -Wno-unused-local-typedefs"
-  LDFLAGS="$LDFLAGS -L/usr/local/lib -Wl,-rpath,/usr/local/lib"
-  pkgconfigdir="/usr/lib/pkgconfig"
+  # CPPFLAGS="$CPPFLAGS -D _GNU_SOURCE -I/usr/local/include -Wno-unused-local-typedefs"
+  CPPFLAGS="$CPPFLAGS -D _GNU_SOURCE -Wno-unused-local-typedefs"
+  # LDFLAGS="$LDFLAGS -L/usr/local/lib -Wl,-rpath,/usr/local/lib"
+  PKGCONFIGDIR="/usr/lib/pkgconfig"
   ;;
 *-*-darwin*)
   CPPFLAGS="$CPPFLAGS -I/opt/local/include -Wno-unused-local-typedefs"
   LDFLAGS="$LDFLAGS -L/opt/local/lib"
-  pkgconfigdir="/usr/local/lib/pkgconfig"
+  PKGCONFIGDIR="/usr/local/lib/pkgconfig"
   if test "$GCC" = "yes"; then
           CFLAGS="$CFLAGS -Wno-unused-local-typedefs -Wno-tautological-compare"
   fi
   ;;
 esac
 
-AC_SUBST([pkgconfigdir])
+AC_SUBST([PKGCONFIGDIR])
 
 # Checks for programs.
 AC_PROG_CC
@@ -175,6 +176,7 @@ AC_ARG_WITH(cargos-lib,
 
 if test x$enable_cargos = "xyes" ; then
 	OLD_CPPFLAGS=${CPPFLAGS};
+	OLD_LDFLAGS=${LDFLAGS}
 	if test x$cargos_inc != "xno"; then
 		CPPFLAGS="${CPPFLAGS} -I${cargos_inc}"
 	fi
@@ -182,7 +184,6 @@ if test x$enable_cargos = "xyes" ; then
 	AC_CHECK_HEADER(cargos-lib.h,[enable_cargos=yes],[enable_cargos=no])
 	
 	if test x$enable_cargos = "xyes" ; then
-		OLD_LDFLAGS=${LDFLAGS}
 		if test x$cargos_lib != "xno"; then
 			LDFLAGS="${LDFLAGS}  -L${cargos_lib}"
 		fi