diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-10-11 12:55:26 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-10-11 12:55:26 +0000 |
| commit | ae0db182e82c4df9ba148c7a4f60259fa69743e0 (patch) | |
| tree | 08dadd862769f3c074cb3057feec0e509d1b40ec /config_office | |
| parent | a132879ecf4fe550cd09b99468a8fe88068cd071 (diff) | |
INTEGRATION: CWS configure1 (1.69.2); FILE MERGED
2004/09/21 12:02:58 cmc 1.69.2.1: #i34439# a full stop instead of a comma on configure.in for the expat option
Diffstat (limited to 'config_office')
| -rw-r--r-- | config_office/configure.in | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/config_office/configure.in b/config_office/configure.in index 9d98448142a5..effe2f22476e 100644 --- a/config_office/configure.in +++ b/config_office/configure.in @@ -3,7 +3,7 @@ dnl * vi:set sw=3 ts=3 et: dnl * dnl * Name: configure.in dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland -dnl * Date: $Date: 2004-10-11 13:48:26 $ +dnl * Date: $Date: 2004-10-11 13:55:26 $ dnl * dnl * Desc: This file serves as input for the GNU autoconf package dnl * in order to create a configure script. @@ -12,7 +12,7 @@ dnl * necessary to build OpenOffice.org dnl * dnl * dnl ******************************************************************/ -AC_REVISION( $Revision: 1.70 $ ) +AC_REVISION( $Revision: 1.71 $ ) AC_PREREQ(2.50) AC_INIT() echo "$@" >config.parms @@ -1729,7 +1729,7 @@ AC_MSG_CHECKING([which expat to use]) if test -n "$with_system_expat"; then AC_MSG_RESULT([external]) SYSTEM_EXPAT=YES - AC_CHECK_HEADER(expat.h, []. + AC_CHECK_HEADER(expat.h, [], [AC_MSG_ERROR(expat.h not found. install expat)], []) # TODO: add lib check here else @@ -2032,18 +2032,22 @@ AC_MSG_CHECKING([which neon to use]) if test -z "$without_system_neon"; then if test -n "$with_system_neon" -o -n "$with_system_libs"; then AC_MSG_RESULT([external]) - AC_PATH_PROG(NEON_CONFIG, neon-config, no) - AC_MSG_CHECKING([whether neon version is 0.23.x]) - # 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 - AC_MSG_RESULT([yes]) - SYSTEM_NEON=YES - NEON_CFLAGS="$($NEON_CONFIG --cflags) -DSYSTEM_NEON -DUSE_DAV_LOCKS=1" - NEON_LIBS=$($NEON_CONFIG --libs) + AC_PATH_PROG(NEON_CONFIG, neon-config) + if test -z "$NEON_CONFIG"; then + AC_MSG_ERROR([no neon found in \$PATH, install neon]) else - AC_MSG_ERROR([no. neon 0.24.x is API-incompatible. use 0.23.x]) + AC_MSG_CHECKING([whether neon version is 0.23.x]) + # 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 + AC_MSG_RESULT([yes]) + SYSTEM_NEON=YES + NEON_CFLAGS="$($NEON_CONFIG --cflags) -DSYSTEM_NEON -DUSE_DAV_LOCKS=1" + NEON_LIBS=$($NEON_CONFIG --libs) + else + AC_MSG_ERROR([no. neon 0.24.x is API-incompatible. use 0.23.x]) + fi fi else AC_MSG_RESULT([internal]) |