diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-27 12:59:09 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-27 12:59:09 +0000 |
| commit | 94e0b06fca75b5d9a999f7d8bb00f81e6ca30071 (patch) | |
| tree | e5b203cfc888c1aeb99e0a16156755a69f2b8e5c /config_office | |
| parent | fcb2b9cc4c68bbde2f375109562cc803386f622a (diff) | |
INTEGRATION: CWS pmladek05 (1.208.2); FILE MERGED
2007/06/20 10:17:11 pmladek 1.208.2.2: #i75366#
rename the used variable from UNIXFILENAME to a more clear UNIXWRAPPERNAME
2007/06/18 16:02:21 pmladek 1.208.2.1: #i75366#
allow to redefine the UNIX wrapper name in the shared desktop files
Diffstat (limited to 'config_office')
| -rw-r--r-- | config_office/configure.in | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/config_office/configure.in b/config_office/configure.in index 01c1acd3a684..fc66b8c35ef3 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: 2007-06-27 12:11:48 $ +dnl * Date: $Date: 2007-06-27 13:59:09 $ 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.211 $ ) +AC_REVISION( $Revision: 1.212 $ ) AC_PREREQ(2.50) AC_INIT() echo "$@" >config.parms @@ -584,6 +584,12 @@ AC_ARG_WITH(vendor, Usage: --with-vendor="John the Builder" ],,) +AC_ARG_WITH(unix-wrapper, +[ --with-unix-wrapper Redefines the name of the UNIX wrapper that will be used + in the desktop files and in the desktop-integration RPMs. + + Usage: --with-unix-wrapper=ooffice +],,) AC_ARG_WITH(asm-home, [ --with-asm-home For Windows users, please supply the path for the ml.exe assembler. @@ -5265,6 +5271,16 @@ else fi AC_SUBST(OOO_VENDOR) +UNIXWRAPPERNAME= +AC_MSG_CHECKING([for UNIX wrapper name]) +if test -z "$with_unix_wrapper" -o "$with_unix_wrapper" = "no" -o "$with_unix_wrapper" = "yes" ; then + AC_MSG_RESULT([not set]) +else + UNIXWRAPPERNAME="$with_unix_wrapper" + AC_MSG_RESULT([$UNIXWRAPPERNAME]) +fi +AC_SUBST(UNIXWRAPPERNAME) + AC_MSG_CHECKING([whether to statically link to Gtk]) if test -n "$enable_static_gtk" && test "$enable_static_gtk" != "no"; then ENABLE_STATIC_GTK="TRUE" |