* include stdlib.h so that NULL is always defined

 * restore LIBS when iconv library is not found

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/eina@45986 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/configure.ac b/configure.ac
index 818c325..ff7fff9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -388,6 +388,7 @@ if test "x${have_iconv}" = "xno" ; then
       AC_LINK_IFELSE(
          [AC_LANG_PROGRAM(
              [[
+#include <stdlib.h>
 #include <iconv.h>
              ]],
              [[
@@ -408,6 +409,7 @@ size_t count = iconv(ic, NULL, NULL, NULL, NULL);
       AC_LINK_IFELSE(
          [AC_LANG_PROGRAM(
              [[
+#include <stdlib.h>
 #include <iconv.h>
              ]],
              [[
@@ -416,7 +418,10 @@ size_t count;
 count = iconv(ic, NULL, NULL, NULL, NULL);
              ]])],
          [have_iconv="yes"],
-         [have_iconv="no"])
+         [
+          have_iconv="no"
+          LIBS=${LIBS_save}
+         ])
 
       AC_MSG_RESULT([${have_iconv}])
    fi
@@ -429,6 +434,7 @@ count = iconv(ic, NULL, NULL, NULL, NULL);
       AC_LINK_IFELSE(
          [AC_LANG_PROGRAM(
              [[
+#include <stdlib.h>
 #include <iconv.h>
              ]],
              [[
@@ -436,8 +442,10 @@ iconv_t ic;
 size_t count = iconv(ic, NULL, NULL, NULL, NULL);
              ]])],
          [have_iconv="yes"],
-         [have_iconv="no"])
-      LDFLAGS="${LDFLAGS_save}"
+         [
+          have_iconv="no"
+          LIBS=${LIBS_save}
+         ])
 
       AC_MSG_RESULT([${have_iconv}])
    fi