[patch] Being able to specify AR ARFLAGS and RANLIB during "configure"

yudit-3.1.0.patch2.txt (text/plain), 9.97 KB, created by Gaspar Sinai on 2023-02-24 12:00:43 UTC

# yudit-3.1.0.patch2.txt
# 
# URL: https://yudit.org/
# Urgency: low
#
# This very low priority patch removes hardcoded "ar" and "ranlib"
# and makes them configurable.
# 
# You may not need this patch at all.
#
# Gaspar Sinai 2023-02-24, Tokyo
#
*** yudit-3.1.0/Makefile.conf.in-	2023-02-03 21:30:27.000000000 +0900
--- yudit-3.1.0/Makefile.conf.in	2023-02-24 20:00:38.362210579 +0900
***************
*** 40,44 ****
  X11_LIB = @X11_LIB@
  
! AR = ar cr
  #
  # For Sun's SUNWspro compiler you need to have CC's AR 
--- 40,44 ----
  X11_LIB = @X11_LIB@
  
! AR = @AR@ @ARFLAGS@
  #
  # For Sun's SUNWspro compiler you need to have CC's AR 
***************
*** 49,57 ****
  # non-pure virtual function of class SVector<SString> is defined]
  #
! # Todo: put this in configure.
! # AR = CC -xar -o 
  #
  #ALL_LIBS=wsock32.lib
! RANLIB=ranlib
  LD= $(CXX) $(LDFLAGS)
  
--- 49,60 ----
  # non-pure virtual function of class SVector<SString> is defined]
  #
! # For those platforms, use this to configure:
! # AR="CC" ARLFLAGS="-xar -o" ./configure
  #
  #ALL_LIBS=wsock32.lib
! 
! # If you dont have ranlib, use this to configure 
! # RANLIB=: ./configure
! RANLIB=@RANLIB@
  LD= $(CXX) $(LDFLAGS)
  
*** yudit-3.1.0/configure.ac-	2023-02-09 13:00:37.000000000 +0900
--- yudit-3.1.0/configure.ac	2023-02-24 19:58:58.066161130 +0900
***************
*** 29,32 ****
--- 29,35 ----
  AC_PROG_CXXCPP
  AC_PROG_CC
+ AC_CHECK_TOOL(RANLIB, ranlib)
+ AC_CHECK_TOOL(AR, ar)
+ test -n "$ARFLAGS" || ARFLAGS="cr"
  dnl AC_PROG_INSTALL
  
***************
*** 37,45 ****
  AC_PATH_XTRA
  
- AC_PATH_PROG(RANLIB, ranlib)
- if test x$RANLIB = x; then
-    RANLIB=":"
- fi
- 
  LPR_COMMAND=""
  LPR_CFLAGS="-DLPR_COMMAND=\\\"/bin/lpr\\\""
--- 40,43 ----
***************
*** 368,371 ****
--- 366,370 ----
  AC_SUBST(X11_LIB)
  AC_SUBST(WITH_GUI)
+ AC_SUBST(ARFLAGS)
  
  AC_CONFIG_FILES([Makefile.conf uniconv/uniconv.1 uniprint/uniprint.1 yudit.properties doc/FAQ.TXT doc/vi/FAQ.TXT doc/de/FAQ.TXT doc/hu/FAQ.TXT doc/ko/FAQ.TXT doc/ja/FAQ.TXT doc/yi/FAQ.TXT doc/es/FAQ.TXT doc/fi/FAQ.TXT doc/ru/FAQ.TXT doc/te/FAQ.TXT doc/sr/FAQ.TXT doc/zh/FAQ.TXT doc/cs/FAQ.TXT doc/bg/FAQ.TXT doc/it/FAQ.TXT Makefile])
*** yudit-3.1.0/configure-	2023-02-09 18:08:32.000000000 +0900
--- yudit-3.1.0/configure	2023-02-24 19:59:02.102162522 +0900
***************
*** 653,656 ****
--- 653,657 ----
  ac_subst_vars='LTLIBOBJS
  LIBOBJS
+ ARFLAGS
  WITH_GUI
  X11_LIB
***************
*** 673,677 ****
  LPR_CFLAGS
  LPR_COMMAND
- RANLIB
  X_EXTRA_LIBS
  X_LIBS
--- 674,677 ----
***************
*** 680,683 ****
--- 680,685 ----
  CPP
  XMKMF
+ AR
+ RANLIB
  ac_ct_CC
  CFLAGS
