Add protections against the shlwapi.h header file.

This commit was SVN r15597.

configure.ac

@@ -596,7 +596,7 @@ AC_CHECK_HEADERS([alloca.h aio.h arpa/inet.h dirent.h \
     sys/types.h sys/uio.h net/uio.h sys/utsname.h sys/wait.h syslog.h \
     time.h termios.h ulimit.h unistd.h util.h utmp.h malloc.h \
     ifaddrs.h sys/sysctl.h crt_externs.h regex.h \
-    ioLib.h sockLib.h hostLib.h])
+    ioLib.h sockLib.h hostLib.h shlwapi.h])
 
 # Needed to work around Darwin requiring sys/socket.h for
 # net/if.h

opal/util/path.c

@@ -22,9 +22,9 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#if defined(__WINDOWS__)
+#ifdef HAVE_SHLWAPI_H
 #include <shlwapi.h>
-#endif  /* defined(__WINDOWS__) */
+#endif
 
 #include "opal/util/path.h"
 #include "opal/util/os_path.h"
@@ -307,7 +307,9 @@ char* opal_find_absolute_path( char* app_name )
 #if !defined(__WINDOWS__)
         realpath( abs_app_name, resolved_path );
 #else
+#ifdef HAVE_SHLWAPI_H
 		PathCanonicalize(resolved_path, abs_app_name);
+#endif
 #endif  /* !defined(__WINDOWS__) */
         if( abs_app_name != app_name ) free(abs_app_name);
         return strdup(resolved_path);