CVS Commit by dpage: Dynamically link libpq/OpenSSL for sensible

[cvs(at)cvs(dot)pgadmin(dot)org]

Log Message:
-----------
Dynamically link libpq/OpenSSL for sensible installation with Win32 PostgreSQL.
Libs can be downloaded from http://developer.pgadmin.org/snapshots/postgresql/libs-win32-20040927.zip

Modified Files:
--------------
    pgadmin3:
        CHANGELOG.txt (r1.138 -> r1.139)
    pgadmin3/pkg/win32:
        pgadmin3.wsi (r1.19 -> r1.20)
        pgadmin3.wsm (r1.4 -> r1.5)
    pgadmin3/src:
        pgAdmin3.cpp (r1.104 -> r1.105)
        pgAdmin3.dsp (r1.112 -> r1.113)
    pgadmin3/src/include:
        pgAdmin3.h (r1.31 -> r1.32)

Index: CHANGELOG.txt
===================================================================
RCS file: /projects/pgadmin3/CHANGELOG.txt,v
retrieving revision 1.138
retrieving revision 1.139
diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.138 -r1.139
--- CHANGELOG.txt
+++ CHANGELOG.txt
@@ -17,6 +17,7 @@
 </ul>
 <br>
 <ul>
+    <li>2004-09-27 DP  1.2B3 Dynamically link libpq/OpenSSL for sensible installation with Win32 PostgreSQL
     <li>2004-09-18 DP  1.2B2 Prevent dropped servers reappearing after View System Objects change.
     <li>2004-09-17 AP  1.2B2 GRANT for functions in reengineered SQL window
     <li>2004-09-17 AP  1.2B2 Fix Database creation for 7.3/7.4 [Jona]
Index: pgAdmin3.cpp
===================================================================
RCS file: /projects/pgadmin3/src/pgAdmin3.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -Lsrc/pgAdmin3.cpp -Lsrc/pgAdmin3.cpp -u -w -r1.104 -r1.105
--- src/pgAdmin3.cpp
+++ src/pgAdmin3.cpp
@@ -78,14 +78,6 @@
 #define LANG_FILE   wxT("pgadmin3.lng")
 
 
-#ifdef SSL
-extern "C"
-{
-extern const char *SSL_version_str;
-}
-#endif
-
-
 IMPLEMENT_APP(pgAdmin3)
 
 
@@ -178,7 +170,7 @@
 #endif
 
 #ifdef SSL
-    wxLogInfo(wxT("Compiled with ") + wxString::FromAscii(SSL_version_str));
+    wxLogInfo(wxT("Compiled with dynamically linked SSL support"));
 #endif
 
 #if wxCHECK_VERSION(2,5,1)
Index: pgAdmin3.dsp
===================================================================
RCS file: /projects/pgadmin3/src/pgAdmin3.dsp,v
retrieving revision 1.112
retrieving revision 1.113
diff -Lsrc/pgAdmin3.dsp -Lsrc/pgAdmin3.dsp -u -w -r1.112 -r1.113
--- src/pgAdmin3.dsp
+++ src/pgAdmin3.dsp
@@ -56,7 +56,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswud.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib stcd.lib libpq.lib wxxrcd.lib regexd.lib /nologo /subsystem:windows /map /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"c:/wxWindows_2.5/lib" /libpath:"c:/wxWindows_2.5/contrib/lib" /libpath:"c:/postgresql/lib"
-# ADD LINK32 libpqd.lib ssleay32.lib libeay32.lib wxbase25ud.lib wxbase25ud_xml.lib wxbase25ud_net.lib wxmsw25ud_adv.lib wxmsw25ud_core.lib wxmsw25ud_html.lib wxregexud.lib wxpngd.lib wxzlibd.lib wxjpegd.lib wxtiffd.lib wxmsw25ud_stc.lib wxmsw25ud_xrc.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib ole32.lib oleaut32.lib /nologo /subsystem:windows /map /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"c:/wxWidgets/lib/vc_lib" /libpath:"c:/postgresql/lib"
+# ADD LINK32 libpqddll.lib ssleay32.lib libeay32.lib wxbase25ud.lib wxbase25ud_xml.lib wxbase25ud_net.lib wxmsw25ud_adv.lib wxmsw25ud_core.lib wxmsw25ud_html.lib wxregexud.lib wxpngd.lib wxzlibd.lib wxjpegd.lib wxtiffd.lib wxmsw25ud_stc.lib wxmsw25ud_xrc.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib ole32.lib oleaut32.lib /nologo /subsystem:windows /map /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"c:/wxWidgets/lib/vc_lib" /libpath:"c:/postgresql/lib"
 
 !ELSEIF  "$(CFG)" == "pgAdmin3 - Win32 Unicode SSL Release"
 
Index: pgAdmin3.h
===================================================================
RCS file: /projects/pgadmin3/src/include/pgAdmin3.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -Lsrc/include/pgAdmin3.h -Lsrc/include/pgAdmin3.h -u -w -r1.31 -r1.32
--- src/include/pgAdmin3.h
+++ src/include/pgAdmin3.h
@@ -12,7 +12,6 @@
 #ifndef PGADMIN3_H
 #define PGADMIN3_H
 
-
 // wxWindows headers
 #include <wx/wx.h>
 #include <wx/listctrl.h>