Attachment #258946 for bug #333425

View | Details | Raw Unified | Return to bug 333425
Collapse All | Expand All

Lines 1221-1226 if test "x$want_ldap" = "xyes"; then Link Here

(-)a/configure.in (+1 lines)
1221	fi	1221	fi
1222	CFLAGS="${CFLAGS} ${LDAP_CPPFLAGS}"	1222	CFLAGS="${CFLAGS} ${LDAP_CPPFLAGS}"
1223	LDFLAGS="${LDFLAGS} ${LDAP_LDFLAGS}"	1223	LDFLAGS="${LDFLAGS} ${LDAP_LDFLAGS}"
		1224	LIBS="${LIBS} ${LDAP_LIBS}"
1224		1225
1225	found_iconv="no"	1226	found_iconv="no"
1226	dnl Check for libiconv [by default - skip]	1227	dnl Check for libiconv [by default - skip]




               fi

               LDAP_CPPFLAGS=-I$LDAP_INCDIR
               LDAP_LDFLAGS="-L$LDAP_LIBDIR $LDAP_LIBS"
               LDAP_LIBS="-lldap -llber $LDAP_LIBS"

               found_ldap="yes"
               AC_DEFINE(HAVE_LDAP,1,[Define to 1 if LDAP should be enabled.])


  AC_SUBST(LDAP_CPPFLAGS)
  AC_SUBST(LDAP_LDFLAGS)
  AC_SUBST(LDAP_LIBS)

  unset _libldap_with
])dnl
- 
--
m4/ax_lib_postgresql.m4 |    4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)

Lines 84-90 AC_DEFUN([AX_LIB_POSTGRESQL], Link Here

(-)a/m4/ax_lib_postgresql.m4 (-2 / +3 lines)
84	AC_MSG_CHECKING([for PostgreSQL libraries])	84	AC_MSG_CHECKING([for PostgreSQL libraries])
85		85
86	POSTGRESQL_CPPFLAGS="-I`$PG_CONFIG --includedir`"	86	POSTGRESQL_CPPFLAGS="-I`$PG_CONFIG --includedir`"
87	POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir` -lpq"	87	POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir`"
		88	POSTGRESQL_LIBS="-lpq"
88		89
89	POSTGRESQL_VERSION=`$PG_CONFIG --version \| sed -e 's#PostgreSQL ##'`	90	POSTGRESQL_VERSION=`$PG_CONFIG --version \| sed -e 's#PostgreSQL ##'`
90		91
Lines 179-182 PQserverVersion(conn); Link Here
179	AC_SUBST([POSTGRESQL_VERSION])	180	AC_SUBST([POSTGRESQL_VERSION])
180	AC_SUBST([POSTGRESQL_CPPFLAGS])	181	AC_SUBST([POSTGRESQL_CPPFLAGS])
181	AC_SUBST([POSTGRESQL_LDFLAGS])	182	AC_SUBST([POSTGRESQL_LDFLAGS])
		183	AC_SUBST([POSTGRESQL_LIBS])
182	])	184	])
183	-

Return to bug 333425

Lines 72-78 AC_HELP_STRING([--with-ldap@<:@=DIR@:>@],[Include LDAP support @<:@default=no@:> Link Here

(-)a/m4/ldap.m4 (-3 / +3 lines)
72	fi	72	fi
73		73
74	LDAP_CPPFLAGS=-I$LDAP_INCDIR	74	LDAP_CPPFLAGS=-I$LDAP_INCDIR
75	LDAP_LDFLAGS="-L$LDAP_LIBDIR -lldap -llber $LDAP_LIBS"	75	LDAP_LDFLAGS="-L$LDAP_LIBDIR $LDAP_LIBS"
		76	LDAP_LIBS="-lldap -llber $LDAP_LIBS"
76		77
77	found_ldap="yes"	78	found_ldap="yes"
78	AC_DEFINE(HAVE_LDAP,1,[Define to 1 if LDAP should be enabled.])	79	AC_DEFINE(HAVE_LDAP,1,[Define to 1 if LDAP should be enabled.])
Lines 92-97 AC_HELP_STRING([--with-ldap@<:@=DIR@:>@],[Include LDAP support @<:@default=no@:> Link Here
92		93
93	AC_SUBST(LDAP_CPPFLAGS)	94	AC_SUBST(LDAP_CPPFLAGS)
94	AC_SUBST(LDAP_LDFLAGS)	95	AC_SUBST(LDAP_LDFLAGS)
		96	AC_SUBST(LDAP_LIBS)
95		97
96	unset _libldap_with	98	unset _libldap_with
97	])dnl	99	])dnl
98	-
99	--
100	m4/ax_lib_postgresql.m4 \| 4 +++-	100	m4/ax_lib_postgresql.m4 \| 4 +++-
101	1 files changed, 3 insertions(+), 1 deletions(-)	101	1 files changed, 3 insertions(+), 1 deletions(-)