diff options
| author | Daniel Glassey <wdg@debian.org> | 2015-09-07 11:14:57 +0100 |
|---|---|---|
| committer | Daniel Glassey <wdg@debian.org> | 2015-09-07 11:14:57 +0100 |
| commit | 7b6c8b08e9d29332dcd0a1029e7421334bfb6f61 (patch) | |
| tree | dc263ee8b6c923716a8e0fed64756b7af1238dc7 /configure.ac | |
| parent | 7a00574163029c0c2b649878c95d5acbd083564a (diff) | |
Imported Upstream version 1.7.3+dfsg
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/configure.ac b/configure.ac index bb687cb..e5568ea 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ # Version change: Change line 8 only ! # Change it immediately after a release -AC_INIT(sword, 1.7.2, sword-bugs@crosswire.org, sword, http://crosswire.org/sword) +AC_INIT(sword, 1.7.3, sword-bugs@crosswire.org, sword, http://crosswire.org/sword) AC_CONFIG_SRCDIR(sword.bmp) AC_PREREQ(2.52) AC_REVISION($Revision: 1.45 $) @@ -172,33 +172,22 @@ fi # --------------------------------------------------------------------- # Find ICU tools # --------------------------------------------------------------------- -ICU_VER= ICU_LIBS= ICU_IOLIBS= if test x$with_icu = xyes; then AC_PATH_PROG(ICU_CONFIG, icu-config, no) -# The icu-config script was new in icu 2.2 - if test "$ICU_CONFIG" = "no" ; then - echo "*** The icu-config script installed by icu could not be found" - echo "*** continuing anyway and assuming 2.1 or earlier" - ICU_VER="2.1" - ICU_LIBS="-licui18n -licuuc -licudata" - ICU_IOLIBS="-lustdio" - else - ICU_VER=`$ICU_CONFIG --version` + if test "$ICU_CONFIG" != "no" ; then ICU_LIBS=`$ICU_CONFIG --ldflags` - #ICU_IOLIBS=`if test $(echo "$ICU_VER >= 3.0"|bc) -eq 1; then $ICU_CONFIG --ldflags-icuio; else $ICU_CONFIG --ldflags-ustdio; fi;` ICU_IOLIBS=`$ICU_CONFIG --ldflags-icuio` + with_icu=yes + LIBS="$LIBS $ICU_LIBS $ICU_IOLIBS" + AM_CXXFLAGS="$AM_CXXFLAGS -D_ICU_" + AM_CFLAGS="$AM_CFLAGS -D_ICU_" + else + echo "*** The icu-config script installed by icu could not be found" + echo "*** compiling without ICU support" + with_icu=no fi - AM_CXXFLAGS="$AM_CXXFLAGS -D_ICU_" - AM_CFLAGS="$AM_CFLAGS -D_ICU_" -fi - -if test "x$ICU_LIBS" != x; then - with_icu=yes - LIBS="$LIBS $ICU_LIBS $ICU_IOLIBS" -else - with_icu=no fi @@ -338,7 +327,6 @@ AC_SUBST(with_icusword) AC_SUBST(with_conf) AC_SUBST(dir_confdef) AC_SUBST(CC) -AC_SUBST(ICU_VER) AC_SUBST(enable_debug) AC_SUBST(enable_profile) @@ -384,7 +372,7 @@ AM_CONDITIONAL(BUILDEXAMPLES, test x$enable_examples = xyes) # --------------------------------------------------------------------- # Final output # --------------------------------------------------------------------- -AC_CONFIG_FILES(Makefile lib/Makefile tests/Makefile tests/cppunit/Makefile utilities/Makefile examples/Makefile examples/cmdline/Makefile utilities/diatheke/Makefile sword.pc include/swversion.h sword.spec) +AC_CONFIG_FILES(Makefile lib/Makefile tests/Makefile tests/cppunit/Makefile utilities/Makefile examples/Makefile examples/cmdline/Makefile examples/tasks/Makefile utilities/diatheke/Makefile sword.pc include/swversion.h sword.spec) AC_OUTPUT echo |