Commits

Anonymous committed 758accc

#101480# new configure

Comments (0)

Files changed (1)

 XINERAMA_LINK
 USE_XINERAMA
 SCPDEFS
-WITH_WRITER2LATEX
 WITHOUT_AFMS
 WITHOUT_PPDS
 WITH_FONTS
 PTHREAD_LIBS
 PTHREAD_CFLAGS
 OSVERSION
+GNUTAR
 target_os
 target_vendor
 target_cpu
 with_external_dict_dir
 with_external_hyph_dir
 with_external_thes_dir
-with_writer2latex
 with_system_libs
 with_system_headers
 with_system_jars
 
   --with-external-thes-dir Specify external thesaurus dir
 
-  --without-writer2latex Removes writer2latex from openoffice.org installation
-                          set, for people building for specific distributions
-                          where writer2latex is known to be already available
-
   --with-system-libs      Use libs already on system -- enables all
                           --with-system-* flags except mozilla and
                           odbc/sane/xrender-header(s)
 fi
 
 
-# Check whether --with-writer2latex was given.
-if test "${with_writer2latex+set}" = set; then
-  withval=$with_writer2latex;
-fi
-
-
 # Check whether --with-system-libs was given.
 if test "${with_system_libs+set}" = set; then
   withval=$with_system_libs;
         test_randr=yes
 		test_freetype=yes
 		_os=SunOS
+		# Extract the first word of "gtar", so it can be a program name with args.
+set dummy gtar; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_GNUTAR+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $GNUTAR in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GNUTAR="$GNUTAR" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$PATH:/usr/sfw/bin"
+for as_dir in $as_dummy
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_GNUTAR="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+GNUTAR=$ac_cv_path_GNUTAR
+if test -n "$GNUTAR"; then
+  { $as_echo "$as_me:$LINENO: result: $GNUTAR" >&5
+$as_echo "$GNUTAR" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+		if test -z "$GNUTAR"; then
+			{ { $as_echo "$as_me:$LINENO: error: gtar (gnu tar) not found but needed. Install it (SUN Freeware package)." >&5
+$as_echo "$as_me: error: gtar (gnu tar) not found but needed. Install it (SUN Freeware package)." >&2;}
+   { (exit 1); exit 1; }; }
+		fi
+
 
 						   		{ $as_echo "$as_me:$LINENO: checking the Solaris operating system release" >&5
 $as_echo_n "checking the Solaris operating system release... " >&6; }
 fi
 
 
+{ $as_echo "$as_me:$LINENO: checking for GNU tar" >&5
+$as_echo_n "checking for GNU tar... " >&6; }
+for a in $GNUTAR gtar gnutar tar; do
+      $a --version 2> /dev/null | grep GNU  2>&1 > /dev/null
+      if test $? -eq 0;  then
+           GNUTAR=$a
+           break
+      fi
+done
+{ $as_echo "$as_me:$LINENO: result: $GNUTAR" >&5
+$as_echo "$GNUTAR" >&6; }
+if test -z "$GNUTAR"; then
+    { { $as_echo "$as_me:$LINENO: error: not found. install GNU tar." >&5
+$as_echo "$as_me: error: not found. install GNU tar." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+
 if test "$_os" = "SunOS"; then
    if test "$CC" = "cc"; then
       for ac_prog in cc
         if test -z "$COMMONS_LOGGING_JAR"; then
                 COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar
         fi
-   as_ac_File=`$as_echo "ac_cv_file_$COMMONS_HTTPCLIENT_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $COMMONS_HTTPCLIENT_JAR" >&5
-$as_echo_n "checking for $COMMONS_HTTPCLIENT_JAR... " >&6; }
+   as_ac_File=`$as_echo "ac_cv_file_$COMMONS_LOGGING_JAR" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $COMMONS_LOGGING_JAR" >&5
+$as_echo_n "checking for $COMMONS_LOGGING_JAR... " >&6; }
 if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
 $as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
-if test -r "$COMMONS_HTTPCLIENT_JAR"; then
+if test -r "$COMMONS_LOGGING_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
    if test "x$as_val" = x""yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: commons-httpclient.jar not found." >&5
-$as_echo "$as_me: error: commons-httpclient.jar not found." >&2;}
+  { { $as_echo "$as_me:$LINENO: error: commons-logging.jar not found." >&5
+$as_echo "$as_me: error: commons-logging.jar not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to include writer2latex" >&5
-$as_echo_n "checking whether to include writer2latex... " >&6; }
-if test "$with_writer2latex" != "no" ; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-  WITH_WRITER2LATEX=YES
-  BUILD_TYPE="$BUILD_TYPE WRITER2LATEX"
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-  WITH_WRITER2LATEX=NO
-  SCPDEFS="$SCPDEFS -DWITHOUT_WRITER2LATEX"
-fi
-
-
 
 
 { $as_echo "$as_me:$LINENO: checking whether and how to use Xinerama" >&5
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.