percona-pam-for-mysql

Merge lp:~sergei.glushchenko/percona-pam-for-mysql/rem-deps into lp:percona-pam-for-mysql

  1. rem-deps
  2. Merge into percona-pam-for-mysql
Proposed by Sergei Glushchenko
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: 21
Merged at revision: 21
Proposed branch: lp:~sergei.glushchenko/percona-pam-for-mysql/rem-deps
Merge into: lp:percona-pam-for-mysql
Diff against target: 46 lines (+7/-4)
2 files modified
configure.ac (+5/-2)
src/Makefile.am (+2/-2)
To merge this branch: bzr merge lp:~sergei.glushchenko/percona-pam-for-mysql/rem-deps
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+92212@code.launchpad.net

Description of the change

Bug 929333
Unnecessary dependencies in dialog.so and auth_pam.so
Both dialog.so and auth_pam.so are dependent of libmysqlclient and
libpam. However libmysqlclient is not used in auth_pam.so and libpam is
not used in dialog.so

Build scripts were changed. dialog.so was linked against libmysqlclient
while auth_pam.so was linked against libpam.

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote :

LGTM, thank you.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2012-02-01 15:15:19 +0000
3+++ configure.ac 2012-02-09 06:27:17 +0000
4@@ -42,11 +42,11 @@
5 [AC_MSG_ERROR([Unable to find mysql_config. Please install or specify.])])
6
7 # Checks for libraries.
8-AC_CHECK_LIB([pam], [pam_start], ,
9+AC_CHECK_LIB([pam], [pam_start], [AUTH_PAM_LIBS="$AUTH_PAM_LIBS -lpam"],
10 AC_MSG_ERROR(
11 [Unable to find PAM. Please install the PAM development libraries])
12 )
13-AC_CHECK_LIB([mysqlclient], [mysql_init], ,
14+AC_CHECK_LIB([mysqlclient], [mysql_init], [DIALOG_LIBS="$DIALOG_LIBS -lmysqlclient"],
15 AC_MSG_ERROR(
16 [Unable to find libmysqlclient. Please install the mysql development libraries])
17 )
18@@ -78,6 +78,9 @@
19
20 AC_SUBST([REVISION])
21
22+AC_SUBST([AUTH_PAM_LIBS])
23+AC_SUBST([DIALOG_LIBS])
24+
25 # Output files
26 AC_CONFIG_FILES([Makefile
27 src/Makefile
28
29=== modified file 'src/Makefile.am'
30--- src/Makefile.am 2012-02-01 14:42:43 +0000
31+++ src/Makefile.am 2012-02-09 06:27:17 +0000
32@@ -22,7 +22,7 @@
33
34 auth_pam_la_SOURCES = auth_pam.c lib_auth_pam_client.h lib_auth_pam_client.c
35 auth_pam_la_CPPFLAGS = $(plugin_CPPFLAGS)
36-auth_pam_la_LDFLAGS = $(plugin_LDFLAGS)
37+auth_pam_la_LDFLAGS = $(plugin_LDFLAGS) $(AUTH_PAM_LIBS)
38
39 test_auth_pam_client_la_SOURCES = test_auth_pam_client.c \
40 lib_auth_pam_client.h lib_auth_pam_client.c
41@@ -30,4 +30,4 @@
42
43 dialog_la_SOURCES = dialog.c
44 dialog_la_CPPFLAGS = $(plugin_CPPFLAGS)
45-dialog_la_LDFLAGS = $(plugin_LDFLAGS)
46+dialog_la_LDFLAGS = $(plugin_LDFLAGS) $(DIALOG_LIBS)

Subscribers

People subscribed via source and target branches