[sword-svn] r2486 - in trunk: . include

[scribe at crosswire.org]

Author: scribe
Date: 2009-12-06 21:02:43 -0700 (Sun, 06 Dec 2009)
New Revision: 2486

Modified:
   trunk/configure.ac
   trunk/include/config.h
   trunk/sword.pc.in
   trunk/usrinst.sh
Log:
changed default configure values


Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-12-05 07:24:16 UTC (rev 2485)
+++ trunk/configure.ac	2009-12-07 04:02:43 UTC (rev 2486)
@@ -41,7 +41,7 @@
 AC_ARG_WITH(zlib,
 	AC_HELP_STRING([--with-zlib],[allow zlib compressed modules (default=yes)]),,with_zlib=yes)
 AC_ARG_WITH(icu,
-	AC_HELP_STRING([--with-icu],[use ICU for unicode (default=no)]),,with_icu=no)
+	AC_HELP_STRING([--with-icu],[use ICU for unicode (default=yes)]),,with_icu=yes)
 AC_ARG_WITH(icusword,
 	AC_HELP_STRING([--with-icusword],[use custom SWORD ICU (default=no)]),,with_icusword=no)
 AC_ARG_WITH(conf,
@@ -70,7 +70,7 @@
 AC_ARG_ENABLE(profilefn,
 	AC_HELP_STRING([--enable-profilefn],[allow functioncheck profiling (default=no)]),,enable_profilefn=no)
 AC_ARG_ENABLE(tests,
-	AC_HELP_STRING([--enable-tests],[build test programs (default=no)]),,enable_tests=no)
+	AC_HELP_STRING([--enable-tests],[build test programs (default=yes)]),,enable_tests=yes)
 AC_ARG_ENABLE(utilities,
 	AC_HELP_STRING([--enable-utilities],[build utilities (default=yes)]),,enable_utilities=yes)
 AC_ARG_ENABLE(examples,
@@ -315,6 +315,9 @@
 COLORED_ECHO([Configuration:])
 COLORED_ECHO([    DEBUG:            $enable_debug])
 COLORED_ECHO([    PROFILE:          $enable_profile])
+COLORED_ECHO([    BUILD TESTS:      $enable_tests])
+COLORED_ECHO([    BUILD EXAMPLES:   $enable_examples])
+COLORED_ECHO([    BUILD UTILITIES:  $enable_utilities])
 COLORED_ECHO([    LIBZ:             $with_zlib])
 COLORED_ECHO([    ICU:              $with_icu])
 COLORED_ECHO([    ICUSWORD:         $with_icusword])

Modified: trunk/include/config.h
===================================================================
--- trunk/include/config.h	2009-12-05 07:24:16 UTC (rev 2485)
+++ trunk/include/config.h	2009-12-07 04:02:43 UTC (rev 2486)
@@ -59,9 +59,6 @@
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "sword"
 
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
 /* Define to the version of this package. */
 #define PACKAGE_VERSION "1.6.0"
 

Modified: trunk/sword.pc.in
===================================================================
--- trunk/sword.pc.in	2009-12-05 07:24:16 UTC (rev 2485)
+++ trunk/sword.pc.in	2009-12-07 04:02:43 UTC (rev 2486)
@@ -5,7 +5,7 @@
 
 
 Name: SWORD
-Description: Biblical Text Engine
+Description: Biblical Text Research Engine
 Version: @VERSION@
 @SHAREDLIB_TRUE at Libs: -L${libdir} -lsword
 @SHAREDLIB_FALSE at Libs: -L${libdir} -lsword -lz @CURL_LIBS@ @CLUCENE_LIBS@ @ICU_LIBS@ @ICU_IOLIBS@

Modified: trunk/usrinst.sh
===================================================================
--- trunk/usrinst.sh	2009-12-05 07:24:16 UTC (rev 2485)
+++ trunk/usrinst.sh	2009-12-07 04:02:43 UTC (rev 2486)
@@ -28,12 +28,12 @@
 OPTIONS="--enable-debug $OPTIONS"
 #OPTIONS="--enable-profile $OPTIONS"
 
-OPTIONS="--with-icu $OPTIONS"
+#OPTIONS="--without-icu $OPTIONS"
 #OPTIONS="--with-icusword $OPTIONS"
 #OPTIONS="--without-clucene $OPTIONS"
 #OPTIONS="--without-curl $OPTIONS"
 
-OPTIONS="--enable-tests $OPTIONS"
+#OPTIONS="--disable-tests $OPTIONS"
 #OPTIONS="--disable-utilities $OPTIONS"