Attachment #29991 for bug #34169

Lines 7-17 Link Here

(-)rekall-2.2.0-beta3-orig/db/mysql/Makefile.am (-4 / +2 lines)
7		7
8	libkbase_driver_mysql_la_LIBADD = \	8	libkbase_driver_mysql_la_LIBADD = \
9	../../libs/common/libkbase_common.la \	9	../../libs/common/libkbase_common.la \
10	$(LIBQT) \	10	$(LIBQT) $(MYSQL_OBJS)
11	-lmysqlclient
12		11
13	libkbase_driver_mysql_la_LDFLAGS = \	12	libkbase_driver_mysql_la_LDFLAGS = -module $(MYSQL_LIBDIR) $(MYSQL_LIBS)
14	-L$(MYSQL_LIBDIR)
15		13
16	services_DATA = rekall_driver_mysql.desktop	14	services_DATA = rekall_driver_mysql.desktop
17	servicesdir = $(kde_datadir)/$(APPDIR)/services	15	servicesdir = $(kde_datadir)/$(APPDIR)/services




dnl checks for MySQL
dnl ================

AC_ARG_ENABLE(mysql, [  --enable-mysql              build MySQL-plugin [default=auto]],
[  case $enableval in
      no)   mysql_plugin=no  ;;
      yes)  mysql_plugin=yes ;;
      auto) mysql_plugin=auto ;;
      *)    AC_MSG_ERROR([--enable-mysql value $withval is not valid; please choose yes, no, or auto.]) ;;
   esac
], mysql_plugin=auto)

AC_ARG_WITH(mysql_includes,
[  --with-mysql-includes=DIR   use MySQL-includes installed in this directory ],


AC_MSG_CHECKING([for MySQL])

if test "x$mysql_plugin" = "xyes" || test "x$mysql_plugin" = "xauto"; then
  dnl check header files
  mysql_incdirs="$ac_mysql_incdir /usr/include /usr/include/mysql /usr/local/include/mysql /usr/local/include"
  AC_FIND_FILE(mysql.h, $mysql_incdirs, mysql_incdir)
  if test ! -r $mysql_incdir/mysql.h; then
    compile_mysql_plugin="no"
  else
    MYSQL_INCDIR=$mysql_incdir
  fi

  dnl check libraries
  mysql_libdirs="$ac_mysql_libdir /usr/lib /usr/lib/mysql /usr/local/lib/mysql /usr/local/lib"
  AC_FIND_FILE([libmysqlclient.so libmysqlclient.dylib], $mysql_libdirs, mysql_libdir)
  if test "$mysql_libdir" = 'no'; then
      AC_FIND_FILE(libmysqlclient.a, $mysql_libdirs, mysql_libdir)
      if test "$mysql_libdir" = 'NO'; then
mysql_libdirs="$ac_mysql_libdir /usr/lib /usr/lib/mysql /usr/local/lib/mysql /usr/local/lib"
AC_FIND_FILE(libmysqlclient.so, $mysql_libdirs, mysql_libdir)
if test ! -r $mysql_libdir/libmysqlclient.so; then
    AC_FIND_FILE(libmysqlclient.so, $mysql_libdirs, mysql_libdir)
    if test ! -r $mysql_libdir/libmysqlclient.so; then
        compile_mysql_plugin="no"
      else
	compile_mysql_plugin="yes"
	MYSQL_LIBDIR=
	MYSQL_OBJS=$mysql_libdir/libmysqlclient.a
      fi
  else
    compile_mysql_plugin="yes"
    MYSQL_LIBDIR="-L$mysql_libdir"
    MYSQL_LIBS='-lmysqlclient'
  fi

  if test "x$mysql_plugin" = "xyes" && test "$compile_mysql_plugin" = "no"; then
    AC_MSG_ERROR([
mysql plugin was enabled, but a suitable libmysqlclient wasn't found.  Please check config.log

])
  fi
else
  compile_mysql_plugin="no"
fi

if test "$compile_mysql_plugin" = "yes"; then

AC_SUBST(MYSQL_INCDIR)
AC_SUBST(MYSQL_LIBDIR)
AC_SUBST(MYSQL_SUBDIR)
AC_SUBST(MYSQL_OBJS)
AC_SUBST(MYSQL_LIBS)

BUILDING_WITH("$compile_mysql_plugin" = "yes","Building with MySQL Driver","MySQL driver will not build")





dnl add configure-args

AC_ARG_ENABLE(pgsql, [  --enable-pgsql              build PostgreSQL-plugin [default=auto]],
[ 
case $enableval in
  no)   pgsql_plugin=no ;;
  yes)  pgsql_plugin=yes ;;
  auto) pgsql_plugin=auto ;;
  *)    AC_MSG_ERROR([unknown option '$enableval' given to --enable-pgsql]) ;;
