diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-03-10 22:48:20 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-03-11 11:57:16 +0100 |
| commit | ad40015ac4eb17e9b2bd337ec81b745cfede5b5b (patch) | |
| tree | 63fae35f547c7ba0e2b29e14e80d4b630a80aab6 | |
| parent | d744bcae5da339a1d365e37a4223212ae3560f7e (diff) | |
normalize values of WITH_GSSAPI/WITH_KRB5
Change-Id: I72c67d5a4987f25ddfa21d93a89b0ceae40c9e81
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | connectivity/Library_postgresql-sdbc-impl.mk | 4 | ||||
| -rw-r--r-- | external/postgresql/ExternalProject_postgresql.mk | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index b8a1b8f984f5..b3506f7ac915 100644 --- a/configure.ac +++ b/configure.ac @@ -8278,13 +8278,13 @@ if test "x$enable_postgresql_sdbc" != "xno"; then else # if/when anything else than PostgreSQL uses Kerberos, # move this out of `test "x$enable_postgresql_sdbc" != "xno"' - WITH_KRB5=NO - WITH_GSSAPI=no + WITH_KRB5= + WITH_GSSAPI= case "$_os" in Darwin) # MacOS X has system MIT Kerberos 5 since 10.4 if test "$with_krb5" != "no"; then - WITH_KRB5=YES + WITH_KRB5=TRUE save_LIBS=$LIBS AC_SEARCH_LIBS(com_err, [com_err 'com_err -lssl -lcrypto' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [], [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5, try installing libcom_err devel package])]) @@ -8296,7 +8296,7 @@ if test "x$enable_postgresql_sdbc" != "xno"; then LIBS=$save_LIBS fi if test "$with_gssapi" != "no"; then - WITH_GSSAPI=YES + WITH_GSSAPI=TRUE save_LIBS=$LIBS AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'], [], [AC_MSG_ERROR([could not find function 'gss_init_sec_context' required for GSSAPI])]) @@ -8311,7 +8311,7 @@ if test "x$enable_postgresql_sdbc" != "xno"; then ;; Linux|GNU|*BSD|DragonFly) if test "$with_krb5" != "no"; then - WITH_KRB5=YES + WITH_KRB5=TRUE save_LIBS=$LIBS AC_SEARCH_LIBS(com_err, [com_err 'com_err -lssl -lcrypto' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [], [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5])]) @@ -8323,7 +8323,7 @@ if test "x$enable_postgresql_sdbc" != "xno"; then LIBS=$save_LIBS fi if test "$with_gssapi" != "no"; then - WITH_GSSAPI=YES + WITH_GSSAPI=TRUE save_LIBS=$LIBS AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'], [], [AC_MSG_ERROR([could not find function 'gss_init_sec_context' required for GSSAPI])]) @@ -8333,7 +8333,7 @@ if test "x$enable_postgresql_sdbc" != "xno"; then ;; *) if test "$with_krb5" = "yes"; then - WITH_KRB5=YES + WITH_KRB5=TRUE save_LIBS=$LIBS AC_SEARCH_LIBS(com_err, [com_err 'com_err -lssl -lcrypto' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [], [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5])]) @@ -8345,7 +8345,7 @@ if test "x$enable_postgresql_sdbc" != "xno"; then LIBS=$save_LIBS fi if test "$with_gssapi" = "yes"; then - WITH_GSSAPI=YES + WITH_GSSAPI=TRUE save_LIBS=$LIBS AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'], [], [AC_MSG_ERROR([could not find function 'gss_init_sec_context' required for GSSAPI])]) diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index d8a888c849d9..7c1ede91de4d 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -56,8 +56,8 @@ ifeq ($(SYSTEM_POSTGRESQL),) ifneq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Library_add_libs,postgresql-sdbc-impl,\ - $(if $(filter YES,$(WITH_GSSAPI)),$(GSSAPI_LIBS)) \ - $(if $(filter YES,$(WITH_KRB5)),$(KRB5_LIBS)) \ + $(if $(WITH_GSSAPI),$(GSSAPI_LIBS)) \ + $(if $(WITH_KRB5),$(KRB5_LIBS)) \ $(if $(filter-out MACOSX,$(OS)),-ldl) \ $(if $(filter-out MACOSX,$(OS)),-lpthread) \ )) diff --git a/external/postgresql/ExternalProject_postgresql.mk b/external/postgresql/ExternalProject_postgresql.mk index 557dc48c6c7e..42fa12f6dc43 100644 --- a/external/postgresql/ExternalProject_postgresql.mk +++ b/external/postgresql/ExternalProject_postgresql.mk @@ -56,8 +56,8 @@ $(call gb_ExternalProject_get_state_target,postgresql,build) : --without-readline --disable-shared --with-ldap \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(DISABLE_OPENSSL),,--with-openssl \ - $(if $(filter YES,$(WITH_KRB5)), --with-krb5) \ - $(if $(filter YES,$(WITH_GSSAPI)),--with-gssapi)) \ + $(if $(WITH_KRB5), --with-krb5) \ + $(if $(WITH_GSSAPI),--with-gssapi)) \ CPPFLAGS="$(postgresql_CPPFLAGS)" \ LDFLAGS="$(postgresql_LDFLAGS)" \ EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4" \ |