[sword-svn] r3317 - trunk

[scribe at crosswire.org]

Author: scribe
Date: 2014-12-29 15:52:06 -0700 (Mon, 29 Dec 2014)
New Revision: 3317

Modified:
   trunk/Makefile.am
   trunk/configure.ac
Log:
Updated autotools make system for better output

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2014-12-24 20:38:32 UTC (rev 3316)
+++ trunk/Makefile.am	2014-12-29 22:52:06 UTC (rev 3317)
@@ -60,18 +60,17 @@
 
 install: install-recursive
 	@echo ""
-	@echo "sword is installed."
+	@echo "SWORD is installed."
 	@echo ""
-	@echo "if this is your first time, you may need a basic global"
-	@echo "configuration file.  one can be generated to $(DESTDIR)$(sysconfdir)/sword.conf"
-	@echo "by typing: \"make install_config\""
+	@echo "If this is your first time, you may need a basic global"
+	@echo "configuration file.  One can be generated to $(DESTDIR)$(sysconfdir)/sword.conf"
+	@echo "by typing: \"sudo make install_config\""
 	@echo ""
-	@echo "modules (Bibles, etc.), may then be unzipped to $(pkgdatadir)/"
+	@echo "Modules (Bibles, etc.), may then be unzipped to $(pkgdatadir)/"
+	@echo "or installed with the command line tool: installmgr"
 	@echo ""
-	@echo "type \"make register\" to help us keep track of how many"
-	@echo "people are using sword."
-	@echo "(you may consider exiting from 'root', first, to make this"
-	@echo "a little more personal)"
+	@echo "Type \"make register\" to help us keep track of how many"
+	@echo "people are using SWORD."
 	@echo ""
 
 
@@ -92,8 +91,14 @@
 	@echo "[Install]" > $(DESTDIR)$(sysconfdir)/sword.conf
 	@echo "DataPath=$(pkgdatadir)/" >> $(DESTDIR)$(sysconfdir)/sword.conf
 	@echo "sword.conf generated"
+	@echo ""
+	@echo "You can now try to install modules with installmgr, e.g.,"
+	@echo "sudo installmgr -sc -r CrossWire -ri CrossWire KJV"
+	@echo ""
+	@echo "Run installmgr with no options for help."
 
 
+
 dist-hook:
 	(cd $(distdir) && ./autogen.sh)
 	rm -r $(distdir)/autom4te.cache

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2014-12-24 20:38:32 UTC (rev 3316)
+++ trunk/configure.ac	2014-12-29 22:52:06 UTC (rev 3317)
@@ -154,8 +154,8 @@
 fi
 
 AS_IF([test "x$with_internalregex" = "xyes"],
-      [have_systemregex="no"],
-      [AC_SEARCH_LIBS(regexec, regex, [have_systemregex="yes"], [have_systemregex="no"])])
+      [have_systemregex="no, using internal regex"],
+      [AC_SEARCH_LIBS(regexec, regex, [have_systemregex="yes"], [have_systemregex="no, using internal regex"])])
 
 AS_IF([test "x$have_systemregex" = "xyes"],
       [with_internalregex="no"
@@ -252,7 +252,7 @@
     if test "$CURL_CONFIG" = "no" ; then
 	echo "*** The curl-config script installed by curl could not be found"
 	echo "*** compiling without libcurl support"
-	with_curl=no
+	with_curl="no, using internal ftplib"
 	with_curl_sftp=no
 	with_internalftplib=yes
     else
@@ -272,7 +272,7 @@
 	fi
     fi
 else
-	with_curl=no;
+	with_curl="no, using internal ftplib"
 	with_curl_sftp=no;
 	with_internalftplib=yes
 fi
@@ -427,26 +427,28 @@
 echo
 echo
 echo "Configuration:"
-echo     "     LIBDIR:           $libdir"
-echo     "     DEBUG:            $enable_debug"
-echo     "     PROFILE:          $enable_profile"
-echo     "     BUILD TESTS:      $enable_tests"
-echo     "     BUILD EXAMPLES:   $enable_examples"
-echo     "     BUILD UTILITIES:  $enable_utilities"
-echo     "     LIBZ:             $with_zlib"
-echo     "     BZIP2:            $with_bzip2"
-echo     "     XZ:               $with_xz"
-echo     "     ICU:              $with_icu"
-echo     "     ICUSWORD:         $with_icusword"
-echo     "     CXX11REGEX:       $with_cxx11regex"
-echo     "     CURL:             $with_curl"
-echo     "     CURL SFTP:        $with_curl_sftp"
-echo     "     INTERNAL FTPLIB:  $with_internalftplib"
-echo     "     INTERNAL REGEX:   $with_internalregex"
-echo     "     CLUCENE:          $with_clucene"
-echo     "     XAPIAN:           $with_xapian"
-echo
-echo
+echo     ""
+echo     " Settings:"
+echo     "     LIBDIR:               $libdir"
+echo     "     DEBUG:                $enable_debug"
+echo     "     PROFILE:              $enable_profile"
+echo     "     BUILD TESTS:          $enable_tests"
+echo     "     BUILD EXAMPLES:       $enable_examples"
+echo     "     BUILD UTILITIES:      $enable_utilities"
+echo     ""
+echo     " Dependencies for standard use:"
+echo     "     REGEX:                $have_systemregex"
+echo     "     ZLIB:                 $with_zlib"
+echo     "     LIBICU:               $with_icu"
+echo     "     LIBCURL:              $with_curl"
+echo     "     CLUCENE-CORE:         $with_clucene"
+echo     ""
+echo     " Optional / Experimental:"
+echo     "     LIBCURL SFTP:         $with_curl_sftp"
+echo     "     BZIP2:                $with_bzip2"
+echo     "     XZ:                   $with_xz"
+echo     "     ICUSWORD:             $with_icusword"
+echo     "     CXX11REGEX:           $with_cxx11regex"
+echo     "     XAPIAN-CORE:          $with_xapian"
 
 
-