Released 0.12

Thu Jul  6 15:24:38 2000  Owen Taylor  <otaylor@redhat.com>

	* Released 0.12

        * configure.in: Use AM_PATH_GLIB_2_0()

	* pango-config.in: Use @FRIBIDI_LIBS@, not -lfribidi

	* pango-config.in: Fix accidental inclusion
	-I lib/glib/include/

9 files changed, 84 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index 661aa69c..a8cfb169 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Thu Jul  6 15:24:38 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* Released 0.12
+
+        * configure.in: Use AM_PATH_GLIB_2_0()
+	
+	* pango-config.in: Use @FRIBIDI_LIBS@, not -lfribidi
+
+	* pango-config.in: Fix accidental inclusion 
+	-I lib/glib/include/
+
 Mon Jul 10 10:42:42 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-utils.c (pango_split_file_list): Fix
@@ -11,8 +22,6 @@ Mon Jul 10 10:42:42 2000  Owen Taylor  <otaylor@redhat.com>
 
 Thu Jul  6 15:24:38 2000  Owen Taylor  <otaylor@redhat.com>
 
-	* Released 0.12
-
 	* gdk/Makefile.am: Fix missing \ which was causing
 	srcdir != builddir builds to fail.
 
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 661aa69c..a8cfb169 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,14 @@
+Thu Jul  6 15:24:38 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* Released 0.12
+
+        * configure.in: Use AM_PATH_GLIB_2_0()
+	
+	* pango-config.in: Use @FRIBIDI_LIBS@, not -lfribidi
+
+	* pango-config.in: Fix accidental inclusion 
+	-I lib/glib/include/
+
 Mon Jul 10 10:42:42 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-utils.c (pango_split_file_list): Fix
@@ -11,8 +22,6 @@ Mon Jul 10 10:42:42 2000  Owen Taylor  <otaylor@redhat.com>
 
 Thu Jul  6 15:24:38 2000  Owen Taylor  <otaylor@redhat.com>
 
-	* Released 0.12
-
 	* gdk/Makefile.am: Fix missing \ which was causing
 	srcdir != builddir builds to fail.
 
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 661aa69c..a8cfb169 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,14 @@
+Thu Jul  6 15:24:38 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* Released 0.12
+
+        * configure.in: Use AM_PATH_GLIB_2_0()
+	
+	* pango-config.in: Use @FRIBIDI_LIBS@, not -lfribidi
+
+	* pango-config.in: Fix accidental inclusion 
+	-I lib/glib/include/
+
 Mon Jul 10 10:42:42 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-utils.c (pango_split_file_list): Fix
@@ -11,8 +22,6 @@ Mon Jul 10 10:42:42 2000  Owen Taylor  <otaylor@redhat.com>
 
 Thu Jul  6 15:24:38 2000  Owen Taylor  <otaylor@redhat.com>
 
-	* Released 0.12
-
 	* gdk/Makefile.am: Fix missing \ which was causing
 	srcdir != builddir builds to fail.
 
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 661aa69c..a8cfb169 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,14 @@
+Thu Jul  6 15:24:38 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* Released 0.12
+
+        * configure.in: Use AM_PATH_GLIB_2_0()
+	
+	* pango-config.in: Use @FRIBIDI_LIBS@, not -lfribidi
+
+	* pango-config.in: Fix accidental inclusion 
+	-I lib/glib/include/
+
 Mon Jul 10 10:42:42 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-utils.c (pango_split_file_list): Fix
@@ -11,8 +22,6 @@ Mon Jul 10 10:42:42 2000  Owen Taylor  <otaylor@redhat.com>
 
 Thu Jul  6 15:24:38 2000  Owen Taylor  <otaylor@redhat.com>
 
-	* Released 0.12
-
 	* gdk/Makefile.am: Fix missing \ which was causing
 	srcdir != builddir builds to fail.
 
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 661aa69c..a8cfb169 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,14 @@
+Thu Jul  6 15:24:38 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* Released 0.12
+
+        * configure.in: Use AM_PATH_GLIB_2_0()
+	
+	* pango-config.in: Use @FRIBIDI_LIBS@, not -lfribidi
+
+	* pango-config.in: Fix accidental inclusion 
+	-I lib/glib/include/
+
 Mon Jul 10 10:42:42 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-utils.c (pango_split_file_list): Fix