esac ], pgsql_plugin=auto)

AC_ARG_WITH(pgsql_includes,
[  --with-pgsql-includes=DIR   use PostgreSQL-includes installed in this directory ],
[
  ac_pgsql_dir=$withval
], ac_pgsql_dir=/usr/local/include
)

AC_ARG_WITH(pgsql_libraries,
[  --with-pgsql-libraries=DIR  use PostgreSQL-libraries installed in this directory ],
[
  ac_pgsql_libdir=$withval


AC_MSG_CHECKING([for PostgreSQL])

if test "x$pgsql_plugin" = "xyes" || test "x$pgsql_plugin" = "xauto"; then
  dnl check header files
  pgsql_incdirs="$ac_pgsql_incdir /usr/include /usr/include/pgsql /usr/include/postgresql /usr/local/include /usr/local/pgsql/include /opt/postgres/include"
  AC_FIND_FILE(libpq-fe.h, $pgsql_incdirs, pgsql_incdir)
  if test ! -r $pgsql_incdir/libpq-fe.h; then
    compile_postgresql_plugin="no"
    AC_MSG_CHECKING([include ])
  else
    PG_INCDIR=$pgsql_incdir
  fi

  dnl check libraries
  pgsql_libdirs="$ac_pgsql_libdir /usr/lib64 /usr/lib /usr/local/lib /usr/local/pgsql/lib /opt/postgres/lib"
  AC_FIND_FILE(libpq.so, $pgsql_libdirs, pgsql_libdir)
  if test ! -r $pgsql_libdir/libpq.so; then
    compile_postgresql_plugin="no"
    AC_MSG_CHECKING([library ])
  else
    PG_LIBDIR=$pgsql_libdir
  fi

  if test "$compile_postgresql_plugin" = "no" && test "x$pgsql_plugin" = "xyes"; then
    AC_MSG_ERROR([
postgresql support was enabled, but no usable pq lib was found.  Please check config.log for details

])
  fi
fi

dnl check header files
pgsql_incdirs="$ac_pgsql_incdir /usr/include /usr/include/pgsql /usr/include/postgresql /usr/local/include /usr/local/pgsql/include /opt/postgres/include"
AC_FIND_FILE(libpq-fe.h, $pgsql_incdirs, pgsql_incdir)
if test ! -r $pgsql_incdir/libpq-fe.h; then
  compile_postgresql_plugin="no"
  AC_MSG_CHECKING("include ")
else
  PG_INCDIR=$pgsql_incdir
fi

dnl check libraries
pgsql_libdirs="$ac_pgsql_libdir /usr/lib64 /usr/lib /usr/local/lib /usr/local/pgsql/lib /opt/postgres/lib"
AC_FIND_FILE(libpq.so, $pgsql_libdirs, pgsql_libdir)
if test ! -r $pgsql_libdir/libpq.so; then
  compile_postgresql_plugin="no"
  AC_MSG_CHECKING("library ")
else
  PG_LIBDIR=$pgsql_libdir
fi

if test "$compile_postgresql_plugin" = "yes"; then
  AC_MSG_RESULT([libraries $pgsql_libdir, headers $pgsql_incdir])
  
  PGSQL_SUBDIR="pgsql"
else
  AC_MSG_RESULT(not found)




dnl ================

AC_ARG_ENABLE(xbase,
[  --enable-xbase              build XBase/XBSQL-plugin [default=auto]],
[ case $enableval in
   no)   xbase_plugin=no   ;; 
   yes)  xbase_plugin=yes  ;;
   auto) xbase_plugin=auto ;;
   *)    AC_MSG_ERROR([--enable-xbase accepts only no, yes, or auto- you past it $enableval.  Please choose a valid setting.])
  esac
], xbase_plugin=auto)

