[Tux4kids-commits] r1510 - tuxmath/trunk/server tuxmath/trunk/src tuxtype/trunk
David Bruce
dbruce-guest at alioth.debian.org
Fri Sep 11 02:51:05 UTC 2009
Author: dbruce-guest
Date: 2009-09-11 02:51:04 +0000 (Fri, 11 Sep 2009)
New Revision: 1510
Modified:
tuxmath/trunk/server/server.c
tuxmath/trunk/server/testclient.c
tuxmath/trunk/src/game.c
tuxmath/trunk/src/game.h
tuxmath/trunk/src/options.h
tuxmath/trunk/src/transtruct.h
tuxtype/trunk/aclocal.m4
Log:
cleanup of lan project
Modified: tuxmath/trunk/server/server.c
===================================================================
--- tuxmath/trunk/server/server.c 2009-09-10 21:17:55 UTC (rev 1509)
+++ tuxmath/trunk/server/server.c 2009-09-11 02:51:04 UTC (rev 1510)
@@ -949,7 +949,7 @@
/* Send enough questions to fill the initial comet slots (currently 10) */
- for(j = 0; j < TEST_COMETS; j++)
+ for(j = 0; j < QUEST_QUEUE_SIZE; j++)
{
int k = 0;
Modified: tuxmath/trunk/server/testclient.c
===================================================================
--- tuxmath/trunk/server/testclient.c 2009-09-10 21:17:55 UTC (rev 1509)
+++ tuxmath/trunk/server/testclient.c 2009-09-11 02:51:04 UTC (rev 1510)
@@ -35,7 +35,7 @@
int quit = 0;
int game_status = GAME_NOT_STARTED;
-MC_FlashCard comets[TEST_COMETS]; //current questions
+MC_FlashCard comets[QUEST_QUEUE_SIZE]; //current questions
int remaining_quests = 0;
@@ -369,7 +369,7 @@
/* Start out with our "comets" empty: */
{
int i;
- for(i = 0; i < TEST_COMETS; i ++)
+ for(i = 0; i < QUEST_QUEUE_SIZE; i ++)
erase_flashcard(&comets[i]);
}
@@ -416,13 +416,13 @@
}
else //we got input, but not the correct answer:
{
- int i = rand()%TEST_COMETS;
+ int i = rand()%QUEST_QUEUE_SIZE;
printf("Sorry, %s is incorrect. Try again!\n", buf);
// Can't tell which question was the 'wrong' one, so we
// a non-empty one at random. Note that this is just for
// purposes of testing LAN_NotAnsweredCorrectly()
while(-1 == comets[i].question_id)
- i = rand()%TEST_COMETS;
+ i = rand()%QUEST_QUEUE_SIZE;
LAN_NotAnsweredCorrectly(comets[i].question_id);
print_current_quests();
}
@@ -480,7 +480,7 @@
{
int i;
printf("\n------------ Current Questions: -----------\n");
- for(i = 0; i < TEST_COMETS; i ++)
+ for(i = 0; i < QUEST_QUEUE_SIZE; i ++)
{
if(comets[i].question_id != -1)
printf("Comet %d - question %d:\t%s\n", i, comets[i].question_id, comets[i].formula_string);
@@ -510,7 +510,7 @@
MC_FlashCard* find_comet_by_id(int id)
{
int i = 0;
- for(i = 0; i < TEST_COMETS; i++)
+ for(i = 0; i < QUEST_QUEUE_SIZE; i++)
{
if(comets[i].question_id == id)
return &comets[i];
@@ -527,7 +527,7 @@
MC_FlashCard* check_answer(int ans)
{
int i = 0;
- for(i = 0; i < TEST_COMETS; i++)
+ for(i = 0; i < QUEST_QUEUE_SIZE; i++)
{
/* Make sure we don't "match" an empty question with a zero answer: */
if( (comets[i].question_id != -1)
Modified: tuxmath/trunk/src/game.c
===================================================================
--- tuxmath/trunk/src/game.c 2009-09-10 21:17:55 UTC (rev 1509)
+++ tuxmath/trunk/src/game.c 2009-09-11 02:51:04 UTC (rev 1510)
@@ -26,11 +26,18 @@
#include <string.h>
#include "SDL.h"
+#include "SDL_image.h"
+
#ifndef NOSOUND
#include "SDL_mixer.h"
#endif
-#include "SDL_image.h"
+/* Make sure we don't try to call network code if we built without */
+/* network support: */
+#ifdef HAVE_LIBSDL_NET
+#include "network.h"
+#endif
+
#include "transtruct.h"
#include "game.h"
#include "fileops.h"
@@ -44,13 +51,7 @@
#include "pixels.h"
#include "throttle.h"
-/* Make sure we don't try to call network code if we built without */
-/* network support: */
-#ifdef HAVE_LIBSDL_NET
-#include "network.h"
-#endif
-
#define FPS 15 /* 15 frames per second */
#define MS_PER_FRAME (1000 / FPS)
@@ -144,7 +145,7 @@
static int start_message_chosen = 0;
/*****************************************************************/
-MC_FlashCard comets_questions[TEST_COMETS]; //current questions
+MC_FlashCard quest_queue[QUEST_QUEUE_SIZE]; //current questions
int remaining_quests = 0;
static int comet_counter = 0;
/****************************************************************/
@@ -216,8 +217,8 @@
/* Display to player: */
void print_current_quests(void);
-MC_FlashCard* find_comet_by_id(int id);
-comet_type* finder(int id);
+MC_FlashCard* search_queue_by_id(int id);
+comet_type* search_comets_by_id(int id);
/******************************************************/
@@ -505,7 +506,7 @@
return 0;
// comet_ques->alive = 0;
comet_ques->expl = 0;
- comet_ques->zapped = 1;
+// comet_ques->zapped = 1;
// comet_ques->city = 0;
// comet_ques->x = 0;
// comet_ques->y = 0;
@@ -520,7 +521,7 @@
int add_quest_recvd(char* buf)
{
/* Empty slots indicated by question_id == -1 */
- MC_FlashCard* fc = find_comet_by_id(-1);
+ MC_FlashCard* fc = search_queue_by_id(-1);
DEBUGMSG(debug_game, "Enter add_quest_recvd(), buf is: %s\n", buf);
@@ -579,8 +580,8 @@
if(id < 1) // The question_id can never be negative or zero
return 0;
- comet_screen = finder(id);
- fc = find_comet_by_id(id);
+ comet_screen = search_comets_by_id(id);
+ fc = search_queue_by_id(id);
if(!comet_screen && !fc)
return 0;
@@ -617,17 +618,17 @@
{
int i;
printf("\n------------ Current Questions: -----------\n");
- for(i = 0; i < MAX_COMETS; i++)
+ for(i = 0; i < Opts_MaxComets(); i++)
{
if(comets[i].alive == 1)
printf("Comet %d - question %d:\t%s\n", i, comets[i].flashcard.question_id, comets[i].flashcard.formula_string);
}
printf("--------------Test Comets-----------------\n");
- for(i = 0; i < TEST_COMETS; i++)
+ for(i = 0; i < QUEST_QUEUE_SIZE; i++)
{
- if(comets_questions[i].question_id != -1)
- printf("Comet %d - question %d:\t%s\n", i, comets_questions[i].question_id, comets_questions[i].formula_string);
+ if(quest_queue[i].question_id != -1)
+ printf("Comet %d - question %d:\t%s\n", i, quest_queue[i].question_id, quest_queue[i].formula_string);
else
printf("Comet %d:\tEmpty\n", i);
}
@@ -638,23 +639,23 @@
/* Return a pointer to an empty comet slot, */
/* returning NULL if no vacancy found: */
-MC_FlashCard* find_comet_by_id(int id)
+MC_FlashCard* search_queue_by_id(int id)
{
int i = 0;
- for(i = 0; i < TEST_COMETS; i++)
+ for(i = 0; i < QUEST_QUEUE_SIZE; i++)
{
- if(comets_questions[i].question_id == id)
- return &comets_questions[i];
+ if(quest_queue[i].question_id == id)
+ return &quest_queue[i];
}
//if we don't find a match:
return NULL;
}
-comet_type* finder(int id)
+comet_type* search_comets_by_id(int id)
{
int i;
- for (i = 0; i < MAX_COMETS; i++)
+ for (i = 0; i < Opts_MaxComets(); i++)
{
if (comets[i].flashcard.question_id == id)
{printf("the question id is in slot %d\n",i);
@@ -777,8 +778,8 @@
else /* Start out with our question queue empty: */
{
int i;
- for(i = 0; i < TEST_COMETS; i ++)
- MC_ResetFlashCard(&(comets_questions[i]));
+ for(i = 0; i < QUEST_QUEUE_SIZE; i ++)
+ MC_ResetFlashCard(&(quest_queue[i]));
}
/* Allocate memory */
@@ -792,35 +793,21 @@
printf("Allocation of comets failed");
return 0;
}
- else
- {
- for (i = 0; i < MAX_MAX_COMETS; ++i)
- {
- comets[i].flashcard = MC_AllocateFlashcard();
- if (!MC_FlashCardGood(&comets[i].flashcard) )
- {
- //something's wrong
- printf("Allocation of flashcard %d failed\n", i);
- for (; i >= 0; --i) //free anything we've already gotten
- MC_FreeFlashcard(&comets[i].flashcard);
- return 0;
- }
- }
- }
- DEBUGMSG(debug_game,"Flashcards allocated.\n");
-
+
cities = (city_type *) malloc(NUM_CITIES * sizeof(city_type));
if (cities == NULL)
{
printf("Allocation of cities failed");
return 0;
}
+
penguins = (penguin_type *) malloc(NUM_CITIES * sizeof(penguin_type));
if (penguins == NULL)
{
printf("Allocation of penguins failed");
return 0;
}
+
steam = (steam_type *) malloc(NUM_CITIES * sizeof(steam_type));
if (steam == NULL)
{
@@ -884,7 +871,6 @@
}
num_cities_alive = NUM_CITIES;
-// num_comets_alive = 0;
igloo_vertical_offset = images[IMG_CITY_BLUE]->h - images[IMG_IGLOO_INTACT]->h;
@@ -1315,7 +1301,7 @@
if (picked_comet == -1 && (rand() % 10) < 3)
{
/* Demo mode! Randomly pick a comet to destroy: */
- picked_comet = (rand() % MAX_COMETS);
+ picked_comet = (rand() % Opts_MaxComets());
if (!(comets[picked_comet].alive &&
comets[picked_comet].expl == -1)
@@ -1390,7 +1376,7 @@
void game_handle_answer(void)
{
int i, j, lowest, lowest_y;
- char ans[MC_MAX_DIGITS+2]; //extra space for negative, and for final '\0'
+ char ans[MC_MAX_DIGITS + 2]; //extra space for negative, and for final '\0'
Uint32 ctime;
if (!doing_answer)
@@ -1415,7 +1401,7 @@
lowest_y = 0;
lowest = -1;
- for (i = 0; i < MAX_COMETS; i++)
+ for (i = 0; i < Opts_MaxComets(); i++)
{
if (comets[i].alive &&
comets[i].expl == -1 &&
@@ -1468,8 +1454,7 @@
#endif
}
-
- /* FIXME maybe should move this into game_handle_tux() */
+ /* Pick Tux animation: */
/* 50% of the time.. */
if ((rand() % 10) < 5)
{
@@ -1591,7 +1576,7 @@
for (i = 0; i < NUM_CITIES; i++)
cities[i].threatened = 0;
- for (i = 0; i < MAX_COMETS; i++)
+ for (i = 0; i < Opts_MaxComets(); i++)
{
if (comets[i].alive)
{
@@ -1601,6 +1586,7 @@
/* Update comet position */
comets[i].x = comets[i].x + 0; /* no lateral motion for now! */
/* Make bonus comet move faster at chosen ratio: */
+ /* NOTE y increment scaled to make game play similar at any resolution */
if (comets[i].bonus)
{
comets[i].y += speed * Opts_BonusSpeedRatio() *
@@ -2184,7 +2170,7 @@
char* comet_str;
/* First draw regular comets: */
- for (i = 0; i < MAX_COMETS; i++)
+ for (i = 0; i < Opts_MaxComets(); i++)
{
if (comets[i].alive && !comets[i].bonus)
{
@@ -2225,7 +2211,7 @@
}
/* Now draw any bonus comets: */
- for (i = 0; i < MAX_COMETS; i++)
+ for (i = 0; i < Opts_MaxComets(); i++)
{
if (comets[i].alive && comets[i].bonus)
{
@@ -2652,7 +2638,7 @@
/* Clear all comets: */
- for (i = 0; i < MAX_COMETS; i++)
+ for (i = 0; i < Opts_MaxComets(); i++)
{
DEBUGCODE(debug_game)
{
@@ -2822,7 +2808,7 @@
y_spacing = (images[IMG_NUMS]->h) * 1.5;
/* Return if any previous comet too high up to create another one yet: */
- for (i = 0; i < MAX_COMETS; i++)
+ for (i = 0; i < Opts_MaxComets(); i++)
{
if (comets[i].alive)
if (comets[i].y < y_spacing)
@@ -2835,7 +2821,7 @@
}
/* Now look for a free comet slot: */
- for (i = 0; i < MAX_COMETS; i++)
+ for (i = 0; i < Opts_MaxComets(); i++)
{
if (!comets[i].alive)
{
@@ -2859,13 +2845,13 @@
if(Opts_LanMode())
{
DEBUGCODE(debug_game) print_current_quests();
- for (i = 0; i < TEST_COMETS; i++)
+ for (i = 0; i < QUEST_QUEUE_SIZE; i++)
{
- if(comets_questions[i].question_id != -1)
+ if(quest_queue[i].question_id != -1)
{
DEBUGMSG(debug_game, "Found question_id %d, %s\n",
- comets_questions[i].question_id,
- comets_questions[i].formula_string);
+ quest_queue[i].question_id,
+ quest_queue[i].formula_string);
q_found = i;
break;
}
@@ -2883,8 +2869,8 @@
if(Opts_LanMode())
{
- copy_card(&(comets_questions[q_found]), &(comets[com_found].flashcard));
- MC_ResetFlashCard(&(comets_questions[q_found]));
+ copy_card(&(quest_queue[q_found]), &(comets[com_found].flashcard));
+ MC_ResetFlashCard(&(quest_queue[q_found]));
}
else // Not LAN mode - just get question with direct call:
{
@@ -3710,7 +3696,7 @@
int i = 0;
comet_counter = 0;
- for (i = 0; i < MAX_COMETS; i++)
+ for (i = 0; i < Opts_MaxComets(); i++)
{
comets[i].alive = 0;
comets[i].expl = -1;
@@ -3811,7 +3797,7 @@
city_expl_height = screen->h - images[IMG_CITY_BLUE]->h;
//move comets to a location 'equivalent' to where they were
//i.e. with the same amount of time left before impact
- for (i = 0; i < MAX_COMETS; ++i)
+ for (i = 0; i < Opts_MaxComets(); ++i)
{
if (!comets[i].alive)
continue;
@@ -3828,7 +3814,7 @@
{
int i = 0;
int living = 0;
- for(i = 0; i < MAX_COMETS; i++)
+ for(i = 0; i < Opts_MaxComets(); i++)
if(comets[i].alive)
living++;
return living;
Modified: tuxmath/trunk/src/game.h
===================================================================
--- tuxmath/trunk/src/game.h 2009-09-10 21:17:55 UTC (rev 1509)
+++ tuxmath/trunk/src/game.h 2009-09-11 02:51:04 UTC (rev 1510)
@@ -139,8 +139,8 @@
int game(void);
void game_set_start_message(const char*, const char*, const char*, const char*);
+
/* draw_nums() is used in options.c and factoroids.c/h so need extern linkage */
-
void draw_nums(const char* str, int x, int y);
/*used in factoroids.c/h*/
Modified: tuxmath/trunk/src/options.h
===================================================================
--- tuxmath/trunk/src/options.h 2009-09-10 21:17:55 UTC (rev 1509)
+++ tuxmath/trunk/src/options.h 2009-09-11 02:51:04 UTC (rev 1510)
@@ -64,7 +64,7 @@
int slow_after_wrong;
int starting_comets;
int extra_comets_per_wave;
- int max_comets;
+ int max_comets;
char next_mission[PATH_MAX];
int save_summary;
int use_feedback;
Modified: tuxmath/trunk/src/transtruct.h
===================================================================
--- tuxmath/trunk/src/transtruct.h 2009-09-10 21:17:55 UTC (rev 1509)
+++ tuxmath/trunk/src/transtruct.h 2009-09-11 02:51:04 UTC (rev 1510)
@@ -24,7 +24,7 @@
#define MC_FORMULA_LEN 40
#define MC_ANSWER_LEN 5
-#define TEST_COMETS 10
+#define QUEST_QUEUE_SIZE 10
typedef struct _MC_FlashCard {
Modified: tuxtype/trunk/aclocal.m4
===================================================================
--- tuxtype/trunk/aclocal.m4 2009-09-10 21:17:55 UTC (rev 1509)
+++ tuxtype/trunk/aclocal.m4 2009-09-11 02:51:04 UTC (rev 1510)
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
-[m4_warning([this file was generated for autoconf 2.64.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
+[m4_warning([this file was generated for autoconf 2.63.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -3706,10 +3706,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
+[am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11], [],
+m4_if([$1], [1.10.2], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -3725,7 +3725,7 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11])dnl
+[AM_AUTOMAKE_VERSION([1.10.2])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -3785,14 +3785,14 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 9
+# serial 8
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
@@ -3805,7 +3805,6 @@
AC_SUBST([$1_FALSE])dnl
_AM_SUBST_NOTMAKE([$1_TRUE])dnl
_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-m4_define([_AM_COND_VALUE_$1], [$2])dnl
if $2; then
$1_TRUE=
$1_FALSE='#'
@@ -3819,14 +3818,14 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 10
+# serial 9
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
@@ -3883,16 +3882,6 @@
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
fi
- am__universal=false
- m4_case([$1], [CC],
- [case " $depcc " in #(
- *\ -arch\ *\ -arch\ *) am__universal=true ;;
- esac],
- [CXX],
- [case " $depcc " in #(
- *\ -arch\ *\ -arch\ *) am__universal=true ;;
- esac])
-
for depmode in $am_compiler_list; do
# Setup a source with many dependencies, because some compilers
# like to wrap large dependency lists on column 80 (with \), and
@@ -3910,17 +3899,7 @@
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
- am__obj=sub/conftest.${OBJEXT-o}
- am__minus_obj="-o $am__obj"
case $depmode in
- gcc)
- # This depmode causes a compiler race in universal mode.
- test "$am__universal" = false || continue
- ;;
nosideeffect)
# after this tag, mechanisms are not by side-effect, so they'll
# only be used when explicitly requested
@@ -3930,23 +3909,19 @@
break
fi
;;
- msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
- # not run yet. These depmodes are late enough in the game, and
- # so weak that their functioning should not be impacted.
- am__obj=conftest.${OBJEXT-o}
- am__minus_obj=
- ;;
none) break ;;
esac
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this.
if depmode=$depmode \
- source=sub/conftest.c object=$am__obj \
+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
@@ -4084,13 +4059,13 @@
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# 2005, 2006, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 16
+# serial 13
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -4107,7 +4082,7 @@
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
+[AC_PREREQ([2.60])dnl
dnl Autoconf wants to disallow AM_ names. We explicitly allow
dnl the ones we care about.
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -4158,8 +4133,8 @@
AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
AM_MISSING_PROG(AUTOHEADER, autoheader)
AM_MISSING_PROG(MAKEINFO, makeinfo)
-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+AM_PROG_INSTALL_SH
+AM_PROG_INSTALL_STRIP
AC_REQUIRE([AM_PROG_MKDIR_P])dnl
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
@@ -4167,38 +4142,25 @@
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
- [_AM_PROG_TAR([v7])])])
+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+ [_AM_PROG_TAR([v7])])])
_AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_CC],
- [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_CC],
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+ [_AM_DEPENDENCIES(CC)],
+ [define([AC_PROG_CC],
+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+ [_AM_DEPENDENCIES(CXX)],
+ [define([AC_PROG_CXX],
+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
AC_PROVIDE_IFELSE([AC_PROG_OBJC],
- [_AM_DEPENDENCIES(OBJC)],
- [define([AC_PROG_OBJC],
- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+ [_AM_DEPENDENCIES(OBJC)],
+ [define([AC_PROG_OBJC],
+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
-AC_CONFIG_COMMANDS_PRE(dnl
-[m4_provide_if([_AM_COMPILER_EXEEXT],
- [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
])
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-dnl mangled by Autoconf and run in a shell conditional statement.
-m4_define([_AC_COMPILER_EXEEXT],
-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-
# When config.status generates a header, we must update the stamp-h file.
# This file resides in the same directory as the config header
# that is generated. The stamp files are numbered to have different names.
@@ -4220,7 +4182,7 @@
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -4231,14 +4193,7 @@
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
- case $am_aux_dir in
- *\ * | *\ *)
- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
- *)
- install_sh="\${SHELL} $am_aux_dir/install-sh"
- esac
-fi
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
AC_SUBST(install_sh)])
# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
@@ -4264,13 +4219,13 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 4
+# serial 3
# AM_MAKE_INCLUDE()
# -----------------
@@ -4279,7 +4234,7 @@
[am_make=${MAKE-make}
cat > confinc << 'END'
am__doit:
- @echo this is the am__doit target
+ @echo done
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -4289,24 +4244,24 @@
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
-esac
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+ am__include=include
+ am__quote=
+ _am_result=GNU
+fi
# Now try BSD make style include.
if test "$am__include" = "#"; then
echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
+ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+ am__include=.include
+ am__quote="\""
+ _am_result=BSD
+ fi
fi
AC_SUBST([am__include])
AC_SUBST([am__quote])
@@ -4316,14 +4271,14 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 6
+# serial 5
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
@@ -4340,14 +4295,7 @@
AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
AC_REQUIRE_AUX_FILE([missing])dnl
-if test x"${MISSING+set}" != xset; then
- case $am_aux_dir in
- *\ * | *\ *)
- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
- *)
- MISSING="\${SHELL} $am_aux_dir/missing" ;;
- esac
-fi
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
# Use eval to expand $SHELL
if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
@@ -4418,14 +4366,14 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 5
+# serial 4
# AM_SANITY_CHECK
# ---------------
@@ -4434,29 +4382,16 @@
# Just in case
sleep 1
echo timestamp > conftest.file
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name. Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
- *[[\\\"\#\$\&\'\`$am_lf]]*)
- AC_MSG_ERROR([unsafe absolute working directory name]);;
-esac
-case $srcdir in
- *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
-esac
-
# Do `set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
if test "$[*]" = "X"; then
# -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
+ set X `ls -t $srcdir/configure conftest.file`
fi
rm -f conftest.file
if test "$[*]" != "X $srcdir/configure conftest.file" \
@@ -4509,25 +4444,18 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 2
-
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
-# AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Public sister of _AM_SUBST_NOTMAKE.
-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-
# Check how to create a tarball. -*- Autoconf -*-
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
More information about the Tux4kids-commits
mailing list