[Gnash-commit] /srv/bzr/gnash/trunk r9976: need to call pkg-config for libs; restore cerr outs to make xpi's getHome work.

[Russell Nelson]

------------------------------------------------------------
revno: 9976
committer: Russell Nelson <address@hidden>
branch nick: trunk
timestamp: Fri 2008-10-10 10:21:55 -0400
message:
  need to call pkg-config for libs; restore cerr outs to make xpi's getHome 
work.
modified:
  macros/xpcom.m4
  plugin/plugin.cpp

=== modified file 'macros/xpcom.m4'
--- a/macros/xpcom.m4   2008-10-07 10:13:09 +0000
+++ b/macros/xpcom.m4   2008-10-10 14:21:55 +0000
@@ -85,6 +85,9 @@
 
       # Look for libxul. TODO: needed at all ?
       if $PKG_CONFIG --exists libxul; then
+        if test x$ac_cv_path_xpcom_sdk_dir = x; then
+          ac_cv_path_xpcom_sdk_dir="`$PKG_CONFIG --libs libxul`"
+        fi
         ac_cv_path_xpidl="`$PKG_CONFIG --libs-only-L libxul`"
       fi
 

=== modified file 'plugin/plugin.cpp'
--- a/plugin/plugin.cpp 2008-10-07 10:38:20 +0000
+++ b/plugin/plugin.cpp 2008-10-10 14:21:55 +0000
@@ -804,7 +804,7 @@
        nsISupports * sm = NULL;
 
        // Get service manager
-       //cerr << "Getting Path" << NPN_GetValue(NULL, NPNVserviceManager, &sm) 
<< "\n";
+       cerr << "Getting Path" << NPN_GetValue(NULL, NPNVserviceManager, &sm) 
<< "\n";
 
        // Mozilla returns nsIServiceManager so we can use it directly;
        // doing QI on nsISupports here can still be more appropriate in
@@ -823,17 +823,17 @@
 
        // Gets extension service
        rv = 
gServiceManager->GetServiceByContractID("@mozilla.org/extensions/manager;1", 
NS_GET_IID(nsIExtensionManager), (void **)&nsExtensionService);
-       //cerr << "gSM" << rv << " " << (nsExtensionService == NULL) << "\n";
+       cerr << "gSM" << rv << " " << (nsExtensionService == NULL) << "\n";
        if (!nsExtensionService) return -2;
        
        // Gets install location object
        rv = 
nsExtensionService->GetInstallLocation(NS_LITERAL_STRING("{2b70f2b1-fc72-4734-bb81-4eb2a7713e49}"),
 (nsIInstallLocation**)&installLocation);
-       //cerr << "nES" << rv << " " << (installLocation == NULL) << "\n";
+       cerr << "nES" << rv << " " << (installLocation == NULL) << "\n";
        if (!installLocation) return -3;
 
        // Gets information on file in the extension - here, "address@hidden" 
is the ID of the plugin. install.rdf is a file stored in the plugin
        rv = 
installLocation->GetItemFile(NS_LITERAL_STRING("{2b70f2b1-fc72-4734-bb81-4eb2a7713e49}"),
 NS_LITERAL_STRING("plugins/gnash"), (nsIFile**)&file);
-       //cerr << "iL" << rv << " " << (file == NULL) << "\n";
+       cerr << "iL" << rv << " " << (file == NULL) << "\n";
        if (!file) return -4;
 
        // We get the path (stored as unicode in nsName)
@@ -842,7 +842,7 @@
 
                //const NPString& propValue = 
NS_LossyConvertUTF16toASCII(sName);
        gnashpath = ToNewCString(NS_LossyConvertUTF16toASCII(sName));
-       //cerr << "Path" << gnashpath << "\n";
+       cerr << "Path" << gnashpath << "\n";
        return 0;
 }
 #endif // GNASH_XPI_PLUGIN