[xiph-commits] r13879 - trunk/theora

[giles at svn.xiph.org]

Author: giles
Date: 2007-09-22 00:13:57 -0700 (Sat, 22 Sep 2007)
New Revision: 13879

Modified:
   trunk/theora/configure.ac
Log:
Prepend the srcdir to the Version_script path so building from an 
custom directory works again. This didn't matter previously as 
Version_script was created by configure, which put it in the build 
directory and thus a local copy was available.

Also apply it only on Linux and Solaris, instead of whenever GNU ld
is used as before. This is probably not exactly correct, since the
options are the same on Solaris, and GNU ld probably always accepts
--version-script, but as we're close to release, I chose a more
conservative resolution of the ambiguity in the previous code.


Modified: trunk/theora/configure.ac
===================================================================
--- trunk/theora/configure.ac	2007-09-22 02:02:59 UTC (rev 13878)
+++ trunk/theora/configure.ac	2007-09-22 07:13:57 UTC (rev 13879)
@@ -144,18 +144,15 @@
 AC_PROG_LD
 AC_PROG_LD_GNU
 if test "x$lt_cv_prog_gnu_ld" = "xyes"; then
-   SHLIB_VERSION_ARG="Wl,--version-script=Version_script"
-
-   dnl Set extra linker options
-   case "$target_os" in
+ case "$target_os" in
   linux* | solaris* )
-    SHLIB_VERSION_ARG="-Wl,--version-script=Version_script"
+    SHLIB_VERSION_ARG='-Wl,--version-script=$(srcdir)/Version_script'
     ;;
   *)
     SHLIB_VERSION_ARG=""
     ;;
-   esac
-   THEORA_LDFLAGS="$THEORA_LDFLAGS $SHLIB_VERSION_ARG"
+ esac
+ THEORA_LDFLAGS="$THEORA_LDFLAGS $SHLIB_VERSION_ARG"
 fi
 
 AC_SUBST(THEORA_LDFLAGS)