[Pkg-Cyrus-imapd-Debian-devel] [SVN] r128 - in trunk/cyrus-imapd-2.2.12: . debian
pkg-cyrus-imapd-debian-devel@lists.alioth.debian.org
pkg-cyrus-imapd-debian-devel@lists.alioth.debian.org
Sun, 1 May 2005 12:06:00 +0200
Author: sven
Date: 2005-05-01 12:05:59 +0200 (Sun, 01 May 2005)
New Revision: 128
URL: https://mail.incase.de/svn/cyrus22/trunk/cyrus-imapd-2.2.12
Modified:
trunk/cyrus-imapd-2.2.12/config.h.in
trunk/cyrus-imapd-2.2.12/configure
trunk/cyrus-imapd-2.2.12/debian/executable.files
trunk/cyrus-imapd-2.2.12/debian/rules
Log:
run autogen.sh manually, fix it's results
NOTE: It seems that autogen.sh doesn't create debian/deletable.files corr=
etly! Therefore I disabled it's automatic calling in debian/rules for now
Modified: trunk/cyrus-imapd-2.2.12/config.h.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/config.h.in 2005-05-01 09:50:29 UTC (rev 127=
)
+++ trunk/cyrus-imapd-2.2.12/config.h.in 2005-05-01 10:05:59 UTC (rev 128=
)
@@ -55,6 +55,9 @@
/* What user will we run as? */
#undef CYRUS_USER
=20
+/* Build DRAC support? */
+#undef DRAC_AUTH
+
/* Alternative to /dev/urandom? */
#undef EGD_SOCKET
=20
@@ -480,7 +483,6 @@
/* should we have long LMTP error messages? */
LMTP_LONG_ERROR_MSGS =3D 1,
=20
-
/* default time to wait, in seconds, before giving up
* trying to lock something */
LOCK_GIVEUP_TIMER_DEFAULT =3D 100
Modified: trunk/cyrus-imapd-2.2.12/configure
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/configure 2005-05-01 09:50:29 UTC (rev 127)
+++ trunk/cyrus-imapd-2.2.12/configure 2005-05-01 10:05:59 UTC (rev 128)
@@ -894,6 +894,7 @@
--with-sasl=3DDIR Compile with libsasl2 in <DIR>
--with-staticsasl=3DDIR Compile with staticly linked libsasl2 in <DI=
R>
--with-perl=3DPERL use PERL for perl
+ --with-drac=3DDIR use DRAC library in <DIR> no
--with-libwrap=3DDIR use libwrap (rooted in DIR) yes
--with-snmp=3DDIR use ucd|net snmp (rooted in DIR) yes
=20
@@ -14874,6 +14875,92 @@
SNMP_SUBDIRS=3D""
=20
=20
+DRACLIBS=3D
+
+# Check whether --with-drac or --without-drac was given.
+if test "${with_drac+set}" =3D set; then
+ withval=3D"$with_drac"
+ if test -d "$withval"; then
+ LDFLAGS=3D"$LDFLAGS -L${withval}"
+ echo "$as_me:$LINENO: checking for dracauth in -ldrac" >&5
+echo $ECHO_N "checking for dracauth in -ldrac... $ECHO_C" >&6
+if test "${ac_cv_lib_drac_dracauth+set}" =3D set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=3D$LIBS
+LIBS=3D"-ldrac $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char dracauth ();
+int
+main ()
+{
+dracauth ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_drac_dracauth=3Dyes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_drac_dracauth=3Dno
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=3D$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_drac_dracauth" >&5
+echo "${ECHO_T}$ac_cv_lib_drac_dracauth" >&6
+if test $ac_cv_lib_drac_dracauth =3D yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define DRAC_AUTH
+_ACEOF
+
+ DRACLIBS=3D"-ldrac"
+fi
+
+ fi
+fi;
+
+
+
+
+
# Check whether --with-libwrap or --without-libwrap was given.
if test "${with_libwrap+set}" =3D set; then
withval=3D"$with_libwrap"
Modified: trunk/cyrus-imapd-2.2.12/debian/executable.files
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/debian/executable.files 2005-05-01 09:50:29 =
UTC (rev 127)
+++ trunk/cyrus-imapd-2.2.12/debian/executable.files 2005-05-01 10:05:59 =
UTC (rev 128)
@@ -1,9 +1,11 @@
./autogen.sh
+./configure
./contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl
./contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl
./contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl
./contrib/cyrus-graphtools.1.0/script/cyrus.pl
./contrib/cyrus-graphtools.1.0/script/run
+./contrib/mupdate-test.pl
./contrib/notify_unix/simple_notify.pl
./contrib/notify_unix/sql_notify.pl
./debian/cyrus-makedirs
@@ -11,25 +13,30 @@
./debian/cyrus22-common.postinst
./debian/cyrus22-common.postrm
./debian/cyrus22-common.prerm
+./debian/examples/mboxtocyrus
./debian/rules
-./debian/examples/mboxtocyrus
+./doc/internal/internationalization.html
+./et/compile_et.sh
+./et/config_script
./imap/xversion.sh
+./install-sh
./lib/test/run
./makedepend/configure
./makedepend/install-sh
+./mkinstalldirs
./netnews/inn.diffs
./perl/imap/examples/test-imsp.pl
./snmp/snmpgen
+./tools/arbitronsort.pl
+./tools/config2header
+./tools/config2man
./tools/dohash
+./tools/masssievec
./tools/mkimap
+./tools/mknewsgroups
+./tools/mupdate-loadgen.pl
./tools/not-mkdep
./tools/rehash
./tools/translatesieve
-./tools/masssievec
./tools/undohash
./tools/upgradesieve
-./config.guess
-./config.sub
-./install-sh
-./mkinstalldirs
-./configure
Modified: trunk/cyrus-imapd-2.2.12/debian/rules
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/debian/rules 2005-05-01 09:50:29 UTC (rev 12=
7)
+++ trunk/cyrus-imapd-2.2.12/debian/rules 2005-05-01 10:05:59 UTC (rev 12=
8)
@@ -70,7 +70,7 @@
dh_clean
=20
configure:
- ./autogen.sh
+ # ./autogen.sh
=20
build: build-arch build-indep
=20