diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2009-04-23 07:55:31 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2009-04-23 07:55:31 +0000 |
| commit | 3fee6327319a516b69b8d026888fda077250c34e (patch) | |
| tree | 12f95d542bc58f50d35ff59d3d623d025e24050d | |
| parent | - Update to 0.19 (diff) | |
Allow compilation without gnome.
Submitted by: Stefan Thurner <thurners@nicsys.de>
| -rw-r--r-- | editors/openoffice-3-devel/files/Makefile.knobs | 10 | ||||
| -rw-r--r-- | editors/openoffice.org-3-RC/files/Makefile.knobs | 10 | ||||
| -rw-r--r-- | editors/openoffice.org-3-devel/files/Makefile.knobs | 10 |
3 files changed, 15 insertions, 15 deletions
diff --git a/editors/openoffice-3-devel/files/Makefile.knobs b/editors/openoffice-3-devel/files/Makefile.knobs index e601e4651f61..849e2e5c6e01 100644 --- a/editors/openoffice-3-devel/files/Makefile.knobs +++ b/editors/openoffice-3-devel/files/Makefile.knobs @@ -26,10 +26,10 @@ CONFIGURE_ARGS+= --disable-mozilla CONFIGURE_ARGS+= --enable-build-mozilla .endif -.if defined(WITHOUT_GNOMEVFS) -CONFIGURE_ARGS+= --disable-gnome-vfs +.if defined(WITHOUT_GNOME) +CONFIGURE_ARGS+= --disable-gconf --disable-gnome-vfs .else -USE_GNOME+= gnomevfs2 +USE_GNOME+= gconf2 gnomevfs2 .endif .if defined(WITH_EVOLUTION2) @@ -72,10 +72,10 @@ pre-fetch: @${ECHO} "You can compile OOo without Mozilla connectivity with" @${ECHO} "make -DWITHOUT_MOZILLA" .endif -.if !defined(WITHOUT_GNOMEVFS) +.if !defined(WITHOUT_GNOME) @${ECHO} @${ECHO} "You can compile OOo without gnome VFS support with" - @${ECHO} "make -DWITHOUT_GNOMEVFS" + @${ECHO} "make -DWITHOUT_GNOME" .endif .if !defined(WITH_SYSTEM_ICU) @${ECHO} diff --git a/editors/openoffice.org-3-RC/files/Makefile.knobs b/editors/openoffice.org-3-RC/files/Makefile.knobs index c1a56b9ed2a3..e1053db6682d 100644 --- a/editors/openoffice.org-3-RC/files/Makefile.knobs +++ b/editors/openoffice.org-3-RC/files/Makefile.knobs @@ -23,10 +23,10 @@ CONFIGURE_ARGS+= --disable-mozilla CONFIGURE_ARGS+= --enable-build-mozilla .endif -.if defined(WITHOUT_GNOMEVFS) -CONFIGURE_ARGS+= --disable-gnome-vfs +.if defined(WITHOUT_GNOME) +CONFIGURE_ARGS+= --disable-gconf --disable-gnome-vfs .else -USE_GNOME+= gnomevfs2 +USE_GNOME+= gconf2 gnomevfs2 .endif .if defined(WITH_EVOLUTION2) @@ -69,10 +69,10 @@ pre-fetch: @${ECHO} "You can compile OOo without Mozilla connectivity with" @${ECHO} "make -DWITHOUT_MOZILLA" .endif -.if !defined(WITHOUT_GNOMEVFS) +.if !defined(WITHOUT_GNOME) @${ECHO} @${ECHO} "You can compile OOo without gnome VFS support with" - @${ECHO} "make -DWITHOUT_GNOMEVFS" + @${ECHO} "make -DWITHOUT_GNOME" .endif .if !defined(WITH_SYSTEM_ICU) @${ECHO} diff --git a/editors/openoffice.org-3-devel/files/Makefile.knobs b/editors/openoffice.org-3-devel/files/Makefile.knobs index e601e4651f61..849e2e5c6e01 100644 --- a/editors/openoffice.org-3-devel/files/Makefile.knobs +++ b/editors/openoffice.org-3-devel/files/Makefile.knobs @@ -26,10 +26,10 @@ CONFIGURE_ARGS+= --disable-mozilla CONFIGURE_ARGS+= --enable-build-mozilla .endif -.if defined(WITHOUT_GNOMEVFS) -CONFIGURE_ARGS+= --disable-gnome-vfs +.if defined(WITHOUT_GNOME) +CONFIGURE_ARGS+= --disable-gconf --disable-gnome-vfs .else -USE_GNOME+= gnomevfs2 +USE_GNOME+= gconf2 gnomevfs2 .endif .if defined(WITH_EVOLUTION2) @@ -72,10 +72,10 @@ pre-fetch: @${ECHO} "You can compile OOo without Mozilla connectivity with" @${ECHO} "make -DWITHOUT_MOZILLA" .endif -.if !defined(WITHOUT_GNOMEVFS) +.if !defined(WITHOUT_GNOME) @${ECHO} @${ECHO} "You can compile OOo without gnome VFS support with" - @${ECHO} "make -DWITHOUT_GNOMEVFS" + @${ECHO} "make -DWITHOUT_GNOME" .endif .if !defined(WITH_SYSTEM_ICU) @${ECHO} |