gobject-introspection r859 - in trunk: . girepository

[tko svn gnome org]

Author: tko
Date: Sat Nov  1 18:21:55 2008
New Revision: 859
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=859&view=rev

Log:
Bug 557898 â Fails to build on OSX 10.4

2008-11-01  Tommi Komulainen  <tommi komulainen iki fi>

	* configure.ac: Check for $shrext_cmds that should be implicitly
	available if you're using libtool >= 2.0. If undefined, call
	libtool --config explicitly to get its value.
	* girepository/gtypelib.c: Remove special case for (non-)Darwin
	systems as unneeded.

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/girepository/gtypelib.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Nov  1 18:21:55 2008
@@ -75,15 +75,18 @@
 AC_CHECK_LIB([dl], [dlopen])
 
 AC_MSG_CHECKING(for the suffix of shared libraries)
-export SED
-shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
-eval $shrext_cmds
+# libtool variables are immediately available since 2.0, prior to that we need
+# to call libtool --config explicitly
+if test "x$shrext_cmds" = x; then
+    shrext_cmds=`SED=$SED ./libtool --config | grep '^shrext_cmds='`
+    eval $shrext_cmds
+fi
 eval std_shrext=$shrext_cmds
 # chop the initial dot
-SHLIB_SUFFIX=`echo $std_shrext | sed 's/^\.//'`
+SHLIB_SUFFIX=${std_shrext#.}
 AC_MSG_RESULT(.$SHLIB_SUFFIX)
 # any reason it may fail?
-if test "X$SHLIB_SUFFIX" = x; then
+if test "x$SHLIB_SUFFIX" = x; then
         AC_MSG_ERROR(Cannot determine shared library suffix from libtool)
 fi
 AC_DEFINE_UNQUOTED([SHLIB_SUFFIX], "$SHLIB_SUFFIX", [Define to the platform's shared library suffix])

Modified: trunk/girepository/gtypelib.c
==============================================================================
--- trunk/girepository/gtypelib.c	(original)
+++ trunk/girepository/gtypelib.c	Sat Nov  1 18:21:55 2008
@@ -35,11 +35,6 @@
 #define ALIGN_VALUE(this, boundary) \
   (( ((unsigned long)(this)) + (((unsigned long)(boundary)) -1)) & (~(((unsigned long)(boundary))-1)))
 
-#if !defined(__Darwin__)
-#  undef SHLIB_SUFFIX
-#  define SHLIB_SUFFIX G_MODULE_SUFFIX 
-#endif
-
 static void
 push_context (ValidateContext *ctx, const char *name)
 {