Chris_T avatar Chris_T committed 883ab20 Merge

Markus: Fixed a configuration bug on non-Linux Unix-platforms that prevented corrected linking.

Comments (0)

Files changed (5)

 7d0f9ae1ed38c6948b93a83d801031527de8d488 release-5.5.2
 81f8807cb7d4b6d88acb8403c433c067a12e020f forge-release-6.0.0
 4fafa3d754454dee714c608c286032637913cb43 forge-release-6.0.1
+4a799d1f445522367f89c5b299c7ee33d744b86e forge-release-6.0.2
+f19a649b2663705681cfdc57b5b5655c505ea42f forge-release-6.0.3
+2012-02-28:  Previous configuration bug fix did not work correctly, should
+             be solved now.
+
+2012-02-24:  Fixed a configuration bug on non-Linux Unix-platforms that
+             prevented corrected linking.
+
 2012-02-01:  New major release version 6.0.0!
 
                1) Switched build process to Oasis
         exp10.c,
         f2c.h, lacaml_macros.h, utils_c.h
   BuildDepends: bigarray
-  if system(linux)
-    CCOpt: -O2 -DPIC
-    CCLib: -lblas -llapack
+  CCOpt: -O2 -DPIC
+  CCLib: -lblas -llapack
   if system(macosx)
     CCOpt: -O2 -DPIC -DEXTERNAL_EXP10 -framework vecLib
     CCLib: -framework vecLib
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 4410b49dd31ecd7c35d0b9221f7a21d2) *)
+(* DO NOT EDIT (digest: 7ce87e2a073ff60e41a80f863a85a1e3) *)
 module OASISGettext = struct
 # 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/oasis/OASISGettext.ml"
   
        [
           (["oasis_library_lacaml_ccopt"; "compile"],
             [
-               (OASISExpr.EBool true, S []);
-               (OASISExpr.ETest ("system", "linux"),
+               (OASISExpr.EBool true,
                  S [A "-ccopt"; A "-O2"; A "-ccopt"; A "-DPIC"]);
                (OASISExpr.ETest ("system", "macosx"),
                  S
             ]);
           (["oasis_library_lacaml_cclib"; "link"],
             [
-               (OASISExpr.EBool true, S []);
-               (OASISExpr.ETest ("system", "linux"),
+               (OASISExpr.EBool true,
                  S [A "-cclib"; A "-lblas"; A "-cclib"; A "-llapack"]);
                (OASISExpr.ETest ("system", "macosx"),
                  S [A "-cclib"; A "-framework"; A "-cclib"; A "vecLib"])
             ]);
           (["oasis_library_lacaml_cclib"; "ocamlmklib"; "c"],
             [
-               (OASISExpr.EBool true, S []);
-               (OASISExpr.ETest ("system", "linux"),
-                 S [A "-lblas"; A "-llapack"]);
+               (OASISExpr.EBool true, S [A "-lblas"; A "-llapack"]);
                (OASISExpr.ETest ("system", "macosx"),
                  S [A "-framework"; A "vecLib"])
             ]);
 (* setup.ml generated for the first time by OASIS v0.2.0 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: ae0f320b4b9b0526361155b378756250) *)
+(* DO NOT EDIT (digest: 921bce7fcd202ecf4d5066e7225436f0) *)
 (*
    Regenerated by OASIS v0.2.0
    Visit http://oasis.forge.ocamlcore.org for more information and
                       bs_data_files = [];
                       bs_ccopt =
                         [
-                           (OASISExpr.EBool true, []);
-                           (OASISExpr.ETest ("system", "linux"),
-                             ["-O2"; "-DPIC"]);
+                           (OASISExpr.EBool true, ["-O2"; "-DPIC"]);
                            (OASISExpr.ETest ("system", "macosx"),
                              [
                                 "-O2";
                         ];
                       bs_cclib =
                         [
-                           (OASISExpr.EBool true, []);
-                           (OASISExpr.ETest ("system", "linux"),
-                             ["-lblas"; "-llapack"]);
+                           (OASISExpr.EBool true, ["-lblas"; "-llapack"]);
                            (OASISExpr.ETest ("system", "macosx"),
                              ["-framework"; "vecLib"])
                         ];
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.