Ignore:
Timestamp:
Jun 15, 2007, 10:11:22 AM (13 years ago)
Author:
jmpp@…
Message:

Finally merging the dp2mp-move branch into trunk, woot!

This basically means all strings in our sources,
whether it's something we output to the user or something
internal, such as a function/proc naming, are entirely in
the macports namespace and we no longer mix darwinports
with apple with macports strings.

It also means we now have new paths in svn and on
the client side at installation time, added to a
cleaner structure under ${prefix}/var/. Read
http://trac.macports.org/projects/macports/wiki/MacPortsRenaming
for more information.

NOTE: This commit also marks the rsync server finally
being moved over to the macosforge boxes, with the new
layout outlined in the dp2mp-move branch in place.
DNS entries still point to the old rsync server for
macports, however, so sync'ing/selfupdating an installation
based on these sources will be temporarily broken
until dns refresh.

To developers and testers, please do test the upgrade
target in the main base/Makefile as thouroughly as
possible and report any bugs/shortcomings/unexpected_behavior
to me, thanks!

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/aclocal.m4

    r26135 r26177  
    44
    55#------------------------------------------------------------------------
    6 # OD_CHECK_FRAMEWORK_COREFOUNDATION --
     6# MP_CHECK_FRAMEWORK_COREFOUNDATION --
    77#
    88#       Check if CoreFoundation framework is available, define HAVE_FRAMEWORK_COREFOUNDATION if so.
     
    2424#
    2525#------------------------------------------------------------------------
    26 AC_DEFUN(OD_CHECK_FRAMEWORK_COREFOUNDATION, [
     26AC_DEFUN(MP_CHECK_FRAMEWORK_COREFOUNDATION, [
    2727        FRAMEWORK_LIBS="-framework CoreFoundation"
    2828
    2929        AC_MSG_CHECKING([for CoreFoundation framework])
    3030
    31         AC_CACHE_VAL(od_cv_have_framework_corefoundation, [
     31        AC_CACHE_VAL(mp_cv_have_framework_corefoundation, [
    3232                ac_save_LIBS="$LIBS"
    3333                LIBS="$FRAMEWORK_LIBS $LIBS"
     
    4141                        ])
    4242                        ], [
    43                                 od_cv_have_framework_corefoundation="yes"
    44                         ], [
    45                                 od_cv_have_framework_corefoundation="no"
     43                                mp_cv_have_framework_corefoundation="yes"
     44                        ], [
     45                                mp_cv_have_framework_corefoundation="no"
    4646                        ]
    4747                )
     
    5050        ])
    5151
    52         AC_MSG_RESULT(${od_cv_have_framework_corefoundation})
    53 
    54         if test x"${od_cv_have_framework_corefoundation}" = "xyes"; then
     52        AC_MSG_RESULT(${mp_cv_have_framework_corefoundation})
     53
     54        if test x"${mp_cv_have_framework_corefoundation}" = "xyes"; then
    5555                AC_DEFINE([HAVE_FRAMEWORK_COREFOUNDATION], [], [Define if CoreFoundation framework is available])
    5656        fi
     
    6161
    6262#------------------------------------------------------------------------
    63 # OD_CHECK_FUNCTION_CFNOTIFICATIONCENTERGETDARWINNOTIFYCENTER --
     63# MP_CHECK_FUNCTION_CFNOTIFICATIONCENTERGETDARWINNOTIFYCENTER --
    6464#
    6565#       Check if if the routine CFNOTIFICATIONCENTERGETDARWINNOTIFYCENTER
     
    8282#
    8383#------------------------------------------------------------------------
    84 AC_DEFUN(OD_CHECK_FUNCTION_CFNOTIFICATIONCENTERGETDARWINNOTIFYCENTER, [
     84AC_DEFUN(MP_CHECK_FUNCTION_CFNOTIFICATIONCENTERGETDARWINNOTIFYCENTER, [
    8585        FRAMEWORK_LIBS="-framework CoreFoundation"
    8686
    8787        AC_MSG_CHECKING([for CFNotificationCenterGetDarwinNotifyCenter])
    8888
    89         AC_CACHE_VAL(od_cv_have_function_cfnotificationcentergetdarwinnotifycenter, [
     89        AC_CACHE_VAL(mp_cv_have_function_cfnotificationcentergetdarwinnotifycenter, [
    9090                ac_save_LIBS="$LIBS"
    9191                LIBS="$FRAMEWORK_LIBS $LIBS"
     
    9898                        ])
    9999                        ], [
    100                                 od_cv_have_function_cfnotificationcentergetdarwinnotifycenter="yes"
    101                         ], [
    102                                 od_cv_have_function_cfnotificationcentergetdarwinnotifycenter="no"
     100                                mp_cv_have_function_cfnotificationcentergetdarwinnotifycenter="yes"
     101                        ], [
     102                                mp_cv_have_function_cfnotificationcentergetdarwinnotifycenter="no"
    103103                        ]
    104104                )
     
    107107        ])
    108108
    109         AC_MSG_RESULT(${od_cv_have_function_cfnotificationcentergetdarwinnotifycenter})
    110 
    111         if test x"${od_cv_have_function_cfnotificationcentergetdarwinnotifycenter}" = "xyes"; then
     109        AC_MSG_RESULT(${mp_cv_have_function_cfnotificationcentergetdarwinnotifycenter})
     110
     111        if test x"${mp_cv_have_function_cfnotificationcentergetdarwinnotifycenter}" = "xyes"; then
    112112                AC_DEFINE([HAVE_FUNCTION_CFNOTIFICATIONCENTERGETDARWINNOTIFYCENTER], [], [Define if function CFNotificationCenterGetDarwinNotifyCenter in CoreFoundation framework])
    113113        fi
     
    118118
    119119#------------------------------------------------------------------------
    120 # OD_CHECK_FRAMEWORK_SYSTEMCONFIGURATION --
     120# MP_CHECK_FRAMEWORK_SYSTEMCONFIGURATION --
    121121#
    122122#       Check if SystemConfiguration framework is available, define HAVE_FRAMEWORK_SYSTEMCONFIGURATION if so.
     
    138138#
    139139#------------------------------------------------------------------------
    140 AC_DEFUN(OD_CHECK_FRAMEWORK_SYSTEMCONFIGURATION, [
     140AC_DEFUN(MP_CHECK_FRAMEWORK_SYSTEMCONFIGURATION, [
    141141        FRAMEWORK_LIBS="-framework SystemConfiguration"
    142142
    143143        AC_MSG_CHECKING([for SystemConfiguration framework])
    144144
    145         AC_CACHE_VAL(od_cv_have_framework_systemconfiguration, [
     145        AC_CACHE_VAL(mp_cv_have_framework_systemconfiguration, [
    146146                ac_save_LIBS="$LIBS"
    147147                LIBS="$FRAMEWORK_LIBS $LIBS"
     
    155155                        ])
    156156                        ], [
    157                                 od_cv_have_framework_systemconfiguration="yes"
    158                         ], [
    159                                 od_cv_have_framework_systemconfiguration="no"
     157                                mp_cv_have_framework_systemconfiguration="yes"
     158                        ], [
     159                                mp_cv_have_framework_systemconfiguration="no"
    160160                        ]
    161161                )
     
    164164        ])
    165165
    166         AC_MSG_RESULT(${od_cv_have_framework_systemconfiguration})
    167 
    168         if test x"${od_cv_have_framework_systemconfiguration}" = "xyes"; then
     166        AC_MSG_RESULT(${mp_cv_have_framework_systemconfiguration})
     167
     168        if test x"${mp_cv_have_framework_systemconfiguration}" = "xyes"; then
    169169                AC_DEFINE([HAVE_FRAMEWORK_SYSTEMCONFIGURATION], [], [Define if SystemConfiguration framework is available])
    170170        fi
     
    175175
    176176#------------------------------------------------------------------------
    177 # OD_CHECK_FRAMEWORK_IOKIT --
     177# MP_CHECK_FRAMEWORK_IOKIT --
    178178#
    179179#       Check if IOKit framework is available, define HAVE_FRAMEWORK_IOKIT if so.
     
    195195#
    196196#------------------------------------------------------------------------
    197 AC_DEFUN(OD_CHECK_FRAMEWORK_IOKIT, [
     197AC_DEFUN(MP_CHECK_FRAMEWORK_IOKIT, [
    198198        FRAMEWORK_LIBS="-framework IOKit"
    199199
    200200        AC_MSG_CHECKING([for IOKit framework])
    201201
    202         AC_CACHE_VAL(od_cv_have_framework_iokit, [
     202        AC_CACHE_VAL(mp_cv_have_framework_iokit, [
    203203                ac_save_LIBS="$LIBS"
    204204                LIBS="$FRAMEWORK_LIBS $LIBS"
     
    212212                        ])
    213213                        ], [
    214                                 od_cv_have_framework_iokit="yes"
    215                         ], [
    216                                 od_cv_have_framework_iokit="no"
     214                                mp_cv_have_framework_iokit="yes"
     215                        ], [
     216                                mp_cv_have_framework_iokit="no"
    217217                        ]
    218218                )
     
    221221        ])
    222222
    223         AC_MSG_RESULT(${od_cv_have_framework_iokit})
    224 
    225         if test x"${od_cv_have_framework_iokit}" = "xyes"; then
     223        AC_MSG_RESULT(${mp_cv_have_framework_iokit})
     224
     225        if test x"${mp_cv_have_framework_iokit}" = "xyes"; then
    226226                AC_DEFINE([HAVE_FRAMEWORK_IOKIT], [], [Define if IOKit framework is available])
    227227        fi
     
    231231
    232232
    233 dnl This macro checks if the user specified a dports tree
     233dnl This macro checks if the user specified a ports tree
    234234dnl explicitly. If not, search for it
    235235
    236 # OD_PATH_DPORTSDIR(DEFAULT_DPORTSDIR)
    237 #---------------------------------------
    238  AC_DEFUN([OD_PATH_DPORTSDIR],[
     236# MP_PATH_PORTSDIR(DEFAULT_PORTSDIR)
     237#---------------------------------------
     238 AC_DEFUN([MP_PATH_PORTSDIR],[
    239239        dnl For ease of reading, run after gcc has been found/configured
    240240        AC_REQUIRE([AC_PROG_CC])
    241241
    242         AC_ARG_WITH(dports-dir, [AC_HELP_STRING([--with-dports-dir=DIR], [Specify alternate dports directory])], [ dportsdir="$withval" ] )
    243 
    244 
    245         AC_MSG_CHECKING([for dports tree])
    246         if test "x$dportsdir" != "x" ; then
    247           if test -d "$dportsdir" -a -e "$dportsdir/PortIndex" ; then
     242        AC_ARG_WITH(ports-dir, [AC_HELP_STRING([--with-ports-dir=DIR], [Specify alternate ports directory])], [ portsdir="$withval" ] )
     243
     244
     245        AC_MSG_CHECKING([for ports tree])
     246        if test "x$portsdir" != "x" ; then
     247          if test -d "$portsdir" -a -e "$portsdir/PortIndex" ; then
    248248                :
    249249          else
    250                 AC_MSG_ERROR([$dportsdir not a valid dports tree])
     250                AC_MSG_ERROR([$portsdir not a valid ports tree])
    251251          fi
    252252        else
     
    254254                if test "x$1" != "x" ; then
    255255                  if test -d "$1" -a -e "$1/PortIndex" ; then
    256                         dportsdir=$1
     256                        portsdir=$1
    257257                  fi
    258258                fi
    259259        fi
    260260
    261         if test "x$dportsdir" != "x" ; then
    262                 AC_MSG_RESULT($dportsdir)
    263                 DPORTSDIR="$dportsdir"
    264                 AC_SUBST(DPORTSDIR)
     261        if test "x$portsdir" != "x" ; then
     262                AC_MSG_RESULT($portsdir)
     263                PORTSDIR="$portsdir"
     264                AC_SUBST(PORTSDIR)
    265265        else
    266                 AC_MSG_WARN([No dports tree found])
     266                AC_MSG_WARN([No ports tree found])
    267267        fi
    268268
     
    270270
    271271
    272 # OD_PATH_PORTCONFIGDIR
    273 #---------------------------------------
    274 AC_DEFUN([OD_PATH_PORTCONFIGDIR],[
     272# MP_PATH_MPCONFIGDIR
     273#---------------------------------------
     274AC_DEFUN([MP_PATH_MPCONFIGDIR],[
    275275        dnl if the user actually specified --prefix, shift
    276         dnl portconfigdir to $prefix/etc/ports
    277         dnl     AC_REQUIRE([OD_PATH_DPORTSDIR])
     276        dnl mpconfigdir to $prefix/etc/macports
     277        dnl     AC_REQUIRE([MP_PATH_PORTSDIR])
    278278       
    279         AC_MSG_CHECKING([for ports config directory])
    280 
    281         portconfigdir='${sysconfdir}/ports'
    282 
    283         AC_MSG_RESULT([$portconfigdir])
    284         PORTCONFIGDIR="$portconfigdir"
    285         AC_SUBST(PORTCONFIGDIR)
     279        AC_MSG_CHECKING([for MacPorts config directory])
     280
     281        mpconfigdir='${sysconfdir}/macports'
     282
     283        AC_MSG_RESULT([$mpconfigdir])
     284        MPCONFIGDIR="$mpconfigdir"
     285        AC_SUBST(MPCONFIGDIR)
    286286
    287287        ])
    288288
    289 # OD_CHECK_INSTALLUSER
     289# MP_CHECK_INSTALLUSER
    290290#-------------------------------------------------
    291 AC_DEFUN([OD_CHECK_INSTALLUSER],[
     291AC_DEFUN([MP_CHECK_INSTALLUSER],[
    292292        dnl if with user specifies --with-install-user,
    293293        dnl use it. otherwise default to platform defaults
    294         AC_REQUIRE([OD_PATH_PORTCONFIGDIR])
     294        AC_REQUIRE([MP_PATH_MPCONFIGDIR])
    295295
    296296        AC_ARG_WITH(install-user, [AC_HELP_STRING([--with-install-user=USER], [Specify user ownership of installed files])], [ DSTUSR=$withval ] )
     
    305305])
    306306
    307 # OD_CHECK_INSTALLGROUP
     307# MP_CHECK_INSTALLGROUP
    308308#-------------------------------------------------
    309 AC_DEFUN([OD_CHECK_INSTALLGROUP],[
     309AC_DEFUN([MP_CHECK_INSTALLGROUP],[
    310310        dnl if with user specifies --with-install-group,
    311311        dnl use it. otherwise default to platform defaults
    312         AC_REQUIRE([OD_CHECK_INSTALLUSER])
     312        AC_REQUIRE([MP_CHECK_INSTALLUSER])
    313313
    314314        AC_ARG_WITH(install-group, [AC_HELP_STRING([--with-install-group=GROUP], [Specify group ownership of installed files])], [ DSTGRP=$withval ] )
     
    331331])
    332332
    333 # OD_DIRECTORY_MODE
     333# MP_DIRECTORY_MODE
    334334#-------------------------------------------------
    335 AC_DEFUN([OD_DIRECTORY_MODE],[
     335AC_DEFUN([MP_DIRECTORY_MODE],[
    336336        dnl if with user specifies --with-directory-mode,
    337337        dnl use the specified permissions for ${prefix} directories
    338338        dnl otherwise use 0775
    339         AC_REQUIRE([OD_PATH_PORTCONFIGDIR])
     339        AC_REQUIRE([MP_PATH_MPCONFIGDIR])
    340340
    341341        AC_ARG_WITH(directory-mode, [AC_HELP_STRING([--with-directory-mode=MODE], [Specify directory mode of installed directories])], [ DSTMODE=$withval ] )
     
    350350])
    351351
    352 # OD_LIB_MD5
     352# MP_LIB_MD5
    353353#---------------------------------------
    354354# Check for an md5 implementation
    355 AC_DEFUN([OD_LIB_MD5],[
     355AC_DEFUN([MP_LIB_MD5],[
    356356
    357357        # Check for libmd, which is prefered
     
    401401dnl print a warning
    402402
    403 # OD_CHECK_X11
     403# MP_CHECK_X11
    404404# ---------------------
    405 AC_DEFUN([OD_CHECK_X11], [
     405AC_DEFUN([MP_CHECK_X11], [
    406406
    407407        AC_PATH_XTRA
     
    429429                # either the user said --without-x, or it was not found
    430430                # at all (runtime or headers)
    431                         AC_MSG_WARN([X11 not available. You will not be able to use dports that use X11])
     431                        AC_MSG_WARN([X11 not available. You will not be able to use ports that use X11])
    432432                        state=0
    433433                        ;;
     
    485485])
    486486
    487 # OD_PROG_XAR
    488 #---------------------------------------
    489 AC_DEFUN([OD_PROG_XAR],[
     487# MP_PROG_XAR
     488#---------------------------------------
     489AC_DEFUN([MP_PROG_XAR],[
    490490
    491491        AC_PATH_PROG([XAR], [xar], ,  [/usr/bin:/usr/sbin:/bin:/sbin])
     
    500500])
    501501
    502 # OD_PROG_DAEMONDO
    503 #---------------------------------------
    504 AC_DEFUN([OD_PROG_DAEMONDO],[
    505         AC_REQUIRE([OD_CHECK_FRAMEWORK_COREFOUNDATION])
    506         AC_REQUIRE([OD_CHECK_FRAMEWORK_SYSTEMCONFIGURATION])
    507         AC_REQUIRE([OD_CHECK_FRAMEWORK_IOKIT])
    508         AC_REQUIRE([OD_CHECK_FUNCTION_CFNOTIFICATIONCENTERGETDARWINNOTIFYCENTER])
     502# MP_PROG_DAEMONDO
     503#---------------------------------------
     504AC_DEFUN([MP_PROG_DAEMONDO],[
     505        AC_REQUIRE([MP_CHECK_FRAMEWORK_COREFOUNDATION])
     506        AC_REQUIRE([MP_CHECK_FRAMEWORK_SYSTEMCONFIGURATION])
     507        AC_REQUIRE([MP_CHECK_FRAMEWORK_IOKIT])
     508        AC_REQUIRE([MP_CHECK_FUNCTION_CFNOTIFICATIONCENTERGETDARWINNOTIFYCENTER])
    509509       
    510510    AC_MSG_CHECKING(for whether we will build daemondo)
     
    512512        case $host_os in
    513513        darwin*)
    514                 if test "x$od_cv_have_framework_corefoundation" == "xyes" &&
    515                    test "x$od_cv_have_framework_systemconfiguration" == "xyes" &&
    516                    test "x$od_cv_have_framework_iokit" == "xyes" &&
    517                    test "x$od_cv_have_function_cfnotificationcentergetdarwinnotifycenter" == "xyes"; then
     514                if test "x$mp_cv_have_framework_corefoundation" == "xyes" &&
     515                   test "x$mp_cv_have_framework_systemconfiguration" == "xyes" &&
     516                   test "x$mp_cv_have_framework_iokit" == "xyes" &&
     517                   test "x$mp_cv_have_function_cfnotificationcentergetdarwinnotifycenter" == "xyes"; then
    518518                        result=yes
    519519                        EXTRA_PROGS="$EXTRA_PROGS daemondo"
     
    527527
    528528#------------------------------------------------------------------------
    529 # OD_TCL_PACKAGE_DIR --
     529# MP_TCL_PACKAGE_DIR --
    530530#
    531531#       Locate the correct directory for Tcl package installation
     
    548548#------------------------------------------------------------------------
    549549
    550 AC_DEFUN(OD_TCL_PACKAGE_DIR, [
     550AC_DEFUN(MP_TCL_PACKAGE_DIR, [
    551551    AC_MSG_CHECKING(for Tcl package directory)
    552552
     
    608608])
    609609
    610 # OD_PROG_TCLSH
    611 #---------------------------------------
    612 AC_DEFUN([OD_PROG_TCLSH],[
     610# MP_PROG_TCLSH
     611#---------------------------------------
     612AC_DEFUN([MP_PROG_TCLSH],[
    613613
    614614
    615615        case $host_os in
    616                 freebsd*)
    617                         # FreeBSD installs a dummy tclsh (annoying)
    618                         # Look for a real versioned tclsh first
    619                         AC_PATH_PROG([TCLSH], [tclsh${TCL_VERSION} tclsh])
    620                         ;;
    621616                *)
    622617                        # Otherwise, look for a non-versioned tclsh
     
    631626])
    632627
    633 # OD_TCL_PACKAGE
     628# MP_TCL_PACKAGE
    634629#       Determine if a Tcl package is present.
    635630#
     
    638633#
    639634# Syntax:
    640 #   OD_TCL_PACKAGE (package, [action-if-found], [action-if-not-found])
     635#   MP_TCL_PACKAGE (package, [action-if-found], [action-if-not-found])
    641636#
    642637# Requires:
     
    646641#       Execute action-if-found or action-if-not-found
    647642#---------------------------------------
    648 AC_DEFUN([OD_TCL_PACKAGE],[
     643AC_DEFUN([MP_TCL_PACKAGE],[
    649644        AC_MSG_CHECKING([for Tcl $1 package])
    650645        package_present=`echo 'if {[[catch {package require $1}]]} {puts -nonewline 0} else {puts -nonewline 1}' | $TCLSH`
     
    652647])
    653648
    654 # OD_TCL_THREAD_SUPPORT
     649# MP_TCL_THREAD_SUPPORT
    655650#       Determine if thread support is available in tclsh.
    656651#
     
    664659#   Fails if thread support isn't available.
    665660#---------------------------------------
    666 AC_DEFUN([OD_TCL_THREAD_SUPPORT],[
     661AC_DEFUN([MP_TCL_THREAD_SUPPORT],[
    667662        AC_MSG_CHECKING([whether tclsh was compiled with threads])
    668663        tcl_threadenabled=`echo 'puts -nonewline [[info exists tcl_platform(threaded)]]' | $TCLSH`
     
    675670])
    676671
    677 # OD_LIBCURL_FLAGS
     672# MP_LIBCURL_FLAGS
    678673#       Sets the flags to compile with libcurl.
    679674#
     
    688683#   sets CFLAGS_LIBCURL and LDFLAGS_LIBCURL
    689684#---------------------------------------
    690 AC_DEFUN([OD_LIBCURL_FLAGS],[
     685AC_DEFUN([MP_LIBCURL_FLAGS],[
    691686        AC_ARG_WITH(curlprefix,
    692687                   [  --with-curlprefix       base directory for the cURL install '/usr', '/usr/local',...],
     
    712707])
    713708
    714 # OD_LIBCURL_VERSION
     709# MP_LIBCURL_VERSION
    715710#       Determine the version of libcurl.
    716711#
     
    724719#   sets libcurl_version to "0" or some number
    725720#---------------------------------------
    726 AC_DEFUN([OD_LIBCURL_VERSION],[
     721AC_DEFUN([MP_LIBCURL_VERSION],[
    727722        if test "x$CURL" = "x"; then
    728723                libcurl_version="0"
     
    737732dnl This macro tests if the compiler supports GCC's
    738733dnl __attribute__ syntax for unused variables/parameters
    739 AC_DEFUN([OD_COMPILER_ATTRIBUTE_UNUSED], [
     734AC_DEFUN([MP_COMPILER_ATTRIBUTE_UNUSED], [
    740735        AC_MSG_CHECKING([how to mark unused variables])
    741736        AC_COMPILE_IFELSE(
     
    748743])
    749744
    750 dnl This macro ensures DP installation prefix bin/sbin paths are NOT in PATH
     745dnl This macro ensures MP installation prefix bin/sbin paths are NOT in PATH
    751746dnl for configure to prevent potential problems when base/ code is updated
    752747dnl and ports are installed that would match needed items.
    753 AC_DEFUN([OD_PATH_SCAN],[
     748AC_DEFUN([MP_PATH_SCAN],[
    754749        oldprefix=$prefix
    755750        if test "x$prefix" = "xNONE" ; then
     
    776771
    777772dnl This macro tests for tar support of --no-same-owner
    778 AC_DEFUN([OD_TAR_NO_SAME_OWNER],[
     773AC_DEFUN([MP_TAR_NO_SAME_OWNER],[
    779774        AC_PATH_PROG(TAR, [tar])
    780775        AC_PATH_PROG(GNUTAR, [gnutar])
     
    796791
    797792#------------------------------------------------------------------------
    798 # DP_CHECK_READLINK_IS_P1003_1A --
     793# MP_CHECK_READLINK_IS_P1003_1A --
    799794#
    800795#       Check if readlink conforms to POSIX 1003.1a standard, define
     
    817812#
    818813#------------------------------------------------------------------------
    819 AC_DEFUN(DP_CHECK_READLINK_IS_P1003_1A, [
     814AC_DEFUN(MP_CHECK_READLINK_IS_P1003_1A, [
    820815        AC_MSG_CHECKING([if readlink conforms to POSIX 1003.1a])
    821816
    822         AC_CACHE_VAL(dp_cv_readlink_is_posix_1003_1a, [
     817        AC_CACHE_VAL(mp_cv_readlink_is_posix_1003_1a, [
    823818                AC_COMPILE_IFELSE([
    824819                        AC_LANG_PROGRAM([
     
    828823                        ])
    829824                        ], [
    830                                 dp_cv_readlink_is_posix_1003_1a="yes"
    831                         ], [
    832                                 dp_cv_readlink_is_posix_1003_1a="no"
     825                                mp_cv_readlink_is_posix_1003_1a="yes"
     826                        ], [
     827                                mp_cv_readlink_is_posix_1003_1a="no"
    833828                        ]
    834829                )
    835830        ])
    836831
    837         AC_MSG_RESULT(${dp_cv_readlink_is_posix_1003_1a})
    838 
    839         if test x"${dp_cv_readlink_is_posix_1003_1a}" = "xno"; then
     832        AC_MSG_RESULT(${mp_cv_readlink_is_posix_1003_1a})
     833
     834        if test x"${mp_cv_readlink_is_posix_1003_1a}" = "xno"; then
    840835                AC_DEFINE([READLINK_IS_NOT_P1003_1A], [], [Define to 1 if readlink does not conform with POSIX 1003.1a (where third argument is a size_t and return value is a ssize_t)])
    841836        fi
Note: See TracChangeset for help on using the changeset viewer.