Here and there fixes, found by trying to compile on sf.net Compile Farm!

diff --git a/AUTHORS b/AUTHORS
index 6a3d5492378f97737b9cf700d842a366401a6694..aed50fd49efec51cd1c8c284c2e158c7c99021fa 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,4 @@
-behdad:Behdad Esfahbod  <behdad@gnu.org>
+behdad: Behdad Esfahbod <behdad@gnu.org>
 #
 # Behdad Esfahbod is the only one that actually codes these days.  He
 # maintains it himself too.  He has revised all code written by anyone else,
@@ -7,7 +7,7 @@ behdad:Behdad Esfahbod  <behdad@gnu.org>
 # implements, documents, maintains, all alone... :'-(.
 #
 
-dov-g:Dov Grobgeld  <dov@imagic.weizmann.ac.il>
+dov-g: Dov Grobgeld <dov@imagic.weizmann.ac.il>
 #
 # Dov Grobgeld originally wrote FriBidi.  The 0.1.* versions are all comletely
 # done by Dov.  After that, he almost never touched the code, but contributed
@@ -15,7 +15,7 @@ dov-g:Dov Grobgeld  <dov@imagic.weizmann.ac.il>
 # author in the header of the file.
 #
 
-#roozbeh:Roozbeh Pournader  <roozbeh@gnu.org>
+#roozbeh: Roozbeh Pournader <roozbeh@gnu.org>
 #
 # Roozbeh Pournader actually didn't contributed much code to GNU FriBidi; but
 # he has promoted and psychologically supported the project.  He has helped

diff --git a/TODO b/TODO
index a768ecef7dd4141cdec3116e8e16144ef3a32cbc..d0e6589f07125e9462c0e1830bdb47084ae6050b 100644 (file)
--- a/TODO
+++ b/TODO
@@ -47,9 +47,6 @@ Implementation issues:
   cleanup stuff if asked to fail on memory allocation failure (xmalloc).  When
   this is done, FRIBIDI_GNUC_WARN_UNUSEDS can be turned off conditionally.
 
-* Fix cvs2cl bug with spacing around author names read with -U option.  Then
-  fix spacing in AUTHORS.
-
 * Generate HTML and DVI documentation.
 
 * Rewrite fribidi.spec.in

diff --git a/configure.ac b/configure.ac
index 063d50408819f41d5d4f31d7ffc99a07390d0ca5..fffba48de1527fd801ba9415a0ed0e02ba4d163b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,10 +3,10 @@
 ## Use autoupdate to update this file for newer versions of autoconf.
 ## Use autoscan to check if you need to add something to this file.
 ##############################################################################
-## $Id: configure.ac,v 1.16 2004-06-15 11:52:02 behdad Exp $
+## $Id: configure.ac,v 1.17 2004-07-03 11:36:15 behdad Exp $
 ## $Auther: behdad $
-## $Date: 2004-06-15 11:52:02 $
-## $Revision: 1.16 $
+## $Date: 2004-07-03 11:36:15 $
+## $Revision: 1.17 $
 ## $Source: /home/behdad/src/fdo/fribidi/togit/git/../fribidi/fribidi2/configure.ac,v $
 ##############################################################################
 
@@ -44,7 +44,7 @@ m4_define(fribidi_version,
            fribidi_major_version.fribidi_minor_version.fribidi_micro_version))dnl
 
 AC_INIT([GNU FriBidi],fribidi_version(),[http://freedesktop.org/cgi-bin/bugzilla/enter_bug.cgi?product=FriBidi])
-AC_REVISION([$Id: configure.ac,v 1.16 2004-06-15 11:52:02 behdad Exp $])
+AC_REVISION([$Id: configure.ac,v 1.17 2004-07-03 11:36:15 behdad Exp $])
 AC_CONFIG_SRCDIR(lib/fribidi.h)
 AC_CONFIG_HEADERS(config.h)
 AM_INIT_AUTOMAKE([gnits])
@@ -103,7 +103,7 @@ AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
 # Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_TIME
-AC_CHECK_HEADERS([stdlib.h string.h strings.h inttypes.h stdbool.h wchar.h sys/times.h asm/page.h])
+AC_CHECK_HEADERS([stdlib.h string.h strings.h inttypes.h wchar.h sys/times.h asm/page.h])
 
 # Checks for typedefs and structures.
 AC_C_CONST
@@ -178,16 +178,17 @@ AC_ARG_WITH(glib,
               AC_HELP_STRING([--with-glib=@<:@no/auto/yes@:>@],
                              [use Glib @<:@default=auto@:>@]))
 GLIB_PACKAGE=glib-2.0
+GLIB_MINVERSION=2.4
 GLIB_LIBS=
 GLIB_CFLAGS=
 if test x$with_glib = xyes; then
-       PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE)
+       PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION)
        FRIBIDI_USE_GLIB=1
 else
 if test x$with_glib = xno; then
        FRIBIDI_USE_GLIB=0
 else
-       PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE,
+       PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION,
                FRIBIDI_USE_GLIB=1,
                FRIBIDI_USE_GLIB=0)
 fi
@@ -201,7 +202,7 @@ AM_CONDITIONAL(FRIBIDI_USE_GLIB, test x$FRIBIDI_USE_GLIB = x1)
 
 MISC_CFLAGS="$GLIB_CFLAGS"
 MISC_LIBS="$GLIB_LIBS"
