Ticket #14297: patch-configure.diff

File patch-configure.diff, 7.0 KB (added by mp@…, 17 years ago)

Copy into gnucash/files port directory

  • configure

    old new  
    2532525325
    2532625326
    2532725327        if test "x$cross_compiling" = "xyes" ; then
    25328           name_build_guile="$target_alias-guile-config"
     25328          name_build_guile="$target_alias-guile16-config"
    2532925329        else
    25330           name_build_guile="guile-config"
     25330          name_build_guile="guile16-config"
    2533125331        fi
    2533225332
    2533325333        # Extract the first word of "$name_build_guile", so it can be a program name with args.
    … …  
    2551025510
    2551125511
    2551225512        if test "x$BUILD_GUILE" = "xyes"; then
    25513                 { echo "$as_me:$LINENO: checking for guile libraries" >&5
    25514 echo $ECHO_N "checking for guile libraries... $ECHO_C" >&6; }
     25513                { echo "$as_me:$LINENO: checking for guile16 libraries" >&5
     25514echo $ECHO_N "checking for guile16 libraries... $ECHO_C" >&6; }
    2551525515                GUILE_LIBS="`$name_build_guile link`"
    2551625516                { echo "$as_me:$LINENO: result: $GUILE_LIBS" >&5
    2551725517echo "${ECHO_T}$GUILE_LIBS" >&6; }
    25518                 { echo "$as_me:$LINENO: checking for guile headers" >&5
    25519 echo $ECHO_N "checking for guile headers... $ECHO_C" >&6; }
     25518                { echo "$as_me:$LINENO: checking for guile16 headers" >&5
     25519echo $ECHO_N "checking for guile16 headers... $ECHO_C" >&6; }
    2552025520                GUILE_INCS="`$name_build_guile compile`"
    2552125521                { echo "$as_me:$LINENO: result: $GUILE_INCS" >&5
    2552225522echo "${ECHO_T}$GUILE_INCS" >&6; }
    … …  
    2584225842  GUILE_LIBS="$GUILE_LIBS -lsocket"
    2584325843fi
    2584425844
    25845                 GUILE_LIBS="-lguile $GUILE_LIBS $QTTHREADS_LIB $READLINE_LIB $TERMCAP_LIB"
     25845                GUILE_LIBS="-lguile16 $GUILE_LIBS $QTTHREADS_LIB $READLINE_LIB $TERMCAP_LIB"
    2584625846        fi
    2584725847
    2584825848
    … …  
    2585225852        LIBS="$LIBS $GUILE_LIBS"
    2585325853        CPPFLAGS="$saved_cppflags $GUILE_INCS"
    2585425854
    25855         { echo "$as_me:$LINENO: checking whether guile works" >&5
    25856 echo $ECHO_N "checking whether guile works... $ECHO_C" >&6; }
     25855        { echo "$as_me:$LINENO: checking whether guile16 works" >&5
     25856echo $ECHO_N "checking whether guile16 works... $ECHO_C" >&6; }
    2585725857        cat >conftest.$ac_ext <<_ACEOF
    2585825858/* confdefs.h.  */
    2585925859_ACEOF
    … …  
    2586125861cat >>conftest.$ac_ext <<_ACEOF
    2586225862/* end confdefs.h.  */
    2586325863
    25864                 #include <libguile.h>
    25865                 #include <guile/gh.h>
     25864                #include <libguile16.h>
     25865                #include <guile16/gh.h>
    2586625866
    2586725867int
    2586825868main ()
    … …  
    2596525965
    2596625966
    2596725967if test x${GUILE} = x ; then
    25968    # Extract the first word of "guile", so it can be a program name with args.
    25969 set dummy guile; ac_word=$2
     25968   # Extract the first word of "guile16", so it can be a program name with args.
     25969set dummy guile16; ac_word=$2
    2597025970{ echo "$as_me:$LINENO: checking for $ac_word" >&5
    2597125971echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
    2597225972if test "${ac_cv_path_GUILE+set}" = set; then
    … …  
    2610426104
    2610526105
    2610626106if test x${GUILE} = x ; then
    26107    # Extract the first word of "guile", so it can be a program name with args.
    26108 set dummy guile; ac_word=$2
     26107   # Extract the first word of "guile16", so it can be a program name with args.
     26108set dummy guile16; ac_word=$2
    2610926109{ echo "$as_me:$LINENO: checking for $ac_word" >&5
    2611026110echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
    2611126111if test "${ac_cv_path_GUILE+set}" = set; then
    … …  
    2625226252
    2625326253### Check size of long_long - some guile's are broken.
    2625426254{ echo "$as_me:$LINENO: checking if guile long_long is at least as big as gint64" >&5
    26255 echo $ECHO_N "checking if guile long_long is at least as big as gint64... $ECHO_C" >&6; }
     26255echo $ECHO_N "checking if guile16 long_long is at least as big as gint64... $ECHO_C" >&6; }
    2625626256GNC_OLDCFLAGS="$CFLAGS"
    2625726257CFLAGS="${GNOME_CFLAGS} ${GUILE_INCS} ${CFLAGS} ${GLIB_CFLAGS}"
    2625826258if test "$cross_compiling" = yes; then
    2625926259
    2626026260  { echo "$as_me:$LINENO: result: assuming yes" >&5
    2626126261echo "${ECHO_T}assuming yes" >&6; }
    26262   { echo "$as_me:$LINENO: checking for scm_long_long2num in -lguile" >&5
    26263 echo $ECHO_N "checking for scm_long_long2num in -lguile... $ECHO_C" >&6; }
     26262  { echo "$as_me:$LINENO: checking for scm_long_long2num in -lguile16" >&5
     26263echo $ECHO_N "checking for scm_long_long2num in -lguile16... $ECHO_C" >&6; }
    2626426264if test "${ac_cv_lib_guile_scm_long_long2num+set}" = set; then
    2626526265  echo $ECHO_N "(cached) $ECHO_C" >&6
    2626626266else
    2626726267  ac_check_lib_save_LIBS=$LIBS
    26268 LIBS="-lguile  $LIBS"
     26268LIBS="-lguile16  $LIBS"
    2626926269cat >conftest.$ac_ext <<_ACEOF
    2627026270/* confdefs.h.  */
    2627126271_ACEOF
    … …  
    2633826338/* end confdefs.h.  */
    2633926339
    2634026340  #include <glib.h>
    26341   #include <libguile/__scm.h>
     26341  #include <libguile16/__scm.h>
    2634226342  int main(int argc, char *argv[]) {
    2634326343    return(!(sizeof(long_long) >= sizeof(gint64)));
    2634426344  }
    … …  
    2636726367
    2636826368  { echo "$as_me:$LINENO: result: yes" >&5
    2636926369echo "${ECHO_T}yes" >&6; }
    26370   { echo "$as_me:$LINENO: checking for scm_long_long2num in -lguile" >&5
    26371 echo $ECHO_N "checking for scm_long_long2num in -lguile... $ECHO_C" >&6; }
     26370  { echo "$as_me:$LINENO: checking for scm_long_long2num in -lguile16" >&5
     26371echo $ECHO_N "checking for scm_long_long2num in -lguile16... $ECHO_C" >&6; }
    2637226372if test "${ac_cv_lib_guile_scm_long_long2num+set}" = set; then
    2637326373  echo $ECHO_N "(cached) $ECHO_C" >&6
    2637426374else
    2637526375  ac_check_lib_save_LIBS=$LIBS
    26376 LIBS="-lguile  $LIBS"
     26376LIBS="-lguile16  $LIBS"
    2637726377cat >conftest.$ac_ext <<_ACEOF
    2637826378/* confdefs.h.  */
    2637926379_ACEOF
    … …  
    2656526565
    2656626566{ echo "$as_me:$LINENO: checking if guile needs our copy of (guile www)" >&5
    2656726567echo $ECHO_N "checking if guile needs our copy of (guile www)... $ECHO_C" >&6; }
    26568 # Extract the first word of "guile", so it can be a program name with args.
    26569 set dummy guile; ac_word=$2
     26568# Extract the first word of "guile16", so it can be a program name with args.
     26569set dummy guile16; ac_word=$2
    2657026570{ echo "$as_me:$LINENO: checking for $ac_word" >&5
    2657126571echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
    2657226572if test "${ac_cv_path_GUILE+set}" = set; then
    … …  
    2660626606
    2660726607
    2660826608  if test "$GUILE" = "" ; then
    26609       { { echo "$as_me:$LINENO: error: guile required but not found" >&5
    26610 echo "$as_me: error: guile required but not found" >&2;}
     26609      { { echo "$as_me:$LINENO: error: guile16 required but not found" >&5
     26610echo "$as_me: error: guile16 required but not found" >&2;}
    2661126611   { (exit 1); exit 1; }; }
    2661226612  fi
    2661326613
    26614   # Extract the first word of "guile-config", so it can be a program name with args.
    26615 set dummy guile-config; ac_word=$2
     26614  # Extract the first word of "guile16-config", so it can be a program name with args.
     26615set dummy guile16-config; ac_word=$2
    2661626616{ echo "$as_me:$LINENO: checking for $ac_word" >&5
    2661726617echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
    2661826618if test "${ac_cv_path_GUILE_CONFIG+set}" = set; then
    … …  
    2665226652
    2665326653
    2665426654  if test "$GUILE_CONFIG" = "" ; then
    26655       { { echo "$as_me:$LINENO: error: guile-config required but not found" >&5
    26656 echo "$as_me: error: guile-config required but not found" >&2;}
     26655      { { echo "$as_me:$LINENO: error: guile16-config required but not found" >&5
     26656echo "$as_me: error: guile16-config required but not found" >&2;}
    2665726657   { (exit 1); exit 1; }; }
    2665826658  fi
    2665926659
    26660   # Extract the first word of "guile-tools", so it can be a program name with args.
    26661 set dummy guile-tools; ac_word=$2
     26660  # Extract the first word of "guile16-tools", so it can be a program name with args.
     26661set dummy guile16-tools; ac_word=$2
    2666226662{ echo "$as_me:$LINENO: checking for $ac_word" >&5
    2666326663echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
    2666426664if test "${ac_cv_path_GUILE_TOOLS+set}" = set; then