[Xfce4-commits] <glib-objc:no-foundation-dep> change some cosmetic naming issues in the build system

[Brian J. Tarricone]

Updating branch refs/heads/no-foundation-dep
         to 85cca33b1b3827211dd1d4cbd9fb2ef2f863efac (commit)
       from 07cbb4c44fad8967ee24c9db4393349d4501dd4e (commit)

commit 85cca33b1b3827211dd1d4cbd9fb2ef2f863efac
Author: Brian J. Tarricone <brian at tarricone.org>
Date:   Fri Jul 10 13:31:40 2009 -0700

    change some cosmetic naming issues in the build system

 configure.ac.in                     |   29 +++++++++++++++--------------
 glib-objc/Makefile.am               |    6 +++---
 glib-objc/glib-objc-2.0.pc.in       |    7 ++++---
 gobject-objc/Makefile.am            |    6 +++---
 gobject-objc/gobject-objc-2.0.pc.in |    8 ++++----
 5 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index c723d0f..bcf053c 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -6,17 +6,17 @@ dnl Copyright (c) 2008 Brian Tarricone <bjt23 at cornell.edu>
 dnl
 
 dnl version info
-m4_define([glib_objc_verinfo], [0:0:0])
-m4_define([glib_objc_api_version], [2.0])
-m4_define([go_version_major], [0])
-m4_define([go_version_minor], [1])
-m4_define([go_version_micro], [0])
-m4_define([go_version_build], [@REVISION@])
-m4_define([go_version_tag], [git])
-m4_define([go_version], [go_version_major().go_version_minor().go_version_micro()ifelse(go_version_tag(), [git], [go_version_tag()-go_version_build()], [go_version_tag()])])
+m4_define([goc_verinfo], [0:0:0])
+m4_define([goc_api_version], [2.0])
+m4_define([goc_version_major], [0])
+m4_define([goc_version_minor], [1])
+m4_define([goc_version_micro], [0])
+m4_define([goc_version_build], [@REVISION@])
+m4_define([goc_version_tag], [git])
+m4_define([goc_version], [goc_version_major().goc_version_minor().goc_version_micro()ifelse(goc_version_tag(), [git], [goc_version_tag()-goc_version_build()], [goc_version_tag()])])
 
 dnl init autoconf
-AC_INIT([glib-objc], [go_version], [bjt23 at cornell.edu])
+AC_INIT([glib-objc], [goc_version], [brian at tarricone.org])
 AC_PREREQ([2.59])
 
 dnl init automake
@@ -38,14 +38,15 @@ AC_PROG_LIBTOOL
 
 dnl check for standard header files
 AC_HEADER_STDC
+AC_CHECK_HEADERS([objc/objc-api.h objc/objc-runtime.h])
 
 dnl version information
-GO_VERSION=go_version
-GLIB_OBJC_VERINFO=glib_objc_verinfo
-GLIB_OBJC_API_VERSION=glib_objc_api_version
+GOC_VERSION=goc_version
+GOC_VERINFO=goc_verinfo
+GOC_API_VERSION=goc_api_version
 AC_SUBST(GO_VERSION)
-AC_SUBST(GLIB_OBJC_VERINFO)
-AC_SUBST(GLIB_OBJC_API_VERSION)
+AC_SUBST(GOC_VERINFO)
+AC_SUBST(GOC_API_VERSION)
 
 dnl required
 
diff --git a/glib-objc/Makefile.am b/glib-objc/Makefile.am
index c06efe2..3b313b9 100644
--- a/glib-objc/Makefile.am
+++ b/glib-objc/Makefile.am
@@ -1,6 +1,6 @@
 lib_LTLIBRARIES = libglib-objc-2.0.la
 
-glibobjcmainincludedir = $(includedir)/glib-objc-$(GLIB_OBJC_API_VERSION)
+glibobjcmainincludedir = $(includedir)/glib-objc-$(GOC_API_VERSION)
 glibobjcmaininclude_HEADERS = \
 	glib-objc.h
 glibobjcincludedir = $(glibobjcmainincludedir)/glib-objc