AC_ARG_WITH(xbase_includes,
[  --with-xbase-includes=DIR   use XBase-includes installed in this directory ],


AC_MSG_CHECKING([for xbase/xbsql])

if test "x$xbase_plugin" = "xyes" || test "x$xbase_plugin" = "xauto"; then
  dnl check header files
  xbase_incdirs="$ac_xbase_incdir /usr/include /usr/include/xbase /usr/local/include/xbase /usr/local/include"
  AC_FIND_FILE(xbase.h, $xbase_incdirs, xbase_incdir)
  if test ! -r $xbase_incdir/xbase.h; then
    compile_xbase_plugin="no"
  else
    XBASE_INCDIR=$xbase_incdir/..
  fi

  xbsql_incdirs="$ac_xbsql_incdir /usr/include /usr/include/xbsql /usr/local/include/xbsql /usr/local/include"
  AC_FIND_FILE(xbsql.h, $xbsql_incdirs, xbsql_incdir)
  if test ! -r $xbsql_incdir/xbsql.h; then
    compile_xbsql_plugin="no"
  else
    XBSQL_INCDIR=$xbsql_incdir
  fi

  dnl check libraries
  xbase_libdirs="$ac_xbase_libdir /usr/lib64 /usr/lib /usr/lib/xbase /usr/local/lib/xbase /usr/local/lib"
  AC_FIND_FILE(libxbase.so, $xbase_libdirs, xbase_libdir)
  if test ! -r $xbase_libdir/libxbase.so; then

dnl check libraries
xbase_libdirs="$ac_xbase_libdir /usr/lib64 /usr/lib /usr/lib/xbase /usr/local/lib/xbase /usr/local/lib"
AC_FIND_FILE(libxbase.so, $xbase_libdirs, xbase_libdir)
if test ! -r $xbase_libdir/libxbase.so; then
    AC_FIND_FILE(libxbase.so, $xbase_libdirs, xbase_libdir)
    if test ! -r $xbase_libdir/libxbase.so; then
      compile_xbase_plugin="no"
    else
      XBASE_LIBDIR=$xbase_libdir
    fi
  else
    XBASE_LIBDIR=$xbase_libdir
  fi

  xbsql_libdirs="$ac_xbsql_libdir /usr/lib64 /usr/lib /usr/lib/xbsql /usr/local/lib/xbsql /usr/local/lib"
  AC_FIND_FILE(libxbsql.so, $xbsql_libdirs, xbsql_libdir)
  if test ! -r $xbsql_libdir/libxbsql.so; then
    AC_FIND_FILE(libxbsql.so, $xbsql_libdirs, xbsql_libdir)
    if test ! -r $xbsql_libdir/libxbsql.so; then
        compile_xbase_plugin="no"
    else
        XBSQL_LIBDIR=$xbsql_libdir
    fi
  else
    XBSQL_LIBDIR=$xbsql_libdir
  fi

  if test "$compile_xbase_plugin" = "no" && test "x$xbase_plugin" = "xyes"; then
     AC_MSG_ERROR([
xbase plugin was enabled, but wasn't fully found.  Please check config.log

])
  fi
else
  compile_xbase_plugin="no"
fi

if test "$compile_xbase_plugin" = "yes"; then

Return to bug 34169

Lines 2-9 Link Here

(-)rekall-2.2.0-beta3-orig/db/mysql/configure.in.in (-27 / +44 lines)
2	dnl checks for MySQL	2	dnl checks for MySQL
3	dnl ================	3	dnl ================
4		4
5	AC_ARG_ENABLE(mysql, [ --enable-mysql build MySQL-plugin [default=yes]],	5	AC_ARG_ENABLE(mysql, [ --enable-mysql build MySQL-plugin [default=auto]],
6	mysql_plugin=$enableval, mysql_plugin=yes)	6	[ case $enableval in
		7	no) mysql_plugin=no ;;
		8	yes) mysql_plugin=yes ;;
		9	auto) mysql_plugin=auto ;;
		10	*) AC_MSG_ERROR([--enable-mysql value $withval is not valid; please choose yes, no, or auto.]) ;;
		11	esac
		12	], mysql_plugin=auto)
