[Opende-svn] SF.net SVN: opende: [989] trunk

[<kw...@us...>]

Revision: 989
Author:   kwizatz
Date:     2006-06-11 18:56:55 -0700 (Sun, 11 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/opende/?rev=989&view=rev

Log Message:
-----------
Added initial autotools code for SONAME support

Modified Paths:
--------------
    trunk/configure.in
    trunk/ode/src/Makefile.am
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2006-06-12 00:38:41 UTC (rev 988)
+++ trunk/configure.in	2006-06-12 01:56:55 UTC (rev 989)
@@ -14,11 +14,13 @@
 ODE_CURRENT=0
 ODE_REVISION=6
 ODE_AGE=1
+ODE_SONAME=libode.so.[$ODE_CURRENT]
 ODE_RELEASE=[$ODE_CURRENT].[$ODE_REVISION].[$ODE_AGE]
 AC_SUBST(ODE_CURRENT)
 AC_SUBST(ODE_REVISION)
 AC_SUBST(ODE_AGE)
 AC_SUBST(ODE_RELEASE)
+AC_SUBST(ODE_SONAME)
 
 dnl This is needed because we have subdirectories
 AC_PROG_MAKE_SET
@@ -33,6 +35,16 @@
 AC_PROG_RANLIB
 AC_TYPE_SIZE_T
 
+dnl Check if using sonames is requested
+dnl THIS IS TEMPORARY!
+AC_MSG_CHECKING(if a soname should be set)
+AC_ARG_ENABLE(soname,AC_HELP_STRING([--enable-opcode],
+[Configure ODE shared library to set the soname field on ELF files]),
+use_soname=$enableval,use_soname=no)
+AC_MSG_RESULT($use_soname)
+AM_CONDITIONAL(USE_SONAME, test x$use_soname = xyes)
+
+
 AC_ARG_WITH(arch,AC_HELP_STRING([--with-arch=[arch]],
 [build for $arch, where arch is any of the -march flags passed to gcc, without the -march, for example --with-arch=pentium3]),
 arch=$withval,arch=no)
@@ -285,7 +297,11 @@
     ;;
   *)
    drawstuff="X11" # if anything else default to X11
-    so_ext=".so"
+    if test x$use_soname = xyes; then
+      so_ext=".so.$ODE_RELEASE"
+    else
+      so_ext=".so"
+    fi
     DLLDEFINE=""
     SHARED_LDFLAGS="-shared"
     ;;
@@ -488,5 +504,6 @@
 echo "  Is the CPU x86-64:       $cpu64"
 echo "  Is this a release build: $release"
 echo "  Is this a debug build:   $debug"
+echo "  Using SONAME:		  $use_soname"
 echo "  Headers will be installed in $prefix/include/ode"
 echo "  Libraries will be installed in $prefix/lib"

Modified: trunk/ode/src/Makefile.am
===================================================================
--- trunk/ode/src/Makefile.am	2006-06-12 00:38:41 UTC (rev 988)
+++ trunk/ode/src/Makefile.am	2006-06-12 01:56:55 UTC (rev 989)
@@ -17,6 +17,9 @@
 libode_SOURCES=
 libode_DEPENDENCIES = libfast.a libode.a
 libode_LDFLAGS= @SHARED_LDFLAGS@
+if USE_SONAME
+libode_LDFLAGS+=-Wl,-soname,@ODE_SONAME@
+endif
 libode_LDADD=$(libode_a_OBJECTS) $(libfast_a_OBJECTS)
 if OPCODE
 libode_DEPENDENCIES+= libOPCODE.a


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.