2 files changed, 23 insertions, 12 deletions

diff --git a/mkspecs/hpux-acc-64/qmake.conf b/mkspecs/hpux-acc-64/qmake.conf
index 7ce4711..d43273e 100644
--- a/mkspecs/hpux-acc-64/qmake.conf
+++ b/mkspecs/hpux-acc-64/qmake.conf
@@ -1,121 +1,126 @@
 #
 # $Id$
 #
 # qmake configuration for hpux-n64
 #
 # We define _POSIX_C_SOURCE to 199506L when using threads, therefore
 # we also need to redefine _HPUX_SOURCE.
 # From pthread(3t):
         # Some documentation will recommend the use of -D_REENTRANT for
         # compilation.  While this also functions properly, it is considered
         # an obsolescent form.
 # See pthread(3t) for more details.
 #
 # From the "HP aC++ Online Programmer's Guide":
         # When +DA2.0W is specified:
         # * 64-bit SVR4 Executable and Linking Format (ELF) object files
         #   are generated for PA-RISC 2.0. 
         # * The preprocessor predefined macro, __LP64__ is defined. 
         # * The correct path for 64-bit system and language libraries is
         #   selected.
         # When +DD32 is specified:
         # * The size of an int, long, or pointer data type is 32-bits. 
         #   The size of an int data type is 32-bits. The size of a long or
         #   pointer data type is 64-bits.
         # * This is the default, currently equivalent to +DA1.1 architecture.
         # When +DD64 is specified:
         # * The size of an int data type is 32-bits. The size of a long or
         #   pointer data type is 64-bits.
         # * This is currently equivalent to +DA2.OW architecture.
         # * The preprocessor predefined macro, __LP64__ is defined.
         # Using +DS to Specify Instruction Scheduling:
         # * By default, the compiler performs scheduling tuned for the system
         #   on which you are compiling, or, if specified, tuned for the setting
         #   of the +DA option.
 #
 # From the online "C/HP-UX Reference Manual":
         #-Aa
         #   Enables strict ANSI C compliance.
         # -Ae
         #   Enables ANSI C compliance, HP value-added features (as described
         #   for +e option), and _HPUX_SOURCE name space macro. It is equivalent
         #   to -Aa +e -D_HPUX_SOURCE.
         # +e
         #   Enables the following HP value added features while compiling in
         #   ANSI C mode: sized enum, long long, long pointers, compiler supplied
         #   defaults for missing arguments to intrinsic calls, and $ in identifier
         #   HP C extensions.
 #
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
-        CONFIG          += qt warn_on release
+        CONFIG          += qt warn_on release link_prl
 
         QMAKE_CC        = cc
         QMAKE_LEX       = flex
         QMAKE_LEXFLAGS  = 
         QMAKE_YACC      = yacc
         QMAKE_YACCFLAGS         = -d
         QMAKE_CFLAGS    = -Ae +DA2.0W -w $(CFLAGS_EXTRA)
         QMAKE_CFLAGS_WARN_ON=
-        QMAKE_CFLAGS_WARN_OFF=
+        QMAKE_CFLAGS_WARN_OFF= -w
         QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O +Osize)
         QMAKE_CFLAGS_DEBUG= -g
         QMAKE_CFLAGS_SHLIB= +Z
         QMAKE_CFLAGS_YACC=
         QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE
 
         QMAKE_CXX       = aCC
-        QMAKE_CXXFLAGS  = -Aa +DA2.0W -w -D__STRICT_ANSI__ $(CXXFLAGS_EXTRA)
+        QMAKE_CXXFLAGS  = -Aa +DA2.0W -w -D__STRICT_ANSI__ -D_HPUX_SOURCE $(CXXFLAGS_EXTRA)
+        QMAKE_CXXFLAGS_DEPS= +M
         QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
         QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
         QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
         QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
         QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
         QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
         QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
 
         QMAKE_INCDIR    =
         QMAKE_LIBDIR    =
         QMAKE_INCDIR_X11= /usr/include/X11R6
         QMAKE_LIBDIR_X11= /usr/lib/X11R6/pa20_64
         QMAKE_INCDIR_QT         = $(QTDIR)/include
         QMAKE_LIBDIR_QT         = $(QTDIR)/lib
         QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
         QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib/pa20_64 /usr/contrib/X11R6/lib/pa20_64
 
         QMAKE_LINK      = aCC
         QMAKE_LINK_SHLIB= aCC
         QMAKE_LFLAGS    = +DA2.0W -Wl,+s $(LFLAGS_EXTRA)
         QMAKE_LFLAGS_RELEASE= -O