7		13
8	AC_ARG_WITH(mysql_includes,	14	AC_ARG_WITH(mysql_includes,
9	[ --with-mysql-includes=DIR use MySQL-includes installed in this directory ],	15	[ --with-mysql-includes=DIR use MySQL-includes installed in this directory ],
Lines 25-57 Link Here
25		31
26	AC_MSG_CHECKING([for MySQL])	32	AC_MSG_CHECKING([for MySQL])
27		33
28	compile_mysql_plugin="yes"	34	if test "x$mysql_plugin" = "xyes" \|\| test "x$mysql_plugin" = "xauto"; then
29		35	dnl check header files
30	if test "x$mysql_plugin" != "xyes"; then	36	mysql_incdirs="$ac_mysql_incdir /usr/include /usr/include/mysql /usr/local/include/mysql /usr/local/include"
31	compile_mysql_plugin="no"	37	AC_FIND_FILE(mysql.h, $mysql_incdirs, mysql_incdir)
32	fi	38	if test ! -r $mysql_incdir/mysql.h; then
33		39	compile_mysql_plugin="no"
34	dnl check header files	40	else
35	mysql_incdirs="$ac_mysql_incdir /usr/include /usr/include/mysql /usr/local/include/mysql /usr/local/include"	41	MYSQL_INCDIR=$mysql_incdir
36	AC_FIND_FILE(mysql.h, $mysql_incdirs, mysql_incdir)	42	fi
37	if test ! -r $mysql_incdir/mysql.h; then	43
38	compile_mysql_plugin="no"	44	dnl check libraries
39	else	45	mysql_libdirs="$ac_mysql_libdir /usr/lib /usr/lib/mysql /usr/local/lib/mysql /usr/local/lib"
40	MYSQL_INCDIR=$mysql_incdir	46	AC_FIND_FILE([libmysqlclient.so libmysqlclient.dylib], $mysql_libdirs, mysql_libdir)
41	fi	47	if test "$mysql_libdir" = 'no'; then
42		48	AC_FIND_FILE(libmysqlclient.a, $mysql_libdirs, mysql_libdir)
43	dnl check libraries	49	if test "$mysql_libdir" = 'NO'; then
44	mysql_libdirs="$ac_mysql_libdir /usr/lib /usr/lib/mysql /usr/local/lib/mysql /usr/local/lib"
45	AC_FIND_FILE(libmysqlclient.so, $mysql_libdirs, mysql_libdir)
46	if test ! -r $mysql_libdir/libmysqlclient.so; then
47	AC_FIND_FILE(libmysqlclient.so, $mysql_libdirs, mysql_libdir)
48	if test ! -r $mysql_libdir/libmysqlclient.so; then
49	compile_mysql_plugin="no"	50	compile_mysql_plugin="no"
50	else	51	else
51	MYSQL_LIBDIR=$mysql_libdir	52	compile_mysql_plugin="yes"
52	fi	53	MYSQL_LIBDIR=
		54	MYSQL_OBJS=$mysql_libdir/libmysqlclient.a
		55	fi
		56	else
		57	compile_mysql_plugin="yes"
		58	MYSQL_LIBDIR="-L$mysql_libdir"
		59	MYSQL_LIBS='-lmysqlclient'
		60	fi
		61
		62	if test "x$mysql_plugin" = "xyes" && test "$compile_mysql_plugin" = "no"; then
		63	AC_MSG_ERROR([
		64	mysql plugin was enabled, but a suitable libmysqlclient wasn't found. Please check config.log
		65
		66	])
		67	fi
53	else	68	else
54	MYSQL_LIBDIR=$mysql_libdir	69	compile_mysql_plugin="no"
55	fi	70	fi
56		71
57	if test "$compile_mysql_plugin" = "yes"; then	72	if test "$compile_mysql_plugin" = "yes"; then
Lines 64-68 Link Here
64	AC_SUBST(MYSQL_INCDIR)	79	AC_SUBST(MYSQL_INCDIR)
65	AC_SUBST(MYSQL_LIBDIR)	80	AC_SUBST(MYSQL_LIBDIR)
66	AC_SUBST(MYSQL_SUBDIR)	81	AC_SUBST(MYSQL_SUBDIR)
		82	AC_SUBST(MYSQL_OBJS)
		83	AC_SUBST(MYSQL_LIBS)
67		84
68	BUILDING_WITH("$compile_mysql_plugin" = "yes","Building with MySQL Driver","MySQL driver will not build")	85	BUILDING_WITH("$compile_mysql_plugin" = "yes","Building with MySQL Driver","MySQL driver will not build")

Lines 4-20 Link Here

(-)rekall-2.2.0-beta3-orig/db/pgsql/configure.in.in (-26 / +36 lines)
4		4
5	dnl add configure-args	5	dnl add configure-args
6		6
7	AC_ARG_ENABLE(pgsql, [ --enable-pgsql build PostgreSQL-plugin [default=yes] ],	7	AC_ARG_ENABLE(pgsql, [ --enable-pgsql build PostgreSQL-plugin [default=auto]],
8	pgsql_plugin=$enableval, pgsql_plugin=yes)	8	[
		9	case $enableval in
		10	no) pgsql_plugin=no ;;
		11	yes) pgsql_plugin=yes ;;
		12	auto) pgsql_plugin=auto ;;
		13	*) AC_MSG_ERROR([unknown option '$enableval' given to --enable-pgsql]) ;;
		14	esac ], pgsql_plugin=auto)
