From: Owen Taylor <otaylor@src.gnome.org>
Date: Tue, 21 May 2002 19:53:31 +0000 (+0000)
Subject: ue May 21 15:51:17 2002  Owen Taylor  <otaylor@redhat.com>
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=260befc999849fdca150cc2c6248473daba4423a;p=dana%2Fcg-glib.git

ue May 21 15:51:17 2002  Owen Taylor  <otaylor@redhat.com>

        * configure.in: $with_libiconv, not $with_iconv.
---

diff --git a/ChangeLog b/ChangeLog
index 78adf595..9a302665 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue May 21 15:51:17 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: $with_libiconv, not $with_iconv.
+
 Mon May 20 18:02:46 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Move iconv tests before gettext
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 78adf595..9a302665 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Tue May 21 15:51:17 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: $with_libiconv, not $with_iconv.
+
 Mon May 20 18:02:46 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Move iconv tests before gettext
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 78adf595..9a302665 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,7 @@
+Tue May 21 15:51:17 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: $with_libiconv, not $with_iconv.
+
 Mon May 20 18:02:46 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Move iconv tests before gettext
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 78adf595..9a302665 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+Tue May 21 15:51:17 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: $with_libiconv, not $with_iconv.
+
 Mon May 20 18:02:46 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Move iconv tests before gettext
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 78adf595..9a302665 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+Tue May 21 15:51:17 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: $with_libiconv, not $with_iconv.
+
 Mon May 20 18:02:46 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Move iconv tests before gettext
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 78adf595..9a302665 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Tue May 21 15:51:17 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: $with_libiconv, not $with_iconv.
+
 Mon May 20 18:02:46 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Move iconv tests before gettext
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 78adf595..9a302665 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Tue May 21 15:51:17 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: $with_libiconv, not $with_iconv.
+
 Mon May 20 18:02:46 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Move iconv tests before gettext
diff --git a/configure.in b/configure.in
index 742495cd..00dd4985 100644
--- a/configure.in
+++ b/configure.in
@@ -334,7 +334,7 @@ dnl
 dnl Now we are done with gettext checks, figure out ICONV_LIBS
 dnl
 
-if test x$with_iconv != xno ; then
+if test x$with_libiconv != xno ; then
   case " $INTLLIBS " in
   *[[\ \	]]-liconv[[\ \	]]*) ;;
   *) ICONV_LIBS="-liconv" ;;