-MISC_PACKAGES="$GLIB_PACKAGES"
+MISC_PACKAGES="$GLIB_PACKAGE"
 AC_SUBST(MISC_CFLAGS)
 AC_SUBST(MISC_LIBS)
 AC_SUBST(MISC_PACKAGES)

diff --git a/gen.tab/Makefile.am b/gen.tab/Makefile.am
index b02c5a1992ea3e652c1b9514a88208f8619e6429..aaf3061733c52dbcbf22100ecca77ee6dbad6407 100644 (file)
--- a/gen.tab/Makefile.am
+++ b/gen.tab/Makefile.am
@@ -27,6 +27,15 @@ VPATH += \
                $(srcdir)/unidata/extracted \
                $(top_builddir)/lib
 
+
+UCD_FILES = \
+               unidata/ReadMe.txt \
+               unidata/UnicodeData.txt \
+               unidata/BidiMirroring.txt \
+               unidata/ArabicShaping.txt
+
+EXTRA_DIST = $(UCD_FILES)
+
 COMPRESSION = 4
 
 # generate bidi-type.tab.i
@@ -90,4 +99,12 @@ fribidi-unicode-version.h: \
 # generate all generators:
 gen: $(EXTRA_PROGRAMS)
 
+$(top_builddir)/config.h: $(top_srcdir)/config.h.in
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) config.h
+
+$(top_builddir)/lib/fribidi-config.h: $(top_srcdir)/lib/fribidi-config.h.in
+       cd $(top_builddir)/lib && $(MAKE) $(AM_MAKEFLAGS) fribidi-config.h
+
+.PHONY: gen
+
 .DELETE_ON_ERROR:

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 8084590d38125e3b4e1f6585cc5652898182c17c..56445a0579724181d8109a233a1fa9697ddf2f49 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -28,7 +28,8 @@ $(top_builddir)/charset/libfribidi-char-sets.la:
 endif # FRIBIDI_CHARSETS
 
 include Headers.mk
-pkginclude_HEADERS = $(libfribidi_la_headers) fribidi-config.h
+pkginclude_HEADERS = $(libfribidi_la_headers)
+nodist_pkginclude_HEADERS = fribidi-config.h
 
 libfribidi_la_SOURCES =        \
                bidi-type.tab.i \
@@ -51,13 +52,17 @@ libfribidi_la_SOURCES =     \
                mirroring.tab.i \
                run.h
 
-BUILT_SOURCES= \
+GENERATEDSOURCES = \
                fribidi-unicode-version.h \
                bidi-type.tab.i \
                joining-type.tab.i \
                mirroring.tab.i
 
-$(BUILT_SOURCES):
+BUILT_SOURCES = \
+               $(GENERATEDSOURCES) \
+               fribidi-config.h
+
+$(GENERATEDSOURCES):
        @(cd $(top_builddir)/gen.tab && \
        $(MAKE) $(AM_MAKEFLAGS) $@) && \
        (test -f $@ || mv $(top_builddir)/gen.tab/$@ .)
@@ -73,3 +78,5 @@ MAINTAINERCLEANFILES = $(BUILT_SOURCES)
 
 $(top_builddir)/config.h: $(top_srcdir)/config.h.in
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) config.h
+
+.PHONY: gen

diff --git a/lib/fribidi-types.h b/lib/fribidi-types.h
index e56b5f7bcf71e8da00de3b61fdc3955b4634dd3d..2bc954d2081d0f8645dbcbf80d27d94b425e52da 100644 (file)
--- a/lib/fribidi-types.h
+++ b/lib/fribidi-types.h
@@ -1,10 +1,10 @@
 /* FriBidi
  * fribidi-types.h - define data types for the rest of the library
  *
- * $Id: fribidi-types.h,v 1.8 2004-06-18 19:21:33 behdad Exp $
+ * $Id: fribidi-types.h,v 1.9 2004-07-03 11:36:15 behdad Exp $
  * $Author: behdad $
- * $Date: 2004-06-18 19:21:33 $
- * $Revision: 1.8 $
+ * $Date: 2004-07-03 11:36:15 $
+ * $Revision: 1.9 $
  * $Source: /home/behdad/src/fdo/fribidi/togit/git/../fribidi/fribidi2/lib/fribidi-types.h,v $
  *
  * Author:
@@ -68,14 +68,7 @@
 #   define FRIBIDI_UINT32_LOCAL                unsigned long
 #  endif /* SIZEOF_INT < 4 */
 # endif        /* no int types */
-# if HAVE_STDBOOL_H
-#  ifndef __FRIBIDI_DOC
-#   include <stdbool.h>
-#  endif /* !__FRIBIDI_DOC */
-#  define FRIBIDI_BOOLEAN_LOCAL                bool
-# else /* !HAVE_STDBOOL_H */
-#  define FRIBIDI_BOOLEAN_LOCAL                int
-# endif        /* !HAVE_STDBOOL_H */
+# define FRIBIDI_BOOLEAN_LOCAL         int
 # if SIZEOF_WCHAR_T >= 4
 #  ifndef __FRIBIDI_DOC
 #   if STDC_HEADERS