[evolution-data-server] Bug 588277 – Unnecessary special-purpose configure flag

[Matthew Barnes <mbarnes src gnome org>]

commit d80b0ac1c3edf8b82ecf75f15aca235411b24069
Author: Matthew Barnes <mbarnes redhat com>
Date:   Mon Jul 13 14:48:48 2009 -0400

    Bug 588277 â?? Unnecessary special-purpose configure flag

 configure.ac |   16 ++--------------
 1 files changed, 2 insertions(+), 14 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f94a4e3..78b3ab4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -319,18 +319,8 @@ dnl ******************************
 dnl iconv checking
 dnl ******************************
 have_iconv=no
-AC_ARG_WITH(libiconv,
-  AC_HELP_STRING( [--with-libiconv],
-		  [Prefix where libiconv is installed]))
-if test -d "$withval"; then
-    ICONV_CFLAGS="-I$withval/include"
-    ICONV_LIBS="-L$withval/lib"
-fi
-
-save_CFLAGS="$CFLAGS"
 save_LIBS="$LIBS"
-CFLAGS="$CFLAGS $ICONV_CFLAGS"
-LIBS="$LIBS $ICONV_LIBS -liconv"
+LIBS="$LIBS -liconv"
 AC_CACHE_CHECK(for iconv in -liconv, ac_cv_libiconv, AC_TRY_LINK([
 #include <iconv.h>
 #include <stdlib.h>],[
@@ -339,7 +329,7 @@ AC_CACHE_CHECK(for iconv in -liconv, ac_cv_libiconv, AC_TRY_LINK([
 	exit (0);
 ], ac_cv_libiconv=yes, ac_cv_libiconv=no))
 if test $ac_cv_libiconv = yes; then
-	ICONV_LIBS="$ICONV_LIBS -liconv"
+	ICONV_LIBS="-liconv"
 	if test $os_win32 = yes; then
 		# Don't pointlessly auto-export the global symbols
 		# from a potentially static libiconv.a
@@ -347,7 +337,6 @@ if test $ac_cv_libiconv = yes; then
 	fi
 	have_iconv=yes
 else
-	CFLAGS="$save_CFLAGS"
 	LIBS="$save_LIBS"
 	AC_CHECK_FUNC(iconv, have_iconv=yes, have_iconv=no)
 fi
@@ -394,7 +383,6 @@ fi
 if test "$have_iconv" = no; then
 	AC_MSG_ERROR([You need to install a working iconv implementation, such as ftp://ftp.gnu.org/pub/gnu/libiconv])
 fi
-AC_SUBST(ICONV_CFLAGS)
 AC_SUBST(ICONV_LIBS)
 
 CFLAGS="$CFLAGS -I$srcdir"