***************
*** 4171,4174 ****
--- 4173,4381 ----
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ printf %s "checking for $ac_word... " >&6; }
+ if test ${ac_cv_prog_RANLIB+y}
+ then :
+   printf %s "(cached) " >&6
+ else $as_nop
+   if test -n "$RANLIB"; then
+   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   case $as_dir in #(((
+     '') as_dir=./ ;;
+     */) ;;
+     *) as_dir=$as_dir/ ;;
+   esac
+     for ac_exec_ext in '' $ac_executable_extensions; do
+   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+     printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+   done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+ printf "%s\n" "$RANLIB" >&6; }
+ else
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ printf "%s\n" "no" >&6; }
+ fi
+ 
+ 
+ fi
+ if test -z "$ac_cv_prog_RANLIB"; then
+   ac_ct_RANLIB=$RANLIB
+   # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ printf %s "checking for $ac_word... " >&6; }
+ if test ${ac_cv_prog_ac_ct_RANLIB+y}
+ then :
+   printf %s "(cached) " >&6
+ else $as_nop
+   if test -n "$ac_ct_RANLIB"; then
+   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   case $as_dir in #(((
+     '') as_dir=./ ;;
+     */) ;;
+     *) as_dir=$as_dir/ ;;
+   esac
+     for ac_exec_ext in '' $ac_executable_extensions; do
+   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_RANLIB="ranlib"
+     printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+   done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+ printf "%s\n" "$ac_ct_RANLIB" >&6; }
+ else
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ printf "%s\n" "no" >&6; }
+ fi
+ 
+   if test "x$ac_ct_RANLIB" = x; then
+     RANLIB=""
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+     RANLIB=$ac_ct_RANLIB
+   fi
+ else
+   RANLIB="$ac_cv_prog_RANLIB"
+ fi
+ 
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ar; ac_word=$2
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ printf %s "checking for $ac_word... " >&6; }
+ if test ${ac_cv_prog_AR+y}
+ then :
+   printf %s "(cached) " >&6
+ else $as_nop
+   if test -n "$AR"; then
+   ac_cv_prog_AR="$AR" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   case $as_dir in #(((
+     '') as_dir=./ ;;
+     */) ;;
+     *) as_dir=$as_dir/ ;;
+   esac
+     for ac_exec_ext in '' $ac_executable_extensions; do
+   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+     ac_cv_prog_AR="${ac_tool_prefix}ar"
+     printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+   done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+ printf "%s\n" "$AR" >&6; }
+ else
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ printf "%s\n" "no" >&6; }
+ fi
+ 
+ 
+ fi
+ if test -z "$ac_cv_prog_AR"; then
+   ac_ct_AR=$AR
+   # Extract the first word of "ar", so it can be a program name with args.
+ set dummy ar; ac_word=$2
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ printf %s "checking for $ac_word... " >&6; }
+ if test ${ac_cv_prog_ac_ct_AR+y}
+ then :
+   printf %s "(cached) " >&6
+ else $as_nop
+   if test -n "$ac_ct_AR"; then
+   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   case $as_dir in #(((
+     '') as_dir=./ ;;
+     */) ;;
+     *) as_dir=$as_dir/ ;;
+   esac
+     for ac_exec_ext in '' $ac_executable_extensions; do
+   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_AR="ar"
+     printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+   done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+ printf "%s\n" "$ac_ct_AR" >&6; }
+ else
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ printf "%s\n" "no" >&6; }
+ fi
+ 
+   if test "x$ac_ct_AR" = x; then
+     AR=""
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+     AR=$ac_ct_AR
+   fi
+ else
+   AR="$ac_cv_prog_AR"
+ fi
+ 
+ test -n "$ARFLAGS" || ARFLAGS="cr"
  
  
***************
*** 5031,5083 ****
  
  
- # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- printf %s "checking for $ac_word... " >&6; }
- if test ${ac_cv_path_RANLIB+y}
- then :
-   printf %s "(cached) " >&6
- else $as_nop
-   case $RANLIB in
-   [\\/]* | ?:[\\/]*)
-   ac_cv_path_RANLIB="$RANLIB" # Let the user override the test with a path.
-   ;;
-   *)
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   case $as_dir in #(((
-     '') as_dir=./ ;;
-     */) ;;
-     *) as_dir=$as_dir/ ;;
-   esac
-     for ac_exec_ext in '' $ac_executable_extensions; do
-   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-     ac_cv_path_RANLIB="$as_dir$ac_word$ac_exec_ext"
-     printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-   done
- IFS=$as_save_IFS
- 
-   ;;
- esac
- fi
- RANLIB=$ac_cv_path_RANLIB
- if test -n "$RANLIB"; then
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
- printf "%s\n" "$RANLIB" >&6; }
- else
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
- printf "%s\n" "no" >&6; }
- fi
- 
- 
- if test x$RANLIB = x; then
-    RANLIB=":"
- fi
- 
  LPR_COMMAND=""
  LPR_CFLAGS="-DLPR_COMMAND=\\\"/bin/lpr\\\""
--- 5238,5241 ----
***************
*** 6070,6073 ****
--- 6228,6232 ----
  
  
+