Changeset 540 for trunk/configure.ac

Timestamp:

Dec 29, 2007, 3:40:23 AM (13 years ago)

Author:

Peter Johansson

Message:

fixes automatic update of revision and copyright year in --version output. Options --version and --verbose can no be combined to get a slightly more detailed description.

File:

• trunk/configure.ac (modified) (2 diffs)

trunk/configure.ac

@@ -122 +122 @@
 AC_SEARCH_LIBS([svn_client_log3],[svn_client-1],,svn_found="no")
 
+
+# check if svnversion is installed
+have_svnversion="yes"
+AC_PATH_PROG(SVNVERSION, svnversion, have_svnversion="no")
+
+wc_found="no";
+if (test `$SVNVERSION -n '.'` != "exported"); then
+   wc_found="yes";
+fi
+AC_CHECK_FILE("lib/subversion_info.h", info_found="yes", info_found="no")   
+
+# devel version should have svn WC and SVNVERSION installed
+AM_CONDITIONAL(HAVE_SVN_WC, test "$wc_found" = "yes" )
+
+
 AC_CONFIG_FILES([Makefile
                 bin/Makefile
@@ -133 +148 @@
 # used to trigger exit before creation of output
 all_reqs_ok="true"
+
+# 
+if (test "$info_found" = "no" && test "$wc_found" = "no") ; then
+   AC_MSG_WARN([Cannot find sources (lib/subverion_info.h).])
+   if (test "$svnversion" = "no") ; then
+     AC_MSG_WARN([If you grabbed the source from the subversion repository, 
+     the file will be generated automatically. However, svnversion cannot 
+     be found and therefore the file cannot be generated. Please install 
+     svnversion and make sure it is in your search path.])
+   else
+     AC_MSG_WARN([If you grabbed the source from the subversion repository, 
+     the file will be generated automatically. However, the output from 
+     svnversion was incorrect. Either your installation of svnversion is 
+     is not healthy or there is something wrong with the repository.])
+   fi
+   all_reqs_ok="false"
+fi
 
 # Non-existing APR is fatal -- sub-sequent compilation will fail.