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
@@ -44,34 +44,35 @@
         #   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
 
@@ -83,39 +84,43 @@ 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
@@ -17,32 +17,38 @@
 #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