projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8c321fb
)
* link libz if we detect it.
author
Wilfried Göesgens
<willi@citadel.org>
Sat, 13 Dec 2008 22:36:33 +0000
(22:36 +0000)
committer
Wilfried Göesgens
<willi@citadel.org>
Sat, 13 Dec 2008 22:36:33 +0000
(22:36 +0000)
libcitadel/Makefile.in
patch
|
blob
|
history
libcitadel/configure.in
patch
|
blob
|
history
libcitadel/debian/files
patch
|
blob
|
history
libcitadel/debian/libcitadel1.substvars
patch
|
blob
|
history
diff --git
a/libcitadel/Makefile.in
b/libcitadel/Makefile.in
index f18a1e43ea0937f2450684889c86a8fc8284257d..0d80c40e0647e4ee6ec5542f3c3b0a42b1f72dbc 100755
(executable)
--- a/
libcitadel/Makefile.in
+++ b/
libcitadel/Makefile.in
@@
-24,6
+24,7
@@
top_builddir = .
pkgconfig_DATA = libcitadel.pc
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libcitadel.pc
pkgconfigdir = $(libdir)/pkgconfig
+
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
@@
-85,7
+86,7
@@
CXX = @CXX@
LIBTOOL = @LIBTOOL@
INCLUDES = -I$(srcdir)/lib -I.
LIBTOOL = @LIBTOOL@
INCLUDES = -I$(srcdir)/lib -I.
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@
@LIBS@
CPPFLAGS = @CPPFLAGS@
CFLAGS = @CFLAGS@
CXXFLAGS = @CXXFLAGS@
CPPFLAGS = @CPPFLAGS@
CFLAGS = @CFLAGS@
CXXFLAGS = @CXXFLAGS@
diff --git
a/libcitadel/configure.in
b/libcitadel/configure.in
index b70532b8ef22c9f426226f772fdafd698fe86e9d..8d8e27490e9436858f5015e8086fc09399ee6fda 100755
(executable)
--- a/
libcitadel/configure.in
+++ b/
libcitadel/configure.in
@@
-149,6
+149,7
@@
fi
dnl Checks for typedefs, structures, and compiler characteristics.
dnl Checks for typedefs, structures, and compiler characteristics.
+AC_SUBST(LIBS)
AC_C_CONST
AC_TYPE_SIZE_T
AC_CHECK_FUNCS(memmove bcopy)
AC_C_CONST
AC_TYPE_SIZE_T
AC_CHECK_FUNCS(memmove bcopy)
diff --git
a/libcitadel/debian/files
b/libcitadel/debian/files
index 73fc3064e0412a561172b5a5c47e4c6ec0596e3b..d2ac0561c0b0a03d7eab551e7db9c29484f59207 100644
(file)
--- a/
libcitadel/debian/files
+++ b/
libcitadel/debian/files
@@
-1,3
+1,3
@@
-libcitadel1_7.38-8_
amd64
.deb libs optional
-libcitadel1-dbg_7.38-8_
amd64
.deb libdevel optional
-libcitadel-dev_7.38-8_
amd64
.deb libdevel optional
+libcitadel1_7.38-8_
i386
.deb libs optional
+libcitadel1-dbg_7.38-8_
i386
.deb libdevel optional
+libcitadel-dev_7.38-8_
i386
.deb libdevel optional
diff --git
a/libcitadel/debian/libcitadel1.substvars
b/libcitadel/debian/libcitadel1.substvars
index 36e5a58f3a844db06c70599fe0c515b5c7903aae..d8fed07b50f367a47699bc7c3eba237b765767bc 100644
(file)
--- a/
libcitadel/debian/libcitadel1.substvars
+++ b/
libcitadel/debian/libcitadel1.substvars
@@
-1
+1
@@
-shlibs:Depends=libc6 (>= 2.7-1)
+shlibs:Depends=libc6 (>= 2.7-1)
, zlib1g (>= 1:1.1.4)