[FriBidi-commit] fribidi configure.ac, 1.6, 1.7 fribidi.pc.in, 1.1.1.1, 1.2

[Behdad Esfahbod]

Update of /cvs/fribidi/fribidi
In directory pdx:/tmp/cvs-serv21240

Modified Files:
	configure.ac fribidi.pc.in 
Log Message:
Making gen-bidi-tab work, and more clean up.


Index: configure.ac
===================================================================
RCS file: /cvs/fribidi/fribidi/configure.ac,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/configure.ac	7 May 2004 06:30:37 -0000	1.6
+++ b/configure.ac	22 May 2004 10:35:30 -0000	1.7
@@ -137,7 +137,7 @@
 
 # --enable-debug
 AC_ARG_ENABLE(debug,
-              AS_HELP_STRING([--enable-debug],
+              AC_HELP_STRING([--enable-debug],
                              [turn on debugging @<:@default=debug_default()@:>@]),,
               enableval=debug_default())
 if test x$enableval = xyes; then
@@ -147,7 +147,7 @@
 
 # --enable-malloc
 AC_ARG_ENABLE(debug,
-              AS_HELP_STRING([--enable-malloc],
+              AC_HELP_STRING([--enable-malloc],
                              [use simple malloc instead of memory chunks]))
 if test x$enable_glib = xyes; then
 	AC_DEFINE(USE_SIMPLE_MALLOC,1,
@@ -156,7 +156,7 @@
 
 # --disable-charsets
 AC_ARG_ENABLE(charsets,
-              AS_HELP_STRING([--disable-charsets],
+              AC_HELP_STRING([--disable-charsets],
                              [exclude charset conversion codes from the library]))
 if test x$enable_charsets = xno; then
 	FRIBIDI_CHARSETS=0
@@ -168,7 +168,7 @@
 
 # --without-glib
 AC_ARG_WITH(glib,
-              AS_HELP_STRING([--without-glib],
+              AC_HELP_STRING([--without-glib],
                              [do not use Glib]))
 GLIB_PACKAGE=glib-2.0
 GLIB_LIBS=
@@ -188,11 +188,16 @@
 if test x$FRIBIDI_USER_GLIB = x0; then
 	GLIB_PACKAGE=
 fi
-AC_SUBST(GLIB_PACKAGE)
-AC_SUBST(GLIB_LIBS)
-AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(FRIBIDI_USE_GLIB)
-AM_CONDITIONAL(FRIBIDI_USE_GLIB, test "$FRIBIDI_USE_GLIB" = 1)
+AM_CONDITIONAL(FRIBIDI_USE_GLIB, test x$FRIBIDI_USE_GLIB = x1)
+
+
+MISC_CFLAGS="$GLIB_CFLAGS"
+MISC_LIBS="$GLIB_LIBS"
+MISC_PACKAGES="$GLIB_PACKAGES"
+AC_SUBST(MISC_CFLAGS)
+AC_SUBST(MISC_LIBS)
+AC_SUBST(MISC_PACKAGES)
 
 # Generate output
 AC_CONFIG_FILES([fribidi.pc

Index: fribidi.pc.in
===================================================================
RCS file: /cvs/fribidi/fribidi/fribidi.pc.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- a/fribidi.pc.in	25 Apr 2004 18:47:57 -0000	1.1.1.1
+++ b/fribidi.pc.in	22 May 2004 10:35:30 -0000	1.2
@@ -7,7 +7,7 @@
 
 Name: @PACKAGE_NAME@
 Description: Unicode Bidirectional Algorithm Library
-Requires: @GLIB_PACKAGE@
+Requires: @MISC_PACKAGES@
 Version: @VERSION@
 Libs: -L${libdir} -lfribidi
 Cflags: -I${includedir}/@PACKAGE@