Changeset 964389 in git

Timestamp:

Jul 13, 2011, 7:06:28 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

4ecc5a466643ed4b440bdb5eff9c7fe6f19452a4

Parents:

44d5adb209a6c64fd34d3985f93a7c9dc6e37179

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-07-13 19:06:28+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:39:15+01:00

Message:

ADD: add INSTALL_PREFIX macro into config.h and to the search path

Files:

• for_Hans_with_love.sh (modified) (1 diff)
• libpolys/configure.ac (modified) (1 diff)
• libpolys/polys/nc/gring.cc (modified) (5 diffs)
• libpolys/resources/feResource.cc (modified) (1 diff)

for_Hans_with_love.sh

@@ -50 +50 @@
   libtoolize --force
   aclocal -I $TOP_DIR/m4
+  autoheader
   autotools
   cd $TOP_DIR

libpolys/configure.ac

@@ -71 +71 @@
 SING_CHECK_PLURAL
 
+if test "x$prefix" != xNONE; then
+  PREFIX="$prefix"
+else
+  PREFIX="$ac_default_prefix"
+fi
+
+# AC_SUBST(PREFIX)
+AC_DEFINE_UNQUOTED(INSTALL_PREFIX,"$PREFIX",Prefix)
+
 AC_SUBST(LIBPREFIX)
 

libpolys/polys/nc/gring.cc

@@ -2372 +2372 @@
   int *M1=(int *)omAlloc0((rN+1)*sizeof(int));
   int *M2=(int *)omAlloc0((rN+1)*sizeof(int));
-  int *PREFIX=(int *)omAlloc0((rN+1)*sizeof(int));
-  int *SUFFIX=(int *)omAlloc0((rN+1)*sizeof(int));
+  int *aPREFIX=(int *)omAlloc0((rN+1)*sizeof(int));
+  int *aSUFFIX=(int *)omAlloc0((rN+1)*sizeof(int));
   p_GetExpV(m1,M1, r);
   p_GetExpV(m2,M2, r);
@@ -2419 +2419 @@
           {
             /* now mult (prefix, bres, suffix) */
-            memcpy(SUFFIX, M1,(rN+1)*sizeof(int));
-            memcpy(PREFIX, M1,(rN+1)*sizeof(int));
-            for (k=1;k<=j;k++) SUFFIX[k]=0;
-            for (k=j;k<=rN;k++) PREFIX[k]=0;
-            SUFFIX[0]=0;
-            PREFIX[0]=0;
+            memcpy(aSUFFIX, M1,(rN+1)*sizeof(int));
+            memcpy(aPREFIX, M1,(rN+1)*sizeof(int));
+            for (k=1;k<=j;k++) aSUFFIX[k]=0;
+            for (k=j;k<=rN;k++) aPREFIX[k]=0;
+            aSUFFIX[0]=0;
+            aPREFIX[0]=0;
             prefix=p_One(r);
             suffix=p_One(r);
-            p_SetExpV(prefix,PREFIX, r);
+            p_SetExpV(prefix,aPREFIX, r);
             p_Setm(prefix, r);
-            p_SetExpV(suffix,SUFFIX, r);
+            p_SetExpV(suffix,aSUFFIX, r);
             p_Setm(suffix, r);
             if (!p_LmIsConstant(prefix, r)) bres = gnc_mm_Mult_p(prefix, bres, r);
@@ -2435 +2435 @@
             ares=p_Add_q(ares, bres, r);
             /* What to give free? */
-        /* Do we have to free PREFIX/SUFFIX? it seems so */
+        /* Do we have to free aPREFIX/aSUFFIX? it seems so */
             p_Delete(&prefix, r);
             p_Delete(&suffix, r);
@@ -2444 +2444 @@
       {
         /* now mult (prefix, bres, suffix) */
-        memcpy(SUFFIX, M2,(rN+1)*sizeof(int));
-        memcpy(PREFIX, M2,(rN+1)*sizeof(int));
-        for (k=1;k<=i;k++) SUFFIX[k]=0;
-        for (k=i;k<=rN;k++) PREFIX[k]=0;
-        SUFFIX[0]=0;
-        PREFIX[0]=0;
+        memcpy(aSUFFIX, M2,(rN+1)*sizeof(int));
+        memcpy(aPREFIX, M2,(rN+1)*sizeof(int));
+        for (k=1;k<=i;k++) aSUFFIX[k]=0;
+        for (k=i;k<=rN;k++) aPREFIX[k]=0;
+        aSUFFIX[0]=0;
+        aPREFIX[0]=0;
         prefix=p_One(r);
         suffix=p_One(r);
-        p_SetExpV(prefix,PREFIX, r);
+        p_SetExpV(prefix,aPREFIX, r);
         p_Setm(prefix, r);
-        p_SetExpV(suffix,SUFFIX, r);
+        p_SetExpV(suffix,aSUFFIX, r);
         p_Setm(suffix, r);
         bres=ares;
@@ -2467 +2467 @@
   freeT(M1, rN);
   freeT(M2, rN);
-  freeT(PREFIX, rN);
-  freeT(SUFFIX, rN);
+  freeT(aPREFIX, rN);
+  freeT(aSUFFIX, rN);
 #ifdef PDEBUG
   p_Test(res, r);

libpolys/resources/feResource.cc

@@ -77 +77 @@
   {"SearchPath",    's', feResPath,  NULL,
    "$SINGULARPATH;"
+   "" INSTALL_PREFIX ";"
    "%b/LIB;"
    "%b/MOD;"