Changeset 4510


Ignore:
Timestamp:
Jan 7, 2004, 6:12:10 PM (17 years ago)
Author:
ssen
Message:

On Darwin, if the user did not specify --prefix, install config files in
/private/etc/ports instead of /etc/ports, to comply with the standard
FS layout.

Regenerate configure on Mac OS X 10.3

Location:
trunk/base
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/aclocal.m4

    r3937 r4510  
    4040
    4141
    42 # OD_PATH_PORTCONFIGDIR(DEFAULT_PORTCONFIGDIR, PREFIX)
     42# OD_PATH_PORTCONFIGDIR(PREFIX)
    4343#---------------------------------------
    4444AC_DEFUN([OD_PATH_PORTCONFIGDIR],[
     
    4949        AC_MSG_CHECKING([for ports config directory])
    5050
    51         if test "$2" != "NONE" ; then
     51        if test "$1" != "NONE" ; then
    5252                dnl user gave --prefix
    5353                portconfigdir='${sysconfdir}/ports'
    5454        else
    55                 dnl just use the default /etc/ports
     55           case $host_os in
     56           darwin*)
     57                portconfigdir='/private/etc/ports'
     58                ;;
     59           *)
    5660                portconfigdir='/etc/ports'
     61                ;;
     62           esac
    5763        fi
    5864
  • trunk/base/configure

    r4096 r4510  
    34083408                                portconfigdir='${sysconfdir}/ports'
    34093409        else
    3410                                 portconfigdir='/etc/ports'
     3410           case $host_os in
     3411           darwin*)
     3412                portconfigdir='/private/etc/ports'
     3413                ;;
     3414           *)
     3415                portconfigdir='/etc/ports'
     3416                ;;
     3417           esac
    34113418        fi
    34123419
  • trunk/base/configure.ac

    r3937 r4510  
    2424AC_PREFIX_DEFAULT(/opt/local)
    2525OD_PATH_DPORTSDIR([$DPORTS_DIR_DEFAULT])
    26 OD_PATH_PORTCONFIGDIR([/etc/ports], [$prefix])
     26OD_PATH_PORTCONFIGDIR([$prefix])
    2727
    2828# Check for install ownership
  • trunk/base/src/config.h.in

    r3314 r4510  
    1 /* src/config.h.in.  Generated automatically from configure.ac by autoheader.  */
     1/* src/config.h.in.  Generated from configure.ac by autoheader.  */
    22
    3 /* Define if the `closedir' function returns void instead of `int'. */
     3/* Define to 1 if the `closedir' function returns void instead of `int'. */
    44#undef CLOSEDIR_VOID
    55
    6 /* Define if you have the `bzero' function. */
     6/* Define to 1 if you have the `bzero' function. */
    77#undef HAVE_BZERO
    88
    9 /* Define if you have the <crt_externs.h> header file. */
     9/* Define to 1 if you have the <crt_externs.h> header file. */
    1010#undef HAVE_CRT_EXTERNS_H
    1111
     
    1414#undef HAVE_DECL_STRERROR_R
    1515
    16 /* Define if you have the <dirent.h> header file, and it defines `DIR'. */
     16/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
     17   */
    1718#undef HAVE_DIRENT_H
    1819
    19 /* Define if you have the `dup2' function. */
     20/* Define to 1 if you have the `dup2' function. */
    2021#undef HAVE_DUP2
    2122
    22 /* Define if you have the <fcntl.h> header file. */
     23/* Define to 1 if you have the <fcntl.h> header file. */
    2324#undef HAVE_FCNTL_H
    2425
    25 /* Define if you have the `fgetln' function. */
     26/* Define to 1 if you have the `fgetln' function. */
    2627#undef HAVE_FGETLN
    2728
    28 /* Define if you have the `flock' function. */
     29/* Define to 1 if you have the `flock' function. */
    2930#undef HAVE_FLOCK
    3031
    31 /* Define if you have the `fork' function. */
     32/* Define to 1 if you have the `fork' function. */
    3233#undef HAVE_FORK
    3334
    34 /* Define if you have the <inttypes.h> header file. */
     35/* Define to 1 if you have the <inttypes.h> header file. */
    3536#undef HAVE_INTTYPES_H
    3637
     
    4142#undef HAVE_LIBMD
    4243
    43 /* Define if you have the <limits.h> header file. */
     44/* Define to 1 if you have the <limits.h> header file. */
    4445#undef HAVE_LIMITS_H
    4546
    46 /* Define if you have the `lockf' function. */
     47/* Define to 1 if you have the `lockf' function. */
    4748#undef HAVE_LOCKF
    4849
    49 /* Define if you have the <md5.h> header file. */
     50/* Define to 1 if you have the <md5.h> header file. */
    5051#undef HAVE_MD5_H
    5152
    52 /* Define if you have the <memory.h> header file. */
     53/* Define to 1 if you have the <memory.h> header file. */
    5354#undef HAVE_MEMORY_H
    5455
    55 /* Define if you have the `memset' function. */
     56/* Define to 1 if you have the `memset' function. */
    5657#undef HAVE_MEMSET
    5758
    58 /* Define if you have the <ndir.h> header file, and it defines `DIR'. */
     59/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
    5960#undef HAVE_NDIR_H
    6061
    61 /* Define if you have the <openssl/md5.h> header file. */
     62/* Define to 1 if you have the <openssl/md5.h> header file. */
    6263#undef HAVE_OPENSSL_MD5_H
    6364
    64 /* Define if you have the <paths.h> header file. */
     65/* Define to 1 if you have the <paths.h> header file. */
    6566#undef HAVE_PATHS_H
    6667
    67 /* Define if you have the `regcomp' function. */
     68/* Define to 1 if you have the `regcomp' function. */
    6869#undef HAVE_REGCOMP
    6970
    70 /* Define if you have the <stdint.h> header file. */
     71/* Define to 1 if you have the <stdint.h> header file. */
    7172#undef HAVE_STDINT_H
    7273
    73 /* Define if you have the <stdlib.h> header file. */
     74/* Define to 1 if you have the <stdlib.h> header file. */
    7475#undef HAVE_STDLIB_H
    7576
    76 /* Define if you have the `strdup' function. */
     77/* Define to 1 if you have the `strdup' function. */
    7778#undef HAVE_STRDUP
    7879
    79 /* Define if you have the `strerror' function. */
     80/* Define to 1 if you have the `strerror' function. */
    8081#undef HAVE_STRERROR
    8182
    82 /* Define if you have the `strerror_r' function. */
     83/* Define to 1 if you have the `strerror_r' function. */
    8384#undef HAVE_STRERROR_R
    8485
    85 /* Define if you have the <strings.h> header file. */
     86/* Define to 1 if you have the <strings.h> header file. */
    8687#undef HAVE_STRINGS_H
    8788
    88 /* Define if you have the <string.h> header file. */
     89/* Define to 1 if you have the <string.h> header file. */
    8990#undef HAVE_STRING_H
    9091
    91 /* Define if you have the `strtol' function. */
     92/* Define to 1 if you have the `strtol' function. */
    9293#undef HAVE_STRTOL
    9394
    94 /* Define if you have the <sys/dir.h> header file, and it defines `DIR'. */
     95/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
     96   */
    9597#undef HAVE_SYS_DIR_H
    9698
    97 /* Define if you have the <sys/fcntl.h> header file. */
     99/* Define to 1 if you have the <sys/fcntl.h> header file. */
    98100#undef HAVE_SYS_FCNTL_H
    99101
    100 /* Define if you have the <sys/file.h> header file. */
     102/* Define to 1 if you have the <sys/file.h> header file. */
    101103#undef HAVE_SYS_FILE_H
    102104
    103 /* Define if you have the <sys/ndir.h> header file, and it defines `DIR'. */
     105/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
     106   */
    104107#undef HAVE_SYS_NDIR_H
    105108
    106 /* Define if you have the <sys/stat.h> header file. */
     109/* Define to 1 if you have the <sys/stat.h> header file. */
    107110#undef HAVE_SYS_STAT_H
    108111
    109 /* Define if you have the <sys/types.h> header file. */
     112/* Define to 1 if you have the <sys/types.h> header file. */
    110113#undef HAVE_SYS_TYPES_H
    111114
    112 /* Define if you have <sys/wait.h> that is POSIX.1 compatible. */
     115/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
    113116#undef HAVE_SYS_WAIT_H
    114117
    115 /* Define if you have the <unistd.h> header file. */
     118/* Define to 1 if you have the <unistd.h> header file. */
    116119#undef HAVE_UNISTD_H
    117120
    118 /* Define if you have the `vfork' function. */
     121/* Define to 1 if you have the `vfork' function. */
    119122#undef HAVE_VFORK
    120123
    121 /* Define if you have the <vfork.h> header file. */
     124/* Define to 1 if you have the <vfork.h> header file. */
    122125#undef HAVE_VFORK_H
    123126
    124 /* Define if `fork' works. */
     127/* Define to 1 if `fork' works. */
    125128#undef HAVE_WORKING_FORK
    126129
    127 /* Define to 1 if `strerror_r' returns a string. */
    128 #undef HAVE_WORKING_STRERROR_R
     130/* Define to 1 if `vfork' works. */
     131#undef HAVE_WORKING_VFORK
    129132
    130 /* Define if `vfork' works. */
    131 #undef HAVE_WORKING_VFORK
     133/* Define to the address where bug reports for this package should be sent. */
     134#undef PACKAGE_BUGREPORT
     135
     136/* Define to the full name of this package. */
     137#undef PACKAGE_NAME
     138
     139/* Define to the full name and version of this package. */
     140#undef PACKAGE_STRING
     141
     142/* Define to the one symbol short name of this package. */
     143#undef PACKAGE_TARNAME
     144
     145/* Define to the version of this package. */
     146#undef PACKAGE_VERSION
    132147
    133148/* Define to 1 if static build is requested */
    134149#undef STATIC_BUILD
    135150
    136 /* Define if the `S_IS*' macros in <sys/stat.h> do not work properly. */
     151/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
    137152#undef STAT_MACROS_BROKEN
    138153
    139 /* Define if you have the ANSI C header files. */
     154/* Define to 1 if you have the ANSI C header files. */
    140155#undef STDC_HEADERS
     156
     157/* Define to 1 if strerror_r returns char *. */
     158#undef STRERROR_R_CHAR_P
    141159
    142160/* Define to `int' if <sys/types.h> does not define. */
Note: See TracChangeset for help on using the changeset viewer.