--- a/symbian-qemu-0.9.1-12/qemu-symbian-svp/configure	Thu Jul 29 11:34:55 2010 +0100
+++ b/symbian-qemu-0.9.1-12/qemu-symbian-svp/configure	Wed Aug 04 10:56:22 2010 +0100
@@ -1091,6 +1091,7 @@
   datasuffix=""
   docsuffix=""
   binsuffix=""
+  libsuffix=""
 else
   if test -z "$prefix" ; then
       prefix="/usr/local"
@@ -1099,11 +1100,22 @@
   datasuffix="/share/qemu"
   docsuffix="/share/doc/qemu"
   binsuffix="/bin"
+  libsuffix="/lib"
 fi
 
+MODEL_LIBS_DIR=""
+if test `expr "$source_path" : ".*\/qemu-symbian-svp$"` != 0 ; then
+	if [ "$linux" = "yes" -a -f "$source_path/../model-libraries/Makefile" ]; then
+		MODEL_LIBS_DIR="$source_path/../model-libraries"
+	fi
+fi 
+
 echo "Install prefix    $prefix"
 echo "BIOS directory    $prefix$datasuffix"
 echo "binary directory  $prefix$binsuffix"
+if [ ! -z "$MODEL_LIBS_DIR" ]; then
+	echo "lib directory  $prefix$libsuffix"
+fi 
 if test "$mingw32" = "no" ; then
 echo "Manual directory  $prefix$mansuffix"
 echo "ELF interp prefix $interp_prefix"
@@ -1181,6 +1193,9 @@
 
 echo "prefix=$prefix" >> $config_mak
 echo "bindir=\${prefix}$binsuffix" >> $config_mak
+if [ ! -z "$MODEL_LIBS_DIR" ]; then
+	echo "libdir=\${prefix}$libsuffix" >> $config_mak
+fi 
 echo "mandir=\${prefix}$mansuffix" >> $config_mak
 echo "datadir=\${prefix}$datasuffix" >> $config_mak
 echo "docdir=\${prefix}$docsuffix" >> $config_mak
@@ -1200,6 +1215,10 @@
 echo "ARCH_LDFLAGS=$ARCH_LDFLAGS" >> $config_mak
 echo "CFLAGS=$CFLAGS" >> $config_mak
 echo "LDFLAGS=$LDFLAGS" >> $config_mak
+if [ ! -z "$MODEL_LIBS_DIR" ]; then
+	echo "RPATH_FLAGS=-Wl,-rpath=\"${prefix}$libsuffix\"" >> $config_mak
+	echo "MODEL_LIBS_DIR=$MODEL_LIBS_DIR" >> $config_mak
+fi 
 echo "EXESUF=$EXESUF" >> $config_mak
 echo "AIOLIBS=$AIOLIBS" >> $config_mak
 case "$cpu" in
@@ -1811,6 +1830,7 @@
   echo "#define CONFIG_BSD_USER 1" >> $config_h
 fi
 
+
 test -f ${config_h}~ && cmp -s $config_h ${config_h}~ && mv ${config_h}~ $config_h
 
 done # for target in $targets