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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
9023b3a3
Commit
9023b3a3
authored
16 years ago
by
kent@mysql.com/kent-amd64.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
configure.in, acinclude.m4:
Minor cleanup, removed semicolons not needed
parent
417669f9
Branches unavailable
Tags unavailable
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
17 deletions
+17
-17
acinclude.m4
acinclude.m4
+2
-2
configure.in
configure.in
+15
-15
No files found.
acinclude.m4
View file @
9023b3a3
...
@@ -859,11 +859,11 @@ AC_MSG_CHECKING(for OpenSSL)
...
@@ -859,11 +859,11 @@ AC_MSG_CHECKING(for OpenSSL)
AC_MSG_RESULT(no)
AC_MSG_RESULT(no)
if test ! -z "$openssl_includes"
if test ! -z "$openssl_includes"
then
then
AC_MSG_ERROR(Can't have --with-openssl-includes without --with-openssl)
;
AC_MSG_ERROR(Can't have --with-openssl-includes without --with-openssl)
fi
fi
if test ! -z "$openssl_libs"
if test ! -z "$openssl_libs"
then
then
AC_MSG_ERROR(Can't have --with-openssl-libs without --with-openssl)
;
AC_MSG_ERROR(Can't have --with-openssl-libs without --with-openssl)
fi
fi
fi
fi
AC_SUBST(openssl_libs)
AC_SUBST(openssl_libs)
...
...
This diff is collapsed.
Click to expand it.
configure.in
View file @
9023b3a3
...
@@ -150,7 +150,7 @@ CC_VERSION=`$CC --version | sed 1q`
...
@@ -150,7 +150,7 @@ CC_VERSION=`$CC --version | sed 1q`
esac
esac
if
test
$?
-eq
"0"
if
test
$?
-eq
"0"
then
then
AC_MSG_CHECKING
(
"C Compiler version"
)
;
AC_MSG_CHECKING
(
"C Compiler version"
)
AC_MSG_RESULT
(
"
$CC
$CC_VERSION
"
)
AC_MSG_RESULT
(
"
$CC
$CC_VERSION
"
)
else
else
CC_VERSION
=
""
CC_VERSION
=
""
...
@@ -165,7 +165,7 @@ CXX_VERSION=`$CXX --version | sed 1q`
...
@@ -165,7 +165,7 @@ CXX_VERSION=`$CXX --version | sed 1q`
esac
esac
if
test
$?
-eq
"0"
if
test
$?
-eq
"0"
then
then
AC_MSG_CHECKING
(
"C++ compiler version"
)
;
AC_MSG_CHECKING
(
"C++ compiler version"
)
AC_MSG_RESULT
(
"
$CXX
$CXX_VERSION
"
)
AC_MSG_RESULT
(
"
$CXX
$CXX_VERSION
"
)
else
else
CXX_VERSION
=
""
CXX_VERSION
=
""
...
@@ -389,12 +389,12 @@ if expr "$target_os" : "[[Ll]]inux.*" > /dev/null
...
@@ -389,12 +389,12 @@ if expr "$target_os" : "[[Ll]]inux.*" > /dev/null
then
then
MYSQLD_DEFAULT_SWITCHES
=
"--skip-locking"
MYSQLD_DEFAULT_SWITCHES
=
"--skip-locking"
TARGET_LINUX
=
"true"
TARGET_LINUX
=
"true"
AC_MSG_RESULT
(
"yes"
)
;
AC_MSG_RESULT
(
"yes"
)
AC_DEFINE
([
TARGET_OS_LINUX],
[
1],
[
Whether we build
for
Linux]
)
AC_DEFINE
([
TARGET_OS_LINUX],
[
1],
[
Whether we build
for
Linux]
)
else
else
MYSQLD_DEFAULT_SWITCHES
=
""
MYSQLD_DEFAULT_SWITCHES
=
""
TARGET_LINUX
=
"false"
TARGET_LINUX
=
"false"
AC_MSG_RESULT
(
"no"
)
;
AC_MSG_RESULT
(
"no"
)
fi
fi
AC_SUBST
(
MYSQLD_DEFAULT_SWITCHES
)
AC_SUBST
(
MYSQLD_DEFAULT_SWITCHES
)
AC_SUBST
(
TARGET_LINUX
)
AC_SUBST
(
TARGET_LINUX
)
...
@@ -1289,7 +1289,7 @@ See the Installation chapter in the Reference Manual for more information.])
...
@@ -1289,7 +1289,7 @@ See the Installation chapter in the Reference Manual for more information.])
else
else
AC_MSG_RESULT
(
"no need to check headers"
)
AC_MSG_RESULT
(
"no need to check headers"
)
fi
fi
AC_MSG_CHECKING
(
"for pthread_create in -lpthread"
)
;
AC_MSG_CHECKING
(
"for pthread_create in -lpthread"
)
ac_save_LIBS
=
"
$LIBS
"
ac_save_LIBS
=
"
$LIBS
"
LIBS
=
"
$LIBS
-lpthread"
LIBS
=
"
$LIBS
-lpthread"
AC_TRY_LINK
(
[
#include <pthread.h>],
AC_TRY_LINK
(
[
#include <pthread.h>],
...
@@ -1359,7 +1359,7 @@ then
...
@@ -1359,7 +1359,7 @@ then
then
then
AC_MSG_RESULT
(
"yes"
)
AC_MSG_RESULT
(
"yes"
)
else
else
AC_MSG_ERROR
([
On SCO UNIX MySQL must be compiled with gcc. See the Installation chapter
in
the Reference Manual.]
)
;
AC_MSG_ERROR
([
On SCO UNIX MySQL must be compiled with gcc. See the Installation chapter
in
the Reference Manual.]
)
fi
fi
AC_MSG_RESULT
(
"yes"
)
AC_MSG_RESULT
(
"yes"
)
elif
test
-f
/usr/local/lib/libpthread.a
-o
-f
/usr/local/lib/libpthread.so
elif
test
-f
/usr/local/lib/libpthread.a
-o
-f
/usr/local/lib/libpthread.so
...
@@ -1375,7 +1375,7 @@ then
...
@@ -1375,7 +1375,7 @@ then
then
then
AC_MSG_RESULT
(
"yes"
)
AC_MSG_RESULT
(
"yes"
)
else
else
AC_MSG_ERROR
([
On SCO UNIX MySQL must be compiled with gcc. See the Installation chapter
in
the Reference Manual.]
)
;
AC_MSG_ERROR
([
On SCO UNIX MySQL must be compiled with gcc. See the Installation chapter
in
the Reference Manual.]
)
fi
fi
AC_MSG_RESULT
(
"yes"
)
AC_MSG_RESULT
(
"yes"
)
# Hack for SCO UnixWare 7.1.x
# Hack for SCO UnixWare 7.1.x
...
@@ -1419,7 +1419,7 @@ then
...
@@ -1419,7 +1419,7 @@ then
AC_MSG_RESULT
(
"no"
)
AC_MSG_RESULT
(
"no"
)
fi
fi
else
else
AC_MSG_ERROR
([
On SCO UNIX MySQL requires that the FSUThreads package is installed. See the Installation chapter
in
the Reference Manual.]
)
;
AC_MSG_ERROR
([
On SCO UNIX MySQL requires that the FSUThreads package is installed. See the Installation chapter
in
the Reference Manual.]
)
fi
fi
else
else
AC_MSG_RESULT
(
"no"
)
AC_MSG_RESULT
(
"no"
)
...
@@ -1564,7 +1564,7 @@ else
...
@@ -1564,7 +1564,7 @@ else
if
test
"
$with_mit_threads
"
=
"no"
if
test
"
$with_mit_threads
"
=
"no"
then
then
# pthread_create is in standard libraries (As in BSDI 3.0)
# pthread_create is in standard libraries (As in BSDI 3.0)
AC_MSG_CHECKING
(
"for pthread_create in -libc"
)
;
AC_MSG_CHECKING
(
"for pthread_create in -libc"
)
AC_TRY_LINK
(
AC_TRY_LINK
(
[
#include <pthread.h>],
[
#include <pthread.h>],
[
(
void
)
pthread_create
((
pthread_t
*
)
0,
(
pthread_attr_t
*
)
0, 0, 0
)
;
]
,
[
(
void
)
pthread_create
((
pthread_t
*
)
0,
(
pthread_attr_t
*
)
0, 0, 0
)
;
]
,
...
@@ -1572,7 +1572,7 @@ else
...
@@ -1572,7 +1572,7 @@ else
AC_MSG_RESULT
(
"
$with_posix_threads
"
)
AC_MSG_RESULT
(
"
$with_posix_threads
"
)
if
test
"
$with_posix_threads
"
=
"no"
if
test
"
$with_posix_threads
"
=
"no"
then
then
AC_MSG_CHECKING
(
"for pthread_create in -lpthread"
)
;
AC_MSG_CHECKING
(
"for pthread_create in -lpthread"
)
ac_save_LIBS
=
"
$LIBS
"
ac_save_LIBS
=
"
$LIBS
"
ac_save_TOOLS_LIBS
=
"
$TOOLS_LIBS
"
ac_save_TOOLS_LIBS
=
"
$TOOLS_LIBS
"
LIBS
=
"
$LIBS
-lpthread"
LIBS
=
"
$LIBS
-lpthread"
...
@@ -1586,7 +1586,7 @@ else
...
@@ -1586,7 +1586,7 @@ else
then
then
LIBS
=
"
$ac_save_LIBS
-lpthreads"
LIBS
=
"
$ac_save_LIBS
-lpthreads"
TOOLS_LIBS
=
"
$ac_save_TOOLS_LIBS
-lpthreads"
TOOLS_LIBS
=
"
$ac_save_TOOLS_LIBS
-lpthreads"
AC_MSG_CHECKING
(
"for pthread_create in -lpthreads"
)
;
AC_MSG_CHECKING
(
"for pthread_create in -lpthreads"
)
AC_TRY_LINK
(
AC_TRY_LINK
(
[
#include <pthread.h>],
[
#include <pthread.h>],
[
pthread_create
((
pthread_t
*
)
0,
(
pthread_attr_t
*
)
0, 0, 0
)
;
]
,
[
pthread_create
((
pthread_t
*
)
0,
(
pthread_attr_t
*
)
0, 0, 0
)
;
]
,
...
@@ -1597,7 +1597,7 @@ else
...
@@ -1597,7 +1597,7 @@ else
# This is for FreeBSD
# This is for FreeBSD
LIBS
=
"
$ac_save_LIBS
-pthread"
LIBS
=
"
$ac_save_LIBS
-pthread"
TOOLS_LIBS
=
"
$ac_save_TOOLS_LIBS
-pthread"
TOOLS_LIBS
=
"
$ac_save_TOOLS_LIBS
-pthread"
AC_MSG_CHECKING
(
"for pthread_create in -pthread"
)
;
AC_MSG_CHECKING
(
"for pthread_create in -pthread"
)
AC_TRY_LINK
(
AC_TRY_LINK
(
[
#include <pthread.h>],
[
#include <pthread.h>],
[
pthread_create
((
pthread_t
*
)
0,
(
pthread_attr_t
*
)
0, 0, 0
)
;
]
,
[
pthread_create
((
pthread_t
*
)
0,
(
pthread_attr_t
*
)
0, 0, 0
)
;
]
,
...
@@ -1840,7 +1840,7 @@ if test "$ac_cv_conv_longlong_to_float" != "yes"
...
@@ -1840,7 +1840,7 @@ if test "$ac_cv_conv_longlong_to_float" != "yes"
then
then
AC_MSG_ERROR
([
Your compiler cannot convert a longlong value to a float!
AC_MSG_ERROR
([
Your compiler cannot convert a longlong value to a float!
If you are using gcc 2.8.# you should upgrade to egcs 1.0.3 or newer and try
If you are using gcc 2.8.# you should upgrade to egcs 1.0.3 or newer and try
again]
)
;
again]
)
fi
fi
fi
fi
MYSQL_PTHREAD_YIELD
MYSQL_PTHREAD_YIELD
...
@@ -1923,7 +1923,7 @@ CFLAGS="$ORG_CFLAGS"
...
@@ -1923,7 +1923,7 @@ CFLAGS="$ORG_CFLAGS"
AC_CHECK_FUNCS
(
fseeko,
AC_CHECK_FUNCS
(
fseeko,
[
if
test
"
$large_file_support
"
=
no
-a
"
$TARGET_LINUX
"
=
"true"
;
[
if
test
"
$large_file_support
"
=
no
-a
"
$TARGET_LINUX
"
=
"true"
;
then
then
AC_MSG_ERROR
(
"Found fseeko symbol but large_file_support is not enabled!"
)
;
AC_MSG_ERROR
(
"Found fseeko symbol but large_file_support is not enabled!"
)
fi
]
fi
]
)
)
...
@@ -2379,7 +2379,7 @@ do
...
@@ -2379,7 +2379,7 @@ do
if
test
$charset_okay
=
0
;
if
test
$charset_okay
=
0
;
then
then
AC_MSG_ERROR
([
Charset
'$cs'
not available.
(
Available
$CHARSETS_AVAILABLE
)
.
AC_MSG_ERROR
([
Charset
'$cs'
not available.
(
Available
$CHARSETS_AVAILABLE
)
.
See the Installation chapter
in
the Reference Manual.]
)
;
See the Installation chapter
in
the Reference Manual.]
)
fi
fi
done
done
...
...
This diff is collapsed.
Click to expand it.
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