9		15
10	AC_ARG_WITH(pgsqlincdir,	16	AC_ARG_WITH(pgsql_includes,
11	[ --with-pgsql-includes=DIR use PostgreSQL-includes installed in this directory ],	17	[ --with-pgsql-includes=DIR use PostgreSQL-includes installed in this directory ],
12	[	18	[
13	ac_pgsql_dir=$withval	19	ac_pgsql_dir=$withval
14	], ac_pgsql_dir=/usr/local/include	20	], ac_pgsql_dir=/usr/local/include
15	)	21	)
16		22
17	AC_ARG_WITH(pgsqllibdir,	23	AC_ARG_WITH(pgsql_libraries,
18	[ --with-pgsql-libraries=DIR use PostgreSQL-libraries installed in this directory ],	24	[ --with-pgsql-libraries=DIR use PostgreSQL-libraries installed in this directory ],
19	[	25	[
20	ac_pgsql_libdir=$withval	26	ac_pgsql_libdir=$withval
Lines 27-61 Link Here
27		33
28	AC_MSG_CHECKING([for PostgreSQL])	34	AC_MSG_CHECKING([for PostgreSQL])
29		35
30	compile_postgresql_plugin="yes"	36	if test "x$pgsql_plugin" = "xyes" \|\| test "x$pgsql_plugin" = "xauto"; then
		37	dnl check header files
		38	pgsql_incdirs="$ac_pgsql_incdir /usr/include /usr/include/pgsql /usr/include/postgresql /usr/local/include /usr/local/pgsql/include /opt/postgres/include"
		39	AC_FIND_FILE(libpq-fe.h, $pgsql_incdirs, pgsql_incdir)
		40	if test ! -r $pgsql_incdir/libpq-fe.h; then
		41	compile_postgresql_plugin="no"
		42	AC_MSG_CHECKING([include ])
		43	else
		44	PG_INCDIR=$pgsql_incdir
		45	fi
		46
		47	dnl check libraries
		48	pgsql_libdirs="$ac_pgsql_libdir /usr/lib64 /usr/lib /usr/local/lib /usr/local/pgsql/lib /opt/postgres/lib"
		49	AC_FIND_FILE(libpq.so, $pgsql_libdirs, pgsql_libdir)
		50	if test ! -r $pgsql_libdir/libpq.so; then
		51	compile_postgresql_plugin="no"
		52	AC_MSG_CHECKING([library ])
		53	else
		54	PG_LIBDIR=$pgsql_libdir
		55	fi
		56
		57	if test "$compile_postgresql_plugin" = "no" && test "x$pgsql_plugin" = "xyes"; then
		58	AC_MSG_ERROR([
		59	postgresql support was enabled, but no usable pq lib was found. Please check config.log for details
31		60
32	if test "x$pgsql_plugin" != "xyes"; then	61	])
33	compile_postgresql_plugin="no"	62	fi
34	fi
35
36	dnl check header files
37	pgsql_incdirs="$ac_pgsql_incdir /usr/include /usr/include/pgsql /usr/include/postgresql /usr/local/include /usr/local/pgsql/include /opt/postgres/include"
38	AC_FIND_FILE(libpq-fe.h, $pgsql_incdirs, pgsql_incdir)
39	if test ! -r $pgsql_incdir/libpq-fe.h; then
40	compile_postgresql_plugin="no"
41	AC_MSG_CHECKING("include ")
42	else	63	else
43	PG_INCDIR=$pgsql_incdir
44	fi
45
46	dnl check libraries
47	pgsql_libdirs="$ac_pgsql_libdir /usr/lib64 /usr/lib /usr/local/lib /usr/local/pgsql/lib /opt/postgres/lib"
48	AC_FIND_FILE(libpq.so, $pgsql_libdirs, pgsql_libdir)
49	if test ! -r $pgsql_libdir/libpq.so; then
50	compile_postgresql_plugin="no"	64	compile_postgresql_plugin="no"
51	AC_MSG_CHECKING("library ")
52	else
53	PG_LIBDIR=$pgsql_libdir
54	fi	65	fi
55		66
56	if test "$compile_postgresql_plugin" = "yes"; then	67	if test "$compile_postgresql_plugin" = "yes"; then
57	AC_MSG_RESULT([libraries $pgsql_libdir, headers $pgsql_incdir])	68	AC_MSG_RESULT([libraries $pgsql_libdir, headers $pgsql_incdir])
58
59	PGSQL_SUBDIR="pgsql"	69	PGSQL_SUBDIR="pgsql"
60	else	70	else
61	AC_MSG_RESULT(not found)	71	AC_MSG_RESULT(not found)

Lines 3-12 Link Here

(-)rekall-2.2.0-beta3-orig/db/xbase/configure.in.in (-41 / +50 lines)
3	dnl ================	3	dnl ================
4		4
5	AC_ARG_ENABLE(xbase,	5	AC_ARG_ENABLE(xbase,
6	[ --enable-xbase build XBase/XBSQL-plugin [default=yes]],	6	[ --enable-xbase build XBase/XBSQL-plugin [default=auto]],
7	xbase_plugin=$enableval,	7	[ case $enableval in
8	xbase_plugin=yes	8	no) xbase_plugin=no ;;
9	)	9	yes) xbase_plugin=yes ;;
		10	auto) xbase_plugin=auto ;;
		11	*) AC_MSG_ERROR([--enable-xbase accepts only no, yes, or auto- you past it $enableval. Please choose a valid setting.])
		12	esac
		13	], xbase_plugin=auto)
