diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-10-14 09:24:33 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-10-14 09:24:33 +0000 |
| commit | 0182a3c0b41062dfdcb2e0a68140f22729b81789 (patch) | |
| tree | 404f4d96833ae34b83c00069cda1e971b260638b /config_office | |
| parent | 1de5698939e9c52ba663cb1037fb6000642fd9b4 (diff) | |
#i10000#: regenerate configure from comfigure.in rev 1.72
Diffstat (limited to 'config_office')
| -rwxr-xr-x | config_office/configure | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/config_office/configure b/config_office/configure index 4fa225734bfe..e639979ab317 100755 --- a/config_office/configure +++ b/config_office/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.66.8.5 . +# From configure.in Revision: 1.72 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59. # @@ -7605,8 +7605,9 @@ echo "${ECHO_T}$ac_cv_header_expat_h" >&6 fi if test $ac_cv_header_expat_h = yes; then - . - { { echo "$as_me:$LINENO: error: expat.h not found. install expat" >&5 + : +else + { { echo "$as_me:$LINENO: error: expat.h not found. install expat" >&5 echo "$as_me: error: expat.h not found. install expat" >&2;} { (exit 1); exit 1; }; } fi @@ -10916,7 +10917,6 @@ do done done - test -z "$ac_cv_path_NEON_CONFIG" && ac_cv_path_NEON_CONFIG="no" ;; esac fi @@ -10930,21 +10930,27 @@ else echo "${ECHO_T}no" >&6 fi - echo "$as_me:$LINENO: checking whether neon version is 0.23.x" >&5 + if test -z "$NEON_CONFIG"; then + { { echo "$as_me:$LINENO: error: no neon found in \$PATH, install neon" >&5 +echo "$as_me: error: no neon found in \$PATH, install neon" >&2;} + { (exit 1); exit 1; }; } + else + echo "$as_me:$LINENO: checking whether neon version is 0.23.x" >&5 echo $ECHO_N "checking whether neon version is 0.23.x... $ECHO_C" >&6 - # check whether we have 0.23.x. 0.24.x is API-incompatible.... - NEON_VER=$($NEON_CONFIG --version | $AWK '{print $2}' \ - | cut -d"." -f1,2) - if test "$NEON_VER" = "0.23"; then - echo "$as_me:$LINENO: result: yes" >&5 + # check whether we have 0.23.x. 0.24.x is API-incompatible.... + NEON_VER=$($NEON_CONFIG --version | $AWK '{print $2}' \ + | cut -d"." -f1,2) + if test "$NEON_VER" = "0.23"; then + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 - SYSTEM_NEON=YES - NEON_CFLAGS="$($NEON_CONFIG --cflags) -DSYSTEM_NEON -DUSE_DAV_LOCKS=1" - NEON_LIBS=$($NEON_CONFIG --libs) - else - { { echo "$as_me:$LINENO: error: no. neon 0.24.x is API-incompatible. use 0.23.x" >&5 + SYSTEM_NEON=YES + NEON_CFLAGS="$($NEON_CONFIG --cflags) -DSYSTEM_NEON -DUSE_DAV_LOCKS=1" + NEON_LIBS=$($NEON_CONFIG --libs) + else + { { echo "$as_me:$LINENO: error: no. neon 0.24.x is API-incompatible. use 0.23.x" >&5 echo "$as_me: error: no. neon 0.24.x is API-incompatible. use 0.23.x" >&2;} { (exit 1); exit 1; }; } + fi fi else echo "$as_me:$LINENO: result: internal" >&5 |