You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mt...@apache.org on 2013/03/26 13:26:10 UTC

svn commit: r1461080 - /commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4

Author: mturk
Date: Tue Mar 26 12:26:10 2013
New Revision: 1461080

URL: http://svn.apache.org/r1461080
Log:
Add support for non-gcc HP-UX compiler

Modified:
    commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4

Modified: commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4
URL: http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4?rev=1461080&r1=1461079&r2=1461080&view=diff
==============================================================================
--- commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4 (original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4 Tue Mar 26 12:26:10 2013
@@ -61,9 +61,15 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
     LDFLAGS="$LDFLAGS -pthread"
     ;;
   hpux*)
-    CFLAGS="$CFLAGS -pthread -DOS_HPUX -DDSO_DLFCN"
-    LDFLAGS="$LDFLAGS -pthread"
-    LIBS="$LIBS -lpthread"
+    if test "x$GCC" = "xyes"
+    then
+        CFLAGS="$CFLAGS -pthread -DOS_HPUX -DDSO_DLFCN"
+        LDFLAGS="$LDFLAGS -pthread"
+        LIBS="$LIBS -lpthread"
+    else
+        CFLAGS="$CFLAGS -mt -DOS_HPUX -DDSO_DLFCN"
+        LDFLAGS="$LDFLAGS -mt"
+    fi
     supported_os="hp-ux"
     ;;
   aix5*)
@@ -119,8 +125,14 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
   ia64w)
     if test "$supported_os" = "hp-ux"
     then
-        CFLAGS="$CFLAGS -mlp64 -DCPU=\\\"IA64W\\\" -DSO_EXT=\\\"so\\\""
-        LDFLAGS="$LDFLAGS -mlp64"
+        if test "x$GCC" = "xyes"
+        then
+            CFLAGS="$CFLAGS -mlp64 -DCPU=\\\"IA64W\\\" -DSO_EXT=\\\"so\\\""
+            LDFLAGS="$LDFLAGS -mlp64"
+        else
+            CFLAGS="$CFLAGS +DD64 -DCPU=\\\"IA64W\\\" -DSO_EXT=\\\"so\\\""
+            LDFLAGS="$LDFLAGS +DD64"
+        fi
     else
         CFLAGS="$CFLAGS -DCPU=\\\"ia64\\\""
     fi
@@ -128,8 +140,14 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
   ia64|ia64n)
     if test "$supported_os" = "hp-ux"
     then
-        CFLAGS="$CFLAGS -milp32 -DCPU=\\\"IA64N\\\" -DSO_EXT=\\\"so\\\""
-        LDFLAGS="$LDFLAGS -milp32"
+        if test "x$GCC" = "xyes"
+        then
+            CFLAGS="$CFLAGS +DD32 -DCPU=\\\"IA64N\\\" -DSO_EXT=\\\"so\\\""
+            LDFLAGS="$LDFLAGS +DD32"
+        else
+            CFLAGS="$CFLAGS -milp32 -DCPU=\\\"IA64N\\\" -DSO_EXT=\\\"so\\\""
+            LDFLAGS="$LDFLAGS -milp32"
+        fi
         HOST_CPU=IA64N
     else
         CFLAGS="$CFLAGS -DCPU=\\\"ia64\\\""