fixed fl makefiles that Julian didn't fix correctly

[wxWidgets.git] / src / unix / dialup.cpp

diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp
index 0b7c075c8c798cd878ef8f7c90c4194374136405..26fc932862c361fc92d49d92726aa5a1562d0531 100644 (file)
--- a/src/unix/dialup.cpp
+++ b/src/unix/dialup.cpp
@@ -639,7 +639,11 @@ wxDialUpManagerImpl::CheckProcNet()
 int
 wxDialUpManagerImpl::CheckIfconfig()
 {
-    // assume that the test doesn't work
+#ifdef __VMS
+       m_CanUseIfconfig = 0;
+        return -1;
+#else
+   // assume that the test doesn't work
     int netDevice = NetDevice_Unknown;
 
     // first time check for ifconfig location
@@ -687,11 +691,11 @@ wxDialUpManagerImpl::CheckIfconfig()
         // VZ: a wild guess (but without it, ifconfig fails completely)
         cmd << _T(" ppp0");
 #else
-#     pragma warning "No ifconfig information for this OS."
-        m_CanUseIfconfig = 0;
+# pragma warning "No ifconfig information for this OS."
+       m_CanUseIfconfig = 0;
         return -1;
 #endif
-        cmd << " >" << tmpfile <<  '\'';
+       cmd << " >" << tmpfile <<  '\'';
         /* I tried to add an option to wxExecute() to not close stdout,
            so we could let ifconfig write directly to the tmpfile, but
            this does not work. That should be faster, as it doesn´t call
@@ -745,6 +749,7 @@ wxDialUpManagerImpl::CheckIfconfig()
     }
 
     return netDevice;
+#endif
 }
 
 wxDialUpManagerImpl::NetConnection wxDialUpManagerImpl::CheckPing()
@@ -753,10 +758,15 @@ wxDialUpManagerImpl::NetConnection wxDialUpManagerImpl::CheckPing()
    // which does not take arguments, a la GNU.
    if(m_CanUsePing == -1) // unknown
    {
+#ifdef __VMS
+      if(wxFileExists("SYS$SYSTEM:TCPIP$PING.EXE"))
+         m_PingPath = "$SYS$SYSTEM:TCPIP$PING";
+#else
       if(wxFileExists("/bin/ping"))
          m_PingPath = "/bin/ping";
       else if(wxFileExists("/usr/sbin/ping"))
          m_PingPath = "/usr/sbin/ping";
+#endif
       if(! m_PingPath)
       {
          m_CanUsePing = 0;
@@ -775,7 +785,7 @@ wxDialUpManagerImpl::NetConnection wxDialUpManagerImpl::CheckPing()
    cmd << m_PingPath << ' ';
 #if defined(__SOLARIS__) || defined (__SUNOS__)
    // nothing to add to ping command
-#elif defined(__LINUX__) || defined ( __FREEBSD__) || defined(__WXMAC__)
+#elif defined(__LINUX__) || defined ( __FREEBSD__) || defined(__WXMAC__) || defined( __VMS )
    cmd << "-c 1 "; // only ping once
 #elif defined(__HPUX__)
    cmd << "64 1 "; // only ping once (need also specify the packet size)