Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Slurm
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tud-zih-energy
Slurm
Commits
f246b7a5
Commit
f246b7a5
authored
10 years ago
by
David Bigagli
Browse files
Options
Downloads
Patches
Plain Diff
Update the mysql_config to use the --include option instead
of --cflags. See #1066.
parent
c4404daf
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
auxdir/x_ac_databases.m4
+2
-2
2 additions, 2 deletions
auxdir/x_ac_databases.m4
with
2 additions
and
2 deletions
auxdir/x_ac_databases.m4
+
2
−
2
View file @
f246b7a5
...
@@ -46,7 +46,7 @@ AC_DEFUN([X_AC_DATABASES],
...
@@ -46,7 +46,7 @@ AC_DEFUN([X_AC_DATABASES],
else
else
# mysql_config puts -I on the front of the dir. We don't
# mysql_config puts -I on the front of the dir. We don't
# want that so we remove it.
# want that so we remove it.
MYSQL_CFLAGS=`$HAVEMYSQLCONFIG --
cflags
`
MYSQL_CFLAGS=`$HAVEMYSQLCONFIG --
include
`
MYSQL_LIBS=`$HAVEMYSQLCONFIG --libs_r`
MYSQL_LIBS=`$HAVEMYSQLCONFIG --libs_r`
save_CFLAGS="$CFLAGS"
save_CFLAGS="$CFLAGS"
save_LIBS="$LIBS"
save_LIBS="$LIBS"
...
@@ -67,7 +67,7 @@ AC_DEFUN([X_AC_DATABASES],
...
@@ -67,7 +67,7 @@ AC_DEFUN([X_AC_DATABASES],
AC_SUBST(MYSQL_CFLAGS)
AC_SUBST(MYSQL_CFLAGS)
AC_DEFINE(HAVE_MYSQL, 1, [Define to 1 if using MySQL libaries])
AC_DEFINE(HAVE_MYSQL, 1, [Define to 1 if using MySQL libaries])
else
else
MYSQL_CFLAGS=`$HAVEMYSQLCONFIG --
cflags
`
MYSQL_CFLAGS=`$HAVEMYSQLCONFIG --
include
`
MYSQL_LIBS=`$HAVEMYSQLCONFIG --libs`
MYSQL_LIBS=`$HAVEMYSQLCONFIG --libs`
save_CFLAGS="$CFLAGS"
save_CFLAGS="$CFLAGS"
save_LIBS="$LIBS"
save_LIBS="$LIBS"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment