Merge lp:~trond-norbye/gearmand/configure into lp:gearmand/1.0

[Trond Norbye]

[Trond Norbye (trond-norbye)]

Allow a user to build a 32 bit version of Gearman on a 64-bit Solaris system. This is needed so that a build server can provide the packages for a 32 and 64 bit installation of Gearman (in addition there is nothing more annoying than if you want to build a program that requires a certain shared lib, and it is not provided in the memory model that your application use...)

=== modified file 'configure.ac'
--- configure.ac	2009-06-11 19:27:28 +0000
+++ configure.ac	2009-06-13 08:54:34 +0000
@@ -94,30 +94,15 @@
   CFLAGS="-ggdb3 -std=gnu99 ${CFLAGS}"
   DEBUG_CFLAGS="-O0"
   OPTMIIZE_CFLAGS="-O3"
-fi
-if test "$SUNCC" = "yes"
+elif test "x$SUNCC" = "xyes"
 then
-  isainfo_k=`isainfo -k`
-  if test "$target_cpu" = "sparc"
-  then
-    MEMALIGN_FLAGS="-xmemalign=8s"
-    IS_64="-m64"
-    LDFLAGS="${LDFLAGS} -L/usr/lib/${isainfo_k} -L/usr/local/lib/${isainfo_k}"
-  else
-    if test "$isainfo_k" = "amd64"
-    then
-      IS_64="-m64"
-      LDFLAGS="${LDFLAGS} -L/usr/lib/${isainfo_k} -L/usr/local/lib/${isainfo_k}"
-    fi
-  fi
-  CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
-
-  CFLAGS="-g -mt -xc99=all ${IS_64} ${MEMALIGN_FLAGS} ${CFLAGS}"
-  CXXFLAGS="-g -xlang=c99 ${IS_64} ${CXXFLAGS}"
-  DEBUG_CFLAGS="-xO0"
-  OPTIMIZE_CFLAGS="-xO4 -xlibmil -xdepend -Xa -mt -xstrconst"
+   CFLAGS="-mt -xc99=all -Xa -xstrconst $CFLAGS"
+   CXXFLAGS="-mt -xlang=c99 $CXXFLAGS"
+   DEBUG_CFLAGS="-g"
+   OPTIMIZE_CFLAGS="-xO4 -xdepend"
 fi
 
+sinclude(m4/64bit.m4)
 
 AC_HEADER_TIME
 AC_CHECK_HEADERS(assert.h errno.h fcntl.h getopt.h netinet/tcp.h pwd.h signal.h)
@@ -259,7 +244,7 @@
   CFLAGS="${DEBUG_CFLAGS} -DDEBUG ${CFLAGS}"
 else
   # Optimized version. No debug
-  CFLAGS="${OPTIMIZE_CFLAGS} ${CFLAGS}"
+  CFLAGS="${OPTIMIZE_CFLAGS} -DNDEBUG ${CFLAGS}"
 fi
 
 
@@ -410,7 +395,7 @@
 echo "   * Host CPU:                  $host_cpu"
 echo "   * C Compiler:                $CC_VERSION"
 echo "   * Assertions enabled:        $ac_cv_assert"
-echo "   * Debug enabled:             $ac_enable_debug"
+echo "   * Debug enabled:             $with_debug"
 echo "   * Warnings as failure:       $ac_warn_fail"
 echo ""
 echo "---"

=== added file 'm4/64bit.m4'
--- m4/64bit.m4	1970-01-01 00:00:00 +0000
+++ m4/64bit.m4	2009-06-13 08:54:34 +0000
@@ -0,0 +1,31 @@
+dnl ---------------------------------------------------------------------------
+dnl Macro: 64BIT
+dnl ---------------------------------------------------------------------------
+AC_CHECK_PROGS(ISAINFO, [isainfo], [no])
+if test "x$ISAINFO" != "xno"
+then
+   isainfo_b=`isainfo -b` 
+   spro_common_flags="-mt"
+   if test "x$isainfo_b" = "x64"
+   then
+      AC_ARG_ENABLE([64bit],
+         [AS_HELP_STRING([--disable-64bit],
+            [Build 64 bit binary @<:@default=on@:>@])],
+         [ac_enable_64bit="$enableval"],
+         [ac_enable_64bit="yes"])
+
+      if test "x$ac_enable_64bit" = "xyes"
+      then
+         CFLAGS="-m64 $CFLAGS"
+         CXXFLAGS="-m64 $CXXFLAGS"
+         if test "$target_cpu" = "sparc" -a "x$SUNCC" = "xyes"
+         then
+            CFLAGS="-xmemalign=8s $CFLAGS"
+            CXXFLAGS="-xmemalign=8s $CXXFLAGS"
+         fi
+      fi
+   fi
+fi
+dnl ---------------------------------------------------------------------------
+dnl End Macro: 64BIT
+dnl ---------------------------------------------------------------------------

=== modified file 'm4/lib-prefix.m4'
--- m4/lib-prefix.m4	2009-01-29 20:00:56 +0000
+++ m4/lib-prefix.m4	2009-06-13 08:54:34 +0000
@@ -183,13 +183,18 @@
       dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
       dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
       dnl symlink is missing, so we set acl_libdirstem2 too.
-      AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
-        [AC_EGREP_CPP([sixtyfour bits], [
-#ifdef _LP64
-sixtyfour bits
-#endif
-           ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
-        ])
+      AC_MSG_CHECKING([if buildling 64-bit app])
+      AC_RUN_IFELSE([
+         AC_LANG_PROGRAM([
+         ], [
+           return sizeof(void*) == 8 ? 0 : 1;
+         ])            
+      ], [
+         gl_cv_solaris_64bit=yes
+      ], [
+         gl_cv_solaris_64bit=no
+      ])
+      AC_MSG_RESULT([$gl_cv_solaris_64bit])
       if test $gl_cv_solaris_64bit = yes; then
         acl_libdirstem=lib/64
         case "$host_cpu" in