View | Details | Raw Unified
Collapse All | Expand All

(-) Singular/mod_raw.cc.orig (-11 / +24 lines)
 Lines 168-173    Link Here  
        echo ${prefix}-Unknown
        echo ${prefix}-Unknown
        exit 1
        exit 1
    fi
    fi
# PowerPC Linux ########################################################
 
elif (echo $uname_a | $egrep " ppc " > $devnull)
 
then
 
    prefix=ppc
 
    if (echo $uname_a | $egrep "Linux" > $devnull)
 
    then
 
        echo ${prefix}-Linux
 
        exit 0
 
    else
 
        echo ${prefix}-Unknown
 
        exit 1
 
    fi
 
else # Unknown ########################################################
else # Unknown ########################################################
    echo Unknown
    echo Unknown
    exit 2
    exit 2
 Lines 40-46    Link Here  
void* dynl_open_binary_warn(char* binary_name, const char* msg)
void* dynl_open_binary_warn(char* binary_name, const char* msg)
{
{
  void* handle = NULL;
  void* handle = NULL;
  const char* bin_dir = feGetResource('b');
 
  const char* bin_dir = feGetResource('r');
 
  if (bin_dir != NULL)
  if (bin_dir != NULL)
  {
  {
    char path_name[MAXPATHLEN];
    char path_name[MAXPATHLEN];
 Lines 104-109    Link Here  
#define HAVE_ELF_SYSTEM
#define HAVE_ELF_SYSTEM
#endif
#endif

            

              
              
#if defined(ppc_Linux)

            

            

              
              
#define HAVE_ELF_SYSTEM

            

            

              
              
#endif

            

            

              
              

            

        
#if defined(HAVE_ELF_SYSTEM)
#if defined(HAVE_ELF_SYSTEM)

        
#include <dlfcn.h>
#include <dlfcn.h>

        

  

    

    

       Lines 45-51
       
    
  Link Here 
    

  

        
#define SINGULAR_DEFAULT_DIR "/usr/local/Singular/"S_VERSION1
#define SINGULAR_DEFAULT_DIR "/usr/local/Singular/"S_VERSION1

        
#endif
#endif

        
#else // ! defined(MAKE_DISTRIBUTION)
#else // ! defined(MAKE_DISTRIBUTION)

            

              
#define SINGULAR_DEFAULT_DIR S_ROOT_DIR

              
#define SINGULAR_DEFAULT_DIR "/usr"

            

        
#endif // defined(MAKE_DISTRIBUTION)
#endif // defined(MAKE_DISTRIBUTION)

        

        
#ifdef ix86_Win
#ifdef ix86_Win

  

    

    

       Lines 83-97
       
    
  Link Here 
    

  

        
{
{

        
  {"SearchPath",    's',     feResPath,  NULL,
  {"SearchPath",    's',     feResPath,  NULL,

        
   "$SINGULARPATH;"
   "$SINGULARPATH;"

            

              
   "%b/LIB;"

              
   "%r/share/singular/LIB;"

            

            

              
   "%r/LIB;"

              

            

            

              
   "%r/../LIB;"

              

            

        
   "%d/LIB;"
   "%d/LIB;"

            

              
   "%d/../LIB"

              
            

        
   ""},
   ""},

            

              
  {"Singular",  'S',    feResBinary,"SINGULAR_EXECUTABLE",  "%d/"S_UNAME"/Singular"EXT,""},

              
  {"Singular",  'S',    feResBinary,"SINGULAR_EXECUTABLE",  "%d/bin/Singular"EXT,""},

            

            

              
  {"BinDir",    'b',    feResDir,   "SINGULAR_BIN_DIR",     "%d/"S_UNAME            ""},

              
  {"BinDir",    'b',    feResDir,   "SINGULAR_BIN_DIR",     "%d/bin",""},

            

            

              
  {"RootDir",   'r',    feResDir,   "SINGULAR_ROOT_DIR",    "%b/..",                ""},

              
  {"RootDir",   'r',    feResDir,   "SINGULAR_ROOT_DIR",    "%d",                ""},

            

        
  {"DefaultDir",'d',    feResDir,   "SINGULAR_DEFAULT_DIR",  SINGULAR_DEFAULT_DIR,  ""},
  {"DefaultDir",'d',    feResDir,   "SINGULAR_DEFAULT_DIR",  SINGULAR_DEFAULT_DIR,  ""},

        
  {"InfoFile",  'i',    feResFile,  "SINGULAR_INFO_FILE",   "%r/info/singular.hlp", ""},
  {"InfoFile",  'i',    feResFile,  "SINGULAR_INFO_FILE",   "%r/info/singular.hlp", ""},

        
  {"IdxFile",   'x',    feResFile,  "SINGULAR_IDX_FILE",    "%r/doc/singular.idx",  ""},
  {"IdxFile",   'x',    feResFile,  "SINGULAR_IDX_FILE",    "%r/doc/singular.idx",  ""},

  

    

    

       Lines 105-111
       
    
  Link Here 
    

  

        
#ifdef ix86_Win
#ifdef ix86_Win

        
  {"rxvt",     'X',    feResBinary,"RXVT",                "%b/rxvt.exe",             ""},
  {"rxvt",     'X',    feResBinary,"RXVT",                "%b/rxvt.exe",             ""},

        
#else
#else

            

              
  {"xterm",     'X',    feResBinary,"XTERM",                "%b/xterm",             ""},

              
  {"xterm",     'X',    feResBinary,"XTERM",                "%d/X11R6/bin/xterm",             ""},

            

        
#endif
#endif

        
  {"Path",      'p',    feResPath,  NULL,                   "%b;$PATH",         ""},
  {"Path",      'p',    feResPath,  NULL,                   "%b;$PATH",         ""},

        
#endif // ! defined(macintosh)
#endif // ! defined(macintosh)

  

    

    

       Lines 44-50
       
    
  Link Here 
    

  

        
  if (bin_dir != NULL)
  if (bin_dir != NULL)

        
  {
  {

        
    char path_name[MAXPATHLEN];
    char path_name[MAXPATHLEN];

            

              
    sprintf(path_name, "%s%s%s.%s", bin_dir, DIR_SEPP, binary_name, 

              
    sprintf(path_name, "%s%s%s%s.%s", bin_dir, "/lib/singular", DIR_SEPP, binary_name, 

            

        
            DL_TAIL);
            DL_TAIL);

        
    handle = dynl_open(path_name);
    handle = dynl_open(path_name);

        
    if (handle == NULL && ! warn_handle)
    if (handle == NULL && ! warn_handle)