Imported Upstream version 1.0.10

[platform/upstream/fribidi.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 13bfa8b..c9bb466 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl   FRIBIDI_BINARY_AGE = FRIBIDI_INTERFACE_AGE = 0;
 dnl
 m4_define(fribidi_major_version, 1)dnl
 m4_define(fribidi_minor_version, 0)dnl
-m4_define(fribidi_micro_version, 2)dnl
+m4_define(fribidi_micro_version, 10)dnl
 m4_define(fribidi_interface_version, 4)dnl
 m4_define(fribidi_interface_age, 0)dnl
 m4_define(fribidi_binary_age, 4)dnl
@@ -38,7 +38,7 @@ AC_CONFIG_SRCDIR([fribidi.pc.in])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([1.11.1 gnits dist-bzip2 no-dist-gzip -Wall no-define])
+AM_INIT_AUTOMAKE([1.11.1 gnits dist-xz no-dist-gzip -Wall no-define])
 AM_SILENT_RULES([yes])
 
 AM_PROG_AR
@@ -147,18 +147,12 @@ if test x$enable_deprecated = xno; then
                  [Don not build deprecated functionality])
 fi
 
-# --disable-docs
-AC_ARG_ENABLE(docs,
-             AC_HELP_STRING([--disable-docs],
-                            [disable building documentation]),
-                            [], [enable_docs=yes])
-if test x$enable_docs = xyes; then
-       AC_CHECK_PROGS([C2MAN], [c2man])
-       if test -z "$C2MAN"; then
-               AC_MSG_ERROR([c2man is required to build documentation])
-       fi
+# define FRIBIDI_LIB_STATIC if in static mode
+if test "$enable_static" = "yes" ; then
+       FRIBIDI_CPPFLAGS="-DFRIBIDI_LIB_STATIC"
 fi
-AM_CONDITIONAL([FRIBIDI_ENABLE_DOC], [test -n "$C2MAN"])
+AC_SUBST(FRIBIDI_CPPFLAGS)
+
 
 # Generate output
 AC_CONFIG_FILES([fribidi.pc