Author: cazfi
Date: Sat Dec 12 08:49:53 2015
New Revision: 30948

URL: http://svn.gna.org/viewcvs/freeciv?rev=30948&view=rev
Log:
Only rerun configure when project definition file changes, do not try to 
regenerate it.

See bug #24157

Modified:
    trunk/configure.ac

Modified: trunk/configure.ac
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=30948&r1=30947&r2=30948&view=diff
==============================================================================
--- trunk/configure.ac  (original)
+++ trunk/configure.ac  Sat Dec 12 08:49:53 2015
@@ -186,8 +186,10 @@
 
 AC_ARG_WITH([project-definition],
   AS_HELP_STRING([--with-project-definition=file], [use given project 
definition file]),
-[project_definition="${withval}"],
-[project_definition="${srcdir}/bootstrap/freeciv.project"])
+[project_definition="${withval}"
+ project_definition_dyn_rel="\$(top_builddir)/${withval}"],
+[project_definition="${srcdir}/bootstrap/freeciv.project"
+ project_definition_dyn_rel="\$(top_srcdir)/bootstrap/freeciv.project"])
 
 . ${project_definition}
 
@@ -1397,7 +1399,8 @@
 LDFLAGS="$EXTRA_DEBUG_LDFLAGS $LDFLAGS"
 
 dnl Rebuild 'configure' whenever fc_version changes, if maintainer mode 
enabled.
-AC_SUBST([CONFIGURE_DEPENDENCIES], ["$CONFIGURE_DEPENDENCIES 
\$(top_srcdir)/fc_version \${top_builddir}/${project_definition}"])
+AC_SUBST([CONFIGURE_DEPENDENCIES], ["$CONFIGURE_DEPENDENCIES 
\$(top_srcdir)/fc_version"])
+AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ["${project_definition_dyn_rel}"])
 
 dnl Make sure that fc_config.h changes when ever CPPFLAGS, CFLAGS or CXXFLAGS
 dnl change so everything gets rebuilt. LDFLAGS is not handled here


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to