Thread: SVN Commit by dpage: r4467 - in trunk/pgadmin3: . src/include

Author: dpage
Date: 2005-09-26 15:31:20 +0100 (Mon, 26 Sep 2005)
New Revision: 4467

Modified:
   trunk/pgadmin3/acinclude.m4
   trunk/pgadmin3/src/include/frmGrantWizard.h
   trunk/pgadmin3/src/include/frmStatus.h
Log:
Tweaks for Solaris


Modified: trunk/pgadmin3/acinclude.m4
===================================================================
--- trunk/pgadmin3/acinclude.m4    2005-09-26 13:29:28 UTC (rev 4466)
+++ trunk/pgadmin3/acinclude.m4    2005-09-26 14:31:20 UTC (rev 4467)
@@ -132,8 +132,18 @@
 then
     PGSQL_OLD_LDFLAGS="$LDFLAGS"
     PGSQL_OLD_CPPFLAGS="$CPPFLAGS"
-    LDFLAGS="$LDFLAGS -L${LIBPQ_HOME}/lib"

+    # Solaris needs -lssl for this test
+    case "${host}" in
+        *solaris*)
+            LDFLAGS="$LDFLAGS -L${LIBPQ_HOME}/lib -lssl"
+            ;;
+        *)
+            LDFLAGS="$LDFLAGS -L${LIBPQ_HOME}/lib"
+            ;;
+    esac
+
+
     AC_LANG_SAVE
     AC_LANG_C
     AC_CHECK_LIB(pq, PQexec, [pgsql_cv_libpq=yes], [pgsql_cv_libpq=no])
@@ -276,8 +286,8 @@
         *-apple-darwin*)
             CPPFLAGS="$CPPFLAGS -no-cpp-precomp -fno-rtti"
             ;;
-        *-solaris*)
-            LIBS="$LIBS -lX11"
+        *solaris*)
+            LDFLAGS="$LDFLAGS -lnsl"
             ;;
         *)
             ;;

Modified: trunk/pgadmin3/src/include/frmGrantWizard.h
===================================================================
--- trunk/pgadmin3/src/include/frmGrantWizard.h    2005-09-26 13:29:28 UTC (rev 4466)
+++ trunk/pgadmin3/src/include/frmGrantWizard.h    2005-09-26 14:31:20 UTC (rev 4467)
@@ -12,6 +12,7 @@
 #ifndef FRMGRANTWIZARD_H
 #define FRMGRANTWIZARD_H

+#include <wx/notebook.h>
 #include "dlgClasses.h"
 #include "base/factory.h"


Modified: trunk/pgadmin3/src/include/frmStatus.h
===================================================================
--- trunk/pgadmin3/src/include/frmStatus.h    2005-09-26 13:29:28 UTC (rev 4466)
+++ trunk/pgadmin3/src/include/frmStatus.h    2005-09-26 14:31:20 UTC (rev 4467)
@@ -17,6 +17,7 @@
 #include <wx/image.h>
 #include <wx/listctrl.h>
 #include <wx/spinctrl.h>
+#include <wx/notebook.h>

 #include "dlgClasses.h"
 #include "base/factory.h"