Fix AC_DEFINEs.

* configure.in (wctype): Fix AC_DEFINEs.

8 files changed, 31 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index ad9994648..7c3f0fad1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1999-09-12  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* configure.in (wctype): Fix AC_DEFINEs.
+
 Fri Sep 10 21:31:00 1999 Pablo Saratxaga <pablo@mandrakesoft.com>
 
 	* po/et.po,configure.in: added Estonian language file
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index ad9994648..7c3f0fad1 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+1999-09-12  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* configure.in (wctype): Fix AC_DEFINEs.
+
 Fri Sep 10 21:31:00 1999 Pablo Saratxaga <pablo@mandrakesoft.com>
 
 	* po/et.po,configure.in: added Estonian language file
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ad9994648..7c3f0fad1 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+1999-09-12  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* configure.in (wctype): Fix AC_DEFINEs.
+
 Fri Sep 10 21:31:00 1999 Pablo Saratxaga <pablo@mandrakesoft.com>
 
 	* po/et.po,configure.in: added Estonian language file
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index ad9994648..7c3f0fad1 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+1999-09-12  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* configure.in (wctype): Fix AC_DEFINEs.
+
 Fri Sep 10 21:31:00 1999 Pablo Saratxaga <pablo@mandrakesoft.com>
 
 	* po/et.po,configure.in: added Estonian language file
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ad9994648..7c3f0fad1 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+1999-09-12  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* configure.in (wctype): Fix AC_DEFINEs.
+
 Fri Sep 10 21:31:00 1999 Pablo Saratxaga <pablo@mandrakesoft.com>
 
 	* po/et.po,configure.in: added Estonian language file
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ad9994648..7c3f0fad1 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+1999-09-12  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* configure.in (wctype): Fix AC_DEFINEs.
+
 Fri Sep 10 21:31:00 1999 Pablo Saratxaga <pablo@mandrakesoft.com>
 
 	* po/et.po,configure.in: added Estonian language file
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ad9994648..7c3f0fad1 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+1999-09-12  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* configure.in (wctype): Fix AC_DEFINEs.
+
 Fri Sep 10 21:31:00 1999 Pablo Saratxaga <pablo@mandrakesoft.com>
 
 	* po/et.po,configure.in: added Estonian language file
diff --git a/configure.in b/configure.in
index a03a17f05..10d34a2c3 100644
--- a/configure.in
+++ b/configure.in
@@ -467,28 +467,18 @@ fi
 
 # Duplicate `widechar' tests from `glib'.
 # Check for wchar.h
-if test x = y; then
-  # will not be executed
-  # hack so as not to update `acconfig.h'
-  AC_CHECK_HEADERS(wchar.h wctype.h)
-  AC_CHECK_FUNCS(broken_wctype)
-fi
-
 AC_MSG_CHECKING(for wchar.h)
 AC_TRY_CPP([#include <wchar.h>], gtk_ok=yes, gtk_ok=no)
 if test $gtk_ok = yes; then
-   ac_kludge=HAVE_WCHAR_H
-   AC_DEFINE($ac_kludge)
+   AC_DEFINE(HAVE_WCHAR_H,1,[Define if wchar.h exists])
 fi
 AC_MSG_RESULT($gtk_ok)
 
 # Check for wctype.h (for iswalnum)
-
 AC_MSG_CHECKING(for wctype.h)
 AC_TRY_CPP([#include <wctype.h>], gtk_ok=yes, gtk_ok=no)
 if test $gtk_ok = yes; then
-   ac_kludge=HAVE_WCTYPE_H
-   AC_DEFINE($ac_kludge)
+   AC_DEFINE(HAVE_WCTYPE_H,1,[Define if wctype.h exists])
 fi
 AC_MSG_RESULT($gtk_ok)
 
@@ -517,8 +507,7 @@ iswalnum((wchar_t) 0);
 LIBS="$oLIBS"
 
 if test $gtk_ok = no; then
-   ac_kludge=HAVE_BROKEN_WCTYPE
-   AC_DEFINE($ac_kludge)
+   AC_DEFINE(HAVE_BROKEN_WCTYPE,1,[Define if the wctype function is broken])
    GDK_WLIBS=
 fi
 AC_MSG_RESULT($gtk_ok)