Merge lp:~sergei.glushchenko/percona-pam-for-mysql/rem-deps into lp: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
=== modified file 'configure.ac'
--- configure.ac 2012-02-01 15:15:19 +0000
+++ configure.ac 2012-02-09 06:27:17 +0000
@@ -42,11 +42,11 @@
42 [AC_MSG_ERROR([Unable to find mysql_config. Please install or specify.])])42 [AC_MSG_ERROR([Unable to find mysql_config. Please install or specify.])])
4343
44# Checks for libraries.44# Checks for libraries.
45AC_CHECK_LIB([pam], [pam_start], ,45AC_CHECK_LIB([pam], [pam_start], [AUTH_PAM_LIBS="$AUTH_PAM_LIBS -lpam"],
46 AC_MSG_ERROR(46 AC_MSG_ERROR(
47 [Unable to find PAM. Please install the PAM development libraries])47 [Unable to find PAM. Please install the PAM development libraries])
48)48)
49AC_CHECK_LIB([mysqlclient], [mysql_init], ,49AC_CHECK_LIB([mysqlclient], [mysql_init], [DIALOG_LIBS="$DIALOG_LIBS -lmysqlclient"],
50 AC_MSG_ERROR(50 AC_MSG_ERROR(
51 [Unable to find libmysqlclient. Please install the mysql development libraries])51 [Unable to find libmysqlclient. Please install the mysql development libraries])
52)52)
@@ -78,6 +78,9 @@
7878
79AC_SUBST([REVISION])79AC_SUBST([REVISION])
8080
81AC_SUBST([AUTH_PAM_LIBS])
82AC_SUBST([DIALOG_LIBS])
83
81# Output files84# Output files
82AC_CONFIG_FILES([Makefile85AC_CONFIG_FILES([Makefile
83 src/Makefile86 src/Makefile
8487
=== modified file 'src/Makefile.am'
--- src/Makefile.am 2012-02-01 14:42:43 +0000
+++ src/Makefile.am 2012-02-09 06:27:17 +0000
@@ -22,7 +22,7 @@
2222
23auth_pam_la_SOURCES = auth_pam.c lib_auth_pam_client.h lib_auth_pam_client.c23auth_pam_la_SOURCES = auth_pam.c lib_auth_pam_client.h lib_auth_pam_client.c
24auth_pam_la_CPPFLAGS = $(plugin_CPPFLAGS)24auth_pam_la_CPPFLAGS = $(plugin_CPPFLAGS)
25auth_pam_la_LDFLAGS = $(plugin_LDFLAGS)25auth_pam_la_LDFLAGS = $(plugin_LDFLAGS) $(AUTH_PAM_LIBS)
2626
27test_auth_pam_client_la_SOURCES = test_auth_pam_client.c \27test_auth_pam_client_la_SOURCES = test_auth_pam_client.c \
28 lib_auth_pam_client.h lib_auth_pam_client.c28 lib_auth_pam_client.h lib_auth_pam_client.c
@@ -30,4 +30,4 @@
3030
31dialog_la_SOURCES = dialog.c31dialog_la_SOURCES = dialog.c
32dialog_la_CPPFLAGS = $(plugin_CPPFLAGS)32dialog_la_CPPFLAGS = $(plugin_CPPFLAGS)
33dialog_la_LDFLAGS = $(plugin_LDFLAGS)33dialog_la_LDFLAGS = $(plugin_LDFLAGS) $(DIALOG_LIBS)

Subscribers

People subscribed via source and target branches