Commit 677fbc7d authored by unknown's avatar unknown
Browse files

Step 1 of the switch to support configuration with NPTL: 

Rename 'IS_LINUX' configuration variable to 'TARGET_LINUX'.
parent 24dd3ea8

acinclude.m4

+1 −1
Original line number Diff line number Diff line
@@ -976,7 +976,7 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [ 
 if test -z "$OPENSSL_LIB" -o -z "$OPENSSL_INCLUDE" ; then

   echo "Could not find an installation of OpenSSL"

   if test -n "$OPENSSL_LIB" ; then

    if test "$IS_LINUX" = "true"; then

    if test "$TARGET_LINUX" = "true"; then

      echo "Looks like you've forgotten to install OpenSSL development RPM"

    fi

   fi

configure.in

+9 −9
Original line number Diff line number Diff line
@@ -410,15 +410,15 @@ AC_MSG_CHECKING("if we should use 'skip-locking' as default for $target_os") 
if expr "$target_os" : "[[Ll]]inux.*" > /dev/null

then

  MYSQLD_DEFAULT_SWITCHES="--skip-locking"

  IS_LINUX="true"

  TARGET_LINUX="true"

  AC_MSG_RESULT("yes");

else

  MYSQLD_DEFAULT_SWITCHES=""

  IS_LINUX="false"

  TARGET_LINUX="false"

  AC_MSG_RESULT("no");

fi

AC_SUBST(MYSQLD_DEFAULT_SWITCHES)

AC_SUBST(IS_LINUX)

AC_SUBST(TARGET_LINUX)



dnl Find paths to some shell programs

AC_PATH_PROG(LN, ln, ln)
@@ -607,7 +607,7 @@ AC_SUBST(NOINST_LDFLAGS) 
# (this is true on the MySQL build machines to avoid NSS problems)

#



if test "$IS_LINUX" = "true" -a "$static_nss" = ""

if test "$TARGET_LINUX" = "true" -a "$static_nss" = ""

then

  tmp=`nm /usr/lib/libc.a  | grep _nss_files_getaliasent_r`

  if test -n "$tmp"
@@ -841,7 +841,7 @@ struct request_info *req; 
])

AC_SUBST(WRAPLIBS)



if test "$IS_LINUX" = "true"; then

if test "$TARGET_LINUX" = "true"; then

  AC_MSG_CHECKING([for atomic operations])



  atom_ops=
@@ -885,7 +885,7 @@ int main() 
    [ USE_PSTACK=no ])

  pstack_libs=

  pstack_dirs=

  if test "$USE_PSTACK" = yes -a "$IS_LINUX" = "true" -a "$BASE_MACHINE_TYPE" = "i386" -a "$with_mit_threads" = "no"

  if test "$USE_PSTACK" = yes -a "$TARGET_LINUX" = "true" -a "$BASE_MACHINE_TYPE" = "i386" -a "$with_mit_threads" = "no"

  then

    have_libiberty= have_libbfd=

    my_save_LIBS="$LIBS"
@@ -1286,7 +1286,7 @@ then 
    else

      AC_MSG_RESULT("Not found")

      # If this is a linux machine we should barf

      if test "$IS_LINUX" = "true"

      if test "$TARGET_LINUX" = "true"

      then

	AC_MSG_ERROR([This is a linux system and Linuxthreads was not

found. On linux Linuxthreads should be used.  Please install Linuxthreads
@@ -1738,7 +1738,7 @@ fi 
AC_SUBST(COMPILATION_COMMENT)



AC_MSG_CHECKING("need of special linking flags")

if test "$IS_LINUX" = "true" -a "$ac_cv_prog_gcc" = "yes" -a "$all_is_static" != "yes"

if test "$TARGET_LINUX" = "true" -a "$ac_cv_prog_gcc" = "yes" -a "$all_is_static" != "yes"

then

  LDFLAGS="$LDFLAGS -rdynamic"

  AC_MSG_RESULT("-rdynamic")
@@ -1955,7 +1955,7 @@ CFLAGS="$ORG_CFLAGS" 
# Sanity check: We chould not have any fseeko symbol unless

# large_file_support=yes

AC_CHECK_FUNC(fseeko,

[if test "$large_file_support" = no -a "$IS_LINUX" = "true";

[if test "$large_file_support" = no -a "$TARGET_LINUX" = "true";

then

  AC_MSG_ERROR("Found fseeko symbol but large_file_support is not enabled!");

fi]

myisam/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ SUFFIXES = .sh 
	  -e 's!@''FIND_PROC''@!@FIND_PROC@!' \

	  -e 's!@''MYSQLD_DEFAULT_SWITCHES''@!@MYSQLD_DEFAULT_SWITCHES@!' \

	  -e 's!@''MYSQL_UNIX_ADDR''@!@MYSQL_UNIX_ADDR@!' \

	  -e 's!@''IS_LINUX''@!@IS_LINUX@!' \

	  -e 's!@''TARGET_LINUX''@!@TARGET_LINUX@!' \

	  -e "s!@""CONF_COMMAND""@!@CONF_COMMAND@!" \

	  -e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \

	  -e 's!@''sysconfdir''@!@sysconfdir@!' \

scripts/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ SUFFIXES = .sh 
	  -e 's!@''MYSQLD_DEFAULT_SWITCHES''@!@MYSQLD_DEFAULT_SWITCHES@!' \

	  -e 's!@''MYSQL_UNIX_ADDR''@!@MYSQL_UNIX_ADDR@!' \

	  -e 's!@''MYSQL_TCP_PORT''@!@MYSQL_TCP_PORT@!' \

	  -e 's!@''IS_LINUX''@!@IS_LINUX@!' \

	  -e 's!@''TARGET_LINUX''@!@TARGET_LINUX@!' \

	  -e "s!@""CONF_COMMAND""@!@CONF_COMMAND@!" \

	  -e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \

	  -e 's!@''STATIC_NSS_FLAGS''@!@STATIC_NSS_FLAGS@!' \

scripts/mysqld_safe.sh

+1 −1
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ do 
    break

  fi



  if @IS_LINUX@ && test $KILL_MYSQLD -eq 1

  if @TARGET_LINUX@ && test $KILL_MYSQLD -eq 1

  then

    # Test if one process was hanging.

    # This is only a fix for Linux (running as base 3 mysqld processes)