← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to configure.in

More cleanup, this time libmysql_r goes to the bitbucket

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.in
575
575
    [ with_named_curses=no ]
576
576
    )
577
577
 
578
 
# Make thread safe client
579
 
AC_ARG_ENABLE(thread-safe-client,
580
 
    [  --disable-thread-safe-client   
581
 
                          Compile the client without threads.],
582
 
    [ THREAD_SAFE_CLIENT=$enableval ],
583
 
    [ THREAD_SAFE_CLIENT=yes ]
584
 
    )
585
 
 
586
578
# compile with strings functions in assembler
587
579
AC_ARG_ENABLE(assembler,
588
580
    [  --enable-assembler      Use assembler versions of some string 
1646
1638
dnl client is just using plain-old libs.
1647
1639
sql_client_dirs="strings regex mysys libmysql"
1648
1640
 
1649
 
AM_CONDITIONAL(THREAD_SAFE_CLIENT, test "$THREAD_SAFE_CLIENT" != "no")
1650
 
 
1651
 
if test "$THREAD_SAFE_CLIENT" != "no"
1652
 
then
1653
 
  sql_client_dirs="$sql_client_dirs libmysql_r"
1654
 
  AC_DEFINE([THREAD_SAFE_CLIENT], [1], [Should the client be thread safe])
1655
 
fi
1656
1641
sql_client_dirs="$sql_client_dirs client"
1657
1642
 
1658
1643
CLIENT_LIBS="$NON_THREADED_LIBS $openssl_libs $ZLIB_LIBS $STATIC_NSS_FLAGS"
1663
1648
AC_SUBST(STATIC_NSS_FLAGS)
1664
1649
AC_SUBST(sql_client_dirs)
1665
1650
 
1666
 
if test "$with_server" = "yes" -o "$THREAD_SAFE_CLIENT" != "no"
 
1651
if test "$with_server" = "yes"
1667
1652
then
1668
1653
  AC_DEFINE([THREAD], [1],
1669
1654
            [Define if you want to have threaded code. This may be undef on client code])
1726
1711
 unittest/mysys/Makefile unittest/examples/Makefile dnl
1727
1712
 strings/Makefile regex/Makefile storage/Makefile dnl
1728
1713
 vio/Makefile dnl
1729
 
 libmysql/Makefile libmysql_r/Makefile client/Makefile dnl
 
1714
 libmysql/Makefile client/Makefile dnl
1730
1715
 sql/Makefile sql/share/Makefile dnl
1731
1716
 sql/sql_builtin.cc sql-common/Makefile dnl
1732
1717
 dbug/Makefile scripts/Makefile include/Makefile dnl