← Back to branch summary

~vkolesnikov/pbxt/pbxt-07-diskfull

« back to all changes in this revision

Viewing changes to config/ac_mysql.m4

  • Committer: Paul McCullagh
  • Date: 2008-09-08 17:47:43 UTC
  • Revision ID: paul.mccullagh@primebase.org-20080908174743-ob33irxkghxtslwc
Fixed configure added --with-plugindir

Show diffs side-by-side

added added

removed removed

Lines of Context:
config/ac_mysql.m4
4
4
AC_DEFUN([MYSQL_SRC_TEST], [
5
5
  AC_MSG_CHECKING(for mysql source code)
6
6
  AC_ARG_WITH(mysql,
7
 
  [[--with-mysql[=mysql source directory] Source required to build engine.]],
 
7
  [[  --with-mysql=DIR        the target MySQL source tree for building the engine,
 
8
                          this option is required]],
8
9
  [ENG_MYSQL_SRC="$withval"],
9
10
  [ENG_MYSQL_SRC="../.."])
10
11
  if test "$ENG_MYSQL_SRC" = "no"; then
11
12
    ENG_MYSQL_SRC="../.."
12
13
  fi;
13
14
  if test -d "$ENG_MYSQL_SRC/sql"; then
14
 
    if test "$ENG_MYSQL_SRC" = "../.."; then
15
 
      ENG_MYSQL_SRC="../../.."
16
 
    fi
 
15
        ENG_MYSQL_SRC=`(cd $ENG_MYSQL_SRC && pwd;)`
17
16
    AC_DEFINE([ENG_MYSQL_SRC], [1], [Source directory for MySQL])
18
17
    ENG_MYSQL_INC="-I$ENG_MYSQL_SRC/sql -I$ENG_MYSQL_SRC/include -I$ENG_MYSQL_SRC/regex -I$ENG_MYSQL_SRC"
19
18
    AC_MSG_RESULT(["$ENG_MYSQL_SRC"])
46
45
        fi      
47
46
        pbxt_mysql_op=`grep 's,@libdir@,' $ENG_MYSQL_SRC/config.status | sed "s/s,@libdir@,//" | sed "s/,;t t$//" | sed "s/,g$//" | sed "s/|#_!!_#|//"`
48
47
        if test "x$pbxt_mysql_op" != "x" ; then 
49
 
                libdir=$pbxt_mysql_op
 
48
                # This is the default. We assume if libdir
 
49
                # is set to the default, then it has not been
 
50
                # set explicitly
 
51
                if test "$libdir" = "\${exec_prefix}/lib" ; then 
 
52
                        libdir=$pbxt_mysql_op
 
53
                fi      
50
54
        fi      
51
55
        pbxt_mysql_op=`grep 's,@includedir@,' $ENG_MYSQL_SRC/config.status | sed "s/s,@includedir@,//" | sed "s/,;t t$//" | sed "s/,g$//" | sed "s/|#_!!_#|//"`
52
56
        if test "x$pbxt_mysql_op" != "x" ; then 
70
74
        else
71
75
                MYSQL_DEBUG_LEVEL="no"
72
76
        fi
73
 
        libdir="$libdir/mysql/plugin"
74
77
        AC_MSG_RESULT(["$prefix"])
75
78
  else
76
79
    AC_MSG_ERROR(["no config.status found at $ENG_MYSQL_SRC"])