Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
48ba5e49
Commit
48ba5e49
authored
Apr 20, 2005
by
joerg@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Step 1 of the switch to support configuration with NPTL:
Rename 'IS_LINUX' configuration variable to 'TARGET_LINUX'.
parent
49b4af7b
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
14 deletions
+14
-14
acinclude.m4
acinclude.m4
+1
-1
configure.in
configure.in
+9
-9
myisam/Makefile.am
myisam/Makefile.am
+1
-1
scripts/Makefile.am
scripts/Makefile.am
+1
-1
scripts/mysqld_safe.sh
scripts/mysqld_safe.sh
+1
-1
support-files/Makefile.am
support-files/Makefile.am
+1
-1
No files found.
acinclude.m4
View file @
48ba5e49
...
...
@@ -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
View file @
48ba5e49
...
...
@@ -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
View file @
48ba5e49
...
...
@@ -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
View file @
48ba5e49
...
...
@@ -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
View file @
48ba5e49
...
...
@@ -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)
...
...
support-files/Makefile.am
View file @
48ba5e49
...
...
@@ -90,7 +90,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@!'
\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment