[Reconnoiter-devel] [reconnoiter commit] Reconnoiter branch, master, updated. ac70325cbd950a7a919b9f19306f0a84070a0894

git at labs.omniti.com git at labs.omniti.com
Thu Dec 22 20:50:39 EST 2011


Pushed by: jesus
The branch, master has been updated
       via  ac70325cbd950a7a919b9f19306f0a84070a0894 (commit)
       via  3bbaa0da7225113c572ed112338d2cb93569d097 (commit)
      from  d95758d937b018c25bc4487c8eddc4727ee7d390 (commit)

Summary of changes:
 configure.in |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

Log:
commit ac70325cbd950a7a919b9f19306f0a84070a0894
Merge: 3bbaa0d d95758d
Author: Theo Schlossnagle <jesus at omniti.com>
Date:   Fri Dec 23 01:56:35 2011 +0000

    Merge branch 'master' of labs.omniti.com:reconnoiter


commit 3bbaa0da7225113c572ed112338d2cb93569d097
Author: Theo Schlossnagle <jesus at omniti.com>
Date:   Fri Dec 23 01:56:12 2011 +0000

    builds out of the box on Illumos with gcc now

diff --git a/configure.in b/configure.in
index db540d6..db0a4b0 100755
--- a/configure.in
+++ b/configure.in
@@ -38,7 +38,7 @@ AC_PATH_PROGS(JAR, jar, , $JAVA_HOME/bin)
 AC_PATH_PROG(NROFF, nroff)
 AC_SUBST(PERL)
 
-if test "x$CC" = "xgcc" ; then
+if test "x$GCC" = "xyes" ; then
   CFLAGS="$CFLAGS -g"
   DEPFLAGS="-MM"
 else
@@ -63,8 +63,9 @@ case $host in
 	DTRACE=/usr/sbin/dtrace
 	DTRACE_ENABLED=1
 	DTRACEOBJ=dtrace_stub.o
+	if test "x$GCC" != "xyes" ; then
 	AC_MSG_CHECKING([32 or 64 bit Solaris assembly])
-	if test -n "`echo $CFLAGS | grep m64`"; then
+	if test -n "`echo $CFLAGS | grep m64`" ; then
 		DTRACEFLAGS=-64
 		if test -n "`isalist | grep sparc`"; then
 			AC_MSG_RESULT([sparc 64])
@@ -82,14 +83,17 @@ case $host in
 			ATOMIC_OBJS="noit_atomic_sol_x86_32.o"
 		fi
 	fi
-	if test "x$CC" != "xgcc" ; then
+	fi
+	if test "x$GCC" != "xyes" ; then
 		CFLAGS="$CFLAGS -mt"
 		PICFLAGS="-Kpic"
+		MODULELD="$CC -G"
+		SHLD="$CC -G"
 	else
 		PICFLAGS="-fPIC"
+		MODULELD="$CC -shared"
+		SHLD="$CC -shared"
 	fi
-	MODULELD="$CC -G"
-	SHLD="$CC -G"
 	MODULEEXT=so
 	RLDFLAG="-R"
 	WHOLE_ARCHIVE="-Wl,-z -Wl,allextract"




hooks/post-receive
-- 
Reconnoiter


More information about the Reconnoiter-devel mailing list