~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle-2.0/libdrizzle/include.am

  • Committer: Henrik Ingo
  • Date: 2011-10-04 20:01:12 UTC
  • mto: This revision was merged to the branch mainline in revision 2431.
  • Revision ID: henrik.ingo@avoinelama.fi-20111004200112-saqklktzedntsgef
This does 2 things:

1) Modify pandora-plugin to allow more keys in a plugin.ini. Until now
you could only specify headers, sources and extra-dist, but not
scripts (that are not compiled, just copied) or various text or data
files you wish to be part of an installation.

The new plugin.ini keys correspond to automake targets as follows:

# plugin.ini key
automake variable
-----------------
# scripts or bin_scripts
dist_bin_SCRIPTS=
# sbin_scripts
dist_sbin_SCRIPTS=
# libexec_scripts
dist_libexec_SCRIPTS=
# pkg_scripts
dist_pkgdata_SCRIPTS=
# data
dist_data_DATA=
# pkg_data
dist_pkgdata_DATA=
# sysconf_data
dist_sysconf_DATA=

2a) Uses the new keys pkg_scripts and pkg_data to move some useful
files from the auth_ldap plugin to ./share/drizzle7/ so an end user
can benefit from them without downloading Drizzle source codes.

2b) Also adds libdrizzle-2.0/libdrizzle/mysql_password_hash to programs
that should be installed and changes the name to drizzle_password_hash.
(Source filenames are unchanged. Makefile first builds mysql_password_hash
and then makes a copy to the final name. I didn't know if someone expects
mysql_password_hash to be there in some tests or something.)

The intent is to write documentation for LDAP authentication that uses
bin/drizzle_password_hash and share/drizzle7/* for creating LDAP user
records.

Show diffs side-by-side

added added

removed removed

Lines of Context:
40
40
endif
41
41
 
42
42
noinst_PROGRAMS+= \
43
 
                  libdrizzle-2.0/libdrizzle/mysql_password_hash
 
43
                  libdrizzle-2.0/libdrizzle/mysql_password_hash
44
44
libdrizzle_2_0_libdrizzle_mysql_password_hash_CXXFLAGS= ${AM_CXXFLAGS} ${LIBDRIZZLE_CPPFLAGS}
45
45
libdrizzle_2_0_libdrizzle_mysql_password_hash_LDADD= libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la
46
46
libdrizzle_2_0_libdrizzle_mysql_password_hash_SOURCES= libdrizzle-2.0/libdrizzle/mysql_password_hash.cc
47
47
 
 
48
# For some reason this has originally been called mysql_password_hash. I'd prefer
 
49
# to call it drizzle_password_hash but to remain backward compatible I didn't
 
50
# change any sources, rather just build it twice and provide both.
 
51
# Only drizzle_password_hash is installed by make install though.
 
52
bin_PROGRAMS+= \
 
53
                  libdrizzle-2.0/libdrizzle/drizzle_password_hash
 
54
libdrizzle_2_0_libdrizzle_drizzle_password_hash_CXXFLAGS= ${AM_CXXFLAGS} ${LIBDRIZZLE_CPPFLAGS}
 
55
libdrizzle_2_0_libdrizzle_drizzle_password_hash_LDADD= libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la
 
56
libdrizzle_2_0_libdrizzle_drizzle_password_hash_SOURCES= libdrizzle-2.0/libdrizzle/mysql_password_hash.cc
 
57
 
48
58
noinst_PROGRAMS+= \
49
59
        examples/client \
50
60
        examples/simple \