[evolution-data-server] Bug 623430 - libedataserverui.pc.in hardcodes 1.2 API version

[Matthew Barnes <mbarnes src gnome org>]

commit 0f75ca408f1386494100ba934625de979f0c17bc
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Jul 3 12:17:42 2010 -0400

    Bug 623430 - libedataserverui.pc.in hardcodes 1.2 API version

 configure.ac                            |    6 +++---
 libedataserverui/Makefile.am            |    6 +++---
 libedataserverui/libedataserverui.pc.in |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 226ea3a..ad5d5bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,12 +52,12 @@ AC_ARG_ENABLE([gtk3],
 	[enable_gtk3=$enableval],[enable_gtk3=no])
 
 if test "x${enable_gtk3}" = "xyes"; then
-	LIBEDATASERVER_UI_API_VERSION=3.0
+	LIBEDATASERVERUI_API_VERSION=3.0
 	GTK_PACKAGE="gtk+-3.0"
 	gtk_minimum_version="2.90.4"
 	gweather_minimum_version="2.90.0"
 else	
-	LIBEDATASERVER_UI_API_VERSION=1.2
+	LIBEDATASERVERUI_API_VERSION=1.2
 	GTK_PACKAGE="gtk+-2.0"
 	gtk_minimum_version="2.20.0"
 	gweather_minimum_version="2.25.4"
@@ -69,7 +69,7 @@ AC_SUBST(GTK_MODULE)
 
 AC_SUBST([BASE_VERSION],[base_version])
 AC_SUBST([API_VERSION],[api_version])
-AC_SUBST(LIBEDATASERVER_UI_API_VERSION)
+AC_SUBST([LIBEDATASERVERUI_API_VERSION])
 AC_DEFINE_UNQUOTED(BASE_VERSION, ["$BASE_VERSION"], [Base version (Major.Minor)])
 AC_DEFINE_UNQUOTED(API_VERSION, ["$API_VERSION"], [API version (Major.Minor)])
 
diff --git a/libedataserverui/Makefile.am b/libedataserverui/Makefile.am
index 7ba3456..0337fae 100644
--- a/libedataserverui/Makefile.am
+++ b/libedataserverui/Makefile.am
@@ -128,11 +128,11 @@ test_name_selector_CPPFLAGS = $(TEST_EDATASERVERUI_CPPFLAGS)
 test_name_selector_SOURCES = test-name-selector.c
 test_name_selector_LDADD = $(TEST_EDATASERVERUI_LDFLAGS)
 
-%-$(LIBEDATASERVER_UI_API_VERSION).pc: %.pc
+%-$(LIBEDATASERVERUI_API_VERSION).pc: %.pc
 	 cp $< $@
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libedataserverui-$(LIBEDATASERVER_UI_API_VERSION).pc
+pkgconfig_DATA = libedataserverui-$(LIBEDATASERVERUI_API_VERSION).pc
 
 ui_DATA = e-categories-dialog.ui e-name-selector-dialog.ui
 
@@ -141,7 +141,7 @@ BUILT_SOURCES = $(MARSHAL_GENERATED)
 EXTRA_DIST = 						\
 	$(ui_DATA)					\
 	e-data-server-ui-marshal.list			\
-	$(pkgconfig_DATA:-$(LIBEDATASERVER_UI_API_VERSION).pc=.pc.in)
+	$(pkgconfig_DATA:-$(LIBEDATASERVERUI_API_VERSION).pc=.pc.in)
 
 CLEANFILES = $(BUILT_SOURCES)
 DISTCLEANFILES = $(pkgconfig_DATA)
diff --git a/libedataserverui/libedataserverui.pc.in b/libedataserverui/libedataserverui.pc.in
index 7c40c20..df081b0 100644
--- a/libedataserverui/libedataserverui.pc.in
+++ b/libedataserverui/libedataserverui.pc.in
@@ -9,5 +9,5 @@ Name: libedataserverui
 Description: GUI utility library for Evolution Data Server
 Version: @VERSION@
 Requires: @GTK_MODULE@ libedataserver- API_VERSION@ libebook- API_VERSION@
-Libs: -L${libdir} -ledataserverui-1.2
+Libs: -L${libdir} -ledataserverui- LIBEDATASERVERUI_API_VERSION@
 Cflags: -I${privincludedir}