Commits

Frank Schima authored 22968b1f766 
bacula: Do not hardcode Macports directory. Fix for installed version of mysql.

git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@122167 d073be05-634f-4543-b044-5fe20cf6d1d6
No tags
10e1d341a14
master

sysutils/bacula/files/patch-configure-mysql.diff

Modified
1 ---- configure.orig 2014-06-03 01:28:41.000000000 -0700
2 -+++ configure 2014-06-26 06:42:01.000000000 -0700
3 -@@ -24039,112 +24039,13 @@
4 - if test "${with_mysql+set}" = set; then :
5 - withval=$with_mysql;
6 - if test "$withval" != "no"; then
7 -- if test "$withval" = "yes"; then
8 --#
9 --# This code is very broken on older systems
10 --#
11 --# MYSQL_CONFIG=`which mysql_config 2>/dev/null`
12 --# if test "x${MYSQL_CONFIG}" != x; then
13 --# MYSQL_BINDIR="${MYSQL_CONFIG%/*}"
14 --# ${MYSQL_CONFIG} --variable=pkglibdir > /dev/null 2>&1
15 --# if test $? = 0 ; then
16 --# MYSQL_LIBDIR=`${MYSQL_CONFIG} --variable=pkglibdir`
17 --# MYSQL_INCDIR=`${MYSQL_CONFIG} --variable=pkgincludedir`
18 --# else
19 --# MYSQL_LIBDIR=`${MYSQL_CONFIG} --libs | sed -e 's/.*-L//' -e 's/ .*//'`
20 --# MYSQL_INCDIR=`${MYSQL_CONFIG} --include | sed -e 's/-I//'`
21 --# fi
22 --# elif test -f /usr/local/mysql/include/mysql/mysql.h; then
23 -- if test -f /usr/local/mysql/include/mysql/mysql.h; then
24 -- MYSQL_INCDIR=/usr/local/mysql/include/mysql
25 -- if test -f /usr/local/mysql/lib64/mysql/libmysqlclient_r.a \
26 -- -o -f /usr/local/mysql/lib64/mysql/libmysqlclient_r.so; then
27 -- MYSQL_LIBDIR=/usr/local/mysql/lib64/mysql
28 -- else
29 -- MYSQL_LIBDIR=/usr/local/mysql/lib/mysql
30 -- fi
31 -- MYSQL_BINDIR=/usr/local/mysql/bin
32 -- elif test -f /usr/include/mysql/mysql.h; then
33 -- MYSQL_INCDIR=/usr/include/mysql
34 -- if test -f /usr/lib64/mysql/libmysqlclient_r.a \
35 -- -o -f /usr/lib64/mysql/libmysqlclient_r.so; then
36 -- MYSQL_LIBDIR=/usr/lib64/mysql
37 -- elif test -f /usr/lib64/libmysqlclient_r.a \
38 -- -o -f /usr/lib64/libmysqlclient_r.so; then
39 -- MYSQL_LIBDIR=/usr/lib64
40 -- elif test -f /usr/lib/x86_64-linux-gnu/libmysqlclient_r.a \
41 -- -o -f /usr/lib/x86_64-linux-gnu/libmysqlclient_r.so; then
42 -- MYSQL_LIBDIR=/usr/lib/x86_64-linux-gnu
43 -- elif test -f /usr/lib/mysql/libmysqlclient_r.a \
44 -- -o -f /usr/lib/mysql/libmysqlclient_r.so; then
45 -- MYSQL_LIBDIR=/usr/lib/mysql
46 -- else
47 -- MYSQL_LIBDIR=/usr/lib
48 -- fi
49 -- MYSQL_BINDIR=/usr/bin
50 -- elif test -f /usr/include/mysql.h; then
51 -- MYSQL_INCDIR=/usr/include
52 -- if test -f /usr/lib64/libmysqlclient_r.a \
53 -- -o -f /usr/lib64/libmysqlclient_r.so; then
54 -- MYSQL_LIBDIR=/usr/lib64
55 -- else
56 -- MYSQL_LIBDIR=/usr/lib
57 -- fi
58 -- MYSQL_BINDIR=/usr/bin
59 -- elif test -f /usr/local/include/mysql/mysql.h; then
60 -- MYSQL_INCDIR=/usr/local/include/mysql
61 -- if test -f /usr/local/lib64/mysql/libmysqlclient_r.a \
62 -- -o -f /usr/local/lib64/mysql/libmysqlclient_r.so; then
63 -- MYSQL_LIBDIR=/usr/local/lib64/mysql
64 -- else
65 -- MYSQL_LIBDIR=/usr/local/lib/mysql
66 -- fi
67 -- MYSQL_BINDIR=/usr/local/bin
68 -- elif test -f /usr/local/include/mysql.h; then
69 -- MYSQL_INCDIR=/usr/local/include
70 -- if test -f /usr/local/lib64/libmysqlclient_r.a \
71 -- -o -f /usr/local/lib64/libmysqlclient_r.so; then
72 -- MYSQL_LIBDIR=/usr/local/lib64
73 -- else
74 -- MYSQL_LIBDIR=/usr/local/lib
75 -- fi
76 -- MYSQL_BINDIR=/usr/local/bin
77 -- else
78 -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
79 --$as_echo "no" >&6; }
80 -- as_fn_error $? "Unable to find mysql.h in standard locations" "$LINENO" 5
81 -- fi
82 -- else
83 -- if test -f $withval/include/mysql/mysql.h; then
84 -- MYSQL_INCDIR=$withval/include/mysql
85 -- if test -f $withval/lib64/mysql/libmysqlclient_r.a \
86 -- -o -f $withval/lib64/mysql/libmysqlclient_r.so; then
87 -- MYSQL_LIBDIR=$withval/lib64/mysql
88 -- elif test -f $withval/lib64/libmysqlclient_r.a \
89 -- -o -f $withval/lib64/libmysqlclient_r.so; then
90 -- MYSQL_LIBDIR=$withval/lib64
91 -- elif test -f $withval/lib/libmysqlclient_r.a \
92 -- -o -f $withval/lib/libmysqlclient_r.so; then
93 -- MYSQL_LIBDIR=$withval/lib
94 -- else
95 -- MYSQL_LIBDIR=$withval/lib/mysql
96 -- fi
97 -- MYSQL_BINDIR=$withval/bin
98 -- elif test -f $withval/include/mysql.h; then
99 -- MYSQL_INCDIR=$withval/include
100 -- if test -f $withval/lib64/libmysqlclient_r.a \
101 -- -o -f $withval/lib64/libmysqlclient_r.so; then
102 -- MYSQL_LIBDIR=$withval/lib64
103 -- else
104 -- MYSQL_LIBDIR=$withval/lib
105 -- fi
106 -- MYSQL_BINDIR=$withval/bin
107 -- else
108 -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
109 --$as_echo "no" >&6; }
110 -- as_fn_error $? "Invalid MySQL directory $withval - unable to find mysql.h under $withval" "$LINENO" 5
111 -- fi
112 -- fi
113 -+
114 -+ ## replaced by macports start
115 -+ MYSQL_INCDIR=/opt/local/include/mysql55/mysql
116 -+ MYSQL_LIBDIR=/opt/local/lib/mysql55/mysql
117 -+ MYSQL_BINDIR=/opt/local/lib/mysql55/bin
118 -+ ## replaced by macports end
119 -+
120 - MYSQL_INCLUDE=-I$MYSQL_INCDIR
121 - if test -f $MYSQL_LIBDIR/libmysqlclient_r.a \
122 - -o -f $MYSQL_LIBDIR/libmysqlclient_r.so; then
1 +--- configure.org 2014-07-15 23:08:18.000000000 +0200
2 ++++ configure 2014-07-15 23:22:03.000000000 +0200
3 +@@ -24139,6 +24139,23 @@
4 + MYSQL_LIBDIR=$withval/lib
5 + fi
6 + MYSQL_BINDIR=$withval/bin
7 ++ ## added by macports start
8 ++ elif test -f $withval/mysql.h; then
9 ++ MYSQL_INCDIR=$withval
10 ++ if [[ ${withval} == *"mysql55"* ]]; then
11 ++ if test -f @@PREFIX@@/lib/mysql55/mysql/libmysqlclient_r.a \
12 ++ -o -f @@PREFIX@@/lib/mysql55/mysql/libmysqlclient_r.so; then
13 ++ MYSQL_LIBDIR=@@PREFIX@@/lib/mysql55/mysql
14 ++ fi
15 ++ MYSQL_BINDIR=@@PREFIX@@/lib/mysql55/bin
16 ++ elif [[ ${withval} == *"mysql51"* ]]; then
17 ++ if test -f @@PREFIX@@/lib/mysql51/mysql/libmysqlclient_r.a \
18 ++ -o -f @@PREFIX@@/lib/mysql51/mysql/libmysqlclient_r.so; then
19 ++ MYSQL_LIBDIR=@@PREFIX@@/lib/mysql51/mysql
20 ++ fi
21 ++ MYSQL_BINDIR=@@PREFIX@@/lib/mysql51/bin
22 ++ fi
23 ++ ## added by macports end
24 + else
25 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
26 + $as_echo "no" >&6; }

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut