summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2012-08-13 12:59:29 +0200
committerMiklos Szeredi <mszeredi@suse.cz>2012-08-13 12:59:29 +0200
commit5957ea2fd952cc7158f5632655d706abfa789e95 (patch)
tree7c29f372ae732029152bf8bd189a50f56b01cea5
parent2f2ac2f8d3b2a6e137eb3262673c51e59f9d7dd9 (diff)
parentefeac22bfa65c845c04adb5e70e6de33b0104fa3 (diff)
downloadfuse-5957ea2fd952cc7158f5632655d706abfa789e95.tar.gz
Merge branch 'fuse_2_9_bugfix'
-rw-r--r--ChangeLog4
-rw-r--r--configure.in2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5eeb9fe..f2582bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-13 Miklos Szeredi <miklos@szeredi.hu>
+
+ * Fix linking against GNU libiconv. Patch by Natanael Copa
+
2012-07-19 Miklos Szeredi <miklos@szeredi.hu>
* Start of 3.0 series. This is going to be a new major version of
diff --git a/configure.in b/configure.in
index 2a27ea0..95d7d2d 100644
--- a/configure.in
+++ b/configure.in
@@ -70,7 +70,7 @@ AC_ARG_WITH([libiconv-prefix],
done
])
AM_ICONV
-libfuse_libs=$libfuse_libs $LTLIBICONV
+libfuse_libs="$libfuse_libs $LTLIBICONV"
AM_CONDITIONAL(ICONV, test "$am_cv_func_iconv" = yes)
AC_SUBST(libfuse_libs)