Commit b217a9e8 authored by kent@mysql.com/kent-amd64.(none)'s avatar kent@mysql.com/kent-amd64.(none)
Browse files

Makefile.am, configure.in: 

  Added --with-mysqld-libs configure flag
parent a4ddc226

configure.in

+6 −0
Original line number Diff line number Diff line
@@ -1747,6 +1747,12 @@ AC_ARG_WITH(client-ldflags, 
    [CLIENT_EXTRA_LDFLAGS=])

AC_SUBST(CLIENT_EXTRA_LDFLAGS)



AC_ARG_WITH(mysqld-libs,

    [  --with-mysqld-libs   Extra libraries to link with for mysqld],

    [MYSQLD_EXTRA_LIBS=$withval],

    [MYSQLD_EXTRA_LIBS=])

AC_SUBST(MYSQLD_EXTRA_LIBS)



AC_ARG_WITH(lib-ccflags,

    [  --with-lib-ccflags      Extra CC options for libraries],

    [LIB_EXTRA_CCFLAGS=$withval],

sql/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \ 
			@bdb_libs@ @innodb_libs@ @pstack_libs@ \

                        @innodb_system_libs@ \

			@ndbcluster_libs@ @ndbcluster_system_libs@ \

			$(LDADD)  $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@

			$(LDADD)  $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@ \

			@MYSQLD_EXTRA_LIBS@

noinst_HEADERS =	item.h item_func.h item_sum.h item_cmpfunc.h \

			item_strfunc.h item_timefunc.h item_uniq.h \

			item_create.h item_subselect.h item_row.h \