[Ganglia-svn] SF.net SVN: ganglia:[2236] branches/monitor-core-3.1-aix

[<d_p...@us...>]

Revision: 2236
          http://ganglia.svn.sourceforge.net/ganglia/?rev=2236&view=rev
Author:   d_pocock
Date:     2010-01-15 11:02:33 +0000 (Fri, 15 Jan 2010)

Log Message:
-----------
Adapt r2234 (BUG227 patch) to create EXPORT_SYMBOLS_DYNAMIC

Modified Paths:
--------------
    branches/monitor-core-3.1-aix/configure.in
    branches/monitor-core-3.1-aix/gmond/Makefile.am

Modified: branches/monitor-core-3.1-aix/configure.in
===================================================================
--- branches/monitor-core-3.1-aix/configure.in	2010-01-15 10:40:24 UTC (rev 2235)
+++ branches/monitor-core-3.1-aix/configure.in	2010-01-15 11:02:33 UTC (rev 2236)
@@ -566,7 +566,10 @@
 dnl
 varstatedir="/var/lib"
 
+# Used when static linking requested
 EXPORT_SYMBOLS="-export-dynamic"
+# Used when dynamic linking requested
+EXPORT_SYMBOLS_DYNAMIC="-export-dynamic"
 case "$host" in
 *linux*)
 		CFLAGS="$CFLAGS -D_REENTRANT"
@@ -621,6 +624,7 @@
 		   echo "For AIX 5 you need to install bos.perf.libperfstat"
 		fi
 		AC_DEFINE(AIX, 1, AIX)
+		EXPORT_SYMBOLS_DYNAMIC="-Wl,-bexpfull"
 		;;
 *hpux*)		CFLAGS="$CFLAGS -D_HPUX_SOURCE" 
 		LIBS="-lpthread $LIBS"
@@ -674,6 +678,7 @@
 esac
 
 AC_SUBST(EXPORT_SYMBOLS)
+AC_SUBST(EXPORT_SYMBOLS_DYNAMIC)
 
 dnl Define VARSTATEDIR in config.h
 dnl

Modified: branches/monitor-core-3.1-aix/gmond/Makefile.am
===================================================================
--- branches/monitor-core-3.1-aix/gmond/Makefile.am	2010-01-15 10:40:24 UTC (rev 2235)
+++ branches/monitor-core-3.1-aix/gmond/Makefile.am	2010-01-15 11:02:33 UTC (rev 2236)
@@ -22,12 +22,8 @@
 else
 GCFLAGS = -D_LARGEFILE64_SOURCE
 GLDADD = 
-if AIX
-GLDFLAGS = -Wl,-bexpfull
-else
-GLDFLAGS = -export-dynamic
+GLDFLAGS = @EXPORT_SYMBOLS_DYNAMIC@
 endif
-endif
 
 INCLUDES = @APR_INCLUDES@
 AM_CFLAGS = -I$(top_builddir)/lib -I$(top_builddir)/include/ -I$(top_builddir)/libmetrics $(GCFLAGS) -DSYSCONFDIR='"$(sysconfdir)"'


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