Clean up checks for usp10.h

Thu Jul 24 15:55:31 2003  Owen Taylor  <otaylor@redhat.com>

        * configure.in: Clean up checks for usp10.h

        * configure.in: Remove configure option for XftConfig
        location.

        * acconfig.h: Remove, not needed with autoconf-2.5x.
        (#114916, Tony Graham)

7 files changed, 59 insertions, 46 deletions

diff --git a/ChangeLog b/ChangeLog
index 4d4bdce4..8b233813 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Thu Jul 24 15:55:31 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Clean up checks for usp10.h
+
+	* configure.in: Remove configure option for XftConfig
+	location.
+
+	* acconfig.h: Remove, not needed with autoconf-2.5x.
+	(#114916, Tony Graham)
+
 Thu Jul 24 15:37:16 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in pango/Makefile.am pango.pc.in: Remove
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 4d4bdce4..8b233813 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,13 @@
+Thu Jul 24 15:55:31 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Clean up checks for usp10.h
+
+	* configure.in: Remove configure option for XftConfig
+	location.
+
+	* acconfig.h: Remove, not needed with autoconf-2.5x.
+	(#114916, Tony Graham)
+
 Thu Jul 24 15:37:16 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in pango/Makefile.am pango.pc.in: Remove
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 4d4bdce4..8b233813 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,13 @@
+Thu Jul 24 15:55:31 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Clean up checks for usp10.h
+
+	* configure.in: Remove configure option for XftConfig
+	location.
+
+	* acconfig.h: Remove, not needed with autoconf-2.5x.
+	(#114916, Tony Graham)
+
 Thu Jul 24 15:37:16 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in pango/Makefile.am pango.pc.in: Remove
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 4d4bdce4..8b233813 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,13 @@
+Thu Jul 24 15:55:31 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Clean up checks for usp10.h
+
+	* configure.in: Remove configure option for XftConfig
+	location.
+
+	* acconfig.h: Remove, not needed with autoconf-2.5x.
+	(#114916, Tony Graham)
+
 Thu Jul 24 15:37:16 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in pango/Makefile.am pango.pc.in: Remove
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 4d4bdce4..8b233813 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,13 @@
+Thu Jul 24 15:55:31 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Clean up checks for usp10.h
+
+	* configure.in: Remove configure option for XftConfig
+	location.
+
+	* acconfig.h: Remove, not needed with autoconf-2.5x.
+	(#114916, Tony Graham)
+
 Thu Jul 24 15:37:16 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in pango/Makefile.am pango.pc.in: Remove
diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644
index f5dbde89..00000000
--- a/acconfig.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* acconfig.h
-   This file is in the public domain.
-
-   Descriptive text for the C preprocessor macros that
-   the distributed Autoconf macros can define.
-   No software package will use all of them; autoheader copies the ones
-   your configure.in uses into your configuration header file templates.
-
-   The entries are in sort -df order: alphabetical, case insensitive,
-   ignoring punctuation (such as underscores).  Although this order
-   can split up related entries, it makes it easier to check whether
-   a given entry is in the file.
-
-   Leave the following blank line there!!  Autoheader needs it.  */
-
-
-#undef HAVE_FRIBIDI
-#undef HAVE_UNISTD_H
-#undef HAVE_FREETYPE_2_0_3
-#undef HAVE_USP10_H
-
-#undef MINI_XFTCONFIG_DIR
-#undef HAVE_X
-#undef HAVE_XFT2
diff --git a/configure.in b/configure.in
index 099194a1..62ad011a 100644
--- a/configure.in
+++ b/configure.in
@@ -183,7 +183,7 @@ if test x$no_x = xyes ; then
 else
   X_LIBS="$X_LIBS -lX11"
   have_x=true
-  AC_DEFINE(HAVE_X)
+  AC_DEFINE(HAVE_X, 1, [Have X libraries])
 fi
 AM_CONDITIONAL(HAVE_X, $have_x) 
 
@@ -283,17 +283,6 @@ AC_SUBST(GLIB_LIBS)
 AC_SUBST(GLIB_CFLAGS)
 
 #
-# Allow setting a default path for XftConfig
-#
-AC_ARG_WITH(xftconfig-dir,
-            [AC_HELP_STRING([--with-xftconfig-dir=PATH],
-                            [path to system XftConfig file for minixft])])
-
-if test "x$with_xftconfig_dir" != "x"; then
-   AC_DEFINE_UNQUOTED(MINI_XFTCONFIG_DIR, "$with_xftconfig_dir")
-fi
-
-#
 # The OpenType test programs aren't particularly portable
 #
 have_varargs=no
@@ -431,17 +420,15 @@ USP10_H=no
 if test "${with_usp10+set}" = set && test "$with_usp10" != no; then
   AC_MSG_CHECKING([for usp10.h])
   if test -f "$with_usp10"/usp10.h; then
-    AC_MSG_RESULT(yes)
     USP10_H="$with_usp10"/usp10.h
-    AC_DEFINE(HAVE_USP10_H)
+  elif test -f "$with_usp10"/include/usp10.h; then
+    USP10_H="$with_usp10"/include/usp10.h
+  fi
+  if test "x$USP10_H" != "xno" ; then
+    AC_MSG_RESULT(yes)
+    AC_DEFINE(HAVE_USP10_H, 1, [Have the usp10.h header file for Win32])
   else
-    if test -f "$with_usp10"/include/usp10.h; then
-      AC_MSG_RESULT(yes)
-      USP10_H="$with_usp10"/include/usp10.h
-      AC_DEFINE(HAVE_USP10_H)
-    else
-      AC_MSG_RESULT(no)
-    fi
+    AC_MSG_RESULT(no)
   fi
 fi
 AC_SUBST(USP10_H)
@@ -669,7 +656,7 @@ EOTEXT
 
 
 AC_HEADER_DIRENT
-AC_CHECK_HEADER(unistd.h, AC_DEFINE(HAVE_UNISTD_H))
+AC_CHECK_HEADERS(unistd.h)
 
 # Honor aclocal flags
 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"