-        QMAKE_LFLAGS_DEBUG= -Wl,+tools -g
-        QMAKE_LFLAGS_SHLIB= -b
+        QMAKE_LFLAGS_DEBUG= -g
+        QMAKE_LFLAGS_SHLIB= -b -Wl,-a,shared
         QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
         QMAKE_LFLAGS_SONAME= -Wl,+h,
         QMAKE_LFLAGS_THREAD=
         QMAKE_RPATH     = -Wl,+b,
+        QMAKE_HPUX_SHLIB= 3
+        QMAKE_EXTENSION_SHLIB= sl
 
-        QMAKE_LIBS      = $(LIBS_EXTRA)
-        QMAKE_LIBS_DYNLOAD= -ldld
+        QMAKE_LIBS      = -lm $(LIBS_EXTRA)
+        QMAKE_LIBS_DYNLOAD= -ldl
         QMAKE_LIBS_X11  = -lXext -lX11
         QMAKE_LIBS_X11SM= -lSM -lICE
         QMAKE_LIBS_QT   = -lqt
         QMAKE_LIBS_QT_THREAD= -lqt-mt
-        QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
-        QMAKE_LIBS_OPENGL_QT= -lGL -lXm
+        QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lXt
+        QMAKE_LIBS_OPENGL_QT= -lGL -lXmu -lXt
         QMAKE_LIBS_THREAD= -lpthread
         QMAKE_LIBS_YACC         = -ly
 
         QMAKE_MOC       = $(QTDIR)/bin/moc
         QMAKE_UIC       = $(QTDIR)/bin/uic
 
         QMAKE_AR        = ar cqs
         QMAKE_RANLIB    =
 
         QMAKE_TAR       = tar -cf
         QMAKE_GZIP      = gzip -9f
 
         QMAKE_COPY      = cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p
diff --git a/mkspecs/hpux-acc-64/qplatformdefs.h b/mkspecs/hpux-acc-64/qplatformdefs.h
index 8a1410c..1779974 100644
--- a/mkspecs/hpux-acc-64/qplatformdefs.h
+++ b/mkspecs/hpux-acc-64/qplatformdefs.h
@@ -1,80 +1,86 @@
 #ifndef QPLATFORMDEFS_H
 #define QPLATFORMDEFS_H
 
 // Get Qt defines/settings
 
 #include "qglobal.h"
 
 // Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
 
 #include <unistd.h>
 
 
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
 
 #ifdef QT_THREAD_SUPPORT
 #include <pthread.h>
 #endif
 
 #include <dirent.h>
 #include <fcntl.h>
 #include <grp.h>
 #include <pwd.h>
 #include <signal.h>
-#include <dl.h>
-#define QT_HPUX_LD
-#define QT_NO_LIBRARY_UNLOAD
+#include <dlfcn.h>
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/ipc.h>
 #include <sys/time.h>
 #include <sys/shm.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 
 // DNS header files are not fully covered by X/Open specifications.
 // In particular nothing is said about res_* :/
+// #ifdef __cplusplus
+// extern "C" {
+// #endif
+// getres() is mangled because of missing extern "C" on
+// HP-UX 11.x systems missing PHCO_23963
 #include <resolv.h>
+// #ifdef __cplusplus
+// }
+// #endif
 // Undeclared - at least on HP-UX 10.20.
 extern "C" int res_init();
 
 
 #if !defined(QT_NO_COMPAT)
         #define QT_STATBUF      struct stat
         #define QT_STATBUF4TSTATstruct stat
         #define QT_STAT                 ::stat
         #define QT_FSTAT        ::fstat
         #define QT_STAT_REG     S_IFREG
         #define QT_STAT_DIR     S_IFDIR
         #define QT_STAT_MASK    S_IFMT
         #define QT_STAT_LNK     S_IFLNK
         #define QT_FILENO       fileno
         #define QT_OPEN                 ::open
         #define QT_CLOSE        ::close
         #define QT_LSEEK        ::lseek
         #define QT_READ                 ::read
         #define QT_WRITE        ::write
         #define QT_ACCESS       ::access
         #define QT_GETCWD       ::getcwd
         #define QT_CHDIR        ::chdir
         #define QT_MKDIR        ::mkdir
         #define QT_RMDIR        ::rmdir
         #define QT_OPEN_RDONLY  O_RDONLY
         #define QT_OPEN_WRONLY  O_WRONLY
         #define QT_OPEN_RDWR    O_RDWR
         #define QT_OPEN_CREAT   O_CREAT
         #define QT_OPEN_TRUNC   O_TRUNC
         #define QT_OPEN_APPEND  O_APPEND
 #endif
 
         #define QT_SIGNAL_RETTYPEvoid
         #define QT_SIGNAL_ARGS  int
         #define QT_SIGNAL_IGNORESIG_IGN
 
         #define QT_SOCKLEN_T    int
 
 
 #endif // QPLATFORMDEFS_H