common/autoconf/basics.m4
changeset 22726 d984085c5ff2
parent 22722 03797b5d2ba3
child 23428 3c8a05bf4656
equal deleted inserted replaced
22725:c382bed20726 22726:d984085c5ff2
   416 ])
   416 ])
   417 
   417 
   418 # Setup basic configuration paths, and platform-specific stuff related to PATHs.
   418 # Setup basic configuration paths, and platform-specific stuff related to PATHs.
   419 AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
   419 AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
   420 [
   420 [
       
   421   # Save the current directory this script was started from
       
   422   CURDIR="$PWD"
       
   423 
       
   424   if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
       
   425     PATH_SEP=";"
       
   426     BASIC_CHECK_PATHS_WINDOWS
       
   427   else
       
   428     PATH_SEP=":"
       
   429   fi
       
   430   AC_SUBST(PATH_SEP)
       
   431 
   421   # We get the top-level directory from the supporting wrappers.
   432   # We get the top-level directory from the supporting wrappers.
   422   AC_MSG_CHECKING([for top-level directory])
   433   AC_MSG_CHECKING([for top-level directory])
   423   AC_MSG_RESULT([$TOPDIR])
   434   AC_MSG_RESULT([$TOPDIR])
       
   435   AC_SUBST(TOPDIR)
       
   436 
       
   437   # We can only call BASIC_FIXUP_PATH after BASIC_CHECK_PATHS_WINDOWS.
       
   438   BASIC_FIXUP_PATH(CURDIR)
   424   BASIC_FIXUP_PATH(TOPDIR)
   439   BASIC_FIXUP_PATH(TOPDIR)
   425   AC_SUBST(TOPDIR)
       
   426 
       
   427   # SRC_ROOT is a traditional alias for TOPDIR.
   440   # SRC_ROOT is a traditional alias for TOPDIR.
   428   SRC_ROOT=$TOPDIR
   441   SRC_ROOT=$TOPDIR
   429 
   442 
   430   # Locate the directory of this script.
   443   # Locate the directory of this script.
   431   AUTOCONF_DIR=$TOPDIR/common/autoconf
   444   AUTOCONF_DIR=$TOPDIR/common/autoconf
   432 
       
   433   # Save the current directory this script was started from
       
   434   CURDIR="$PWD"
       
   435   BASIC_FIXUP_PATH(CURDIR)
       
   436 
       
   437   if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
       
   438     PATH_SEP=";"
       
   439     BASIC_CHECK_PATHS_WINDOWS
       
   440   else
       
   441     PATH_SEP=":"
       
   442   fi
       
   443   AC_SUBST(PATH_SEP)
       
   444 
   445 
   445   if test "x$OPENJDK_BUILD_OS" = "xsolaris"; then
   446   if test "x$OPENJDK_BUILD_OS" = "xsolaris"; then
   446     # Add extra search paths on solaris for utilities like ar and as etc...
   447     # Add extra search paths on solaris for utilities like ar and as etc...
   447     PATH="$PATH:/usr/ccs/bin:/usr/sfw/bin:/opt/csw/bin"
   448     PATH="$PATH:/usr/ccs/bin:/usr/sfw/bin:/opt/csw/bin"
   448   fi
   449   fi