10		14
11	AC_ARG_WITH(xbase_includes,	15	AC_ARG_WITH(xbase_includes,
12	[ --with-xbase-includes=DIR use XBase-includes installed in this directory ],	16	[ --with-xbase-includes=DIR use XBase-includes installed in this directory ],
Lines 42-95 Link Here
42		46
43	AC_MSG_CHECKING([for xbase/xbsql])	47	AC_MSG_CHECKING([for xbase/xbsql])
44		48
45	compile_xbase_plugin="yes"	49	if test "x$xbase_plugin" = "xyes" \|\| test "x$xbase_plugin" = "xauto"; then
46		50	dnl check header files
47	if test "x$xbase_plugin" != "xyes"; then	51	xbase_incdirs="$ac_xbase_incdir /usr/include /usr/include/xbase /usr/local/include/xbase /usr/local/include"
48	compile_xbase_plugin="no"	52	AC_FIND_FILE(xbase.h, $xbase_incdirs, xbase_incdir)
49	fi	53	if test ! -r $xbase_incdir/xbase.h; then
50		54	compile_xbase_plugin="no"
51	dnl check header files	55	else
52	xbase_incdirs="$ac_xbase_incdir /usr/include /usr/include/xbase /usr/local/include/xbase /usr/local/include"	56	XBASE_INCDIR=$xbase_incdir/..
53	AC_FIND_FILE(xbase.h, $xbase_incdirs, xbase_incdir)	57	fi
54	if test ! -r $xbase_incdir/xbase.h; then	58
55	compile_xbase_plugin="no"	59	xbsql_incdirs="$ac_xbsql_incdir /usr/include /usr/include/xbsql /usr/local/include/xbsql /usr/local/include"
56	else	60	AC_FIND_FILE(xbsql.h, $xbsql_incdirs, xbsql_incdir)
57	XBASE_INCDIR=$xbase_incdir/..	61	if test ! -r $xbsql_incdir/xbsql.h; then
58	fi	62	compile_xbsql_plugin="no"
59		63	else
60	xbsql_incdirs="$ac_xbsql_incdir /usr/include /usr/include/xbsql /usr/local/include/xbsql /usr/local/include"	64	XBSQL_INCDIR=$xbsql_incdir
61	AC_FIND_FILE(xbsql.h, $xbsql_incdirs, xbsql_incdir)	65	fi
62	if test ! -r $xbsql_incdir/xbsql.h; then	66
63	compile_xbsql_plugin="no"	67	dnl check libraries
64	else	68	xbase_libdirs="$ac_xbase_libdir /usr/lib64 /usr/lib /usr/lib/xbase /usr/local/lib/xbase /usr/local/lib"
65	XBSQL_INCDIR=$xbsql_incdir	69	AC_FIND_FILE(libxbase.so, $xbase_libdirs, xbase_libdir)
66	fi	70	if test ! -r $xbase_libdir/libxbase.so; then
67
68	dnl check libraries
69	xbase_libdirs="$ac_xbase_libdir /usr/lib64 /usr/lib /usr/lib/xbase /usr/local/lib/xbase /usr/local/lib"
70	AC_FIND_FILE(libxbase.so, $xbase_libdirs, xbase_libdir)
71	if test ! -r $xbase_libdir/libxbase.so; then
72	AC_FIND_FILE(libxbase.so, $xbase_libdirs, xbase_libdir)	71	AC_FIND_FILE(libxbase.so, $xbase_libdirs, xbase_libdir)
73	if test ! -r $xbase_libdir/libxbase.so; then	72	if test ! -r $xbase_libdir/libxbase.so; then
74	compile_xbase_plugin="no"	73	compile_xbase_plugin="no"
75	else	74	else
76	XBASE_LIBDIR=$xbase_libdir	75	XBASE_LIBDIR=$xbase_libdir
77	fi	76	fi
78	else	77	else
79	XBASE_LIBDIR=$xbase_libdir	78	XBASE_LIBDIR=$xbase_libdir
80	fi	79	fi
81		80
82	xbsql_libdirs="$ac_xbsql_libdir /usr/lib64 /usr/lib /usr/lib/xbsql /usr/local/lib/xbsql /usr/local/lib"	81	xbsql_libdirs="$ac_xbsql_libdir /usr/lib64 /usr/lib /usr/lib/xbsql /usr/local/lib/xbsql /usr/local/lib"
83	AC_FIND_FILE(libxbsql.so, $xbsql_libdirs, xbsql_libdir)	82	AC_FIND_FILE(libxbsql.so, $xbsql_libdirs, xbsql_libdir)
84	if test ! -r $xbsql_libdir/libxbsql.so; then	83	if test ! -r $xbsql_libdir/libxbsql.so; then
85	AC_FIND_FILE(libxbsql.so, $xbsql_libdirs, xbsql_libdir)	84	AC_FIND_FILE(libxbsql.so, $xbsql_libdirs, xbsql_libdir)
86	if test ! -r $xbsql_libdir/libxbsql.so; then	85	if test ! -r $xbsql_libdir/libxbsql.so; then
87	compile_xbase_plugin="no"	86	compile_xbase_plugin="no"
88	else	87	else
89	XBSQL_LIBDIR=$xbsql_libdir	88	XBSQL_LIBDIR=$xbsql_libdir
90	fi	89	fi
		90	else
		91	XBSQL_LIBDIR=$xbsql_libdir
		92	fi
		93
		94	if test "$compile_xbase_plugin" = "no" && test "x$xbase_plugin" = "xyes"; then
		95	AC_MSG_ERROR([
		96	xbase plugin was enabled, but wasn't fully found. Please check config.log
		97
		98	])
		99	fi
91	else	100	else
92	XBSQL_LIBDIR=$xbsql_libdir	101	compile_xbase_plugin="no"
93	fi	102	fi
94		103
95	if test "$compile_xbase_plugin" = "yes"; then	104	if test "$compile_xbase_plugin" = "yes"; then