add support for fribidi-config (needs fribidi v0.1.10 or higher). Also

* configure.in: add support for fribidi-config (needs fribidi v0.1.10
or higher). Also actually use the FOO_CONFIG variable filled by
AC_PATH_PROG for --cflags and --libs.

* examples/Makefile.am
* pango/Makefile.am: use $(FRIBIDI_LIBS)

-Yosh

10 files changed, 81 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 47c86455..25ae885f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon May  1 15:04:02 PDT 2000 Manish Singh <yosh@gimp.org>
+
+	* configure.in: add support for fribidi-config (needs fribidi v0.1.10
+	or higher). Also actually use the FOO_CONFIG variable filled by
+	AC_PATH_PROG for --cflags and --libs.
+
+	* examples/Makefile.am
+	* pango/Makefile.am: use $(FRIBIDI_LIBS)
+
 Mon May  1 11:58:55 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/arabic/*: Misc bug fixes from Karl Koehler.
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 47c86455..25ae885f 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,12 @@
+Mon May  1 15:04:02 PDT 2000 Manish Singh <yosh@gimp.org>
+
+	* configure.in: add support for fribidi-config (needs fribidi v0.1.10
+	or higher). Also actually use the FOO_CONFIG variable filled by
+	AC_PATH_PROG for --cflags and --libs.
+
+	* examples/Makefile.am
+	* pango/Makefile.am: use $(FRIBIDI_LIBS)
+
 Mon May  1 11:58:55 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/arabic/*: Misc bug fixes from Karl Koehler.
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 47c86455..25ae885f 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,12 @@
+Mon May  1 15:04:02 PDT 2000 Manish Singh <yosh@gimp.org>
+
+	* configure.in: add support for fribidi-config (needs fribidi v0.1.10
+	or higher). Also actually use the FOO_CONFIG variable filled by
+	AC_PATH_PROG for --cflags and --libs.
+
+	* examples/Makefile.am
+	* pango/Makefile.am: use $(FRIBIDI_LIBS)
+
 Mon May  1 11:58:55 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/arabic/*: Misc bug fixes from Karl Koehler.
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 47c86455..25ae885f 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,12 @@
+Mon May  1 15:04:02 PDT 2000 Manish Singh <yosh@gimp.org>
+
+	* configure.in: add support for fribidi-config (needs fribidi v0.1.10
+	or higher). Also actually use the FOO_CONFIG variable filled by
+	AC_PATH_PROG for --cflags and --libs.
+
+	* examples/Makefile.am
+	* pango/Makefile.am: use $(FRIBIDI_LIBS)
+
 Mon May  1 11:58:55 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/arabic/*: Misc bug fixes from Karl Koehler.
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 47c86455..25ae885f 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,12 @@
+Mon May  1 15:04:02 PDT 2000 Manish Singh <yosh@gimp.org>
+
+	* configure.in: add support for fribidi-config (needs fribidi v0.1.10
+	or higher). Also actually use the FOO_CONFIG variable filled by
+	AC_PATH_PROG for --cflags and --libs.
+
+	* examples/Makefile.am
+	* pango/Makefile.am: use $(FRIBIDI_LIBS)
+
 Mon May  1 11:58:55 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/arabic/*: Misc bug fixes from Karl Koehler.
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 47c86455..25ae885f 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,12 @@
+Mon May  1 15:04:02 PDT 2000 Manish Singh <yosh@gimp.org>
+
+	* configure.in: add support for fribidi-config (needs fribidi v0.1.10
+	or higher). Also actually use the FOO_CONFIG variable filled by
+	AC_PATH_PROG for --cflags and --libs.
+
+	* examples/Makefile.am
+	* pango/Makefile.am: use $(FRIBIDI_LIBS)
+
 Mon May  1 11:58:55 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/arabic/*: Misc bug fixes from Karl Koehler.
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 47c86455..25ae885f 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,12 @@
+Mon May  1 15:04:02 PDT 2000 Manish Singh <yosh@gimp.org>
+
+	* configure.in: add support for fribidi-config (needs fribidi v0.1.10
+	or higher). Also actually use the FOO_CONFIG variable filled by
+	AC_PATH_PROG for --cflags and --libs.
+
+	* examples/Makefile.am
+	* pango/Makefile.am: use $(FRIBIDI_LIBS)
+
 Mon May  1 11:58:55 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/arabic/*: Misc bug fixes from Karl Koehler.
diff --git a/configure.in b/configure.in
index 3afff539..e6cf50f7 100644
--- a/configure.in
+++ b/configure.in
@@ -24,8 +24,18 @@ AM_PATH_GTK(1.2.0,
 
 AM_CONDITIONAL(BUILD_TESTS, test x$gtk_works = xyes)
 
+AC_PATH_PROG(FRIBIDI_CONFIG, fribidi-config, no)
+if test x$FRIBIDI_CONFIG = xno ; then
+  AC_MSG_ERROR([*** fribidi-config not found])
+fi
+FRIBIDI_CFLAGS="`$FRIBIDI_CONFIG --cflags`"
+CFLAGS="$CFLAGS $UNICODE_CFLAGS"
+FRIBIDI_LIBS="`$FRIBIDI_CONFIG --libs`"
+AC_SUBST(FRIBIDI_LIBS)
+AC_SUBST(FRIBIDI_CFLAGS)
+
 AC_CHECK_LIB(fribidi, fribidi_map_range, :,
-	     AC_MSG_ERROR([*** libfribidi not found.]), -lglib)
+	     AC_MSG_ERROR([*** libfribidi not found.]), $FRIBIDI_LIBS)
 
 
 # We run glib-config separately to get the gmodule cflags so we
@@ -35,9 +45,9 @@ AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
 if test x$GLIB_CONFIG = xno ; then
   AC_MSG_ERROR([*** glib-config not found])
 fi
-GLIB_CFLAGS="`glib-config --cflags gmodule`"
+GLIB_CFLAGS="`$GLIB_CONFIG --cflags gmodule`"
 CFLAGS="$CFLAGS $GLIB_CFLAGS"
-GLIB_LIBS="`glib-config --libs gmodule`"
+GLIB_LIBS="`$GLIB_CONFIG --libs gmodule`"
 AC_SUBST(GLIB_LIBS)
 AC_SUBST(GLIB_CFLAGS)
 
@@ -46,15 +56,16 @@ AC_PATH_PROG(UNICODE_CONFIG, unicode-config, no)
 if test x$UNICODE_CONFIG = xno ; then
   AC_MSG_ERROR([*** unicode-config not found])
 fi
-UNICODE_CFLAGS="`unicode-config --cflags`"
+UNICODE_CFLAGS="`$UNICODE_CONFIG --cflags`"
 CFLAGS="$CFLAGS $UNICODE_CFLAGS"
-UNICODE_LIBS="`unicode-config --libs`"
+UNICODE_LIBS="`$UNICODE_CONFIG --libs`"
 AC_SUBST(UNICODE_LIBS)
 AC_SUBST(UNICODE_CFLAGS)
 
 AC_CHECK_LIB(unicode, unicode_type, :,
 	     AC_MSG_ERROR([*** libunicode not found.]), $UNICODE_LIBS)
 
+
 #
 # Checks for iconv
 #
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 784afb85..f0b841cf 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -9,7 +9,7 @@ bin_PROGRAMS = pango-viewer
 
 pango_viewer_SOURCES = \
 	viewer.c
-pango_viewer_LDADD = ../pango/libpango.la ../pango/libpangox.la $(GTK_LIBS) -lfribidi $(UNICODE_LIBS)
+pango_viewer_LDADD = ../pango/libpango.la ../pango/libpangox.la $(GTK_LIBS) $(FRIBID_LIBS) $(UNICODE_LIBS)
 endif
 
 all-local: pango.modules
diff --git a/pango/Makefile.am b/pango/Makefile.am
index acf3c95d..892ad7ad 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -49,5 +49,5 @@ pangoinclude_HEADERS = 	   \
 
 pango_querymodules_SOURCES = \
 	querymodules.c
-pango_querymodules_LDADD = libpango.la $(GLIB_LIBS) -lfribidi $(UNICODE_LIBS)
+pango_querymodules_LDADD = libpango.la $(GLIB_LIBS) $(FRIBIDI_LIBS) $(UNICODE_LIBS)