File xarchon-0.50.diff of Package xarchon

--- acinclude.m4
+++ acinclude.m4
@@ -35,7 +35,7 @@
 AC_TRY_LINK(dnl
 ifelse([$2], [main], , dnl Avoid conflicting decl of main.
 [/* Override any gcc2 internal prototype to avoid an error.  */
-]ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
+]ifelse([AC_LANG], CPLUSPLUS, [#ifdef __cplusplus
 extern "C"
 #endif
 ])dnl
--- configure.in
+++ configure.in
@@ -35,7 +35,7 @@
 
 AC_PATH_XTRA
 FC_CHECK_X_LIB(X11, XOpenDisplay, , 
-   AC_MSG_ERROR(Need X11; perhaps try/adjust --x-libraries))
+   [AC_MSG_ERROR(Need X11; perhaps try/adjust --x-libraries)])
 
 dnl ---------------------
 dnl Check for Xpm library
--- data/Makefile.am
+++ data/Makefile.am
@@ -7,8 +7,8 @@
 	   echo "--> Installing theme '$$theme'"; \
 	   THEME_DIRS=`find $$theme -type d`; \
 	   for p in $$THEME_DIRS; do \
-	      echo "mkdir $(pkgdatadir)/$$p"; \
-	      mkdir $(pkgdatadir)/$$p; \
+	      echo "mkdir $(DESTDIR)$(pkgdatadir)/$$p"; \
+	      mkdir $(DESTDIR)$(pkgdatadir)/$$p; \
 	   done; \
 	   THEME_FILES=`find $$theme -type f`; \
 	   for p in $$THEME_FILES; do \
--- src/Genetic.hpp
+++ src/Genetic.hpp
@@ -216,9 +216,9 @@
   virtual Genetic_Operator<T> *Choose_Operator(void)
   {
     int max=(int)total_op_weight;
-    list<Genetic_Operator<T> *>::iterator start=operators.begin();
-    list<Genetic_Operator<T> *>::iterator end=operators.end();
-    list<Genetic_Operator<T> *>::iterator iter;
+    typename list<Genetic_Operator <T> *>::iterator start=operators.begin();
+    typename list<Genetic_Operator <T> *>::iterator end=operators.end();
+    typename list<Genetic_Operator <T> *>::iterator iter;
     int r=rand()%max;
     int count=0;
     for (iter=start;iter!=end;iter++) {
@@ -249,7 +249,7 @@
     Genetic_Population<T> *newpop=new Genetic_Population<T>(p->size);
     int cur_size=0;
     while (cur_size<newpop->size) {
-      Genetic_Operator<T> *op=Choose_Operator();
+      Genetic_Operator<T> *op=this->Choose_Operator();
       if ( (cur_size+op->NumOfResults())>newpop->size)
 	continue;
       for (i=0;i<op->NumOfOperands();i++) {
@@ -264,7 +264,7 @@
 	cur_size++;
       }
     }
-    newpop->Eval_Fitness(fit_func);
+    newpop->Eval_Fitness(this->fit_func);
     return newpop;
   }
 
--- src/Problem.hpp
+++ src/Problem.hpp
@@ -306,14 +306,14 @@
   virtual G Goal_Value(T *a)
   {
     if (depth==0) 
-      return tester->Goal_Value(a);
+      return this->tester->Goal_Value(a);
     
-    Goal_Test<G,T> *endtester=tester;
-    tester=new Minimax_Goal_Test(depth-1,generator,other_acc,goal_acc,tester);
+    Goal_Test<G,T> *endtester=this->tester;
+    this->tester=new Minimax_Goal_Test(depth-1,this->generator,other_acc,this->goal_acc,this->tester);
     G ret_val=Successor_Goal_Test<G,T>::Goal_Value(a);
-    delete tester;
-    tester=endtester;
-    delete next;
+    delete this->tester;
+    this->tester=endtester;
+    delete this->next;
 
     return ret_val;
   }
@@ -340,19 +340,19 @@
   
   virtual G Goal_Value(T *a)
   {
-    Goal_Accumulator <G,T> *old=goal_acc;
+    Goal_Accumulator <G,T> *old=this->goal_acc;
     Multi_Goal_Accumulator <G,T,greater<G> > *mga=new Multi_Goal_Accumulator<G,T,greater<G> >(branch);
-    goal_acc=mga;
+    this->goal_acc=mga;
     Successor_Goal_Test<G,T>::Goal_Value(a);
-    goal_acc=old;
+    this->goal_acc=old;
     for (mga->Init();!mga->IsEnd();mga->Next()) { 
       T *state=mga->Get_State();
-      Multi_Minimax_Goal_Test *next=new Multi_Minimax_Goal_Test(d-1,b,gen,other,goal_acc,tester);
+      Multi_Minimax_Goal_Test *next=new Multi_Minimax_Goal_Test(this->d-1,this->b,this->gen,other,this->goal_acc,this->tester);
       next->Goal_Value(state);
-      goal_acc->Put(accumulator->value,acc->state,acc->op);
+      this->goal_acc->Put(this->accumulator->value,this->acc->state,this->acc->op);
     }
-    goal_acc->Put(mga->Get_State(),mga->Get_Operator(),mga->Get_Result());
-    return goal_acc->Get_Value();
+    this->goal_acc->Put(mga->Get_State(),mga->Get_Operator(),mga->Get_Result());
+    return this->goal_acc->Get_Value();
   }
 };
 
--- src/board.c
+++ src/board.c
@@ -27,7 +27,7 @@
 #define FLOOR_DARK     0                /* steppings for light and dark */
 #define FLOOR_LIGHT    7                /*   outside luminance cycle */
 
-#define FONT_NAME      "-misc-fixed-medium-*-normal-*-15-0-*-*-*-*-iso8859-1"
+#define FONT_NAME      "-misc-fixed-medium-*-normal-*-15-*-*-*-*-*-iso8859-1"
 
 #define V_CELL_YSIZE   40               /* revive cell height */
 
@@ -166,7 +166,7 @@
 
 int board_turn;
 
-static int board_frame_time = 0;
+int board_frame_time = 0;
 
 /*--------------------------------------------------------------------------*/
 /* spells                                                                   */
--- src/field.c
+++ src/field.c
@@ -20,7 +20,7 @@
 /* defines                                                                  */
 /*--------------------------------------------------------------------------*/
 
-#define FONT_NAME      "-misc-fixed-medium-*-normal-*-40-0-*-*-*-*-iso8859-1"
+#define FONT_NAME      "-misc-fixed-medium-*-normal-*-20-*-*-*-*-*-iso8859-1"
 
 #define NUM_ROCKS      12
 #define ROCK_DELAY     2                /* rocks delay time in frames */
--- src/network.c
+++ src/network.c
@@ -31,7 +31,7 @@
 /* define                                                                   */
 /*--------------------------------------------------------------------------*/
 
-#define FONT_NAME      "-misc-fixed-medium-*-normal-*-20-0-*-*-*-*-iso8859-1"
+#define FONT_NAME      "-misc-fixed-medium-*-normal-*-20-*-*-*-*-*-iso8859-1"
 
 #define TIMEOUT        3
 #define RETRIES        4