diff options
| author | behdad <behdad> | 2002-07-22 19:38:53 +0000 |
|---|---|---|
| committer | behdad <behdad> | 2002-07-22 19:38:53 +0000 |
| commit | f2c671b9c60bd407f362fa0154933a3e4c61932a (patch) | |
| tree | 84d4795f3f403872d3ea0d1223e7cef987d7af85 | |
| parent | 9abcd976ed3bb09d185c148432c9f8ca1c6edf8b (diff) | |
Small change.
| -rw-r--r-- | configure.in | 28 | ||||
| -rw-r--r-- | fribidi.c | 2 | ||||
| -rw-r--r-- | fribidi_config.h.in | 4 |
3 files changed, 13 insertions, 21 deletions
diff --git a/configure.in b/configure.in index 8516f83..78992a9 100644 --- a/configure.in +++ b/configure.in @@ -105,49 +105,41 @@ dnl --enable-debug AC_ARG_ENABLE(debug, dnl [ --enable-debug turn debugging information on [default=no]], [case "${enableval}" in - yes) debug=true ;; - no) debug=false ;; + yes) AC_DEFINE(DEBUG) ;; + no) ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;; -esac],[debug=false]) -if test x"$debug" = xtrue; then - AC_DEFINE(DEBUG) -fi +esac]) dnl --enable-malloc AC_ARG_ENABLE(malloc, dnl [ --enable-malloc do not allocate chunks of memory [default=no]], [case "${enableval}" in - yes) malloc=true ;; - no) malloc=false ;; + yes) AC_DEFINE(USE_SIMPLE_MALLOC) ;; + no) ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-malloc) ;; -esac],[malloc=false]) -if test x"$malloc" = xtrue; then - AC_DEFINE(USE_SIMPLE_MALLOC) -fi +esac]) dnl --enable-memopt AC_ARG_ENABLE(memopt, dnl [ --enable-memopt optimize for memory usage [default=no]], [case "${enableval}" in - yes) memopt=true ;; + yes) AC_DEFINE(MEM_OPTIMIZED) + memopt=true ;; no) memopt=false ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-memopt) ;; esac],[memopt=false]) -if test x"$memopt" = xtrue; then - AC_DEFINE(MEM_OPTIMIZED) -fi dnl --without-charsets AC_ARG_WITH(charsets, dnl [ --without-charsets exclude character set converters from library causes command-line tool to use iconv], [case "${withval}" in - yes) charsets=true ;; + yes) AC_DEFINE(FRIBIDI_NO_CHARSETS) + charsets=true ;; no) charsets=false ;; *) AC_MSG_ERROR(bad value ${withval} for --without-charsets) ;; esac],[charsets=true]) if test x"$charsets" = xfalse; then - AC_DEFINE(FRIBIDI_NO_CHARSETS) FRIBIDI_NO_CHARSETS=1 else FRIBIDI_NO_CHARSETS=0 @@ -1382,7 +1382,7 @@ fribidi_log2vis_get_embedding_levels (FriBidiEnv *fribidienv, const char *fribidi_version_info = FRIBIDI_PACKAGE " " FRIBIDI_VERSION "\n" - "interface version " FRIBIDI_INTERFACE_VERSION_STR "\n" + "interface version " TOSTR(FRIBIDI_INTERFACE_VERSION) "\n" "Unicode version " FRIBIDI_UNICODE_VERSION "\n" "\n" "Copyright (C) 2002 FriBidi Project (http://fribidi.sf.net/).\n" diff --git a/fribidi_config.h.in b/fribidi_config.h.in index 2fc9b53..a5876cc 100644 --- a/fribidi_config.h.in +++ b/fribidi_config.h.in @@ -4,9 +4,8 @@ #define FRIBIDI_VERSION "@FRIBIDI_VERSION@" #define FRIBIDI_MAJOR_VERSION @FRIBIDI_MAJOR_VERSION@ #define FRIBIDI_MINOR_VERSION @FRIBIDI_MINOR_VERSION@ -#define FRIBIDI_MICRO_VERSION @FRIBIDI_MICRO_VERSION@ +#define FRIBIDI_MICRO_VERSION_STR "@FRIBIDI_MICRO_VERSION@" #define FRIBIDI_INTERFACE_VERSION @FRIBIDI_INTERFACE_VERSION@ -#define FRIBIDI_INTERFACE_VERSION_STR "@FRIBIDI_INTERFACE_VERSION@" #if @FRIBIDI_NO_CHARSETS@ #define FRIBIDI_NO_CHARSETS 1 @@ -14,3 +13,4 @@ #undef FRIBIDI_NO_CHARSETS #endif +#define TOSTR(x) #x |