ORBit2 r2108 - trunk

[strba svn gnome org]

Author: strba
Date: Fri Jan  9 15:55:28 2009
New Revision: 2108
URL: http://svn.gnome.org/viewvc/ORBit2?rev=2108&view=rev

Log:
add warning to indicate that the test of linking is not run while cross-compiling + allow use of other idl compiler during the build

Modified:
   trunk/ChangeLog
   trunk/Makefile.shared
   trunk/configure.in

Modified: trunk/Makefile.shared
==============================================================================
--- trunk/Makefile.shared	(original)
+++ trunk/Makefile.shared	Fri Jan  9 15:55:28 2009
@@ -1,4 +1,4 @@
-IDL_COMPILER = $(top_builddir)/src/idl-compiler/orbit-idl-2$(EXEEXT)
+IDL_COMPILER = @IDL_COMPILER@
 
 %-stubs.c %-skels.c %-common.c %-imodule.c %-skelimpl.c: %.h
 	true

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Jan  9 15:55:28 2009
@@ -118,6 +118,23 @@
 	AC_DEFINE(ORBIT_PURIFY, 1, [defined if purify is enabled])
 fi
 
+AC_MSG_CHECKING(which idl compiler to use)
+IDL_COMPILER="\$(top_builddir)/src/idl-compiler/orbit-idl-2\$(EXEEXT)"
+AC_ARG_WITH(idl-compiler,
+    [  --with-idl-compiler    use specific idl compiler (useful when crosscompiling)],
+	if test "x$withval" != x; then
+		if test -f "$withval"; then
+		    IDL_COMPILER=$withval
+		fi
+	fi
+)
+if test x$IDL_COMPILER == x"\$(top_builddir)/src/idl-compiler/orbit-idl-2\$(EXEEXT)"; then
+  AC_MSG_RESULT(internal)
+else
+  AC_MSG_RESULT(external ($IDL_COMPILER))
+fi
+AC_SUBST(IDL_COMPILER)
+
 AC_PROG_AWK
 
 GLIB_REQUIRED=2.8.0
@@ -211,7 +228,8 @@
 Linking is badly borked on your system. Please ensure your library path is correct
 Check config.log for details - check near the end of the log above 'failed program was'
 Alternatively ensure that your /etc/ld.so.conf (and/or LD_LIBRARY_PATH) includes the
-prefix you're compiling on: '${prefix}' ], ))
+prefix you're compiling on: '${prefix}' ]), 
+AC_MSG_WARN([Could not check for borked linking while cross-compiling]))
 LIBS="$dofus_save_libs"
 
 orig_CPPFLAGS=$CPPFLAGS