Index: configure
@@ -17656,8 +17656,8 @@
 
 
 
-ac_save_cflags=$CFLAGS
-ac_save_ldflags=$LDFLAGS
+ac_save_CFLAGS=$CFLAGS
+ac_save_LDFLAGS=$LDFLAGS
 ac_save_libs=$LIBS
 
 use_sound=1
@@ -17676,7 +17676,7 @@
     LDFLAGS="$LDFLAGS -lSDL_mixer"
     LIBS="-lSDL_mixer $LIBS"
 
-            if test $CC = "gcc" || test $CXX = "g++"; then
+            if test $CC = "gcc" || test $CXX = "g++" || test $CXX = "c++"; then
 
        if test "$cross_compiling" = yes; then
   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
@@ -21267,8 +21267,7 @@
 
 rm -f src/main.o
 
-LORDSAWAR_DATADIR="$datadir/lordsawar"
-LORDSAWAR_DATADIR=${LORDSAWAR_DATADIR/'${prefix}'/$prefix}
+eval LORDSAWAR_DATADIR="$datadir/lordsawar"
 
 
 ac_config_files="$ac_config_files dat/Makefile dat/army/Makefile dat/army/default/Makefile dat/army/bigdefault/Makefile dat/tilesets/Makefile dat/tilesets/default/Makefile dat/tilesets/default/misc/Makefile dat/tilesets/bigdefault/Makefile dat/tilesets/bigdefault/misc/Makefile dat/tilesets/stark/Makefile dat/tilesets/stark/misc/Makefile dat/tilesets/bigstark/Makefile dat/tilesets/bigstark/misc/Makefile dat/shield/Makefile dat/shield/default/Makefile dat/shield/plain/Makefile dat/shield/dol/Makefile dat/c itysets/Makefile dat/citysets/default/Makefile dat/citysets/bigdefault/Makefile dat/citysets/dol/Makefile dat/citysets/bigdol/Makefile dat/various/Makefile dat/various/items/Makefile dat/various/editor/Makefile dat/map/Makefile dat/campaign/Makefile dat/music/Makefile dat/glade/Makefile dat/glade/editor/Makefile po/Makefile.in Makefile src/Makefile doc/Makefile help/Makefile help/figures/Makefile src/editor/Makefile src/pbm/Makefile src/gui/Makefile"
