Login
Check-in [8ba26d0b75]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:On Haiku, if no --prefix is provided then default to /boot/home/config/non-packaged, per /chat input from Brickviking. With this change, (./configure && make && make install) work on Haiku and the f-apps binaries and fnc run :-D. Or, in haiku form: On Haiku systems / If no prefix is defined / use boot/.../non-packaged
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 8ba26d0b75cd73acddb1ca110f1588430b768faec4696fae109bdb67696a0596
User & Date: stephan 2025-04-04 02:36:28.780
Original Comment: On HaikuOS, if no --prefix is provided then default to /boot/home/config/non-packaged, per /chat input from BrickViking. With this change, (./configure && make && make install) work on HaikuOS and the f-apps binaries and fnc run :-D.
Context
2025-04-11
07:06
Latest upstream autosetup/proj.tcl. check-in: 3b94573456 user: stephan tags: trunk
2025-04-04
02:36
On Haiku, if no --prefix is provided then default to /boot/home/config/non-packaged, per /chat input from Brickviking. With this change, (./configure && make && make install) work on Haiku and the f-apps binaries and fnc run :-D. Or, in haiku form: On Haiku systems / If no prefix is defined / use boot/.../non-packaged check-in: 8ba26d0b75 user: stephan tags: trunk
2025-04-03
22:50
Update autosetup from upstream trunk. (With my apologies for the time warp in the history - the previous checkin was from a VM with an incorrect clock.) check-in: 9628e48654 user: stephan tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to auto.def.
1
2
3



4
5
6
7
8
9
10
# vim:se syn=tcl:
#
use cc cc-shared cc-lib wh-common




set DUMP_DEFINES_FILE config.defines.txt
file delete -force $DUMP_DEFINES_FILE
options [subst {
  shared=1 => {Disable build of a shared library.}
  no-debug=0 => {Disable debug build options.}
  amal => {Generates a conservative config file for the amalgamation build.}


|
>
>
>







1
2
3
4
5
6
7
8
9
10
11
12
13
# vim:se syn=tcl:
#
use wh-common cc cc-shared cc-lib
if {"--help" ne $::argv} {
  proj-tweak-default-env-dirs
}

set DUMP_DEFINES_FILE config.defines.txt
file delete -force $DUMP_DEFINES_FILE
options [subst {
  shared=1 => {Disable build of a shared library.}
  no-debug=0 => {Disable debug build options.}
  amal => {Generates a conservative config file for the amalgamation build.}
435
436
437
438
439
440
441

442
443
444
445
446
447
448
449
450
451
452
453
454
455
  # build error.
  if {![cc-with {} {cc-check-flags [get-define SH_LINKFLAGS]]}} {
    puts "Clearing out SH_LINKFLAGS because flags check fails for them: [get-define SH_LINKFLAGS]"
    define SH_LINKFLAGS ""
  }
}


# Each generated Makefile requires an input file with a .in extension:
proj-make-from-dot-in -touch {
  GNUmakefile
}
proj-make-from-dot-in -touch {
    doc/Doxyfile
}

if {0} {
    # Achtung: ordering of the -bare/-str options here is important
    # because of the mixed use of strings and integers for #defines...
    make-config-header include/fossil-scm/autoconfig.h \
        -none {DOXYGEN_*} \
        -bare {HAVE_*  FSL_ENABLE_* _DEFAULT_SOURCE _XOPEN_SOURCE} \







>

|
<
<
<
<
<







438
439
440
441
442
443
444
445
446
447





448
449
450
451
452
453
454
  # build error.
  if {![cc-with {} {cc-check-flags [get-define SH_LINKFLAGS]]}} {
    puts "Clearing out SH_LINKFLAGS because flags check fails for them: [get-define SH_LINKFLAGS]"
    define SH_LINKFLAGS ""
  }
}

proj-remap-autoconf-dir-vars
# Each generated Makefile requires an input file with a .in extension:
proj-make-from-dot-in -touch GNUmakefile doc/Doxyfile






if {0} {
    # Achtung: ordering of the -bare/-str options here is important
    # because of the mixed use of strings and integers for #defines...
    make-config-header include/fossil-scm/autoconfig.h \
        -none {DOXYGEN_*} \
        -bare {HAVE_*  FSL_ENABLE_* _DEFAULT_SOURCE _XOPEN_SOURCE} \
Changes to autosetup/proj.tcl.
1434
1435
1436
1437
1438
1439
1440





























  } else {
    set shName ".tclConfigSh.tcl"
    proj-file-write $shName $shBody
    eval [exec sh $shName $tclConfigSh]
    file delete -force $shName
  }
}




































>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
  } else {
    set shName ".tclConfigSh.tcl"
    proj-file-write $shName $shBody
    eval [exec sh $shName $tclConfigSh]
    file delete -force $shName
  }
}

########################################################################
# @proj-tweak-default-env-dirs
#
# This function is not useful before [use system] is called to set up
# --prefix and friends.
#
# For certain target environments, if --prefix is _not_ passed in by
# the user, set the prefix to an environment-specific default. May
# emit output. For such environments its does [define prefix ...]  and
# [proj-opt-set prefix ...], but it does not process vars derived from
# the prefix, e.g. exec-prefix. To do so it is generally necessary,
# late in the config process (immediately before ".in" files are
# filtered) to also call proj-remap-autoconf-dir-vars.
#
# Returns 1 if it modifies the environment, else 0.
proc proj-tweak-default-env-dirs {} {
  switch -glob -- [get-define host] {
    *-haiku {
      set hpre /boot/home/config/non-packaged
      if {![proj-opt-was-provided prefix]} {
        proj-opt-set prefix $hpre
        define prefix $hpre
        return 1
      }
    }
  }
  return 0
}