@@ -11,8 +22,6 @@ Mon Jul 10 10:42:42 2000  Owen Taylor  <otaylor@redhat.com>
 
 Thu Jul  6 15:24:38 2000  Owen Taylor  <otaylor@redhat.com>
 
-	* Released 0.12
-
 	* gdk/Makefile.am: Fix missing \ which was causing
 	srcdir != builddir builds to fail.
 
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 661aa69c..a8cfb169 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,14 @@
+Thu Jul  6 15:24:38 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* Released 0.12
+
+        * configure.in: Use AM_PATH_GLIB_2_0()
+	
+	* pango-config.in: Use @FRIBIDI_LIBS@, not -lfribidi
+
+	* pango-config.in: Fix accidental inclusion 
+	-I lib/glib/include/
+
 Mon Jul 10 10:42:42 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-utils.c (pango_split_file_list): Fix
@@ -11,8 +22,6 @@ Mon Jul 10 10:42:42 2000  Owen Taylor  <otaylor@redhat.com>
 
 Thu Jul  6 15:24:38 2000  Owen Taylor  <otaylor@redhat.com>
 
-	* Released 0.12
-
 	* gdk/Makefile.am: Fix missing \ which was causing
 	srcdir != builddir builds to fail.
 
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 661aa69c..a8cfb169 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,14 @@
+Thu Jul  6 15:24:38 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* Released 0.12
+
+        * configure.in: Use AM_PATH_GLIB_2_0()
+	
+	* pango-config.in: Use @FRIBIDI_LIBS@, not -lfribidi
+
+	* pango-config.in: Fix accidental inclusion 
+	-I lib/glib/include/
+
 Mon Jul 10 10:42:42 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-utils.c (pango_split_file_list): Fix
@@ -11,8 +22,6 @@ Mon Jul 10 10:42:42 2000  Owen Taylor  <otaylor@redhat.com>
 
 Thu Jul  6 15:24:38 2000  Owen Taylor  <otaylor@redhat.com>
 
-	* Released 0.12
-
 	* gdk/Makefile.am: Fix missing \ which was causing
 	srcdir != builddir builds to fail.
 
diff --git a/configure.in b/configure.in
index af367cf8..03a37962 100644
--- a/configure.in
+++ b/configure.in
@@ -24,9 +24,9 @@ fi
 X_LIBS="-L$x_libraries -lX11"
 AC_SUBST(X_LIBS)
 
-AM_PATH_GLIB(1.3.1,,
-             AC_MSG_ERROR([GLib 1.3.1 is required for building Pango]),
-	     gmodule gobject)
+AM_PATH_GLIB_2_0(1.3.1,,
+                 AC_MSG_ERROR([GLib 1.3.1 is required for building Pango]),
+	         gmodule gobject)
 
 AC_PATH_PROG(FRIBIDI_CONFIG, fribidi-config, no)
 if test x$FRIBIDI_CONFIG = xno ; then
@@ -42,9 +42,9 @@ AC_CHECK_LIB(fribidi, fribidi_map_range, :,
 	     AC_MSG_ERROR([*** libfribidi not found.]), $FRIBIDI_LIBS)
 
 
-AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
+AC_PATH_PROG(GLIB_CONFIG, glib-config-2.0, no)
 if test x$GLIB_CONFIG = xno ; then
-  AC_MSG_ERROR([*** glib-config not found])
+  AC_MSG_ERROR([*** glib-config-2.0 not found])
 fi
 GLIB_CFLAGS="`$GLIB_CONFIG --cflags gmodule gobject`"
 CFLAGS="$CFLAGS $GLIB_CFLAGS"
diff --git a/pango-config.in b/pango-config.in
index cdee18a5..d0c88437 100644
--- a/pango-config.in
+++ b/pango-config.in
@@ -83,10 +83,10 @@ if test "$echo_exec_prefix" = "yes"; then
 fi
 if test "$echo_cflags" = "yes"; then
 	cflags="@UNICODE_CFLAGS@ @GLIB_CFLAGS@"
-	echo -I@libdir@/glib/include $includes $cflags
+	echo $includes $cflags
 fi
 if test "$echo_libs" = "yes"; then
-	libs="-lpango -lfribidi @UNICODE_LIBS@ @GLIB_LIBS@"
+	libs="-lpango @FRIBIDI_LIBS@ @UNICODE_LIBS@ @GLIB_LIBS@"
 	if test "$lib_pangox" = "yes"; then
 		libs="@X_LIBS@ -lpangox $libs"
 	fi