aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-07-14 02:48:06 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-07-14 02:48:06 +0800
commit3bd46ea849351345825abbe6412f39e0e625c6c8 (patch)
tree5362bdf55f8d7aab4ce217ce35e5afa1c1773bfb
parent1e0b252fc78b0a96c621c5500a8140c9fcca6e9c (diff)
downloadgsoc2013-evolution-3bd46ea849351345825abbe6412f39e0e625c6c8.tar
gsoc2013-evolution-3bd46ea849351345825abbe6412f39e0e625c6c8.tar.gz
gsoc2013-evolution-3bd46ea849351345825abbe6412f39e0e625c6c8.tar.bz2
gsoc2013-evolution-3bd46ea849351345825abbe6412f39e0e625c6c8.tar.lz
gsoc2013-evolution-3bd46ea849351345825abbe6412f39e0e625c6c8.tar.xz
gsoc2013-evolution-3bd46ea849351345825abbe6412f39e0e625c6c8.tar.zst
gsoc2013-evolution-3bd46ea849351345825abbe6412f39e0e625c6c8.zip
Bug 588277 – Unnecessary special-purpose configure flag
-rw-r--r--configure.ac16
-rw-r--r--e-util/Makefile.am1
-rw-r--r--widgets/misc/Makefile.am4
3 files changed, 3 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac
index 770bcfa37e..254ee9f01f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -242,18 +242,8 @@ dnl ******************************
dnl iconv checking
dnl ******************************
have_iconv=no
-AC_ARG_WITH([libiconv],
- AS_HELP_STRING([--with-libiconv=PATH],
- [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_LINK_IFELSE([AC_LANG_PROGRAM(
[[
@@ -267,7 +257,7 @@ AC_CACHE_CHECK([for iconv in -liconv], [ac_cv_libiconv],
)],[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
@@ -275,7 +265,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
@@ -321,7 +310,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"
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index f85644b476..d723e3b290 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -34,7 +34,6 @@ AM_CPPFLAGS = \
-DSEARCH_RULE_DIR=\"$(ruledir)\" \
-DG_LOG_DOMAIN=\"e-utils\" \
$(GNOME_PILOT_CFLAGS) \
- $(ICONV_CFLAGS) \
$(E_UTIL_CFLAGS)
privsolib_LTLIBRARIES = libeutil.la libeconduit.la
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index 303efa878b..d6689ef73f 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -10,9 +10,7 @@ AM_CPPFLAGS = \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DG_LOG_DOMAIN=__FILE__ \
$(EVOLUTION_MAIL_CFLAGS) \
- $(GNOME_PLATFORM_CFLAGS) \
- $(ICONV_CFLAGS)
-
+ $(GNOME_PLATFORM_CFLAGS)
privsolib_LTLIBRARIES = \
libemiscwidgets.la \