r15267 - gnucash/branches/reshuffle-modules - Add .dylib files to the list of files checked by the module system,

Andreas Köhler andi5 at cvs.gnucash.org
Wed Dec 27 15:47:53 EST 2006


Author: andi5
Date: 2006-12-27 15:47:52 -0500 (Wed, 27 Dec 2006)
New Revision: 15267
Trac: http://svn.gnucash.org/trac/changeset/15267

Modified:
   gnucash/branches/reshuffle-modules/
   gnucash/branches/reshuffle-modules/src/gnc-module/gnc-module.c
Log:
Add .dylib files to the list of files checked by the module system,
because G_MODULE_SUFFIX is .so on MacOSX. Interim solution.



Property changes on: gnucash/branches/reshuffle-modules
___________________________________________________________________
Name: svk:merge
   - 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/reshuffle-modules:1050
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:802
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/trunk:990
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13714
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk2:13366
   + 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/reshuffle-modules:1052
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:802
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/trunk:990
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13714
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk2:13366

Modified: gnucash/branches/reshuffle-modules/src/gnc-module/gnc-module.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/gnc-module/gnc-module.c	2006-12-27 17:08:29 UTC (rev 15266)
+++ gnucash/branches/reshuffle-modules/src/gnc-module/gnc-module.c	2006-12-27 20:47:52 UTC (rev 15267)
@@ -208,7 +208,9 @@
       while ((dent = readdir(d)) != NULL)
       {
         /* is the file a .la shared lib? */
-        if (g_str_has_suffix(dent->d_name, "." G_MODULE_SUFFIX))
+        /* FIXME: remove/#ifdef hardcoded .dylib suffix */
+        if (g_str_has_suffix(dent->d_name, "." G_MODULE_SUFFIX) ||
+            g_str_has_suffix(dent->d_name, ".dylib"))
         {
           /* get the full path name, then dlopen the library and see
            * if it has the appropriate symbols to be a gnc_module */



More information about the gnucash-changes mailing list