Bug 651623: fix DLL_SUFFIX value depending on SO_VERSION env var on OpenBSD. r=glandium
authorLandry Breuil <landry@openbsd.org>
Thu, 21 Apr 2011 08:51:23 +0200
changeset 68382 a7ef81a75db73e12849afae4b797e1cd9baea868
parent 68381 46fdf12082d48475b66c42491a1a73e4d0cf0f31
child 68383 bf99d8e0734e28ff197ad964f263697fdc673308
push idunknown
push userunknown
push dateunknown
reviewersglandium
bugs651623
milestone6.0a1
Bug 651623: fix DLL_SUFFIX value depending on SO_VERSION env var on OpenBSD. r=glandium When using $(if) makefile idiom, it ends up in expandlib_config.py, which is confused. Use a plain shell if block instead.
configure.in
--- a/configure.in
+++ b/configure.in
@@ -2451,17 +2451,21 @@ ia64*-hpux*)
 	case "${host_cpu}" in
 	i*86)
 	USE_ELF_DYNSTR_GC=1
 	;;
 	esac
 	;;
 
 *-openbsd*)
-    DLL_SUFFIX='.so.$(if $(SO_VERSION),$(SO_VERSION),1.0)'
+    if test "$SO_VERSION"; then
+        DLL_SUFFIX=".so.$SO_VERSION"
+    else
+        DLL_SUFFIX=".so.1.0"
+    fi
     MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -Wl,-rpath-link,$(if $(X11BASE),$(X11BASE),/usr/X11R6)/lib'
     DSO_CFLAGS=''
     DSO_PIC_CFLAGS='-fPIC'
     DSO_LDOPTS='-shared -fPIC'
     if test "$LIBRUNPATH"; then
 	DSO_LDOPTS="-R$LIBRUNPATH $DSO_LDOPTS"
     fi
     ;;