summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSøren Sandmann Pedersen <sandmann@daimi.au.dk>2005-06-17 20:33:33 +0000
committerSøren Sandmann Pedersen <sandmann@daimi.au.dk>2005-06-17 20:33:33 +0000
commitdb8fd7e670cbd901116344212217bee8001ab460 (patch)
tree05568b4a95a1413c0ba65fd440f8525e8997dd8c
parente5525d268c6165318894f326be445b22a2523558 (diff)
Add lbxutil to symlink.sh Add back accidentally removed include in Type1XORG-6_8_99_13XORG-6_8_99_12
directory Disable Speedo by default
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac2
-rw-r--r--src/Type1/t1io.c1
3 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 99a7d21..848c433 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jun 17 16:13:18 2005 Søren Sandmann <sandmann@redhat.com>
+
+ * configure.ac (XFONT_SPEEDO): Disable Speedo by default.
+
2005-06-09 Alexander Gottwald <ago@freedesktop.org>
* src/fc/fstrans.c:
diff --git a/configure.ac b/configure.ac
index 6297ac9..da3343c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -112,7 +112,7 @@ if test "x$XFONT_TYPE1" = xyes; then
AC_DEFINE(XFONT_TYPE1,1,[Support Type 1 font files])
fi
-AC_ARG_ENABLE(speedo, [ --disable-speedo ], [XFONT_SPEEDO=$enableval], [XFONT_SPEEDO=yes])
+AC_ARG_ENABLE(speedo, [ --disable-speedo ], [XFONT_SPEEDO=$enableval], [XFONT_SPEEDO=no])
AM_CONDITIONAL(XFONT_SPEEDO, [test "x$XFONT_SPEEDO" = xyes ])
if test "x$XFONT_SPEEDO" = xyes; then
AC_DEFINE(XFONT_SPEEDO,1,[Support Type 1 font files])
diff --git a/src/Type1/t1io.c b/src/Type1/t1io.c
index ac09b54..db3a05e 100644
--- a/src/Type1/t1io.c
+++ b/src/Type1/t1io.c
@@ -58,6 +58,7 @@
#include <fcntl.h>
#include <unistd.h>
#else
+#include "Xdefs.h"
#include "Xmd.h" /* INT32 declaration */
#include "xf86_ansic.h"
#endif