summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2011-06-03 07:45:52 +0000
committerVincent Torri <vincent.torri@gmail.com>2011-06-03 07:45:52 +0000
commit23f1d7366ad11364598d3468494547fff4b4ea6e (patch)
treebb777510efa5e1e3f10921c0f48f80656a2912b3
parent2cd6baae7e8cacd3fb32b97d225b73467d8199be (diff)
Eina: fix static linking with eina
Fix static linking with eina (iconv could potentially not be passed to the linker) SVN revision: 59913
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac13
-rw-r--r--eina.pc.in2
3 files changed, 16 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9b7ea7e..6540d90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,3 +19,7 @@
19 19
20 1.0.1 release 20 1.0.1 release
21 21
222011-06-3 Vincent Torri
23
24 * Fix static linking with eina (iconv could potentially not be
25 passed to the linker)
diff --git a/configure.ac b/configure.ac
index 7a6a599..f58afb4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -453,6 +453,7 @@ AC_ARG_WITH([iconv-link],
453 [ 453 [
454 LIBS="$withval $LIBS" 454 LIBS="$withval $LIBS"
455 have_iconv="yes" 455 have_iconv="yes"
456 iconv_libs=$withval
456 ]) 457 ])
457 458
458AC_MSG_CHECKING(for explicit iconv link options) 459AC_MSG_CHECKING(for explicit iconv link options)
@@ -500,7 +501,10 @@ iconv_t ic;
500size_t count; 501size_t count;
501count = iconv(ic, NULL, NULL, NULL, NULL); 502count = iconv(ic, NULL, NULL, NULL, NULL);
502 ]])], 503 ]])],
503 [have_iconv="yes"], 504 [
505 have_iconv="yes"
506 iconv_libs="-liconv"
507 ],
504 [ 508 [
505 have_iconv="no" 509 have_iconv="no"
506 LIBS=${LIBS_save} 510 LIBS=${LIBS_save}
@@ -524,7 +528,10 @@ count = iconv(ic, NULL, NULL, NULL, NULL);
524iconv_t ic; 528iconv_t ic;
525size_t count = iconv(ic, NULL, NULL, NULL, NULL); 529size_t count = iconv(ic, NULL, NULL, NULL, NULL);
526 ]])], 530 ]])],
527 [have_iconv="yes"], 531 [
532 have_iconv="yes"
533 iconv_libs="-liconv_plug"
534 ],
528 [ 535 [
529 have_iconv="no" 536 have_iconv="no"
530 LIBS=${LIBS_save} 537 LIBS=${LIBS_save}
@@ -534,6 +541,8 @@ size_t count = iconv(ic, NULL, NULL, NULL, NULL);
534 fi 541 fi
535fi 542fi
536 543
544AC_SUBST([iconv_libs])
545
537if test "x${have_iconv}" = "xyes" ; then 546if test "x${have_iconv}" = "xyes" ; then
538 AC_DEFINE([HAVE_ICONV], [1], [Set to 1 if iconv library is installed]) 547 AC_DEFINE([HAVE_ICONV], [1], [Set to 1 if iconv library is installed])
539fi 548fi
diff --git a/eina.pc.in b/eina.pc.in
index 1a5a745..3995be0 100644
--- a/eina.pc.in
+++ b/eina.pc.in
@@ -8,5 +8,5 @@ Description: A Library that implements fast data types and miscellaneous tools
8@pkgconfig_requires_private@: @requirement_eina@ 8@pkgconfig_requires_private@: @requirement_eina@
9Version: @VERSION@ 9Version: @VERSION@
10Libs: -L${libdir} -leina 10Libs: -L${libdir} -leina
11Libs.private: @EFL_FNMATCH_LIBS@ @EFL_PTHREAD_LIBS@ -ldl 11Libs.private: @EFL_FNMATCH_LIBS@ @EFL_PTHREAD_LIBS@ @iconv_libs@ -ldl
12Cflags: -I${includedir}/eina-@VMAJ@ -I${includedir}/eina-@VMAJ@/eina 12Cflags: -I${includedir}/eina-@VMAJ@ -I${includedir}/eina-@VMAJ@/eina