[Libreoffice-commits] .: bin/setup.in bin/unpack configure.in download.in

[Petr Mladek]

 bin/setup.in |    1 -
 bin/unpack   |    9 ---------
 configure.in |   19 -------------------
 download.in  |    7 -------
 4 files changed, 36 deletions(-)

New commits:
commit 70217709cee6b13489ce90faa9ed7050daf141e9
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Mar 30 21:08:12 2011 +0200

    bin obsolete download/unpack support for CT2N extension
    
    is in plain sources now

diff --git a/bin/setup.in b/bin/setup.in
index 305e1f1..9d80b56 100755
--- a/bin/setup.in
+++ b/bin/setup.in
@@ -41,7 +41,6 @@ LIGHTPROOF_FILENAMES='@LIGHTPROOF_FILENAMES@'
 NUMBERTEXT_EXTENSION='@NUMBERTEXT_EXTENSION@'
 HUNART_EXTENSION='@HUNART_EXTENSION@'
 TYPO_EXTENSION='@TYPO_EXTENSION@'
-CT2N_EXTENSION='@CT2N_EXTENSION@'
 WATCH_WINDOW_EXTENSION='@WATCH_WINDOW_EXTENSION@'
 DIAGRAM_EXTENSION='@DIAGRAM_EXTENSION@'
 VALIDATOR_EXTENSION='@VALIDATOR_EXTENSION@'
diff --git a/bin/unpack b/bin/unpack
index 3063efe..2023326 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -828,15 +828,6 @@ if test "x$TYPO_EXTENSION" != "x"; then
     cp $SRCDIR/$TYPO_EXTENSION $OOBUILDDIR/extras/source/extensions/typo.oxt || exit 1
 fi
 
-if test "x$CT2N_EXTENSION" != "x"; then
-    check_file $SRCDIR/$CT2N_EXTENSION
-    echo "Linking ConvertTextToNumber extension sources to the expected name"
-    md5=`md5sum $SRCDIR/$CT2N_EXTENSION | cut -d' ' -f1`
-    ln -sf $SRCDIR/$CT2N_EXTENSION $SRCDIR/$md5-$CT2N_EXTENSION || exit 1
-    # create empty module dir so bin/applyflags could force applying the build patches
-    mkdir -p $OOBUILDDIR/ct2n
-fi
-
 if test "x$WATCH_WINDOW_EXTENSION" != "x"; then
     check_file $SRCDIR/$WATCH_WINDOW_EXTENSION
     echo "Copying Watch Window extension into the tree"
diff --git a/configure.in b/configure.in
index d15bca2..bc01c63 100755
--- a/configure.in
+++ b/configure.in
@@ -62,11 +62,6 @@ AC_ARG_ENABLE(ext-barcode,
   --enable-ext-barcode    Download and integrate Barcode extension.],
 ,)
 
-AC_ARG_ENABLE(ext-ct2n,
-[
-  --enable-ext-ct2n       Download and integrate ConvertTextToNumber extension.],
-,)
-
 AC_ARG_ENABLE(ext-diagram,
 [
   --enable-ext-diagram    Download and integrate Diagram extension.],
@@ -1505,20 +1500,6 @@ else
 fi
 AC_SUBST(SUNTEMPLATES_LANG)
 
-AC_MSG_CHECKING([whether to include ConvertTextToNumber extension])
-if test "$enable_extensions" != "no" ; then
-    if test "z$enable_ext_ct2n" = "zyes" ; then
-        CT2N_EXTENSION="ConvertTextToNumber-1.3.2.oxt"
-        WITH_CT2N=YES
-        AC_MSG_RESULT([yes])
-    else
-        WITH_CT2N=NO
-        AC_MSG_RESULT([no])
-    fi
-fi
-AC_SUBST(WITH_CT2N)
-AC_SUBST(CT2N_EXTENSION)
-
 AC_MSG_CHECKING([whether to include Watch Window extension for Calc])
 if test "$enable_extensions" != "no" ; then
     if test "z$enable_ext_watch_window" = "zyes" ; then
diff --git a/download.in b/download.in
index bcd2de7..d7a8096 100755
--- a/download.in
+++ b/download.in
@@ -195,9 +195,6 @@ sub download_tests_dependencies() {
 # Typography toolbar extension
     'typo-*'                         	 => 'http://ftp.fsf.hu/OpenOffice.org_hu/typo/',
 
-# ConvertTextToNumber extension
-    'ConvertTextToNumber-*'              => 'http://download.go-oo.org/src/',
-
 # Watch Window extension
     'WatchWindow*'                       => 'http://ftp.devall.hu/kami/go-oo/',
 
@@ -564,10 +561,6 @@ if ('@TYPO_EXTENSION@' ne '') {
     source_file( '@TYPO_EXTENSION@' );
 }
 
-if ('@CT2N_EXTENSION@' ne '') {
-    source_file( '@CT2N_EXTENSION@' );
-}
-
 if ('@WATCH_WINDOW_EXTENSION@' ne '') {
     source_file( '@WATCH_WINDOW_EXTENSION@' );
 }