FS-6375: now withless for the dev to remember

diff --git a/configure.ac b/configure.ac
index 5fbef7b3334e0c3c7bda13dfc4b0acd72eaa940a..c37368d7ea8f48c48f932d8d2b8de681191fd683 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -33,6 +33,29 @@ switch_builddir=`pwd`
 AC_SUBST(switch_srcdir)
 AC_SUBST(switch_builddir)
 
+#
+# --enable-64 has been moved up higher prior to AC_PROG_CC so that we can tuck in the -m64 flag 
+# so devs on with Solaris wanting to build 64bit can not bother with adding any additional 
+# flags on the ./configure line.  User friendly.
+#
+
+#  Enable 64 bit build
+AC_ARG_ENABLE(64,
+[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"])
+
+if test "${enable_64}" = "yes"; then
+   case "$host" in
+        *-solaris2*)
+           # All three have to have -m64 for AC_PROG_CC to pick the right libtool
+            CFLAGS="$CFLAGS -m64"
+            LDFLAGS="$LDFLAGS -m64"
+            CXXFLAGS="$CXXFLAGS -m64"
+        ;;
+        *)
+        ;;
+   esac
+fi
+
 # Whether to follow FHS
 AC_ARG_ENABLE([fhs],
   [AS_HELP_STRING([--enable-fhs],
@@ -262,10 +285,6 @@ fi
 AC_MSG_RESULT([using libtool library extension... ${LIBTOOL_LIB_EXTEN}])
 
 
-#  Enable 64 bit build
-AC_ARG_ENABLE(64,
-[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"])
-
 # tweak compiler specific flags
 if test "x${ax_cv_c_compiler_vendor}"  =  "xsun" ; then
     APR_ADDTO(SWITCH_AM_CFLAGS, -KPIC)