diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2012-10-25 17:27:43 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-10-31 16:29:12 +0000 |
| commit | 664012b313f3c3cd5666fc6f943fc8152e503e23 (patch) | |
| tree | 97e6b9c1dc080dbdf651f7c907e1ea60a4d7d560 /configure.ac | |
| parent | 2a088faa707657cbeb21c2c7ed2ac201d1318718 (diff) | |
remove GIT_REPO_NAMES (duplicated by GIT_NEEDED_SUBMODULES)
use plain copy instead of git-new-workdir when using --with-linked-git
configure switch (point it to your master copy of the core-repo)
also remove obsolete bin/create_bootstrap_links, bin/mkworkdir and
bin/repo-list[.in]
Change-Id: I37028badf2c46a24a3d628e80476efe4dd365d06
Reviewed-on: https://gerrit.libreoffice.org/912
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 8910055e51e2..d1dc1273c9a7 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,6 @@ save_CXX=$CXX BUILD_TYPE="LibO" SCPDEFS="" -GIT_REPO_NAMES="" GIT_NEEDED_SUBMODULES="" LO_PATH= # used by path_munge to construct a PATH variable @@ -4069,7 +4068,6 @@ if test "$cross_compiling" = "yes"; then rm -rf CONF-FOR-BUILD config_build.mk mkdir CONF-FOR-BUILD tar cf - \ - bin/repo-list.in \ config.guess \ config_host.mk.in \ config_host.mk.source \ @@ -4366,7 +4364,6 @@ if test "$enable_binfilter" = "no"; then else WITH_BINFILTER="YES" BUILD_TYPE="$BUILD_TYPE BINFILTER" - GIT_REPO_NAMES="$GIT_REPO_NAMES binfilter" GIT_NEEDED_SUBMODULES="binfilter $GIT_NEEDED_SUBMODULES" AC_MSG_RESULT([yes]) fi @@ -4377,7 +4374,6 @@ if test "$with_help" != "no" -a $_os != iOS -a $_os != Android; then AC_MSG_RESULT([yes]) BUILD_TYPE="$BUILD_TYPE HELP" SCPDEFS="$SCPDEFS -DWITH_HELP" - GIT_REPO_NAMES="$GIT_REPO_NAMES help" GIT_NEEDED_SUBMODULES="helpcontent2 $GIT_NEEDED_SUBMODULES" else AC_MSG_RESULT([no]) @@ -4390,7 +4386,6 @@ if test -z "$with_myspell_dicts" -o "$with_myspell_dicts" = "yes"; then AC_MSG_RESULT([yes]) WITH_MYSPELL_DICTS=YES BUILD_TYPE="$BUILD_TYPE DICTIONARIES" - GIT_REPO_NAMES="$GIT_REPO_NAMES dictionaries" GIT_NEEDED_SUBMODULES="dictionaries $GIT_NEEDED_SUBMODULES" else AC_MSG_RESULT([no]) @@ -12134,7 +12129,6 @@ if test -z "$WITH_LANG" -o "$WITH_LANG" = "en-US"; then AC_MSG_RESULT([en-US]) else AC_MSG_RESULT([$WITH_LANG]) - GIT_REPO_NAMES="$GIT_REPO_NAMES translations" GIT_NEEDED_SUBMODULES="translations $GIT_NEEDED_SUBMODULES" fi # check that the list is valid @@ -12160,7 +12154,6 @@ test -z "$WITH_LANG" || BUILD_TYPE="$BUILD_TYPE TRANSLATIONS" AC_SUBST(ALL_LANGS) AC_SUBST(WITH_LANG) AC_SUBST(WITH_LANG_LIST) -AC_SUBST(GIT_REPO_NAMES) AC_SUBST(GIT_NEEDED_SUBMODULES) @@ -12180,7 +12173,7 @@ AC_SUBST(WITH_POOR_HELP_LOCALIZATIONS) dnl git-new-workdir dnl =================================================================== if test -n "${GIT_LINK_SRC}"; then - for repo in ${GIT_REPO_NAMES}; do + for repo in ${GIT_NEEDED_SUBMODULES}; do if ! test -d "${GIT_LINK_SRC}"/${repo}; then AC_MSG_ERROR([linked git: required repository does not exist: ${GIT_LINK_SRC}/${repo}]) fi @@ -12807,7 +12800,7 @@ else echo > config_host.mk.last fi -AC_CONFIG_FILES([config_host.mk ooo.lst bin/repo-list]) +AC_CONFIG_FILES([config_host.mk ooo.lst]) AC_OUTPUT # touch the config timestamp file set_soenv.stamp |