@@ -31,13 +31,13 @@ libglib_objc_2_0_la_CFLAGS = \
 libglib_objc_2_0_la_OBJCFLAGS = $(libglib_objc_2_0_la_CFLAGS)
 
 libglib_objc_2_0_la_LDFLAGS = \
-	-version-info $(GLIB_OBJC_VERINFO)
+	-version-info $(GOC_VERINFO)
 
 libglib_objc_2_0_la_LIBADD = \
 	$(GLIB_LIBS)
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_in_files = glib-objc-$(GLIB_OBJC_API_VERSION).pc.in
+pkgconfig_in_files = glib-objc-$(GOC_API_VERSION).pc.in
 pkgconfig_DATA = $(pkgconfig_in_files:.in=)
 
 DISTCLEANFILES = \
diff --git a/glib-objc/glib-objc-2.0.pc.in b/glib-objc/glib-objc-2.0.pc.in
index cc13945..4102f5e 100644
--- a/glib-objc/glib-objc-2.0.pc.in
+++ b/glib-objc/glib-objc-2.0.pc.in
@@ -3,11 +3,12 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-libglib_objc_api_version=@GLIB_OBJC_API_VERSION@
+api_version=@GOC_API_VERSION@
+constant_string_class=@GOC_CONSTANT_STRING_CLASS@
 
 Name: Glib-ObjC
 Description: Objective-C bindings for Glib
 Version: @VERSION@
 Requires: glib-2.0
-Libs: -lglib-objc-${libglib_objc_api_version}
-Cflags: -I${includedir}/glib-objc-${libglib_objc_api_version}
+Libs: -lglib-objc-${api_version}
+Cflags: -I${includedir}/glib-objc-${api_version} @GOC_CONSTANT_STRING_PCFILE_CFLAGS@
diff --git a/gobject-objc/Makefile.am b/gobject-objc/Makefile.am
index de9dc8a..e214396 100644
--- a/gobject-objc/Makefile.am
+++ b/gobject-objc/Makefile.am
@@ -1,6 +1,6 @@
 lib_LTLIBRARIES = libgobject-objc-2.0.la
 
-glibobjcmainincludedir = $(includedir)/glib-objc-$(GLIB_OBJC_API_VERSION)
+glibobjcmainincludedir = $(includedir)/glib-objc-$(GOC_API_VERSION)
 glibobjcmaininclude_HEADERS = \
 	gobject-objc.h
 gobjectobjcincludedir = $(glibobjcmainincludedir)/gobject-objc
@@ -27,13 +27,13 @@ libgobject_objc_2_0_la_CFLAGS = \
 libgobject_objc_2_0_la_OBJCFLAGS = $(libgobject_objc_2_0_la_CFLAGS)
 
 libgobject_objc_2_0_la_LDFLAGS = \
-	-version-info $(GLIB_OBJC_VERINFO)
+	-version-info $(GOC_VERINFO)
 
 libgobject_objc_2_0_la_LIBADD = \
 	$(GOBJECT_LIBS)
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_in_files = gobject-objc-$(GLIB_OBJC_API_VERSION).pc.in
+pkgconfig_in_files = gobject-objc-$(GOC_API_VERSION).pc.in
 pkgconfig_DATA = $(pkgconfig_in_files:.in=)
 
 DISTCLEANFILES = \
diff --git a/gobject-objc/gobject-objc-2.0.pc.in b/gobject-objc/gobject-objc-2.0.pc.in
index aa0390d..a91d6fb 100644
--- a/gobject-objc/gobject-objc-2.0.pc.in
+++ b/gobject-objc/gobject-objc-2.0.pc.in
@@ -3,11 +3,11 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-libgobject_objc_api_version=@GLIB_OBJC_API_VERSION@
+api_version=@GOC_API_VERSION@
 
 Name: GObject-ObjC
 Description: Objective-C bindings for GObject
 Version: @VERSION@
-Requires: gobject-2.0
-Libs: -lgobject-objc-${libgobject_objc_api_version} @FOUNDATION_LIBS@
-Cflags: @FOUNDATION_CFLAGS@ -I${includedir}/glib-objc-${libgobject_objc_api_version}
+Requires: gobject-2.0 glib-objc-2.0
+Libs: -lgobject-objc-${api_version}
+Cflags: -I${includedir}/glib-objc-${api_version}