Changeset 7098117 in git

Timestamp:

Jan 29, 2002, 6:26:47 PM (22 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

d4cb43b26737c80cde4d1405d47ce55e39929c13

Parents:

eaf4cbcc0e3ddce55ed242af00a6024d38e4a967

Message:

*hannes: AIX-port


git-svn-id: file:///usr/local/Singular/svn/trunk@5821 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• Makefile.in (modified) (1 diff)
• feResource.cc (modified) (3 diffs)

Singular/Makefile.in

@@ -323 +323 @@
            feOptES.inc mmalloc.o
         ${CXX} -O2 ${CPPFLAGS} ${DEFS} -DESINGULAR -o ESingular emacs.cc fegetopt.o \
-        ${LDFLAGS} ${LIBS} -lomalloc_ndebug mmalloc.o
+        ${LDFLAGS} -lomalloc_ndebug mmalloc.o
 
 TSingular: fegetopt.o feResource.cc mod2.h feOpt.cc version.h emacs.cc \
            feOptTS.inc mmalloc.o
         ${CXX} -O2 ${CPPFLAGS} ${DEFS} -DTSINGULAR -o TSingular emacs.cc fegetopt.o \
-        ${LDFLAGS}  ${LIBS} -lomalloc_ndebug mmalloc.o
+        ${LDFLAGS} -lomalloc_ndebug mmalloc.o
 
 feOpt.o: feOpt.inc feOptES.inc feOptTS.inc

Singular/feResource.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: feResource.cc,v 1.32 2001-08-27 14:46:57 Singular Exp $ */
+/* $Id: feResource.cc,v 1.33 2002-01-29 17:26:47 Singular Exp $ */
 /*
 * ABSTRACT: management of resources
@@ -12 +12 @@
 
 #include "mod2.h"
+#ifdef AIX_4
+#define HAVE_PUTENV 1
+#endif
+
 #include "distrib.h"
 #include "dError.h"
@@ -190 +194 @@
   feResource('s',0);
 
-#ifdef HAVE_SETENV
+#if defined(HAVE_SETENV) || defined(HAVE_PUTENV)
   char* path = feResource('p');
 #ifdef RESOURCE_DEBUG
   printf("feInitResources: setting path with argv0=%s=\n", path);
 #endif
+#ifdef HAVE_PUTENV
+  if (path != NULL) { char *s=(char *)omAlloc0(strlen(path)+6);
+                      sprintf(s,"PATH=%s",path);
+                      putenv(s);
+                    }
+#else
   if (path != NULL) setenv("PATH", path, 1);
+#endif
 #endif
 }