[Tux4kids-commits] r406 - in tuxmath/trunk: . src

[dbruce-guest at alioth.debian.org]

Author: dbruce-guest
Date: 2008-01-02 22:20:20 +0000 (Wed, 02 Jan 2008)
New Revision: 406

Modified:
   tuxmath/trunk/Makefile.am
   tuxmath/trunk/configure
   tuxmath/trunk/configure.ac
   tuxmath/trunk/src/mathcards.c
Log:
Modified Makefile.am to make output more informative if NSIS not found.


Modified: tuxmath/trunk/Makefile.am
===================================================================
--- tuxmath/trunk/Makefile.am	2008-01-02 18:11:08 UTC (rev 405)
+++ tuxmath/trunk/Makefile.am	2008-01-02 22:20:20 UTC (rev 406)
@@ -21,9 +21,9 @@
 
 ## These are defined in configure.ac:
 MAKENSIS=@NSIS@
+NSIS_FOUND=@NSIS_FOUND@
 NSI_INSTALL_DIR=@NSI_INSTALL_DIR@
 NSI_DLL_DIR=@NSI_DLL_DIR@
-NSI_TUXMATH_CONF_DIR=@NSI_TUXMATH_CONF_DIR@
 
 NSI_TEMP_INSTALL_DIR=$(abs_top_builddir)/_instw32
 
@@ -79,29 +79,16 @@
 ## copy needed dll files into NSI_INSTALL_DIR:
 	-cp $(NSI_DLL_DIR)/*.dll $(top_builddir)/$(NSI_INSTALL_DIR);
 
-##install-nsi-local: all
-##	$(INSTALL) -d $(top_srcdir)/$(NSI_INSTALL_DIR)/data;
-##	(cd $(top_srcdir)/$(PACKAGE_DATA_DIR) ; \
-##  tar cf - --exclude "Makefile*" --exclude "*~" --exclude "*.svn*" * ) \
-##  | ( cd $(top_srcdir)/$(NSI_INSTALL_DIR)/$(PACKAGE_DATA_DIR); \
-##  tar xf -);
-##	cp $(NSI_DLL_DIR)/*.dll $(top_srcdir)/$(NSI_INSTALL_DIR);
-##	cp src/TuxMath.exe $(top_srcdir)/$(NSI_INSTALL_DIR);
-##
-##if NSI_USE_TUXMATH_CONF
-##	$(INSTALL) -d $(top_srcdir)/$(NSI_INSTALL_DIR)/TuxMathConfig ;
-##	cp $(NSI_TUXMATH_CONF_DIR)/*.*  ##$(top_srcdir)/$(NSI_INSTALL_DIR)/TuxMathConfig ;
-##endif 
 
 install-nsi-am: install-nsi-local
 
 
 nsis: install-nsi-local
-#if NSI_USE_TUXMATH_CONF
-#	$(MAKENSIS) -NOCD nsis/tuxmath_with_conf.nsi
-#else
-	$(MAKENSIS) -NOCD nsis/tuxmath.nsi
-#endif
+	if test ["x$(MAKENSIS)"="x"]; then \
+	  echo "\nNSIS program not found!\n"; \
+	else \
+	  $(MAKENSIS) -NOCD nsis/tuxmath.nsi; \
+	fi
 
 clean-local:
 	@$(NORMAL_CLEAN)

Modified: tuxmath/trunk/configure
===================================================================
--- tuxmath/trunk/configure	2008-01-02 18:11:08 UTC (rev 405)
+++ tuxmath/trunk/configure	2008-01-02 22:20:20 UTC (rev 406)
@@ -17015,7 +17015,6 @@
 done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_path_NSIS" && ac_cv_path_NSIS="no"
   ;;
 esac
 fi
@@ -17030,7 +17029,6 @@
 
 
 
-
 # --------------------------------------------------------------------------
 # Support for old Qt-based config prog - get rid of this soon:
 # --------------------------------------------------------------------------

Modified: tuxmath/trunk/configure.ac
===================================================================
--- tuxmath/trunk/configure.ac	2008-01-02 18:11:08 UTC (rev 405)
+++ tuxmath/trunk/configure.ac	2008-01-02 22:20:20 UTC (rev 406)
@@ -173,9 +173,8 @@
 fi
 AC_SUBST(NSI_DLL_DIR)
 
-AC_PATH_PROG(NSIS, makensis, no, [$PATH])
+AC_PATH_PROG(NSIS, makensis, [], [$PATH])
 
-
 # --------------------------------------------------------------------------
 # Support for old Qt-based config prog - get rid of this soon:
 # --------------------------------------------------------------------------

Modified: tuxmath/trunk/src/mathcards.c
===================================================================
--- tuxmath/trunk/src/mathcards.c	2008-01-02 18:11:08 UTC (rev 405)
+++ tuxmath/trunk/src/mathcards.c	2008-01-02 22:20:20 UTC (rev 406)
@@ -17,7 +17,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <sys/time.h>
 
 #include "mathcards.h"