|
[-]
[+]
|
Changed |
vpopmail.spec
|
|
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28-makefile.diff
^
|
| @@ -1,15 +1,15 @@
---- Makefile.in.orig 2009-03-13 21:37:15.000000000 +0100
-+++ Makefile.in 2009-03-14 12:02:58.000000000 +0100
-@@ -235,7 +235,7 @@
+--- Makefile.in.orig 2009-09-25 22:06:54.000000000 +0200
++++ Makefile.in 2009-09-26 12:10:27.000000000 +0200
+@@ -243,7 +243,7 @@
+ EXEEXT = @EXEEXT@
GREP = @GREP@
- INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = ${INSTALL} -o @vpopuser@ -m 711 -g @vpopgroup@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = ${INSTALL_PROGRAM} -s
LDFLAGS = @LDFLAGS@
-@@ -1059,13 +1059,13 @@
+@@ -1043,13 +1043,13 @@
install-exec-am:
for d in bin doc etc include lib ; do \
if test ! -d $(DESTDIR)@vpopmaildir@/$$d; then \
@@ -25,8 +25,8 @@
$(DESTDIR)@vpopmaildir@/@domains_dir@
echo "-I@vpopmaildir@/include" > \
-@@ -1079,7 +1079,7 @@
- fi
+@@ -1058,7 +1058,7 @@
+ $(DESTDIR)@vpopmaildir@/etc/lib_deps
if test ! -r $(VLIMITS); then \
- $(INSTALL) -o @vpopuser@ -m 0644 -g @vpopgroup@ \
@@ -34,7 +34,7 @@
vlimits.default $(VLIMITS); \
fi
if test "@USE_MYSQL@" = "1"; then \
-@@ -1107,23 +1107,23 @@
+@@ -1086,23 +1086,23 @@
chmod 0640 $(MYSQLCONF) ; \
fi
@@ -46,7 +46,7 @@
+ $(INSTALL) \
config.h $(DESTDIR)@vpopmaildir@/include/vpopmail_config.h
- for include in vpopmail.h config.h vauth.h vlimits.h storage.h client.h conf.h ippp.h ; do \
+ for include in vpopmail.h config.h vauth.h vlimits.h ; do \
- $(INSTALL) -o root -m 0444 $$include \
+ $(INSTALL) $$include \
$(DESTDIR)@vpopmaildir@/include/ ; \
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28-skel4.patch
^
|
| @@ -1,37 +1,3 @@
---- vpopmail-5.4.28/Makefile.in.orig 2009-03-10 22:14:55.000000000 +0100
-+++ vpopmail-5.4.28/Makefile.in 2009-03-13 21:37:15.000000000 +0100
-@@ -73,6 +73,7 @@
- libvpopmail_a-vlimits.$(OBJEXT) \
- libvpopmail_a-maildirquota.$(OBJEXT) \
- libvpopmail_a-vutil.$(OBJEXT) libvpopmail_a-vlistlib.$(OBJEXT) \
-+ libvpopmail_a-copydir.$(OBJEXT) \
- libvpopmail_a-client.$(OBJEXT) libvpopmail_a-conf.$(OBJEXT) \
- libvpopmail_a-ippp.$(OBJEXT) libvpopmail_a-backfill.$(OBJEXT)
- am_libvpopmail_a_OBJECTS = $(am__objects_1)
-@@ -315,8 +316,8 @@
- vpopuser = @vpopuser@
- SUBDIRS = cdb
- EXTRA_DIST = README.* cdb/* vcdb.c vldap.c vmysql.c voracle.pc vpgsql.c vsybase.c
--noinst_HEADERS = md5.h vpopmail.h file_lock.h vauth.h vlimits.h maildirquota.h vcdb.h vldap.h vmysql.h voracle.h vpgsql.h vsybase.h vlog.h global.h hmac_md5.h seek.h vutil.h
--COMMONSOURCES = vpopmail.c md5.c bigdir.c vauth.c file_lock.c vpalias.c seek.c vlimits.c maildirquota.c vutil.c vlistlib.c backfill.c client.c conf.c ippp.c
-+noinst_HEADERS = md5.h vpopmail.h file_lock.h vauth.h vlimits.h maildirquota.h vcdb.h vldap.h vmysql.h voracle.h vpgsql.h vsybase.h vlog.h global.h hmac_md5.h seek.h vutil.h copydir.h
-+COMMONSOURCES = vpopmail.c md5.c bigdir.c vauth.c file_lock.c vpalias.c seek.c vlimits.c maildirquota.c vutil.c vlistlib.c backfill.c client.c conf.c ippp.c copydir.c
- CONFIG_CLEAN_FILES = vauth.c cdb/conf-cc cdb/conf-ld cdb/compile cdb/load
- MYSQLCONF = $(DESTDIR)@vpopmaildir@/etc/vpopmail.mysql
- VLIMITS = $(DESTDIR)@vpopmaildir@/etc/vlimits.default
-@@ -646,6 +647,12 @@
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-client.obj `if test -f 'client.c'; then $(CYGPATH_W) 'client.c'; else $(CYGPATH_W) '$(srcdir)/client.c'; fi`
-
-
-+libvpopmail_a-copydir.o: copydir.c
-+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-copydir.o `test -f 'copydir.c' || echo '$(srcdir)/'`copydir.c
-+
-+libvpopmail_a-copydir.obj: copydir.c
-+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-copydir.obj `if test -f 'copydir.c'; then $(CYGPATH_W) 'copydir.c'; else $(CYGPATH_W) '$(srcdir)/copydir.c'; fi`
-+
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
- # To change the values of `make' variables: instead of editing Makefiles,
--- vpopmail-5.4.28/config.h.in.orig 2009-03-10 22:14:55.000000000 +0100
+++ vpopmail-5.4.28/config.h.in 2009-03-13 21:33:56.000000000 +0100
@@ -217,6 +217,9 @@
@@ -238,3 +204,37 @@
/* set permissions on the user's dir */
chdir(dir);
+--- vpopmail-5.4.28/Makefile.in.orig 2009-08-24 17:01:33.000000000 +0200
++++ vpopmail-5.4.28/Makefile.in 2009-09-25 22:00:14.000000000 +0200
+@@ -73,6 +73,7 @@
+ libvpopmail_a-vlimits.$(OBJEXT) \
+ libvpopmail_a-maildirquota.$(OBJEXT) \
+ libvpopmail_a-vutil.$(OBJEXT) libvpopmail_a-vlistlib.$(OBJEXT) \
++ libvpopmail_a-copydir.$(OBJEXT) \
+ libvpopmail_a-backfill.$(OBJEXT) \
+ libvpopmail_a-client.$(OBJEXT) libvpopmail_a-conf.$(OBJEXT) \
+ libvpopmail_a-ippp.$(OBJEXT)
+@@ -323,8 +324,8 @@
+ vpopuser = @vpopuser@
+ SUBDIRS = cdb
+ EXTRA_DIST = README.* cdb/* vcdb.c vldap.c vmysql.c voracle.pc vpgsql.c vsybase.c
+-noinst_HEADERS = md5.h vpopmail.h file_lock.h vauth.h vlimits.h maildirquota.h vcdb.h vldap.h vmysql.h voracle.h vpgsql.h vsybase.h vlog.h global.h hmac_md5.h seek.h vutil.h
+-COMMONSOURCES = vpopmail.c md5.c bigdir.c vauth.c file_lock.c vpalias.c seek.c vlimits.c maildirquota.c vutil.c vlistlib.c backfill.c client.c conf.c ippp.c
++noinst_HEADERS = md5.h vpopmail.h file_lock.h vauth.h vlimits.h maildirquota.h vcdb.h vldap.h vmysql.h voracle.h vpgsql.h vsybase.h vlog.h global.h hmac_md5.h seek.h vutil.h copydir.h
++COMMONSOURCES = vpopmail.c md5.c bigdir.c vauth.c file_lock.c vpalias.c seek.c vlimits.c maildirquota.c vutil.c vlistlib.c backfill.c client.c conf.c ippp.c copydir.c
+ CONFIG_CLEAN_FILES = vauth.c cdb/conf-cc cdb/conf-ld cdb/compile cdb/load
+ MYSQLCONF = $(DESTDIR)@vpopmaildir@/etc/vpopmail.mysql
+ VLIMITS = $(DESTDIR)@vpopmaildir@/etc/vlimits.default
+@@ -657,6 +658,12 @@
+ libvpopmail_a-ippp.obj: ippp.c
+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-ippp.obj `if test -f 'ippp.c'; then $(CYGPATH_W) 'ippp.c'; else $(CYGPATH_W) '$(srcdir)/ippp.c'; fi`
+
++libvpopmail_a-copydir.o: copydir.c
++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-copydir.o `test -f 'copydir.c' || echo '$(srcdir)/'`copydir.c
++
++libvpopmail_a-copydir.obj: copydir.c
++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-copydir.obj `if test -f 'copydir.c'; then $(CYGPATH_W) 'copydir.c'; else $(CYGPATH_W) '$(srcdir)/copydir.c'; fi`
++
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
|
|
[-]
[+]
|
Added |
vpopmail-5.4.29-makefile-am.patch
^
|
| @@ -0,0 +1,71 @@
+--- vpopmail-5.4.29/Makefile.am.orig 2009-12-04 21:53:40.000000000 +0100
++++ vpopmail-5.4.29/Makefile.am 2009-12-04 22:00:24.000000000 +0100
+@@ -13,7 +13,7 @@
+
+ CONFIG_CLEAN_FILES=vauth.c cdb/conf-cc cdb/conf-ld cdb/compile cdb/load
+
+-INSTALL_PROGRAM= ${INSTALL} -o @vpopuser@ -m 711 -g @vpopgroup@ $(AM_INSTALL_PROGRAM_FLAGS)
++INSTALL_PROGRAM= ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
+ INSTALL_STRIP_PROGRAM=${INSTALL_PROGRAM} -s
+
+ MYSQLCONF=$(DESTDIR)@vpopmaildir@/etc/vpopmail.mysql
+@@ -134,13 +134,13 @@
+ install-exec-am:
+ for d in bin doc etc include lib ; do \
+ if test ! -d $(DESTDIR)@vpopmaildir@/$$d; then \
+- $(INSTALL) -d -g @vpopgroup@ -m 0755 -o @vpopuser@ \
++ $(INSTALL) -d \
+ $(DESTDIR)@vpopmaildir@/$$d ; \
+ fi ; \
+ done
+
+ install-data-local:
+- $(INSTALL) -d -g @vpopgroup@ -m 0700 -o @vpopuser@ \
++ $(INSTALL) -d \
+ $(DESTDIR)@vpopmaildir@/@domains_dir@
+
+ echo "-I@vpopmaildir@/include" > \
+@@ -149,12 +149,12 @@
+ $(DESTDIR)@vpopmaildir@/etc/lib_deps
+
+ if test ! -r $(VUSAGECCONF); then \
+- $(INSTALL) -o @vpopuser@ -m 0644 -g @vpopgroup@ \
++ $(INSTALL) \
+ vusagec.conf $(VUSAGECCONF); \
+ fi
+
+ if test ! -r $(VLIMITS); then \
+- $(INSTALL) -o @vpopuser@ -m 0644 -g @vpopgroup@ \
++ $(INSTALL) \
+ vlimits.default $(VLIMITS); \
+ fi
+
+@@ -183,23 +183,23 @@
+ chmod 0640 $(MYSQLCONF) ; \
+ fi
+
+- $(INSTALL) -o root -m 0644 \
++ $(INSTALL) \
+ libvpopmail.a $(DESTDIR)@vpopmaildir@/lib/libvpopmail.a
+
+- $(INSTALL) -o root -m 0444 \
++ $(INSTALL) \
+ config.h $(DESTDIR)@vpopmaildir@/include/vpopmail_config.h
+
+ for include in vpopmail.h config.h vauth.h vlimits.h storage.h client.h conf.h ippp.h ; do \
+- $(INSTALL) -o root -m 0444 $$include \
++ $(INSTALL) $$include \
+ $(DESTDIR)@vpopmaildir@/include/ ; \
+ done
+
+ $(INSTALL) -d $(DESTDIR)@vpopmaildir@/doc/man_html
+ $(INSTALL) -d $(DESTDIR)@vpopmaildir@/doc/doc_html
+- $(INSTALL) -o @vpopuser@ -m 0444 -g @vpopgroup@ \
++ $(INSTALL) \
+ doc/man_html/*.* $(DESTDIR)@vpopmaildir@/doc/man_html/
+
+- $(INSTALL) -o @vpopuser@ -m 0444 -g @vpopgroup@ \
++ $(INSTALL) \
+ doc/doc_html/*.* $(DESTDIR)@vpopmaildir@/doc/doc_html/
+
+ fix-priv:
|
|
[-]
[+]
|
Added |
vpopmail-5.4.29-makefile.diff
^
|
| @@ -0,0 +1,65 @@
+--- Makefile.in.orig 2009-12-04 21:39:47.000000000 +0100
++++ Makefile.in 2009-12-04 21:41:57.000000000 +0100
+@@ -242,7 +242,7 @@
+ GREP = @GREP@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_PROGRAM = ${INSTALL} -o @vpopuser@ -m 711 -g @vpopgroup@ $(AM_INSTALL_PROGRAM_FLAGS)
++INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = ${INSTALL_PROGRAM} -s
+ LDFLAGS = @LDFLAGS@
+@@ -1070,13 +1070,13 @@
+ install-exec-am:
+ for d in bin doc etc include lib ; do \
+ if test ! -d $(DESTDIR)@vpopmaildir@/$$d; then \
+- $(INSTALL) -d -g @vpopgroup@ -m 0755 -o @vpopuser@ \
++ $(INSTALL) -d \
+ $(DESTDIR)@vpopmaildir@/$$d ; \
+ fi ; \
+ done
+
+ install-data-local:
+- $(INSTALL) -d -g @vpopgroup@ -m 0700 -o @vpopuser@ \
++ $(INSTALL) -d \
+ $(DESTDIR)@vpopmaildir@/@domains_dir@
+
+ echo "-I@vpopmaildir@/include" > \
+@@ -1090,7 +1090,7 @@
+ fi
+
+ if test ! -r $(VLIMITS); then \
+- $(INSTALL) -o @vpopuser@ -m 0644 -g @vpopgroup@ \
++ $(INSTALL) \
+ vlimits.default $(VLIMITS); \
+ fi
+
+@@ -1119,23 +1119,23 @@
+ chmod 0640 $(MYSQLCONF) ; \
+ fi
+
+- $(INSTALL) -o root -m 0644 \
++ $(INSTALL) \
+ libvpopmail.a $(DESTDIR)@vpopmaildir@/lib/libvpopmail.a
+
+- $(INSTALL) -o root -m 0444 \
++ $(INSTALL) \
+ config.h $(DESTDIR)@vpopmaildir@/include/vpopmail_config.h
+
+ for include in vpopmail.h config.h vauth.h vlimits.h storage.h client.h conf.h ippp.h ; do \
+- $(INSTALL) -o root -m 0444 $$include \
++ $(INSTALL) $$include \
+ $(DESTDIR)@vpopmaildir@/include/ ; \
+ done
+
+ $(INSTALL) -d $(DESTDIR)@vpopmaildir@/doc/man_html
+ $(INSTALL) -d $(DESTDIR)@vpopmaildir@/doc/doc_html
+- $(INSTALL) -o @vpopuser@ -m 0444 -g @vpopgroup@ \
++ $(INSTALL) \
+ doc/man_html/*.* $(DESTDIR)@vpopmaildir@/doc/man_html/
+
+- $(INSTALL) -o @vpopuser@ -m 0444 -g @vpopgroup@ \
++ $(INSTALL) \
+ doc/doc_html/*.* $(DESTDIR)@vpopmaildir@/doc/doc_html/
+
+ fix-priv:
|
|
[-]
[+]
|
Added |
vpopmail-5.4.29-skel4.patch
^
|
| @@ -0,0 +1,240 @@
+--- vpopmail-5.4.28/config.h.in.orig 2009-03-10 22:14:55.000000000 +0100
++++ vpopmail-5.4.28/config.h.in 2009-03-13 21:33:56.000000000 +0100
+@@ -217,6 +217,9 @@
+ #undef ONCHANGE_SCRIPT
+
+ /* "" */
++#undef SKELETON
++
++/* "" */
+ #undef OPEN_SMTP_CUR_FILE
+
+ /* "" */
+--- vpopmail-5.4.28/configure.orig 2009-03-10 22:14:55.000000000 +0100
++++ vpopmail-5.4.28/configure 2009-03-14 11:55:25.000000000 +0100
+@@ -1324,6 +1324,7 @@
+ --enable-qmail-ext Enable qmail email address extension support.
+ --enable-ip-alias-domains Enable mapping of default domain via reverse ip lookup table.
+ --enable-onchange-script Enable onchange script. See README.onchange for more info.
++ --enable-skeleton Enable skeleton directory. See README.skel for more info.
+ --enable-spamassassin Enable spamassassin. See README.spamassassin for more info.
+ --enable-spamc-prog=PATH Full path to spamc program /usr/{local/}bin/spamc.
+ --enable-maildrop Enable maildrop. See README.maildrop for more info.
+@@ -7069,6 +7070,35 @@
+
+ #----------------------------------------------------------------------
+
++echo "$as_me:$LINENO: checking whether skeleton directory is enabled" >&5
++echo $ECHO_N "checking whether skeleton directory is enabled... $ECHO_C" >&6
++# Check whether --enable-skeleton or --disable-skeleton was given.
++if test "${enable_skeleton+set}" = set; then
++ enableval="$enable_skeleton"
++ ENABLE_SKELETON=$enableval
++else
++
++ ENABLE_SKELETON=0
++
++
++fi;
++
++case $ENABLE_SKELETON in
++ 1*|y*|Y*)
++ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++ ENABLE_SKELETON=1
++
++cat >>confdefs.h <<_ACEOF
++#define SKELETON $ENABLE_SKEL
++_ACEOF
++
++ ;;
++ *)
++ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++ ;;
++esac
+
+ #----------------------------------------------------------------------
+
+@@ -9821,6 +9851,16 @@
+ esac
+
+
++case $ENABLE_SKELETON in
++ 1*|y*|Y*)
++ echo "skeleton directory = ON --enable-skeleton"
++ ;;
++ *)
++ echo "skeleton directory = OFF --disable-skeleton (default)"
++ ;;
++esac
++
++
+ case $AUTH_MODULE in
+ cd*|Cd*|CD*)
+ echo " auth module = cdb --enable-auth-module=cdb (default)"
+--- vpopmail-5.4.28/configure.in.orig 2009-03-10 22:14:55.000000000 +0100
++++ vpopmail-5.4.28/configure.in 2009-03-14 11:56:58.000000000 +0100
+@@ -851,6 +851,25 @@
+
+ #----------------------------------------------------------------------
+
++AC_MSG_CHECKING(whether skeleton directory is enabled)
++AC_ARG_ENABLE(skeleton,
++ [ --enable-skeleton Enable skeleton directory. See README.skel for more info.],
++ ENABLE_SKELETON=$enableval,
++ [
++ ENABLE_SKELETON=0
++ ]
++)
++
++case $ENABLE_SKELETON in
++ 1*|y*|Y*)
++ AC_MSG_RESULT(yes)
++ ENABLE_SKELETON=1
++ AC_DEFINE_UNQUOTED(SKELETON,$ENABLE_SKEL,"")
++ ;;
++ *)
++ AC_MSG_RESULT(no)
++ ;;
++esac
+
+ #----------------------------------------------------------------------
+
+@@ -1682,6 +1701,16 @@
+ esac
+
+
++case $ENABLE_SKELETON in
++ 1*|y*|Y*)
++ echo "skeleton directory = ON --enable-skeleton"
++ ;;
++ *)
++ echo "skeleton directory = OFF --disable-skeleton (default)"
++ ;;
++esac
++
++
+ case $AUTH_MODULE in
+ cd*|Cd*|CD*)
+ echo " auth module = cdb --enable-auth-module=cdb (default)"
+--- vpopmail-5.4.28/vpopmail.c.orig 2009-03-10 22:14:55.000000000 +0100
++++ vpopmail-5.4.28/vpopmail.c 2009-03-13 21:34:03.000000000 +0100
+@@ -59,6 +59,10 @@
+ static char relay_tempfile[MAX_BUFF];
+ #endif
+
++#ifdef SKELETON
++#include "copydir.h"
++#endif
++
+ int verrori = 0;
+
+ extern int cdb_seek();
+@@ -1345,7 +1349,8 @@
+ while((mydirent=readdir(mydir))!=NULL){
+ if ( strncmp(mydirent->d_name,".", 2)!=0 &&
+ strncmp(mydirent->d_name,"..", 3)!=0 ) {
+- stat( mydirent->d_name, &statbuf);
++ lstat( mydirent->d_name, &statbuf);
++ if ( S_ISLNK(statbuf.st_mode) ) continue;
+ if ( S_ISDIR(statbuf.st_mode) ) {
+ r_chown( mydirent->d_name, owner, group);
+ } else {
+@@ -2400,8 +2405,24 @@
+ return(NULL);
+ }
+
++#ifdef SKELETON
++ /* copy the skeleton into place */
++ struct stat s;
++ if ( stat ( VPOPMAILDIR "/skel" , &s ) ) {
++ if ( ENOENT != errno )
++ fprintf(stderr,"make_user_dir: stat(%s): %s\n",
++ VPOPMAILDIR "/skel" , strerror(errno) );
++ } else {
++ if ( S_ISDIR ( s.st_mode ) )
++ copydir ( VPOPMAILDIR "/skel" , "." , uid , gid ) ;
++ else
++ fprintf(stderr,"make_user_dir: %s is not a directory\n",
++ VPOPMAILDIR "/skel" );
++ }
++#endif
++
+ for (i = 0; i < (int)(sizeof(dirnames)/sizeof(dirnames[0])); i++) {
+- if (mkdir(dirnames[i],VPOPMAIL_DIR_MODE) == -1){
++ if ((mkdir(dirnames[i],VPOPMAIL_DIR_MODE) == -1) && (EEXIST != errno)){
+ fprintf(stderr, "make_user_dir: failed on %s\n", dirnames[i]);
+ /* back out of changes made above */
+ chdir("..");
+@@ -3108,12 +3129,32 @@
+ /* we should now be able to cd into the user's dir */
+ if ( chdir(dir) != 0 ) { chdir(calling_dir); return(-1); }
+
++#ifdef SKELETON
++ /* copy the skeleton into place */
++ struct stat s;
++ if ( stat ( VPOPMAILDIR "/skel" , &s ) ) {
++ if ( ENOENT != errno )
++ fprintf(stderr,"make_user_dir: stat(%s): %s\n",
++ VPOPMAILDIR "/skel" , strerror(errno) );
++ } else {
++ if ( S_ISDIR ( s.st_mode ) )
++ copydir ( VPOPMAILDIR "/skel" , "." , uid , gid ) ;
++ else
++ fprintf(stderr,"make_user_dir: %s is not a directory\n",
++ VPOPMAILDIR "/skel" );
++ }
++#endif
++
+ /* now create the Maildir */
+- if (mkdir("Maildir",VPOPMAIL_DIR_MODE) == -1) { chdir(calling_dir); return(-1); }
++ if ((mkdir("Maildir",VPOPMAIL_DIR_MODE) == -1) && (EEXIST != errno)) {
++ chdir(calling_dir); return(-1); }
+ if (chdir("Maildir") == -1) { chdir(calling_dir); return(-1); }
+- if (mkdir("cur",VPOPMAIL_DIR_MODE) == -1) { chdir(calling_dir); return(-1); }
+- if (mkdir("new",VPOPMAIL_DIR_MODE) == -1) { chdir(calling_dir); return(-1); }
+- if (mkdir("tmp",VPOPMAIL_DIR_MODE) == -1) { chdir(calling_dir); return(-1); }
++ if ((mkdir("cur",VPOPMAIL_DIR_MODE) == -1) && (EEXIST != errno)) {
++ chdir(calling_dir); return(-1); }
|
|
[-]
[+]
|
Added |
vpopmail-5.4.30-makefile-am.patch
^
|
| @@ -0,0 +1,71 @@
+--- vpopmail-5.4.29/Makefile.am.orig 2009-12-04 21:53:40.000000000 +0100
++++ vpopmail-5.4.29/Makefile.am 2009-12-04 22:00:24.000000000 +0100
+@@ -13,7 +13,7 @@
+
+ CONFIG_CLEAN_FILES=vauth.c cdb/conf-cc cdb/conf-ld cdb/compile cdb/load
+
+-INSTALL_PROGRAM= ${INSTALL} -o @vpopuser@ -m 711 -g @vpopgroup@ $(AM_INSTALL_PROGRAM_FLAGS)
++INSTALL_PROGRAM= ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
+ INSTALL_STRIP_PROGRAM=${INSTALL_PROGRAM} -s
+
+ MYSQLCONF=$(DESTDIR)@vpopmaildir@/etc/vpopmail.mysql
+@@ -134,13 +134,13 @@
+ install-exec-am:
+ for d in bin doc etc include lib ; do \
+ if test ! -d $(DESTDIR)@vpopmaildir@/$$d; then \
+- $(INSTALL) -d -g @vpopgroup@ -m 0755 -o @vpopuser@ \
++ $(INSTALL) -d \
+ $(DESTDIR)@vpopmaildir@/$$d ; \
+ fi ; \
+ done
+
+ install-data-local:
+- $(INSTALL) -d -g @vpopgroup@ -m 0700 -o @vpopuser@ \
++ $(INSTALL) -d \
+ $(DESTDIR)@vpopmaildir@/@domains_dir@
+
+ echo "-I@vpopmaildir@/include" > \
+@@ -149,12 +149,12 @@
+ $(DESTDIR)@vpopmaildir@/etc/lib_deps
+
+ if test ! -r $(VUSAGECCONF); then \
+- $(INSTALL) -o @vpopuser@ -m 0644 -g @vpopgroup@ \
++ $(INSTALL) \
+ vusagec.conf $(VUSAGECCONF); \
+ fi
+
+ if test ! -r $(VLIMITS); then \
+- $(INSTALL) -o @vpopuser@ -m 0644 -g @vpopgroup@ \
++ $(INSTALL) \
+ vlimits.default $(VLIMITS); \
+ fi
+
+@@ -183,23 +183,23 @@
+ chmod 0640 $(MYSQLCONF) ; \
+ fi
+
+- $(INSTALL) -o root -m 0644 \
++ $(INSTALL) \
+ libvpopmail.a $(DESTDIR)@vpopmaildir@/lib/libvpopmail.a
+
+- $(INSTALL) -o root -m 0444 \
++ $(INSTALL) \
+ config.h $(DESTDIR)@vpopmaildir@/include/vpopmail_config.h
+
+ for include in vpopmail.h config.h vauth.h vlimits.h storage.h client.h conf.h ippp.h ; do \
+- $(INSTALL) -o root -m 0444 $$include \
++ $(INSTALL) $$include \
+ $(DESTDIR)@vpopmaildir@/include/ ; \
+ done
+
+ $(INSTALL) -d $(DESTDIR)@vpopmaildir@/doc/man_html
+ $(INSTALL) -d $(DESTDIR)@vpopmaildir@/doc/doc_html
+- $(INSTALL) -o @vpopuser@ -m 0444 -g @vpopgroup@ \
++ $(INSTALL) \
+ doc/man_html/*.* $(DESTDIR)@vpopmaildir@/doc/man_html/
+
+- $(INSTALL) -o @vpopuser@ -m 0444 -g @vpopgroup@ \
++ $(INSTALL) \
+ doc/doc_html/*.* $(DESTDIR)@vpopmaildir@/doc/doc_html/
+
+ fix-priv:
|
|
|
Added |
vpopmail-5.4.28.tar.bz2.old
^
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/ChangeLog
^
|
| @@ -13,6 +13,20 @@
- Updated vusage API to return counts for both users and domains
- Updated domain quota enforcement to work when using vusage
- Re-enabled --enable-domainquotas (with warnings)
+ - Fixed percentage calculation bug in vmaildir_readquota
+ - Updated lastauth/vlog queries not to trigger failure condition on domain
+ deletion in MySQL and PostgreSQL module
+ - Updated build scripts to show version 5.4.28
+ - Added solution for 5.4.28 to LDAP schema for sn and cn attributes being
+ required. A permanent solution will be added to the 5.5 tree
+ - Fixed vdelivermail to process .qmail files for users with dashes in their
+ usernames when qmail-ext is enabled
+ - Fixed bounds error in vauth_much_domain and increased buffer size for
+ longer domain names
+ - Applied same fix to PostgreSQL module
+
+ aledr <matrixworkstation@gmail.com>
+ - Fixed overflow in PostgreSQL module
5.4.27 - Released 16-Jan-2009
Jeremy Kister, Rick Widmer, Tom Collins
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/Makefile.am
^
|
| @@ -33,7 +33,7 @@
vpopmaild vlist authvchkpw vusagec
vusagec_SOURCES = vusagec.c client.c conf.c ippp.c
-vlist_LDADD = libvpopmail.a @auth_libs@
+vusagec_LDADD = libvpopmail.a @auth_libs@
vuserinfo_SOURCES = vuserinfo.c maildirquota.c
vuserinfo_LDADD = libvpopmail.a @auth_libs@
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/Makefile.in
^
|
| @@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -45,13 +45,13 @@
vipmap$(EXEEXT) vdominfo$(EXEEXT) vconvert$(EXEEXT) \
vkill$(EXEEXT) vmoddomlimits$(EXEEXT) vchangepw$(EXEEXT) \
dotqmail2valias$(EXEEXT) vpopmaild$(EXEEXT) vlist$(EXEEXT) \
- vusagec$(EXEEXT)
+ authvchkpw$(EXEEXT) vusagec$(EXEEXT)
subdir = .
-DIST_COMMON = README $(am__configure_deps) $(noinst_HEADERS) \
+DIST_COMMON = $(am__configure_deps) $(noinst_HEADERS) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \
- ChangeLog INSTALL TODO compile config.guess config.sub \
- install-sh ltmain.sh missing mkinstalldirs
+ $(srcdir)/config.h.in $(top_srcdir)/configure ChangeLog \
+ config.guess config.sub install-sh ltmain.sh missing \
+ mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -73,16 +73,17 @@
libvpopmail_a-vlimits.$(OBJEXT) \
libvpopmail_a-maildirquota.$(OBJEXT) \
libvpopmail_a-vutil.$(OBJEXT) libvpopmail_a-vlistlib.$(OBJEXT) \
+ libvpopmail_a-backfill.$(OBJEXT) \
libvpopmail_a-client.$(OBJEXT) libvpopmail_a-conf.$(OBJEXT) \
- libvpopmail_a-ippp.$(OBJEXT) libvpopmail_a-backfill.$(OBJEXT)
+ libvpopmail_a-ippp.$(OBJEXT)
am_libvpopmail_a_OBJECTS = $(am__objects_1)
libvpopmail_a_OBJECTS = $(am_libvpopmail_a_OBJECTS)
am__installdirs = "$(DESTDIR)$(vpopmailbindir)"
vpopmailbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(vpopmailbin_PROGRAMS)
-am_vusagec_OBJECTS = vusagec.$(OBJEXT)
-vusagec_OBJECTS = $(am_vusagec_OBJECTS)
-vusagec_DEPENDENCIES = libvpopmail.a
+am_authvchkpw_OBJECTS = authvchkpw.$(OBJEXT) hmac_md5.$(OBJEXT)
+authvchkpw_OBJECTS = $(am_authvchkpw_OBJECTS)
+authvchkpw_DEPENDENCIES = libvpopmail.a
am_clearopensmtp_OBJECTS = clearopensmtp.$(OBJEXT)
clearopensmtp_OBJECTS = $(am_clearopensmtp_OBJECTS)
clearopensmtp_DEPENDENCIES = libvpopmail.a
@@ -156,6 +157,10 @@
am_vsetuserquota_OBJECTS = vsetuserquota.$(OBJEXT)
vsetuserquota_OBJECTS = $(am_vsetuserquota_OBJECTS)
vsetuserquota_DEPENDENCIES = libvpopmail.a
+am_vusagec_OBJECTS = vusagec.$(OBJEXT) client.$(OBJEXT) conf.$(OBJEXT) \
+ ippp.$(OBJEXT)
+vusagec_OBJECTS = $(am_vusagec_OBJECTS)
+vusagec_DEPENDENCIES = libvpopmail.a
am_vuserinfo_OBJECTS = vuserinfo.$(OBJEXT) maildirquota.$(OBJEXT)
vuserinfo_OBJECTS = $(am_vuserinfo_OBJECTS)
vuserinfo_DEPENDENCIES = libvpopmail.a
@@ -166,28 +171,30 @@
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libvpopmail_a_SOURCES) $(clearopensmtp_SOURCES) \
- $(dotqmail2valias_SOURCES) $(vaddaliasdomain_SOURCES) \
- $(vadddomain_SOURCES) $(vadduser_SOURCES) $(valias_SOURCES) \
- $(vchangepw_SOURCES) $(vchkpw_SOURCES) $(vconvert_SOURCES) \
- $(vdeldomain_SOURCES) $(vdelivermail_SOURCES) \
- $(vdeloldusers_SOURCES) $(vdeluser_SOURCES) \
- $(vdominfo_SOURCES) $(vipmap_SOURCES) $(vkill_SOURCES) \
- $(vlist_SOURCES) $(vmkpasswd_SOURCES) $(vmoddomlimits_SOURCES) \
- $(vmoduser_SOURCES) $(vpasswd_SOURCES) $(vpopbull_SOURCES) \
- $(vpopmaild_SOURCES) $(vsetuserquota_SOURCES) \
- $(vuserinfo_SOURCES) $(vusagec_SOURCES)
-DIST_SOURCES = $(libvpopmail_a_SOURCES) $(clearopensmtp_SOURCES) \
- $(dotqmail2valias_SOURCES) $(vaddaliasdomain_SOURCES) \
- $(vadddomain_SOURCES) $(vadduser_SOURCES) $(valias_SOURCES) \
- $(vchangepw_SOURCES) $(vchkpw_SOURCES) $(vconvert_SOURCES) \
- $(vdeldomain_SOURCES) $(vdelivermail_SOURCES) \
- $(vdeloldusers_SOURCES) $(vdeluser_SOURCES) \
- $(vdominfo_SOURCES) $(vipmap_SOURCES) $(vkill_SOURCES) \
- $(vlist_SOURCES) $(vmkpasswd_SOURCES) $(vmoddomlimits_SOURCES) \
- $(vmoduser_SOURCES) $(vpasswd_SOURCES) $(vpopbull_SOURCES) \
- $(vpopmaild_SOURCES) $(vsetuserquota_SOURCES) \
- $(vuserinfo_SOURCES) $(vusagec_SOURCES)
+SOURCES = $(libvpopmail_a_SOURCES) $(authvchkpw_SOURCES) \
+ $(clearopensmtp_SOURCES) $(dotqmail2valias_SOURCES) \
+ $(vaddaliasdomain_SOURCES) $(vadddomain_SOURCES) \
+ $(vadduser_SOURCES) $(valias_SOURCES) $(vchangepw_SOURCES) \
+ $(vchkpw_SOURCES) $(vconvert_SOURCES) $(vdeldomain_SOURCES) \
+ $(vdelivermail_SOURCES) $(vdeloldusers_SOURCES) \
+ $(vdeluser_SOURCES) $(vdominfo_SOURCES) $(vipmap_SOURCES) \
+ $(vkill_SOURCES) $(vlist_SOURCES) $(vmkpasswd_SOURCES) \
+ $(vmoddomlimits_SOURCES) $(vmoduser_SOURCES) \
+ $(vpasswd_SOURCES) $(vpopbull_SOURCES) $(vpopmaild_SOURCES) \
+ $(vsetuserquota_SOURCES) $(vusagec_SOURCES) \
+ $(vuserinfo_SOURCES)
+DIST_SOURCES = $(libvpopmail_a_SOURCES) $(authvchkpw_SOURCES) \
+ $(clearopensmtp_SOURCES) $(dotqmail2valias_SOURCES) \
+ $(vaddaliasdomain_SOURCES) $(vadddomain_SOURCES) \
+ $(vadduser_SOURCES) $(valias_SOURCES) $(vchangepw_SOURCES) \
+ $(vchkpw_SOURCES) $(vconvert_SOURCES) $(vdeldomain_SOURCES) \
+ $(vdelivermail_SOURCES) $(vdeloldusers_SOURCES) \
+ $(vdeluser_SOURCES) $(vdominfo_SOURCES) $(vipmap_SOURCES) \
+ $(vkill_SOURCES) $(vlist_SOURCES) $(vmkpasswd_SOURCES) \
+ $(vmoddomlimits_SOURCES) $(vmoduser_SOURCES) \
+ $(vpasswd_SOURCES) $(vpopbull_SOURCES) $(vpopmaild_SOURCES) \
+ $(vsetuserquota_SOURCES) $(vusagec_SOURCES) \
+ $(vuserinfo_SOURCES)
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
install-dvi-recursive install-exec-recursive \
@@ -308,6 +315,7 @@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
vpopgroup = @vpopgroup@
@@ -320,18 +328,19 @@
CONFIG_CLEAN_FILES = vauth.c cdb/conf-cc cdb/conf-ld cdb/compile cdb/load
MYSQLCONF = $(DESTDIR)@vpopmaildir@/etc/vpopmail.mysql
VLIMITS = $(DESTDIR)@vpopmaildir@/etc/vlimits.default
-VUSAGECCONF = $(DESTDIR)@vpopmaildir@/etc/vusagec.conf
noinst_LIBRARIES = libvpopmail.a
libvpopmail_a_SOURCES = $(COMMONSOURCES)
libvpopmail_a_LIBADD = cdb/*.o
libvpopmail_a_CFLAGS = -fPIC
vpopmailbindir = @vpopmaildir@/bin
-vusagec_sources = vusagec.c client.c ippp.c conf.c
+vusagec_SOURCES = vusagec.c client.c conf.c ippp.c
vusagec_LDADD = libvpopmail.a @auth_libs@
vuserinfo_SOURCES = vuserinfo.c maildirquota.c
vuserinfo_LDADD = libvpopmail.a @auth_libs@
vlist_SOURCES = vlist.c vlistlib.c vutil.c
vlist_LDADD = libvpopmail.a @auth_libs@
+authvchkpw_SOURCES = authvchkpw.c hmac_md5.c
+authvchkpw_LDADD = libvpopmail.a @auth_libs@
vpopmaild_SOURCES = vpopmaild.c
vpopmaild_LDADD = libvpopmail.a @auth_libs@
vdominfo_SOURCES = vdominfo.c
@@ -464,12 +473,12 @@
clean-vpopmailbinPROGRAMS:
-test -z "$(vpopmailbin_PROGRAMS)" || rm -f $(vpopmailbin_PROGRAMS)
+authvchkpw$(EXEEXT): $(authvchkpw_OBJECTS) $(authvchkpw_DEPENDENCIES)
+ @rm -f authvchkpw$(EXEEXT)
+ $(LINK) $(authvchkpw_OBJECTS) $(authvchkpw_LDADD) $(LIBS)
clearopensmtp$(EXEEXT): $(clearopensmtp_OBJECTS) $(clearopensmtp_DEPENDENCIES)
@rm -f clearopensmtp$(EXEEXT)
$(LINK) $(clearopensmtp_OBJECTS) $(clearopensmtp_LDADD) $(LIBS)
-vusagec$(EXEEXT): $(vusagec_OBJECTS) $(vusagec_DEPENDENCIES)
- @rm -f vusagec$(EXEEXT)
- $(LINK) $(vusagec_OBJECTS) $(vusagec_LDADD) $(LIBS)
dotqmail2valias$(EXEEXT): $(dotqmail2valias_OBJECTS) $(dotqmail2valias_DEPENDENCIES)
@rm -f dotqmail2valias$(EXEEXT)
$(LINK) $(dotqmail2valias_OBJECTS) $(dotqmail2valias_LDADD) $(LIBS)
@@ -539,6 +548,9 @@
vsetuserquota$(EXEEXT): $(vsetuserquota_OBJECTS) $(vsetuserquota_DEPENDENCIES)
@rm -f vsetuserquota$(EXEEXT)
$(LINK) $(vsetuserquota_OBJECTS) $(vsetuserquota_LDADD) $(LIBS)
+vusagec$(EXEEXT): $(vusagec_OBJECTS) $(vusagec_DEPENDENCIES)
+ @rm -f vusagec$(EXEEXT)
+ $(LINK) $(vusagec_OBJECTS) $(vusagec_LDADD) $(LIBS)
vuserinfo$(EXEEXT): $(vuserinfo_OBJECTS) $(vuserinfo_DEPENDENCIES)
@rm -f vuserinfo$(EXEEXT)
$(LINK) $(vuserinfo_OBJECTS) $(vuserinfo_LDADD) $(LIBS)
@@ -561,12 +573,6 @@
libvpopmail_a-vpopmail.obj: vpopmail.c
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-vpopmail.obj `if test -f 'vpopmail.c'; then $(CYGPATH_W) 'vpopmail.c'; else $(CYGPATH_W) '$(srcdir)/vpopmail.c'; fi`
-libvpopmail_a-backfill.o: backfill.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-backfill.o `test -f 'backfill.c' || echo '$(srcdir)/'`backfill.c
-
-libvpopmail_a-backfill.obj: backfill.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-backfill.obj `if test -f 'backfill.c'; then $(CYGPATH_W) 'backfill.c'; else $(CYGPATH_W) '$(srcdir)/backfill.c'; fi`
-
libvpopmail_a-md5.o: md5.c
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-md5.o `test -f 'md5.c' || echo '$(srcdir)/'`md5.c
@@ -627,25 +633,30 @@
libvpopmail_a-vlistlib.obj: vlistlib.c
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-vlistlib.obj `if test -f 'vlistlib.c'; then $(CYGPATH_W) 'vlistlib.c'; else $(CYGPATH_W) '$(srcdir)/vlistlib.c'; fi`
+libvpopmail_a-backfill.o: backfill.c
+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-backfill.o `test -f 'backfill.c' || echo '$(srcdir)/'`backfill.c
+
+libvpopmail_a-backfill.obj: backfill.c
+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-backfill.obj `if test -f 'backfill.c'; then $(CYGPATH_W) 'backfill.c'; else $(CYGPATH_W) '$(srcdir)/backfill.c'; fi`
+
+libvpopmail_a-client.o: client.c
+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-client.o `test -f 'client.c' || echo '$(srcdir)/'`client.c
+
+libvpopmail_a-client.obj: client.c
+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-client.obj `if test -f 'client.c'; then $(CYGPATH_W) 'client.c'; else $(CYGPATH_W) '$(srcdir)/client.c'; fi`
+
libvpopmail_a-conf.o: conf.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-conf.o `if test -f 'conf.c'; then $(CYGPATH_W) 'conf.c'; else $(CYGPATH_W) '$(srcdir)/conf.c'; fi`
+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-conf.o `test -f 'conf.c' || echo '$(srcdir)/'`conf.c
libvpopmail_a-conf.obj: conf.c
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-conf.obj `if test -f 'conf.c'; then $(CYGPATH_W) 'conf.c'; else $(CYGPATH_W) '$(srcdir)/conf.c'; fi`
libvpopmail_a-ippp.o: ippp.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-ippp.o `if test -f 'ippp.c'; then $(CYGPATH_W) 'ippp.c'; else $(CYGPATH_W) '$(srcdir)/ippp.c'; fi`
+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-ippp.o `test -f 'ippp.c' || echo '$(srcdir)/'`ippp.c
libvpopmail_a-ippp.obj: ippp.c
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-ippp.obj `if test -f 'ippp.c'; then $(CYGPATH_W) 'ippp.c'; else $(CYGPATH_W) '$(srcdir)/ippp.c'; fi`
-libvpopmail_a-client.o: client.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-client.o `if test -f 'client.c'; then $(CYGPATH_W) 'client.c'; else $(CYGPATH_W) '$(srcdir)/client.c'; fi`
-
-libvpopmail_a-client.obj: client.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-client.obj `if test -f 'client.c'; then $(CYGPATH_W) 'client.c'; else $(CYGPATH_W) '$(srcdir)/client.c'; fi`
-
-
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
@@ -721,8 +732,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -747,8 +758,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -758,13 +769,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -838,6 +848,10 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -864,6 +878,8 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -936,18 +952,18 @@
uninstall: uninstall-recursive
vusage-msg:
- @echo ""
- @echo "****************************************************"
- @echo ""
- @echo " If you plan to use the vpopmail usage daemon"
- @echo " run the following commands:"
- @echo ""
- @echo " cd vusaged && ./configure && make"
- @echo ""
- @echo " Then follow the INSTALL file to install"
- @echo ""
- @echo "****************************************************"
- @echo ""
+ @echo ""
+ @echo "****************************************************"
+ @echo ""
+ @echo " If you plan to use the vpopmail usage daemon"
+ @echo " run the following commands:"
+ @echo ""
+ @echo " cd vusaged && ./configure && make"
+ @echo ""
+ @echo " Then follow the INSTALL file to install"
+ @echo ""
+ @echo "****************************************************"
+ @echo ""
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
@@ -1032,7 +1048,7 @@
all all-am am--refresh check check-am clean clean-generic \
clean-noinstLIBRARIES clean-vpopmailbinPROGRAMS ctags \
ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \
- dist-shar dist-tarZ dist-zip distcheck distclean \
+ dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-compile distclean-generic distclean-hdr \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
@@ -1065,11 +1081,11 @@
$(DESTDIR)@vpopmaildir@/etc/inc_deps
echo "-L@vpopmaildir@/lib -lvpopmail @auth_libs@ @LIBS@" > \
$(DESTDIR)@vpopmaildir@/etc/lib_deps
-
+
if test ! -r $(VUSAGECCONF); then \
- $(INSTALL) -o @vpopuser@ -m 0644 -g @vpopgroup@ \
- vusagec.conf $(VUSAGECCONF); \
- fi
+ $(INSTALL) -o @vpopuser@ -m 0644 -g @vpopgroup@ \
+ vusagec.conf $(VUSAGECCONF); \
+ fi
if test ! -r $(VLIMITS); then \
$(INSTALL) -o @vpopuser@ -m 0644 -g @vpopgroup@ \
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/aclocal.m4
^
|
| @@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,12 +11,15 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf. If you want to use that,
-you should regenerate the build system entirely.], [63])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
+[m4_warning([this file was generated for autoconf 2.63.
+You have another version of autoconf. It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
-# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -31,7 +34,7 @@
[am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10], [],
+m4_if([$1], [1.10.2], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -45,10 +48,12 @@
# AM_SET_CURRENT_AUTOMAKE_VERSION
# -------------------------------
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10.2])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
@@ -298,57 +303,68 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-#serial 3
+#serial 5
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
+[{
+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # are listed without --file. Let's play safe and only enable the eval
+ # if we detect the quoting.
+ case $CONFIG_FILES in
+ *\'*) eval set x "$CONFIG_FILES" ;;
+ *) set x $CONFIG_FILES ;;
+ esac
+ shift
+ for mf
+ do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+ # We used to match only the files named `Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ dirpart=`AS_DIRNAME("$mf")`
+ else
+ continue
+ fi
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running `make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # When using ansi2knr, U may be empty or an underscore; expand it
+ U=`sed -n 's/^U = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`AS_DIRNAME(["$file"])`
+ AS_MKDIR_P([$dirpart/$fdir])
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
done
-done
+}
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
@@ -380,13 +396,13 @@
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 12
+# serial 13
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -491,16 +507,17 @@
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
+_am_arg=$1
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $1 | $1:* )
+ $_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
@@ -653,13 +670,13 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 3
+# serial 4
# _AM_MANGLE_OPTION(NAME)
# -----------------------
@@ -676,7 +693,7 @@
# ----------------------------------
# OPTIONS is a space-separated list of Automake options.
AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
# -------------------------------------------
@@ -772,7 +789,7 @@
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/authvchkpw.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: authvchkpw.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: authvchkpw.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* Revision 2.2 2008-08-24 17:43:44+05:30 Cprogrammer
@@ -45,7 +45,7 @@
#include "vauth.h"
#ifndef lint
-static char sccsid[] = "$Id: authvchkpw.c 706 2009-03-10 17:56:19Z volz0r $";
+static char sccsid[] = "$Id: authvchkpw.c 924 2009-08-24 15:01:12Z volz0r $";
#endif
#ifdef AUTH_SIZE
#undef AUTH_SIZE
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/backfill.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: backfill.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: backfill.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
* Revision 2.1 2009-01-12 10:38:56+05:30 Cprogrammer
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/bigdir.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: bigdir.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: bigdir.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/clearopensmtp.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: clearopensmtp.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: clearopensmtp.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/client.c
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: client.c 718 2009-03-10 20:43:10Z volz0r $
+ $Id: client.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/client.h
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: client.h 705 2009-03-10 17:43:50Z volz0r $
+ $Id: client.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/conf.c
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: conf.c 705 2009-03-10 17:43:50Z volz0r $
+ $Id: conf.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/conf.h
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: conf.h 705 2009-03-10 17:43:50Z volz0r $
+ $Id: conf.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
|
|
[-]
[+]
|
Deleted |
vpopmail-5.4.28.tar.bz2/config.h.in~
^
|
| @@ -1,370 +0,0 @@
-/* config.h.in. Generated from configure.in by autoheader. */
-
-/* "" */
-#undef CLEAR_PASS
-
-/* Define to 1 if the `closedir' function returns void instead of `int'. */
-#undef CLOSEDIR_VOID
-
-/* "" */
-#undef DOMAINS_DIR
-
-/* "" */
-#undef ENABLE_AUTH_LOGGING
-
-/* "" */
-#undef ENABLE_LEARN_PASSWORDS
-
-/* "" */
-#undef ENABLE_LOGGING
-
-/* "" */
-#undef ENABLE_MYSQL_LIMITS
-
-/* "" */
-#undef ENABLE_PASSWD
-
-/* "" */
-#undef ENABLE_SQL_LOGGING
-
-/* "" */
-#undef FILE_LOCKING
-
-/* "" */
-#undef FILE_SYNC
-
-/* "" */
-#undef HAS_SHADOW
-
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-#undef HAVE_ARPA_INET_H
-
-/* Define to 1 if you have the `bzero' function. */
-#undef HAVE_BZERO
-
-/* Define to 1 if you have the <crypt.h> header file. */
-#undef HAVE_CRYPT_H
-
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
- */
-#undef HAVE_DIRENT_H
-
-/* Define to 1 if you have the `dup2' function. */
-#undef HAVE_DUP2
-
-/* Define to 1 if you have the <err.h> header file. */
-#undef HAVE_ERR_H
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#undef HAVE_FCNTL_H
-
-/* Define to 1 if you have the `fdatasync' function. */
-#undef HAVE_FDATASYNC
-
-/* Define to 1 if you have the `getcwd' function. */
-#undef HAVE_GETCWD
-
-/* Define to 1 if you have the `gethostname' function. */
-#undef HAVE_GETHOSTNAME
-
-/* Define to 1 if you have the `getpass' function. */
-#undef HAVE_GETPASS
-
-/* Define to 1 if you have the `getspnam' function. */
-#undef HAVE_GETSPNAM
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `crypt' library (-lcrypt). */
-#undef HAVE_LIBCRYPT
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the `memset' function. */
-#undef HAVE_MEMSET
-
-/* Define to 1 if you have the `mkdir' function. */
-#undef HAVE_MKDIR
-
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-#undef HAVE_NDIR_H
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-#undef HAVE_NETINET_IN_H
-
-/* Define to 1 if you have the `putenv' function. */
-#undef HAVE_PUTENV
-
-/* Define to 1 if you have the `rmdir' function. */
-#undef HAVE_RMDIR
-
-/* Define to 1 if you have the <shadow.h> header file. */
-#undef HAVE_SHADOW_H
-
-/* Define to 1 if you have the `socket' function. */
-#undef HAVE_SOCKET
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the `strchr' function. */
-#undef HAVE_STRCHR
-
-/* Define to 1 if you have the `strdup' function. */
-#undef HAVE_STRDUP
-
-/* Define to 1 if you have the `strerror' function. */
-#undef HAVE_STRERROR
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the `strncasecmp' function. */
-#undef HAVE_STRNCASECMP
-
-/* Define to 1 if you have the `strrchr' function. */
-#undef HAVE_STRRCHR
-
-/* Define to 1 if you have the `strspn' function. */
-#undef HAVE_STRSPN
-
-/* Define to 1 if you have the `strstr' function. */
-#undef HAVE_STRSTR
-
-/* Define to 1 if you have the <syslog.h> header file. */
-#undef HAVE_SYSLOG_H
-
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
- */
-#undef HAVE_SYS_DIR_H
-
-/* Define to 1 if you have the <sys/file.h> header file. */
-#undef HAVE_SYS_FILE_H
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
- */
-#undef HAVE_SYS_NDIR_H
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#undef HAVE_SYS_PARAM_H
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#undef HAVE_SYS_SOCKET_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#undef HAVE_SYS_TIME_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
-#undef HAVE_SYS_WAIT_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have the `utime' function. */
-#undef HAVE_UTIME
-
-/* Define to 1 if you have the <utime.h> header file. */
-#undef HAVE_UTIME_H
-
-/* Define to 1 if `utime(file, NULL)' sets file's timestamp to the present. */
-#undef HAVE_UTIME_NULL
-
-/* Define to 1 if you have the `warn' function. */
-#undef HAVE_WARN
-
-/* "" */
-#undef IP_ALIAS_DOMAINS
-
-/* "" */
-#undef LOG_NAME
-
-/* "" */
-#undef MAILDROP
-
-/* "" */
-#undef MAILDROP_PROG
-
-/* "" */
-#undef MAKE_SEEKABLE
-
-/* "" */
-#undef MANY_DOMAINS
-
-/* "" */
-#undef MD5_PASSWORDS
-
-/* "" */
-#undef MYSQL_REPLICATION
-
-/* "" */
-#undef ONCHANGE_SCRIPT
-
-/* "" */
-#undef OPEN_SMTP_CUR_FILE
-
-/* "" */
-#undef OPEN_SMTP_LOK_FILE
-
-/* "" */
-#undef OPEN_SMTP_TMP_FILE
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* "" */
-#undef POP_AUTH_OPEN_RELAY
-
-/* "" */
-#undef PS_COMMAND
-
-/* "" */
-#undef QMAILDIR
-
-/* "" */
-#undef QMAILINJECT
-
-/* "" */
-#undef QMAILNEWMRH
-
-/* "" */
-#undef QMAILNEWU
-
-/* "" */
-#undef QMAIL_EXT
-
-/* "" */
-#undef REBUILD_TCPSERVER
-
-/* "" */
-#undef RELAY_CLEAR_MINUTES
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
-
-/* "" */
-#undef SPAMASSASSIN
-
-/* "" */
-#undef SPAMC_PROG
-
-/* "" */
-#undef SQWEBMAIL_PASS
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* "" */
-#undef TCPRULES_PROG
-
-/* "" */
-#undef TCP_FILE
-
-/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-#undef TM_IN_SYS_TIME
-
-/* "" */
-#undef USERS_BIG_DIR
-
-/* "" */
-#undef USE_CDB
-
-/* "" */
-#undef USE_LDAP
-
-/* "" */
-#undef USE_MYSQL
-
-/* "" */
-#undef USE_ORACLE
-
-/* "" */
-#undef USE_POSTGRES
-
-/* "" */
-#undef USE_SQL
-
-/* "" */
-#undef USE_SYBASE
-
-/* "" */
-#undef VALIAS
-
-/* Version number of package */
-#undef VERSION
-
-/* "" */
-#undef VLIMITS_DEFAULT_FILE
-
-/* "" */
-#undef VPOPGROUP
-
-/* "" */
-#undef VPOPMAILDIR
-
-/* "" */
-#undef VPOPMAILGID
-
-/* "" */
-#undef VPOPMAILUID
-
-/* "" */
-#undef VPOPUSER
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef gid_t
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
- calls it, or to nothing if 'inline' is not supported under any name. */
-#ifndef __cplusplus
-#undef inline
-#endif
-
-/* Define to `int' if <sys/types.h> does not define. */
-#undef mode_t
-
-/* Define to `long int' if <sys/types.h> does not define. */
-#undef off_t
-
-/* Define to `int' if <sys/types.h> does not define. */
-#undef pid_t
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#undef size_t
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef uid_t
-
-/* Domain quotas */
-#undef DOMAIN_QUOTAS
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/configure
^
|
| @@ -1,9 +1,9 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for vpopmail 5.4.27.
+# Generated by GNU Autoconf 2.63 for vpopmail 5.4.28.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
@@ -15,7 +15,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@ -37,17 +37,45 @@
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
+else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
else
- PATH_SEPARATOR=:
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+ as_echo_n_body='eval
+ arg=$1;
+ case $arg in
+ *"$as_nl"*)
+ expr "X$arg" : "X\\(.*\\)$as_nl";
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+ esac;
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+ '
+ export as_echo_n_body
+ as_echo_n='sh -c $as_echo_n_body as_echo'
fi
- rm -f conf$$.sh
+ export as_echo_body
+ as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
fi
# Support unset when possible.
@@ -63,8 +91,6 @@
# there to prevent editors from complaining about space-tab.
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
# splitting by setting IFS to empty value.)
-as_nl='
-'
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -87,7 +113,7 @@
as_myself=$0
fi
if test ! -f "$as_myself"; then
- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
{ (exit 1); exit 1; }
fi
@@ -100,17 +126,10 @@
PS4='+ '
# NLS nuisances.
-for as_var in \
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
- LC_TELEPHONE LC_TIME
-do
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
# Required to use basename.
if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -132,7 +151,7 @@
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
@@ -158,7 +177,7 @@
as_have_required=no
fi
- if test $as_have_required = yes && (eval ":
+ if test $as_have_required = yes && (eval ":
(as_func_return () {
(exit \$1)
}
@@ -240,7 +259,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@ -261,7 +280,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@ -341,10 +360,10 @@
if test "x$CONFIG_SHELL" != x; then
for as_var in BASH_ENV ENV
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- done
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ done
+ export CONFIG_SHELL
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
fi
@@ -413,9 +432,10 @@
test \$exitcode = 0") || {
echo No shell found that supports shell functions.
- echo Please tell autoconf@gnu.org about your system,
- echo including any error possibly output before this
- echo message
+ echo Please tell bug-autoconf@gnu.org about your system,
+ echo including any error possibly output before this message.
+ echo This can help us improve future autoconf versions.
+ echo Configuration will now proceed without shell functions.
}
@@ -451,7 +471,7 @@
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
@@ -479,7 +499,6 @@
*)
ECHO_N='-n';;
esac
-
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
@@ -492,19 +511,22 @@
rm -f conf$$.dir/conf$$.file
else
rm -f conf$$.dir
- mkdir conf$$.dir
+ mkdir conf$$.dir 2>/dev/null
fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+if (echo >conf$$.file) 2>/dev/null; then
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -p'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
+ fi
else
as_ln_s='cp -p'
fi
@@ -529,10 +551,10 @@
as_test_x='
eval sh -c '\''
if test -d "$1"; then
- test -d "$1/.";
+ test -d "$1/.";
else
case $1 in
- -*)set "./$1";;
+ -*)set "./$1";;
esac;
case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
???[sx]*):;;*)false;;esac;fi
@@ -572,8 +594,8 @@
# Identity of this package.
PACKAGE_NAME='vpopmail'
PACKAGE_TARNAME='vpopmail'
-PACKAGE_VERSION='5.4.27'
-PACKAGE_STRING='vpopmail 5.4.27'
+PACKAGE_VERSION='5.4.28'
+PACKAGE_STRING='vpopmail 5.4.28'
PACKAGE_BUGREPORT=''
# Factoring default headers for most tests.
@@ -613,104 +635,160 @@
#endif"
ac_header_list=
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-am__isrc
-CYGPATH_W
-PACKAGE
-VERSION
-ACLOCAL
-AUTOCONF
-AUTOMAKE
-AUTOHEADER
-MAKEINFO
-install_sh
-STRIP
-INSTALL_STRIP_PROGRAM
-mkdir_p
-AWK
-SET_MAKE
-am__leading_dot
-AMTAR
-am__tar
-am__untar
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-DEPDIR
-am__include
-am__quote
-AMDEP_TRUE
-AMDEP_FALSE
-AMDEPBACKSLASH
-CCDEPMODE
-am__fastdepCC_TRUE
-am__fastdepCC_FALSE
-RANLIB
-CPP
-GREP
-EGREP
-vpopuser
-vpopgroup
-vpopmaildir
-domains_dir
-authlib
-auth_inc
-USE_MYSQL
-auth_libs
+ac_subst_vars='LTLIBOBJS
LIBOBJS
-LTLIBOBJS'
+auth_libs
+USE_MYSQL
+auth_inc
+authlib
+domains_dir
+vpopmaildir
+vpopgroup
+vpopuser
+EGREP
+GREP
+CPP
+RANLIB
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE
+AMDEPBACKSLASH
+AMDEP_FALSE
+AMDEP_TRUE
+am__quote
+am__include
+DEPDIR
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+MKDIR_P
+INSTALL_STRIP_PROGRAM
+STRIP
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+am__isrc
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_dependency_tracking
+enable_non_root_build
+enable_qmaildir
+enable_qmail_newu
+enable_qmail_inject
+enable_qmail_newmrh
+enable_vpopuser
+enable_vpopgroup
+enable_roaming_users
+enable_tcprules_prog
+enable_tcpserver_file
+enable_rebuild_tcpserver_file
+enable_relay_clear_minutes
+enable_learn_passwords
+enable_md5_passwords
+enable_file_locking
+enable_file_sync
+enable_make_seekable
+enable_clear_passwd
+enable_users_big_dir
+enable_sqwebmail_pass
+enable_qmail_ext
+enable_ip_alias_domains
+enable_onchange_script
+enable_spamassassin
+enable_spamc_prog
+enable_maildrop
+enable_maildrop_prog
+enable_domainquotas
+enable_domains_dir
+enable_incdir
+enable_libdir
+enable_auth_module
+enable_passwd
+enable_logging
+enable_log_name
+enable_auth_logging
+enable_sql_logging
+enable_mysql_limits
+enable_mysql_replication
+enable_valias
+enable_many_domains
+enable_mysql_logging
+enable_pgsql_logging
+enable_mysql
+enable_pgsql
+enable_ldap
+enable_oracle
+enable_sybase
+enable_hardquota
+enable_defaultquota
+enable_default_domain
+'
ac_precious_vars='build_alias
host_alias
target_alias
@@ -725,6 +803,8 @@
# Initialize some variables set by options.
ac_init_help=
ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
# The variables have the same names as the options, with
# dashes changed to underlines.
cache_file=/dev/null
@@ -823,13 +903,21 @@
datarootdir=$ac_optarg ;;
-disable-* | --disable-*)
- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
{ (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
- eval enable_$ac_feature=no ;;
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"enable_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval enable_$ac_useropt=no ;;
-docdir | --docdir | --docdi | --doc | --do)
ac_prev=docdir ;;
@@ -842,13 +930,21 @@
dvidir=$ac_optarg ;;
-enable-* | --enable-*)
- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
{ (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
- eval enable_$ac_feature=\$ac_optarg ;;
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"enable_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval enable_$ac_useropt=\$ac_optarg ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1039,22 +1135,38 @@
ac_init_version=: ;;
-with-* | --with-*)
- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
{ (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
- eval with_$ac_package=\$ac_optarg ;;
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"with_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval with_$ac_useropt=\$ac_optarg ;;
-without-* | --without-*)
- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
{ (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
- eval with_$ac_package=no ;;
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"with_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval with_$ac_useropt=no ;;
--x)
# Obsolete; use --with-x.
@@ -1074,7 +1186,7 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) { echo "$as_me: error: unrecognized option: $ac_option
+ -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; }
;;
@@ -1083,16 +1195,16 @@
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
# Reject names that are not valid shell variable names.
expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+ { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
{ (exit 1); exit 1; }; }
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
*)
# FIXME: should be removed in autoconf 3.0.
- echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
: ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
;;
@@ -1101,22 +1213,38 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- { echo "$as_me: error: missing argument to $ac_option" >&2
+ { $as_echo "$as_me: error: missing argument to $ac_option" >&2
{ (exit 1); exit 1; }; }
fi
-# Be sure to have absolute directory names.
+if test -n "$ac_unrecognized_opts"; then
+ case $enable_option_checking in
+ no) ;;
+ fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+ { (exit 1); exit 1; }; } ;;
+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+ esac
+fi
+
+# Check all directory arguments for consistency.
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir
do
eval ac_val=\$$ac_var
+ # Remove trailing slashes.
+ case $ac_val in
+ */ )
+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+ eval $ac_var=\$ac_val;;
+ esac
+ # Be sure to have absolute directory names.
case $ac_val in
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+ { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
{ (exit 1); exit 1; }; }
done
@@ -1131,7 +1259,7 @@
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
If a cross compiler is detected then cross compile mode will be used." >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
@@ -1147,10 +1275,10 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- { echo "$as_me: error: Working directory cannot be determined" >&2
+ { $as_echo "$as_me: error: working directory cannot be determined" >&2
{ (exit 1); exit 1; }; }
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- { echo "$as_me: error: pwd does not report name of working directory" >&2
+ { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
{ (exit 1); exit 1; }; }
@@ -1158,12 +1286,12 @@
if test -z "$srcdir"; then
ac_srcdir_defaulted=yes
# Try the directory containing this script, then the parent directory.
- ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$0" : 'X\(//\)[^/]' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+ ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_myself" : 'X\(//\)[^/]' \| \
+ X"$as_myself" : 'X\(//\)$' \| \
+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -1190,12 +1318,12 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+ { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
{ (exit 1); exit 1; }; }
fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+ cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
{ (exit 1); exit 1; }; }
pwd)`
# When building in place, set srcdir=.
@@ -1222,7 +1350,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures vpopmail 5.4.27 to adapt to many kinds of systems.
+\`configure' configures vpopmail 5.4.28 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1244,9 +1372,9 @@
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
+ [$ac_default_prefix]
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
- [PREFIX]
+ [PREFIX]
By default, \`make install' will install all the files in
\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
@@ -1256,25 +1384,25 @@
For better control, use the options below.
Fine tuning of the installation directories:
- --bindir=DIR user executables [EPREFIX/bin]
- --sbindir=DIR system admin executables [EPREFIX/sbin]
- --libexecdir=DIR program executables [EPREFIX/libexec]
- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --libdir=DIR object code libraries [EPREFIX/lib]
- --includedir=DIR C header files [PREFIX/include]
- --oldincludedir=DIR C header files for non-gcc [/usr/include]
- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
- --infodir=DIR info documentation [DATAROOTDIR/info]
- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
- --mandir=DIR man documentation [DATAROOTDIR/man]
- --docdir=DIR documentation root [DATAROOTDIR/doc/vpopmail]
- --htmldir=DIR html documentation [DOCDIR]
- --dvidir=DIR dvi documentation [DOCDIR]
- --pdfdir=DIR pdf documentation [DOCDIR]
- --psdir=DIR ps documentation [DOCDIR]
+ --bindir=DIR user executables [EPREFIX/bin]
+ --sbindir=DIR system admin executables [EPREFIX/sbin]
+ --libexecdir=DIR program executables [EPREFIX/libexec]
+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --libdir=DIR object code libraries [EPREFIX/lib]
+ --includedir=DIR C header files [PREFIX/include]
+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
+ --infodir=DIR info documentation [DATAROOTDIR/info]
+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
+ --mandir=DIR man documentation [DATAROOTDIR/man]
+ --docdir=DIR documentation root [DATAROOTDIR/doc/vpopmail]
+ --htmldir=DIR html documentation [DOCDIR]
+ --dvidir=DIR dvi documentation [DOCDIR]
+ --pdfdir=DIR pdf documentation [DOCDIR]
+ --psdir=DIR ps documentation [DOCDIR]
_ACEOF
cat <<\_ACEOF
@@ -1292,11 +1420,12 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of vpopmail 5.4.27:";;
+ short | recursive ) echo "Configuration of vpopmail 5.4.28:";;
esac
cat <<\_ACEOF
Optional Features:
+ --disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--disable-dependency-tracking speeds up one-time build
@@ -1364,15 +1493,17 @@
if test "$ac_init_help" = "recursive"; then
# If there are subdirs, report their specific --help.
for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
- test -d "$ac_dir" || continue
+ test -d "$ac_dir" ||
+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+ continue
ac_builddir=.
case "$ac_dir" in
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
# A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1408,7 +1539,7 @@
echo &&
$SHELL "$ac_srcdir/configure" --help=recursive
else
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi || ac_status=$?
cd "$ac_pwd" || { ac_status=$?; break; }
done
@@ -1417,11 +1548,11 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-vpopmail configure 5.4.27
-generated by GNU Autoconf 2.61
+vpopmail configure 5.4.28
+generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1431,8 +1562,8 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by vpopmail $as_me 5.4.27, which was
-generated by GNU Autoconf 2.61. Invocation command line was
+It was created by vpopmail $as_me 5.4.28, which was
+generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -1468,7 +1599,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- echo "PATH: $as_dir"
+ $as_echo "PATH: $as_dir"
done
IFS=$as_save_IFS
@@ -1503,7 +1634,7 @@
| -silent | --silent | --silen | --sile | --sil)
continue ;;
*\'*)
- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -1555,11 +1686,12 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
*) $as_unset $ac_var ;;
esac ;;
esac
@@ -1589,9 +1721,9 @@
do
eval ac_val=\$$ac_var
case $ac_val in
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
esac
- echo "$ac_var='\''$ac_val'\''"
+ $as_echo "$ac_var='\''$ac_val'\''"
done | sort
echo
@@ -1606,9 +1738,9 @@
do
eval ac_val=\$$ac_var
case $ac_val in
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
esac
- echo "$ac_var='\''$ac_val'\''"
+ $as_echo "$ac_var='\''$ac_val'\''"
done | sort
echo
fi
@@ -1624,8 +1756,8 @@
echo
fi
test "$ac_signal" != 0 &&
- echo "$as_me: caught signal $ac_signal"
- echo "$as_me: exit $exit_status"
+ $as_echo "$as_me: caught signal $ac_signal"
+ $as_echo "$as_me: exit $exit_status"
} >&5
rm -f core *.core core.conftest.* &&
rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1667,21 +1799,24 @@
# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
- set x "$CONFIG_SITE"
+ ac_site_file1=$CONFIG_SITE
elif test "x$prefix" != xNONE; then
- set x "$prefix/share/config.site" "$prefix/etc/config.site"
+ ac_site_file1=$prefix/share/config.site
+ ac_site_file2=$prefix/etc/config.site
else
- set x "$ac_default_prefix/share/config.site" \
- "$ac_default_prefix/etc/config.site"
+ ac_site_file1=$ac_default_prefix/share/config.site
+ ac_site_file2=$ac_default_prefix/etc/config.site
fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
+ test "x$ac_site_file" = xNONE && continue
if test -r "$ac_site_file"; then
- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+ { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
fi
@@ -1691,16 +1826,16 @@
# Some versions of bash will fail to source /dev/null (special
# files actually), so we avoid doing that.
if test -f "$cache_file"; then
- { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+ { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
*) . "./$cache_file";;
esac
fi
else
- { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+ { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
@@ -1715,29 +1850,38 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
ac_cache_corrupted=: ;;
,set)
- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
*)
if test "x$ac_old_val" != "x$ac_new_val"; then
- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
-echo "$as_me: former value: $ac_old_val" >&2;}
- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
-echo "$as_me: current value: $ac_new_val" >&2;}
- ac_cache_corrupted=:
+ # differences in whitespace do not lead to failure.
+ ac_old_val_w=`echo x $ac_old_val`
+ ac_new_val_w=`echo x $ac_new_val`
+ if test "$ac_old_val_w" != "$ac_new_val_w"; then
+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+ ac_cache_corrupted=:
+ else
+ { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+ eval $ac_var=\$ac_old_val
+ fi
+ { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
+ { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
# Pass precious variables to config.status.
if test "$ac_new_set" = set; then
case $ac_new_val in
- *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
@@ -1747,10 +1891,12 @@
fi
done
if $ac_cache_corrupted; then
- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -1809,8 +1955,8 @@
fi
done
if test -z "$ac_aux_dir"; then
- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -1836,11 +1982,12 @@
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
if test -z "$INSTALL"; then
if test "${ac_cv_path_install+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -1869,17 +2016,29 @@
# program-specific install script used by HP pwplus--don't use.
:
else
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
- break 3
+ rm -rf conftest.one conftest.two conftest.dir
+ echo one > conftest.one
+ echo two > conftest.two
+ mkdir conftest.dir
+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+ test -s conftest.one && test -s conftest.two &&
+ test -s conftest.dir/conftest.one &&
+ test -s conftest.dir/conftest.two
+ then
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+ break 3
+ fi
fi
fi
done
done
;;
esac
+
done
IFS=$as_save_IFS
+rm -rf conftest.one conftest.two conftest.dir
fi
if test "${ac_cv_path_install+set}" = set; then
@@ -1892,8 +2051,8 @@
INSTALL=$ac_install_sh
fi
fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
@@ -1903,8 +2062,8 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
echo timestamp > conftest.file
@@ -1927,9 +2086,9 @@
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
- { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
+ { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
+$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
alias in your environment" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -1940,26 +2099,23 @@
# Ok.
:
else
- { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+ { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
+$as_echo "$as_me: error: newly created file is older than distributed files!
Check your system clock" >&2;}
{ (exit 1); exit 1; }; }
fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
# Use a double $ so make ignores it.
test "$program_suffix" != NONE &&
program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $. echo might interpret backslashes.
+# Double any \ or $.
# By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm -f conftest.sed
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
@@ -1970,15 +2126,15 @@
am_missing_run="$MISSING --run "
else
am_missing_run=
- { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
if test -z "$MKDIR_P"; then
if test "${ac_cv_path_mkdir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
@@ -2013,8 +2169,8 @@
MKDIR_P="$ac_install_sh -d"
fi
fi
-{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-echo "${ECHO_T}$MKDIR_P" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
case $mkdir_p in
@@ -2026,10 +2182,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_AWK+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -2042,7 +2198,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AWK="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2053,22 +2209,23 @@
fi
AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
- { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
test -n "$AWK" && break
done
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
SHELL = /bin/sh
@@ -2085,12 +2242,12 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
SET_MAKE=
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
@@ -2109,8 +2266,8 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
{ (exit 1); exit 1; }; }
fi
fi
@@ -2127,7 +2284,7 @@
# Define the identity of the package.
PACKAGE='vpopmail'
- VERSION='5.4.27'
+ VERSION='5.4.28'
cat >>confdefs.h <<_ACEOF
@@ -2165,10 +2322,10 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@ -2181,7 +2338,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2192,11 +2349,11 @@
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
- { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -2205,10 +2362,10 @@
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@ -2221,7 +2378,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_STRIP="strip"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2232,11 +2389,11 @@
fi
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
if test -n "$ac_ct_STRIP"; then
- { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
if test "x$ac_ct_STRIP" = x; then
@@ -2244,12 +2401,8 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
STRIP=$ac_ct_STRIP
@@ -2276,34 +2429,34 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
{ (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
if test "${ac_cv_build+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_build_alias=$build_alias
test "x$ac_build_alias" = x &&
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
test "x$ac_build_alias" = x &&
- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
{ (exit 1); exit 1; }; }
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
{ (exit 1); exit 1; }; }
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
{ (exit 1); exit 1; }; };;
esac
build=$ac_cv_build
@@ -2320,27 +2473,27 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
if test "${ac_cv_host+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test "x$host_alias" = x; then
ac_cv_host=$ac_cv_build
else
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
{ (exit 1); exit 1; }; }
fi
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
{ (exit 1); exit 1; }; };;
esac
host=$ac_cv_host
@@ -2364,10 +2517,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_AWK+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -2380,7 +2533,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AWK="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2391,11 +2544,11 @@
fi
AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
- { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -2410,10 +2563,10 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2426,7 +2579,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2437,11 +2590,11 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -2450,10 +2603,10 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2466,7 +2619,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2477,11 +2630,11 @@
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
if test "x$ac_ct_CC" = x; then
@@ -2489,12 +2642,8 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
CC=$ac_ct_CC
@@ -2507,10 +2656,10 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2523,7 +2672,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2534,11 +2683,11 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -2547,10 +2696,10 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2568,7 +2717,7 @@
continue
fi
ac_cv_prog_CC="cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2591,11 +2740,11 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -2606,10 +2755,10 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2622,7 +2771,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2633,11 +2782,11 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -2650,10 +2799,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2666,7 +2815,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2677,11 +2826,11 @@
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -2693,12 +2842,8 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
CC=$ac_ct_CC
@@ -2708,44 +2853,50 @@
fi
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
{ (ac_try="$ac_compiler --version >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compiler --version >&5") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
{ (ac_try="$ac_compiler -v >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compiler -v >&5") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
{ (ac_try="$ac_compiler -V >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compiler -V >&5") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
cat >conftest.$ac_ext <<_ACEOF
@@ -2764,27 +2915,22 @@
}
_ACEOF
ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort. b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions. Remove them first so a
-# subsequent execution test works.
+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
ac_rmfiles=
for ac_file in $ac_files
do
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
* ) ac_rmfiles="$ac_rmfiles $ac_file";;
esac
done
@@ -2795,10 +2941,11 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link_default") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
@@ -2809,7 +2956,7 @@
do
test -f "$ac_file" || continue
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
;;
[ab].out )
# We found the default executable, but exeext='' is most
@@ -2836,25 +2983,27 @@
ac_file=''
fi
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
if test -z "$ac_file"; then
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
+$as_echo "$as_me: error: C compiler cannot create executables
See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }
+ { (exit 77); exit 77; }; }; }
fi
ac_exeext=$ac_cv_exeext
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
# If not cross compiling, check that we can run a simple program.
if test "$cross_compiling" != yes; then
@@ -2863,49 +3012,53 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_try") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cross_compiling=no
else
if test "$cross_compiling" = maybe; then
cross_compiling=yes
else
- { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
+$as_echo "$as_me: error: cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
fi
fi
fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
ac_clean_files=$ac_clean_files_save
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
@@ -2914,31 +3067,33 @@
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
break;;
* ) break;;
esac
done
else
- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
fi
rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
if test "${ac_cv_objext+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -2961,40 +3116,43 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
done
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
if test "${ac_cv_c_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -3020,20 +3178,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_compiler_gnu=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
@@ -3043,15 +3202,19 @@
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+ GCC=yes
+else
+ GCC=
+fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
if test "${ac_cv_prog_cc_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
@@ -3078,20 +3241,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
CFLAGS=""
@@ -3116,20 +3280,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
:
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_c_werror_flag=$ac_save_c_werror_flag
@@ -3155,20 +3320,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -3183,8 +3349,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
@@ -3200,10 +3366,10 @@
CFLAGS=
fi
fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
if test "${ac_cv_prog_cc_c89+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
ac_save_CC=$CC
@@ -3274,20 +3440,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_cc_c89=$ac_arg
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -3303,15 +3470,15 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
- { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+ { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
xno)
- { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+ { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
*)
CC="$CC $ac_cv_prog_cc_c89"
- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
esac
@@ -3332,8 +3499,8 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
_am_result=none
@@ -3360,8 +3527,8 @@
fi
-{ echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
rm -f confinc confmf
# Check whether --enable-dependency-tracking was given.
@@ -3385,10 +3552,10 @@
depcc="$CC" am_compiler_list=
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
@@ -3476,8 +3643,8 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
if
@@ -3504,11 +3671,12 @@
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
if test -z "$INSTALL"; then
if test "${ac_cv_path_install+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -3537,17 +3705,29 @@
# program-specific install script used by HP pwplus--don't use.
:
else
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
- break 3
+ rm -rf conftest.one conftest.two conftest.dir
+ echo one > conftest.one
+ echo two > conftest.two
+ mkdir conftest.dir
+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+ test -s conftest.one && test -s conftest.two &&
+ test -s conftest.dir/conftest.one &&
+ test -s conftest.dir/conftest.two
+ then
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+ break 3
+ fi
fi
fi
done
done
;;
esac
+
done
IFS=$as_save_IFS
+rm -rf conftest.one conftest.two conftest.dir
fi
if test "${ac_cv_path_install+set}" = set; then
@@ -3560,8 +3740,8 @@
INSTALL=$ac_install_sh
fi
fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
@@ -3574,10 +3754,10 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -3590,7 +3770,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3601,11 +3781,11 @@
fi
RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
- { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -3614,10 +3794,10 @@
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -3630,7 +3810,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3641,11 +3821,11 @@
fi
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
if test -n "$ac_ct_RANLIB"; then
- { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
if test "x$ac_ct_RANLIB" = x; then
@@ -3653,12 +3833,8 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
RANLIB=$ac_ct_RANLIB
@@ -3670,10 +3846,10 @@
#AC_AIX
-{ echo "$as_me:$LINENO: checking for library containing strerror" >&5
-echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5
+$as_echo_n "checking for library containing strerror... " >&6; }
if test "${ac_cv_search_strerror+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
cat >conftest.$ac_ext <<_ACEOF
@@ -3711,26 +3887,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_search_strerror=$ac_res
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext
if test "${ac_cv_search_strerror+set}" = set; then
@@ -3745,8 +3925,8 @@
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
-echo "${ECHO_T}$ac_cv_search_strerror" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
+$as_echo "$ac_cv_search_strerror" >&6; }
ac_res=$ac_cv_search_strerror
if test "$ac_res" != no; then
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@@ -3757,10 +3937,10 @@
#----------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
-echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
+$as_echo_n "checking for crypt in -lcrypt... " >&6; }
if test "${ac_cv_lib_crypt_crypt+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcrypt $LIBS"
@@ -3792,33 +3972,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_crypt_crypt=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_crypt_crypt=no
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
-echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6; }
-if test $ac_cv_lib_crypt_crypt = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
+$as_echo "$ac_cv_lib_crypt_crypt" >&6; }
+if test "x$ac_cv_lib_crypt_crypt" = x""yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBCRYPT 1
_ACEOF
@@ -3839,11 +4023,11 @@
ac_header_dirent=no
for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
- as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
-echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
+ as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
+$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -3869,20 +4053,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
eval "$as_ac_Header=yes"
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_Header=no"
@@ -3890,12 +4075,15 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
_ACEOF
ac_header_dirent=$ac_hdr; break
@@ -3904,10 +4092,10 @@
done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
- { echo "$as_me:$LINENO: checking for library containing opendir" >&5
-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5
+$as_echo_n "checking for library containing opendir... " >&6; }
if test "${ac_cv_search_opendir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
cat >conftest.$ac_ext <<_ACEOF
@@ -3945,26 +4133,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_search_opendir=$ac_res
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext
if test "${ac_cv_search_opendir+set}" = set; then
@@ -3979,8 +4171,8 @@
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+$as_echo "$ac_cv_search_opendir" >&6; }
ac_res=$ac_cv_search_opendir
if test "$ac_res" != no; then
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@@ -3988,10 +4180,10 @@
fi
else
- { echo "$as_me:$LINENO: checking for library containing opendir" >&5
-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5
+$as_echo_n "checking for library containing opendir... " >&6; }
if test "${ac_cv_search_opendir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
cat >conftest.$ac_ext <<_ACEOF
@@ -4029,26 +4221,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_search_opendir=$ac_res
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext
if test "${ac_cv_search_opendir+set}" = set; then
@@ -4063,8 +4259,8 @@
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+$as_echo "$ac_cv_search_opendir" >&6; }
ac_res=$ac_cv_search_opendir
if test "$ac_res" != no; then
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@@ -4078,15 +4274,15 @@
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
if test "${ac_cv_prog_CPP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -4118,20 +4314,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
:
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
@@ -4155,13 +4352,14 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -4169,7 +4367,7 @@
# Broken: success on invalid input.
continue
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
@@ -4194,8 +4392,8 @@
else
ac_cv_prog_CPP=$CPP
fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
@@ -4223,20 +4421,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
:
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
@@ -4260,13 +4459,14 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -4274,7 +4474,7 @@
# Broken: success on invalid input.
continue
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
@@ -4290,11 +4490,13 @@
if $ac_preproc_ok; then
:
else
- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
fi
ac_ext=c
@@ -4304,42 +4506,37 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
if test "${ac_cv_path_GREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
-if test "${ac_cv_path_GREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
+ if test -z "$GREP"; then
ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_prog in grep ggrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
- # Check for GNU ac_path_GREP and select it if it is found.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
*GNU*)
ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
*)
ac_count=0
- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ $as_echo_n 0123456789 >"conftest.in"
while :
do
cat "conftest.in" "conftest.in" >"conftest.tmp"
mv "conftest.tmp" "conftest.in"
cp "conftest.in" "conftest.nl"
- echo 'GREP' >> "conftest.nl"
+ $as_echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
ac_count=`expr $ac_count + 1`
@@ -4354,74 +4551,60 @@
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
-
- $ac_path_GREP_found && break 3
+ $ac_path_GREP_found && break 3
+ done
done
done
-
-done
IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ if test -z "$ac_cv_path_GREP"; then
+ { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
{ (exit 1); exit 1; }; }
-fi
-
+ fi
else
ac_cv_path_GREP=$GREP
fi
-
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
GREP="$ac_cv_path_GREP"
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
if test "${ac_cv_path_EGREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
then ac_cv_path_EGREP="$GREP -E"
else
- # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+ if test -z "$EGREP"; then
ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_prog in egrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
- # Check for GNU ac_path_EGREP and select it if it is found.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
*GNU*)
ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
*)
ac_count=0
- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ $as_echo_n 0123456789 >"conftest.in"
while :
do
cat "conftest.in" "conftest.in" >"conftest.tmp"
mv "conftest.tmp" "conftest.in"
cp "conftest.in" "conftest.nl"
- echo 'EGREP' >> "conftest.nl"
+ $as_echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
ac_count=`expr $ac_count + 1`
@@ -4436,40 +4619,31 @@
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
-
- $ac_path_EGREP_found && break 3
+ $ac_path_EGREP_found && break 3
+ done
done
done
-
-done
IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ if test -z "$ac_cv_path_EGREP"; then
+ { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
{ (exit 1); exit 1; }; }
-fi
-
+ fi
else
ac_cv_path_EGREP=$EGREP
fi
-
fi
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
EGREP="$ac_cv_path_EGREP"
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
if test "${ac_cv_header_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -4496,20 +4670,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_header_stdc=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_header_stdc=no
@@ -4601,37 +4776,40 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_try") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
ac_cv_header_stdc=no
fi
+rm -rf conftest.dSYM
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
@@ -4640,10 +4818,10 @@
fi
-{ echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
-echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
+$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
if test "${ac_cv_header_sys_wait_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -4676,20 +4854,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_header_sys_wait_h=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_header_sys_wait_h=no
@@ -4697,8 +4876,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
+$as_echo "$ac_cv_header_sys_wait_h" >&6; }
if test $ac_cv_header_sys_wait_h = yes; then
cat >>confdefs.h <<\_ACEOF
@@ -4720,11 +4899,11 @@
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
inttypes.h stdint.h unistd.h
do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -4742,20 +4921,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
eval "$as_ac_Header=yes"
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_Header=no"
@@ -4763,12 +4943,15 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
@@ -4794,20 +4977,21 @@
for ac_header in arpa/inet.h fcntl.h memory.h netinet/in.h shadow.h stdlib.h string.h sys/file.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h utime.h crypt.h err.h
do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
else
# Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -4823,32 +5007,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -4862,69 +5047,73 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
;;
esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
eval "$as_ac_Header=\$ac_header_preproc"
fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
@@ -4935,10 +5124,10 @@
#----------------------------------------------------------------------
# Checks for typedefs, structures, and compiler characteristics.
-{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
if test "${ac_cv_c_const+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -5010,20 +5199,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_c_const=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_c_const=no
@@ -5031,20 +5221,20 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
if test $ac_cv_c_const = no; then
cat >>confdefs.h <<\_ACEOF
-#define const
+#define const /**/
_ACEOF
fi
-{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
-echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
+$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
if test "${ac_cv_type_uid_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -5064,8 +5254,8 @@
rm -f conftest*
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
-echo "${ECHO_T}$ac_cv_type_uid_t" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
+$as_echo "$ac_cv_type_uid_t" >&6; }
if test $ac_cv_type_uid_t = no; then
cat >>confdefs.h <<\_ACEOF
@@ -5079,10 +5269,10 @@
fi
-{ echo "$as_me:$LINENO: checking for inline" >&5
-echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
if test "${ac_cv_c_inline+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
@@ -5105,20 +5295,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_c_inline=$ac_kw
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -5129,8 +5320,8 @@
done
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+$as_echo "$ac_cv_c_inline" >&6; }
case $ac_cv_c_inline in
@@ -5148,26 +5339,58 @@
;;
esac
-{ echo "$as_me:$LINENO: checking for mode_t" >&5
-echo $ECHO_N "checking for mode_t... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for mode_t" >&5
+$as_echo_n "checking for mode_t... " >&6; }
if test "${ac_cv_type_mode_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
+ ac_cv_type_mode_t=no
+cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-typedef mode_t ac__type_new_;
int
main ()
{
-if ((ac__type_new_ *) 0)
- return 0;
-if (sizeof (ac__type_new_))
+if (sizeof (mode_t))
+ return 0;
+ ;
return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((mode_t)))
+ return 0;
;
return 0;
}
@@ -5178,30 +5401,39 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- ac_cv_type_mode_t=yes
+ :
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_type_mode_t=no
+ ac_cv_type_mode_t=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
-echo "${ECHO_T}$ac_cv_type_mode_t" >&6; }
-if test $ac_cv_type_mode_t = yes; then
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
+$as_echo "$ac_cv_type_mode_t" >&6; }
+if test "x$ac_cv_type_mode_t" = x""yes; then
:
else
@@ -5211,26 +5443,58 @@
fi
-{ echo "$as_me:$LINENO: checking for off_t" >&5
-echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for off_t" >&5
+$as_echo_n "checking for off_t... " >&6; }
if test "${ac_cv_type_off_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
+ ac_cv_type_off_t=no
+cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-typedef off_t ac__type_new_;
int
main ()
{
-if ((ac__type_new_ *) 0)
- return 0;
-if (sizeof (ac__type_new_))
+if (sizeof (off_t))
+ return 0;
+ ;
return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((off_t)))
+ return 0;
;
return 0;
}
@@ -5241,30 +5505,39 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- ac_cv_type_off_t=yes
+ :
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_type_off_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_type_off_t=no
+
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
-if test $ac_cv_type_off_t = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
+$as_echo "$ac_cv_type_off_t" >&6; }
+if test "x$ac_cv_type_off_t" = x""yes; then
:
else
@@ -5274,26 +5547,58 @@
fi
-{ echo "$as_me:$LINENO: checking for pid_t" >&5
-echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5
+$as_echo_n "checking for pid_t... " >&6; }
if test "${ac_cv_type_pid_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
+ ac_cv_type_pid_t=no
+cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-typedef pid_t ac__type_new_;
int
main ()
{
-if ((ac__type_new_ *) 0)
- return 0;
-if (sizeof (ac__type_new_))
+if (sizeof (pid_t))
+ return 0;
+ ;
return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((pid_t)))
+ return 0;
;
return 0;
}
@@ -5304,30 +5609,39 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- ac_cv_type_pid_t=yes
+ :
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_type_pid_t=no
+ ac_cv_type_pid_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
-echo "${ECHO_T}$ac_cv_type_pid_t" >&6; }
-if test $ac_cv_type_pid_t = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
+$as_echo "$ac_cv_type_pid_t" >&6; }
+if test "x$ac_cv_type_pid_t" = x""yes; then
:
else
@@ -5337,26 +5651,58 @@
fi
-{ echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
+$as_echo_n "checking for size_t... " >&6; }
if test "${ac_cv_type_size_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
+ ac_cv_type_size_t=no
+cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-typedef size_t ac__type_new_;
int
main ()
{
-if ((ac__type_new_ *) 0)
- return 0;
-if (sizeof (ac__type_new_))
+if (sizeof (size_t))
+ return 0;
+ ;
return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((size_t)))
+ return 0;
;
return 0;
}
@@ -5367,30 +5713,39 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- ac_cv_type_size_t=yes
+ :
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_type_size_t=no
+ ac_cv_type_size_t=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
-if test $ac_cv_type_size_t = yes; then
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+$as_echo "$ac_cv_type_size_t" >&6; }
+if test "x$ac_cv_type_size_t" = x""yes; then
:
else
@@ -5401,10 +5756,10 @@
fi
# AC_CHECK_MEMBERS([struct stat.st_blksize])
-{ echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
-echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
+$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
if test "${ac_cv_struct_tm+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -5420,7 +5775,7 @@
{
struct tm tm;
int *p = &tm.tm_sec;
- return !p;
+ return !p;
;
return 0;
}
@@ -5431,20 +5786,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_struct_tm=time.h
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_struct_tm=sys/time.h
@@ -5452,8 +5808,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
-echo "${ECHO_T}$ac_cv_struct_tm" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
+$as_echo "$ac_cv_struct_tm" >&6; }
if test $ac_cv_struct_tm = sys/time.h; then
cat >>confdefs.h <<\_ACEOF
@@ -5467,10 +5823,10 @@
# Checks for library functions.
#AC_FUNC_CHOWN
-{ echo "$as_me:$LINENO: checking whether closedir returns void" >&5
-echo $ECHO_N "checking whether closedir returns void... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether closedir returns void" >&5
+$as_echo_n "checking whether closedir returns void... " >&6; }
if test "${ac_cv_func_closedir_void+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then
ac_cv_func_closedir_void=yes
@@ -5501,36 +5857,39 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_try") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_closedir_void=no
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
ac_cv_func_closedir_void=yes
fi
+rm -rf conftest.dSYM
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_closedir_void" >&5
-echo "${ECHO_T}$ac_cv_func_closedir_void" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_closedir_void" >&5
+$as_echo "$ac_cv_func_closedir_void" >&6; }
if test $ac_cv_func_closedir_void = yes; then
cat >>confdefs.h <<\_ACEOF
@@ -5544,10 +5903,10 @@
#AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
#AC_FUNC_MALLOC
#AC_FUNC_REALLOC
-{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5
+$as_echo_n "checking return type of signal handlers... " >&6; }
if test "${ac_cv_type_signal+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -5572,20 +5931,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_type_signal=int
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_type_signal=void
@@ -5593,8 +5953,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-echo "${ECHO_T}$ac_cv_type_signal" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
+$as_echo "$ac_cv_type_signal" >&6; }
cat >>confdefs.h <<_ACEOF
#define RETSIGTYPE $ac_cv_type_signal
@@ -5608,20 +5968,21 @@
for ac_header in $ac_header_list
do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
else
# Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5637,32 +5998,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5676,69 +6038,73 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
;;
esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
eval "$as_ac_Header=\$ac_header_preproc"
fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
@@ -5753,10 +6119,10 @@
-{ echo "$as_me:$LINENO: checking whether utime accepts a null argument" >&5
-echo $ECHO_N "checking whether utime accepts a null argument... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether utime accepts a null argument" >&5
+$as_echo_n "checking whether utime accepts a null argument... " >&6; }
if test "${ac_cv_func_utime_null+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
rm -f conftest.data; >conftest.data
# Sequent interprets utime(file, 0) to mean use start of epoch. Wrong.
@@ -5792,36 +6158,39 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_try") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_utime_null=yes
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
ac_cv_func_utime_null=no
fi
+rm -rf conftest.dSYM
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_utime_null" >&5
-echo "${ECHO_T}$ac_cv_func_utime_null" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_utime_null" >&5
+$as_echo "$ac_cv_func_utime_null" >&6; }
if test $ac_cv_func_utime_null = yes; then
cat >>confdefs.h <<\_ACEOF
@@ -5854,11 +6223,11 @@
for ac_func in bzero dup2 fdatasync getcwd gethostname getpass getspnam memset mkdir putenv rmdir socket strchr strdup strerror strncasecmp strrchr strspn strstr utime warn
do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -5911,35 +6280,42 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
eval "$as_ac_var=yes"
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-ac_res=`eval echo '${'$as_ac_var'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
@@ -5948,10 +6324,10 @@
#----------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking vpopmail configure options" >&5
-echo $ECHO_N "checking vpopmail configure options... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6; }
+{ $as_echo "$as_me:$LINENO: checking vpopmail configure options" >&5
+$as_echo_n "checking vpopmail configure options... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: ok" >&5
+$as_echo "ok" >&6; }
#----------------------------------------------------------------------
@@ -5984,14 +6360,14 @@
if $idtest && test `$idcommand` != "0"
then
- { echo "$as_me:$LINENO: WARNING: === vpopmail must be configured as root. ===" >&5
-echo "$as_me: WARNING: === vpopmail must be configured as root. ===" >&2;}
- { echo "$as_me:$LINENO: WARNING: === please switch to the root user and ===" >&5
-echo "$as_me: WARNING: === please switch to the root user and ===" >&2;}
- { echo "$as_me:$LINENO: WARNING: === run ./configure. Thanks ===" >&5
-echo "$as_me: WARNING: === run ./configure. Thanks ===" >&2;}
- { { echo "$as_me:$LINENO: error: aborted." >&5
-echo "$as_me: error: aborted." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: === vpopmail must be configured as root. ===" >&5
+$as_echo "$as_me: WARNING: === vpopmail must be configured as root. ===" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: === please switch to the root user and ===" >&5
+$as_echo "$as_me: WARNING: === please switch to the root user and ===" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: === run ./configure. Thanks ===" >&5
+$as_echo "$as_me: WARNING: === run ./configure. Thanks ===" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: aborted." >&5
+$as_echo "$as_me: error: aborted." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -6104,8 +6480,8 @@
case "$host" in
*-*-solaris*)
extralibflags="-R$libdir -lm -lnsl -lsocket"
- { echo "$as_me:$LINENO: WARNING: Solaris install detected. Using extralibflags for linking: $extralibflags" >&5
-echo "$as_me: WARNING: Solaris install detected. Using extralibflags for linking: $extralibflags" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: Solaris install detected. Using extralibflags for linking: $extralibflags" >&5
+$as_echo "$as_me: WARNING: Solaris install detected. Using extralibflags for linking: $extralibflags" >&2;}
;;
*)
extralibflags=""
@@ -6114,8 +6490,8 @@
#----------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking whether we can locate the qmail directory" >&5
-echo $ECHO_N "checking whether we can locate the qmail directory... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we can locate the qmail directory" >&5
+$as_echo_n "checking whether we can locate the qmail directory... " >&6; }
qmaildir=""
for f in /var/qmail
do
@@ -6132,10 +6508,10 @@
if test "$qmaildir" = ""
then
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- { { echo "$as_me:$LINENO: error: Unable to find your qmaildir directory, specify --enable-qmaildir." >&5
-echo "$as_me: error: Unable to find your qmaildir directory, specify --enable-qmaildir." >&2;}
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:$LINENO: error: Unable to find your qmaildir directory, specify --enable-qmaildir." >&5
+$as_echo "$as_me: error: Unable to find your qmaildir directory, specify --enable-qmaildir." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -6143,8 +6519,8 @@
fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
cat >>confdefs.h <<_ACEOF
#define QMAILDIR "$qmaildir"
@@ -6153,8 +6529,8 @@
#----------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking whether we can locate the qmail-newu program" >&5
-echo $ECHO_N "checking whether we can locate the qmail-newu program... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we can locate the qmail-newu program" >&5
+$as_echo_n "checking whether we can locate the qmail-newu program... " >&6; }
qmailnewu=""
for f in "$qmaildir"/bin/qmail-newu /usr/sbin/qmail-newu
do
@@ -6172,10 +6548,10 @@
if test "$qmailnewu" = ""
then
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- { { echo "$as_me:$LINENO: error: Unable to find your qmail-newu file, specify --enable-qmail-newu." >&5
-echo "$as_me: error: Unable to find your qmail-newu file, specify --enable-qmail-newu." >&2;}
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:$LINENO: error: Unable to find your qmail-newu file, specify --enable-qmail-newu." >&5
+$as_echo "$as_me: error: Unable to find your qmail-newu file, specify --enable-qmail-newu." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -6185,15 +6561,15 @@
if test ! -f "$qmailnewu"
then
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- { { echo "$as_me:$LINENO: error: Unable to find your qmail-newu file, specify --enable-qmail-newu=/full/path/to/qmail-newu" >&5
-echo "$as_me: error: Unable to find your qmail-newu file, specify --enable-qmail-newu=/full/path/to/qmail-newu" >&2;}
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:$LINENO: error: Unable to find your qmail-newu file, specify --enable-qmail-newu=/full/path/to/qmail-newu" >&5
+$as_echo "$as_me: error: Unable to find your qmail-newu file, specify --enable-qmail-newu=/full/path/to/qmail-newu" >&2;}
{ (exit 1); exit 1; }; }
fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
cat >>confdefs.h <<_ACEOF
#define QMAILNEWU "$qmailnewu"
@@ -6202,8 +6578,8 @@
#----------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking whether we can locate the qmail-inject program" >&5
-echo $ECHO_N "checking whether we can locate the qmail-inject program... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we can locate the qmail-inject program" >&5
+$as_echo_n "checking whether we can locate the qmail-inject program... " >&6; }
qmailinject=""
for f in "$qmaildir"/bin/qmail-inject /usr/sbin/qmail-inject /usr/bin/qmail-inject
do
@@ -6221,10 +6597,10 @@
if test "$qmailinject" = ""
then
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- { { echo "$as_me:$LINENO: error: Unable to find your qmailinject file, specify --enable-qmail-inject." >&5
-echo "$as_me: error: Unable to find your qmailinject file, specify --enable-qmail-inject." >&2;}
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:$LINENO: error: Unable to find your qmailinject file, specify --enable-qmail-inject." >&5
+$as_echo "$as_me: error: Unable to find your qmailinject file, specify --enable-qmail-inject." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -6234,15 +6610,15 @@
if test ! -f "$qmailinject"
then
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- { { echo "$as_me:$LINENO: error: Unable to find your qmail-inject file, specify --enable-qmail-inject=/full/path/to/qmail-inject" >&5
-echo "$as_me: error: Unable to find your qmail-inject file, specify --enable-qmail-inject=/full/path/to/qmail-inject" >&2;}
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:$LINENO: error: Unable to find your qmail-inject file, specify --enable-qmail-inject=/full/path/to/qmail-inject" >&5
+$as_echo "$as_me: error: Unable to find your qmail-inject file, specify --enable-qmail-inject=/full/path/to/qmail-inject" >&2;}
{ (exit 1); exit 1; }; }
fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
cat >>confdefs.h <<_ACEOF
#define QMAILINJECT "$qmailinject"
@@ -6251,8 +6627,8 @@
#----------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking whether we can locate the qmail-newmrh program" >&5
-echo $ECHO_N "checking whether we can locate the qmail-newmrh program... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we can locate the qmail-newmrh program" >&5
+$as_echo_n "checking whether we can locate the qmail-newmrh program... " >&6; }
qmailnewmrh=""
for f in "$qmaildir"/bin/qmail-newmrh /usr/sbin/qmail-newmrh
do
@@ -6270,10 +6646,10 @@
if test "$qmailnewmrh" = ""
then
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- { { echo "$as_me:$LINENO: error: Unable to find your qmail-newmrh file, specify --enable-qmail-newmrh." >&5
-echo "$as_me: error: Unable to find your qmail-newmrh file, specify --enable-qmail-newmrh." >&2;}
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:$LINENO: error: Unable to find your qmail-newmrh file, specify --enable-qmail-newmrh." >&5
+$as_echo "$as_me: error: Unable to find your qmail-newmrh file, specify --enable-qmail-newmrh." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -6283,15 +6659,15 @@
if test ! -f "$qmailnewmrh"
then
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- { { echo "$as_me:$LINENO: error: Unable to find your qmail-newmrh file, specify --enable-qmail-qmail-newmrh=/full/path/to/qmail-newmrh" >&5
-echo "$as_me: error: Unable to find your qmail-newmrh file, specify --enable-qmail-qmail-newmrh=/full/path/to/qmail-newmrh" >&2;}
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:$LINENO: error: Unable to find your qmail-newmrh file, specify --enable-qmail-qmail-newmrh=/full/path/to/qmail-newmrh" >&5
+$as_echo "$as_me: error: Unable to find your qmail-newmrh file, specify --enable-qmail-qmail-newmrh=/full/path/to/qmail-newmrh" >&2;}
{ (exit 1); exit 1; }; }
fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
cat >>confdefs.h <<_ACEOF
#define QMAILNEWMRH "$qmailnewmrh"
@@ -6300,8 +6676,8 @@
#----------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking for valid vpopmail user and group" >&5
-echo $ECHO_N "checking for valid vpopmail user and group... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for valid vpopmail user and group" >&5
+$as_echo_n "checking for valid vpopmail user and group... " >&6; }
vpopuser="vpopmail"
# Check whether --enable-vpopuser was given.
@@ -6311,8 +6687,8 @@
if test "$vpopuser" = ""
then
- { { echo "$as_me:$LINENO: error: Unable to find your vpopmail user, specify --enable-vpopuser." >&5
-echo "$as_me: error: Unable to find your vpopmail user, specify --enable-vpopuser." >&2;}
+ { { $as_echo "$as_me:$LINENO: error: Unable to find your vpopmail user, specify --enable-vpopuser." >&5
+$as_echo "$as_me: error: Unable to find your vpopmail user, specify --enable-vpopuser." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -6337,8 +6713,8 @@
if test "$vpopgroup" = ""
then
- { { echo "$as_me:$LINENO: error: Unable to find your vpopmail group, specify --enable-vpopgroup." >&5
-echo "$as_me: error: Unable to find your vpopmail group, specify --enable-vpopgroup." >&2;}
+ { { $as_echo "$as_me:$LINENO: error: Unable to find your vpopmail group, specify --enable-vpopgroup." >&5
+$as_echo "$as_me: error: Unable to find your vpopmail group, specify --enable-vpopgroup." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -6353,14 +6729,14 @@
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
-{ echo "$as_me:$LINENO: checking whether password file entry for the vpopmail user exists" >&5
-echo $ECHO_N "checking whether password file entry for the vpopmail user exists... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether password file entry for the vpopmail user exists" >&5
+$as_echo_n "checking whether password file entry for the vpopmail user exists... " >&6; }
if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: Could not compile and run even a trivial ANSI C program - check CC." >&5
-echo "$as_me: error: Could not compile and run even a trivial ANSI C program - check CC." >&2;}
+ { { $as_echo "$as_me:$LINENO: error: Could not compile and run even a trivial ANSI C program - check CC." >&5
+$as_echo "$as_me: error: Could not compile and run even a trivial ANSI C program - check CC." >&2;}
{ (exit 1); exit 1; }; }
else
@@ -6423,34 +6799,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_try") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
-{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- { { echo "$as_me:$LINENO: error: Could not compile and run even a trivial ANSI C program - check CC." >&5
-echo "$as_me: error: Could not compile and run even a trivial ANSI C program - check CC." >&2;}
+{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:$LINENO: error: Could not compile and run even a trivial ANSI C program - check CC." >&5
+$as_echo "$as_me: error: Could not compile and run even a trivial ANSI C program - check CC." >&2;}
{ (exit 1); exit 1; }; }
fi
+rm -rf conftest.dSYM
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
@@ -6458,22 +6837,22 @@
if test ! -f vpopmail.uid
then
- { { echo "$as_me:$LINENO: error: No vpopmail user." >&5
-echo "$as_me: error: No vpopmail user." >&2;}
+ { { $as_echo "$as_me:$LINENO: error: No vpopmail user." >&5
+$as_echo "$as_me: error: No vpopmail user." >&2;}
{ (exit 1); exit 1; }; }
fi
if test ! -f vpopmail.gid
then
- { { echo "$as_me:$LINENO: error: No vpopmail group." >&5
-echo "$as_me: error: No vpopmail group." >&2;}
+ { { $as_echo "$as_me:$LINENO: error: No vpopmail group." >&5
+$as_echo "$as_me: error: No vpopmail group." >&2;}
{ (exit 1); exit 1; }; }
fi
if test ! -f vpopmail.dir
then
- { { echo "$as_me:$LINENO: error: No vpopmail home directory" >&5
-echo "$as_me: error: No vpopmail home directory" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: No vpopmail home directory" >&5
+$as_echo "$as_me: error: No vpopmail home directory" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -6509,15 +6888,15 @@
then
if test ! -d $vpopmaildir
then
- { echo "$as_me:$LINENO: WARNING: creating $vpopmaildir " >&5
-echo "$as_me: WARNING: creating $vpopmaildir " >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: creating $vpopmaildir " >&5
+$as_echo "$as_me: WARNING: creating $vpopmaildir " >&2;}
mkdir -p $vpopmaildir
chown $vpopmailuid $vpopmaildir
chgrp $vpopmailgid $vpopmaildir
chmod 755 $vpopmaildir
fi
- { echo "$as_me:$LINENO: WARNING: making a vpopmail etc directory " >&5
-echo "$as_me: WARNING: making a vpopmail etc directory " >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: making a vpopmail etc directory " >&5
+$as_echo "$as_me: WARNING: making a vpopmail etc directory " >&2;}
mkdir $vpopmaildir/etc
chown $vpopmailuid "$vpopmaildir"/etc
chgrp $vpopmailgid "$vpopmaildir"/etc
@@ -6526,8 +6905,8 @@
#----------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking whether roaming-users has been enabled" >&5
-echo $ECHO_N "checking whether roaming-users has been enabled... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether roaming-users has been enabled" >&5
+$as_echo_n "checking whether roaming-users has been enabled... " >&6; }
# Check whether --enable-roaming-users was given.
if test "${enable_roaming_users+set}" = set; then
enableval=$enable_roaming_users; POPRELAY=$enableval
@@ -6541,8 +6920,8 @@
case $POPRELAY in
1*|y*|Y*)
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
POPRELAY=1
cat >>confdefs.h <<_ACEOF
@@ -6550,8 +6929,8 @@
_ACEOF
- { echo "$as_me:$LINENO: checking whether we can locate the tcprules program" >&5
-echo $ECHO_N "checking whether we can locate the tcprules program... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether we can locate the tcprules program" >&5
+$as_echo_n "checking whether we can locate the tcprules program... " >&6; }
for f in /usr/local/bin/tcprules /usr/bin/tcprules
do
if test -f $f
@@ -6568,10 +6947,10 @@
if test "$tcprules_prog" = ""
then
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- { { echo "$as_me:$LINENO: error: Unable to find your tcprules prog, specify --enable-tcprules-prog." >&5
-echo "$as_me: error: Unable to find your tcprules prog, specify --enable-tcprules-prog." >&2;}
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:$LINENO: error: Unable to find your tcprules prog, specify --enable-tcprules-prog." >&5
+$as_echo "$as_me: error: Unable to find your tcprules prog, specify --enable-tcprules-prog." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -6581,15 +6960,15 @@
if test ! -f "$tcprules_prog"
then
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- { { echo "$as_me:$LINENO: error: Unable to find your tcprulesfile, specify --enable-tcprules-prog=/full/path/to/tcprules" >&5
-echo "$as_me: error: Unable to find your tcprulesfile, specify --enable-tcprules-prog=/full/path/to/tcprules" >&2;}
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:$LINENO: error: Unable to find your tcprulesfile, specify --enable-tcprules-prog=/full/path/to/tcprules" >&5
+$as_echo "$as_me: error: Unable to find your tcprulesfile, specify --enable-tcprules-prog=/full/path/to/tcprules" >&2;}
{ (exit 1); exit 1; }; }
fi
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
cat >>confdefs.h <<_ACEOF
#define TCPRULES_PROG "$tcprules_prog"
@@ -6597,8 +6976,8 @@
- { echo "$as_me:$LINENO: checking whether we can locate the tcp.smtp file" >&5
-echo $ECHO_N "checking whether we can locate the tcp.smtp file... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether we can locate the tcp.smtp file" >&5
+$as_echo_n "checking whether we can locate the tcp.smtp file... " >&6; }
tcpserver_file=""
for f in "$vpopmaildir"/etc/tcp.smtp /etc/tcp.smtp /etc/tcprules.d/qmail-smtpd
do
@@ -6616,10 +6995,10 @@
if test "$tcpserver_file" = ""
then
- { echo "$as_me:$LINENO: WARNING: Unable to find your tcpserver relay file." >&5
-echo "$as_me: WARNING: Unable to find your tcpserver relay file." >&2;}
- { echo "$as_me:$LINENO: WARNING: Creating tcp.smtp in \"$vpopmaildir\"/etc/tcp.smtp." >&5
-echo "$as_me: WARNING: Creating tcp.smtp in \"$vpopmaildir\"/etc/tcp.smtp." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: Unable to find your tcpserver relay file." >&5
+$as_echo "$as_me: WARNING: Unable to find your tcpserver relay file." >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: Creating tcp.smtp in \"$vpopmaildir\"/etc/tcp.smtp." >&5
+$as_echo "$as_me: WARNING: Creating tcp.smtp in \"$vpopmaildir\"/etc/tcp.smtp." >&2;}
echo "127.:allow,RELAYCLIENT=\"\"" > "$vpopmaildir"/etc/tcp.smtp
tcpserver_file="$vpopmaildir"/etc/tcp.smtp
@@ -6631,13 +7010,13 @@
if test ! -f "$tcpserver_file"
then
- { { echo "$as_me:$LINENO: error: Unable to find your tcp.smtp file, specify --enable-tcpserver-path=/full/path/to/tcp.smtp" >&5
-echo "$as_me: error: Unable to find your tcp.smtp file, specify --enable-tcpserver-path=/full/path/to/tcp.smtp" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: Unable to find your tcp.smtp file, specify --enable-tcpserver-path=/full/path/to/tcp.smtp" >&5
+$as_echo "$as_me: error: Unable to find your tcp.smtp file, specify --enable-tcpserver-path=/full/path/to/tcp.smtp" >&2;}
{ (exit 1); exit 1; }; }
fi
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
cat >>confdefs.h <<_ACEOF
#define TCP_FILE "$tcpserver_file"
@@ -6645,8 +7024,8 @@
- { echo "$as_me:$LINENO: checking whether rebuild-tcpserver-file is been enabled" >&5
-echo $ECHO_N "checking whether rebuild-tcpserver-file is been enabled... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether rebuild-tcpserver-file is been enabled" >&5
+$as_echo_n "checking whether rebuild-tcpserver-file is been enabled... " >&6; }
# Check whether --enable-rebuild-tcpserver-file was given.
if test "${enable_rebuild_tcpserver_file+set}" = set; then
enableval=$enable_rebuild_tcpserver_file; REBUILD_TCPSERVER=$enableval
@@ -6660,8 +7039,8 @@
case $REBUILD_TCPSERVER in
1*|y*|Y*)
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
REBUILD_TCPSERVER=1
cat >>confdefs.h <<_ACEOF
@@ -6670,8 +7049,8 @@
;;
*)
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
;;
esac
@@ -6710,15 +7089,15 @@
;;
*)
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
;;
esac
#----------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking whether learn-passwords is enabled" >&5
-echo $ECHO_N "checking whether learn-passwords is enabled... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether learn-passwords is enabled" >&5
+$as_echo_n "checking whether learn-passwords is enabled... " >&6; }
# Check whether --enable-learn-passwords was given.
if test "${enable_learn_passwords+set}" = set; then
enableval=$enable_learn_passwords; ENABLE_LEARN_PASSWORDS=$enableval
@@ -6732,8 +7111,8 @@
case $ENABLE_LEARN_PASSWORDS in
1*|y*|Y*)
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
ENABLE_LEARN_PASSWORDS=1
cat >>confdefs.h <<_ACEOF
@@ -6742,15 +7121,15 @@
;;
*)
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
;;
esac
#----------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking whether md5-passwords is enabled" >&5
-echo $ECHO_N "checking whether md5-passwords is enabled... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether md5-passwords is enabled" >&5
+$as_echo_n "checking whether md5-passwords is enabled... " >&6; }
# Check whether --enable-md5-passwords was given.
if test "${enable_md5_passwords+set}" = set; then
enableval=$enable_md5_passwords; ENABLE_MD5_PASSWORDS=$enableval
@@ -6764,8 +7143,8 @@
case $ENABLE_MD5_PASSWORDS in
1*|y*|Y*)
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
ENABLE_MD5_PASSWORDS=1
cat >>confdefs.h <<_ACEOF
@@ -6774,15 +7153,15 @@
;;
*)
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
;;
esac
#----------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking whether file-locking is enabled" >&5
-echo $ECHO_N "checking whether file-locking is enabled... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether file-locking is enabled" >&5
+$as_echo_n "checking whether file-locking is enabled... " >&6; }
# Check whether --enable-file-locking was given.
if test "${enable_file_locking+set}" = set; then
enableval=$enable_file_locking; FILE_LOCKING=$enableval
@@ -6796,8 +7175,8 @@
case $FILE_LOCKING in
1*|y*|Y*)
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
FILE_LOCKING=1
cat >>confdefs.h <<_ACEOF
@@ -6806,15 +7185,15 @@
;;
*)
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
;;
esac
#----------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking whether file-sync is enabled" >&5
-echo $ECHO_N "checking whether file-sync is enabled... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether file-sync is enabled" >&5
+$as_echo_n "checking whether file-sync is enabled... " >&6; }
# Check whether --enable-file-sync was given.
if test "${enable_file_sync+set}" = set; then
enableval=$enable_file_sync; FILE_SYNC=$enableval
@@ -6828,8 +7207,8 @@
case $FILE_SYNC in
1*|y*|Y*)
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
FILE_SYNC=1
cat >>confdefs.h <<_ACEOF
@@ -6838,15 +7217,15 @@
;;
*)
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
;;
esac
#----------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking whether make-seekable is enabled" >&5
-echo $ECHO_N "checking whether make-seekable is enabled... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether make-seekable is enabled" >&5
+$as_echo_n "checking whether make-seekable is enabled... " >&6; }
# Check whether --enable-make-seekable was given.
if test "${enable_make_seekable+set}" = set; then
enableval=$enable_make_seekable; MAKE_SEEKABLE=$enableval
@@ -6860,8 +7239,8 @@
case $MAKE_SEEKABLE in
1*|y*|Y*)
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
MAKE_SEEKABLE=1
cat >>confdefs.h <<_ACEOF
@@ -6870,15 +7249,15 @@
;;
*)
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
;;
esac
#----------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking whether clear-passwd is enabled" >&5
-echo $ECHO_N "checking whether clear-passwd is enabled... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether clear-passwd is enabled" >&5
+$as_echo_n "checking whether clear-passwd is enabled... " >&6; }
# Check whether --enable-clear-passwd was given.
if test "${enable_clear_passwd+set}" = set; then
enableval=$enable_clear_passwd; CLEAR_PASS=$enableval
@@ -6892,8 +7271,8 @@
case $CLEAR_PASS in
1*|y*|Y*)
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
CLEAR_PASS=1
cat >>confdefs.h <<_ACEOF
@@ -6902,15 +7281,15 @@
;;
*)
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
;;
esac
#----------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking whether user-big-dir is enabled" >&5
-echo $ECHO_N "checking whether user-big-dir is enabled... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether user-big-dir is enabled" >&5
+$as_echo_n "checking whether user-big-dir is enabled... " >&6; }
# Check whether --enable-users-big-dir was given.
if test "${enable_users_big_dir+set}" = set; then
enableval=$enable_users_big_dir; USERS_BIG_DIR=$enableval
@@ -6924,8 +7303,8 @@
case $USERS_BIG_DIR in
1*|y*|Y*)
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
USERS_BIG_DIR=1
cat >>confdefs.h <<_ACEOF
@@ -6934,15 +7313,15 @@
;;
*)
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
;;
esac
#----------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking whether sqwebmail-pass is enabled" >&5
-echo $ECHO_N "checking whether sqwebmail-pass is enabled... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether sqwebmail-pass is enabled" >&5
+$as_echo_n "checking whether sqwebmail-pass is enabled... " >&6; }
# Check whether --enable-sqwebmail-pass was given.
if test "${enable_sqwebmail_pass+set}" = set; then
enableval=$enable_sqwebmail_pass; ENABLE_SQWEBMAIL_PASS=$enableval
@@ -6956,8 +7335,8 @@
case $ENABLE_SQWEBMAIL_PASS in
1*|y*|Y*)
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
ENABLE_SQWEBMAIL_PASS=1
cat >>confdefs.h <<_ACEOF
@@ -6966,15 +7345,15 @@
;;
*)
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
;;
esac
#----------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking whether qmail-ext is enabled" >&5
-echo $ECHO_N "checking whether qmail-ext is enabled... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether qmail-ext is enabled" >&5
+$as_echo_n "checking whether qmail-ext is enabled... " >&6; }
# Check whether --enable-qmail-ext was given.
if test "${enable_qmail_ext+set}" = set; then
enableval=$enable_qmail_ext; QMAIL_EXT=$enableval
@@ -6988,8 +7367,8 @@
case $QMAIL_EXT in
1*|y*|Y*)
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
QMAIL_EXT=1
cat >>confdefs.h <<_ACEOF
@@ -6998,15 +7377,15 @@
;;
*)
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
;;
esac
#----------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking whether ip-alias-domains is enabled" >&5
-echo $ECHO_N "checking whether ip-alias-domains is enabled... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether ip-alias-domains is enabled" >&5
+$as_echo_n "checking whether ip-alias-domains is enabled... " >&6; }
# Check whether --enable-ip-alias-domains was given.
if test "${enable_ip_alias_domains+set}" = set; then
enableval=$enable_ip_alias_domains; IPALIAS=$enableval
@@ -7020,8 +7399,8 @@
case $IPALIAS in
1*|y*|Y*)
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
IPALIAS=1
cat >>confdefs.h <<_ACEOF
@@ -7030,15 +7409,15 @@
;;
*)
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
;;
esac
#----------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking whether onchange script is enabled" >&5
-echo $ECHO_N "checking whether onchange script is enabled... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether onchange script is enabled" >&5
+$as_echo_n "checking whether onchange script is enabled... " >&6; }
# Check whether --enable-onchange-script was given.
if test "${enable_onchange_script+set}" = set; then
enableval=$enable_onchange_script; ENABLE_ONCHANGE_SCRIPT=$enableval
@@ -7052,8 +7431,8 @@
case $ENABLE_ONCHANGE_SCRIPT in
1*|y*|Y*)
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
ENABLE_ONCHANGE_SCRIPT=1
cat >>confdefs.h <<_ACEOF
@@ -7062,8 +7441,8 @@
;;
*)
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
;;
esac
@@ -7072,8 +7451,8 @@
#----------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking whether spamassassin is enabled" >&5
-echo $ECHO_N "checking whether spamassassin is enabled... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether spamassassin is enabled" >&5
+$as_echo_n "checking whether spamassassin is enabled... " >&6; }
# Check whether --enable-spamassassin was given.
if test "${enable_spamassassin+set}" = set; then
enableval=$enable_spamassassin; ENABLE_SPAMASSASSIN=$enableval
@@ -7087,12 +7466,12 @@
case $ENABLE_SPAMASSASSIN in
0*|n*|N*)
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
;;
*)
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
ENABLE_SPAMASSASSIN=1
cat >>confdefs.h <<_ACEOF
@@ -7100,8 +7479,8 @@
_ACEOF
- { echo "$as_me:$LINENO: checking whether we can locate the spamc program" >&5
-echo $ECHO_N "checking whether we can locate the spamc program... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether we can locate the spamc program" >&5
+$as_echo_n "checking whether we can locate the spamc program... " >&6; }
for f in /usr/bin/spamc /usr/local/bin/spamc
do
if test -f $f
@@ -7117,10 +7496,10 @@
if test "$spamc_prog" = ""
then
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- { { echo "$as_me:$LINENO: error: Unable to find your spamc prog, specify --enable-spamc-prog." >&5
-echo "$as_me: error: Unable to find your spamc prog, specify --enable-spamc-prog." >&2;}
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:$LINENO: error: Unable to find your spamc prog, specify --enable-spamc-prog." >&5
+$as_echo "$as_me: error: Unable to find your spamc prog, specify --enable-spamc-prog." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -7130,15 +7509,15 @@
if test ! -f "$spamc_prog"
then
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- { { echo "$as_me:$LINENO: error: Unable to find your spamc program, specify --enable-spamc-prog=/full/path/to/spamc" >&5
-echo "$as_me: error: Unable to find your spamc program, specify --enable-spamc-prog=/full/path/to/spamc" >&2;}
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:$LINENO: error: Unable to find your spamc program, specify --enable-spamc-prog=/full/path/to/spamc" >&5
+$as_echo "$as_me: error: Unable to find your spamc program, specify --enable-spamc-prog=/full/path/to/spamc" >&2;}
{ (exit 1); exit 1; }; }
fi
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
cat >>confdefs.h <<_ACEOF
#define SPAMC_PROG "$spamc_prog"
@@ -7150,8 +7529,8 @@
#----------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking whether maildrop is enabled" >&5
-echo $ECHO_N "checking whether maildrop is enabled... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether maildrop is enabled" >&5
+$as_echo_n "checking whether maildrop is enabled... " >&6; }
# Check whether --enable-maildrop was given.
if test "${enable_maildrop+set}" = set; then
enableval=$enable_maildrop; ENABLE_MAILDROP=$enableval
@@ -7165,12 +7544,12 @@
case $ENABLE_MAILDROP in
0*|n*|N*)
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
;;
*)
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
ENABLE_MAILDROP=1
cat >>confdefs.h <<_ACEOF
@@ -7178,8 +7557,8 @@
_ACEOF
- { echo "$as_me:$LINENO: checking whether we can locate the maildrop program" >&5
-echo $ECHO_N "checking whether we can locate the maildrop program... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether we can locate the maildrop program" >&5
+$as_echo_n "checking whether we can locate the maildrop program... " >&6; }
for f in /usr/bin/maildrop /usr/local/bin/maildrop
do
if test -f $f
@@ -7195,10 +7574,10 @@
if test "$maildrop_prog" = ""
then
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- { { echo "$as_me:$LINENO: error: Unable to find your maildrop prog, specify --enable-maildrop-prog." >&5
-echo "$as_me: error: Unable to find your maildrop prog, specify --enable-maildrop-prog." >&2;}
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:$LINENO: error: Unable to find your maildrop prog, specify --enable-maildrop-prog." >&5
+$as_echo "$as_me: error: Unable to find your maildrop prog, specify --enable-maildrop-prog." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -7208,15 +7587,15 @@
if test ! -f "$maildrop_prog"
then
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- { { echo "$as_me:$LINENO: error: Unable to find your maildrop program, specify --enable-maildrop-prog=/full/path/to/maildrop" >&5
-echo "$as_me: error: Unable to find your maildrop program, specify --enable-maildrop-prog=/full/path/to/maildrop" >&2;}
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:$LINENO: error: Unable to find your maildrop program, specify --enable-maildrop-prog=/full/path/to/maildrop" >&5
+$as_echo "$as_me: error: Unable to find your maildrop program, specify --enable-maildrop-prog=/full/path/to/maildrop" >&2;}
{ (exit 1); exit 1; }; }
fi
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
cat >>confdefs.h <<_ACEOF
#define MAILDROP_PROG "$maildrop_prog"
@@ -7227,8 +7606,8 @@
esac
#----------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking whether domainquotas is enabled" >&5
-echo $ECHO_N "checking whether domainquotas is enabled... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether domainquotas is enabled" >&5
+$as_echo_n "checking whether domainquotas is enabled... " >&6; }
# Check whether --enable-domainquotas was given.
if test "${enable_domainquotas+set}" = set; then
enableval=$enable_domainquotas; ENABLE_DOMAIN_QUOTAS=$enableval
@@ -7242,12 +7621,12 @@
case $ENABLE_DOMAIN_QUOTAS in
0*|n*|N*)
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
;;
*)
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
ENABLE_DOMAIN_QUOTAS=1
cat >>confdefs.h <<_ACEOF
@@ -7321,8 +7700,8 @@
#----------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking whether an auth module has been specified" >&5
-echo $ECHO_N "checking whether an auth module has been specified... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether an auth module has been specified" >&5
+$as_echo_n "checking whether an auth module has been specified... " >&6; }
#default to use CDB authentication
AUTH_MODULE="cdb"
@@ -7336,8 +7715,8 @@
case $AUTH_MODULE in
cd*|Cd*|CD*)
- { echo "$as_me:$LINENO: result: no, so default to cdb" >&5
-echo "${ECHO_T}no, so default to cdb" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no, so default to cdb" >&5
+$as_echo "no, so default to cdb" >&6; }
USE_CDB=1
USE_SQL=0
rm -rf vauth.c
@@ -7354,8 +7733,8 @@
;;
my*|My*|MY*)
- { echo "$as_me:$LINENO: result: mysql" >&5
-echo "${ECHO_T}mysql" >&6; }
+ { $as_echo "$as_me:$LINENO: result: mysql" >&5
+$as_echo "mysql" >&6; }
USE_CDB=0
USE_SQL=1
USE_MYSQL=1
@@ -7377,15 +7756,15 @@
if test "$incdir" = ""
then
- { { echo "$as_me:$LINENO: error: Unable to find your MySQL inc dir, specify --enable-incdir." >&5
-echo "$as_me: error: Unable to find your MySQL inc dir, specify --enable-incdir." >&2;}
+ { { $as_echo "$as_me:$LINENO: error: Unable to find your MySQL inc dir, specify --enable-incdir." >&5
+$as_echo "$as_me: error: Unable to find your MySQL inc dir, specify --enable-incdir." >&2;}
{ (exit 1); exit 1; }; }
fi
if test ! -d "$incdir"
then
- { { echo "$as_me:$LINENO: error: Unable to find your MySQL inc dir, specify --enable-incdir." >&5
-echo "$as_me: error: Unable to find your MySQL inc dir, specify --enable-incdir." >&2;}
+ { { $as_echo "$as_me:$LINENO: error: Unable to find your MySQL inc dir, specify --enable-incdir." >&5
+$as_echo "$as_me: error: Unable to find your MySQL inc dir, specify --enable-incdir." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -7394,15 +7773,15 @@
if test "$libdir" = ""
then
- { { echo "$as_me:$LINENO: error: Unable to find your MySQL lib dir, specify --enable-libdir." >&5
-echo "$as_me: error: Unable to find your MySQL lib dir, specify --enable-libdir." >&2;}
+ { { $as_echo "$as_me:$LINENO: error: Unable to find your MySQL lib dir, specify --enable-libdir." >&5
+$as_echo "$as_me: error: Unable to find your MySQL lib dir, specify --enable-libdir." >&2;}
{ (exit 1); exit 1; }; }
fi
if test ! -d "$libdir"
then
- { { echo "$as_me:$LINENO: error: Unable to find your MySQL lib dir, specify --enable-libdir." >&5
-echo "$as_me: error: Unable to find your MySQL lib dir, specify --enable-libdir." >&2;}
+ { { $as_echo "$as_me:$LINENO: error: Unable to find your MySQL lib dir, specify --enable-libdir." >&5
+$as_echo "$as_me: error: Unable to find your MySQL lib dir, specify --enable-libdir." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -7411,8 +7790,8 @@
;;
pg*|Pg*|PG*)
- { echo "$as_me:$LINENO: result: pgsql" >&5
-echo "${ECHO_T}pgsql" >&6; }
+ { $as_echo "$as_me:$LINENO: result: pgsql" >&5
+$as_echo "pgsql" >&6; }
pgconfig=""
for f in /usr/local/pgsql/bin/pg_config /usr/local/bin/pg_config /usr/bin/pg_config
@@ -7426,15 +7805,15 @@
if test "$pgconfig" = ""
then
- { { echo "$as_me:$LINENO: error: Unable to locate the pg_config program." >&5
-echo "$as_me: error: Unable to locate the pg_config program." >&2;}
+ { { $as_echo "$as_me:$LINENO: error: Unable to locate the pg_config program." >&5
+$as_echo "$as_me: error: Unable to locate the pg_config program." >&2;}
{ (exit 1); exit 1; }; }
fi
if test ! -f "$pgconfig"
then
- { { echo "$as_me:$LINENO: error: Unable to locate the pg_config program." >&5
-echo "$as_me: error: Unable to locate the pg_config program." >&2;}
+ { { $as_echo "$as_me:$LINENO: error: Unable to locate the pg_config program." >&5
+$as_echo "$as_me: error: Unable to locate the pg_config program." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -7461,8 +7840,8 @@
;;
ld*|Ld*|LD*)
- { echo "$as_me:$LINENO: result: ldap" >&5
-echo "${ECHO_T}ldap" >&6; }
+ { $as_echo "$as_me:$LINENO: result: ldap" >&5
+$as_echo "ldap" >&6; }
USE_CDB=0
USE_SQL=0
USE_LDAP=1
@@ -7480,8 +7859,8 @@
;;
or*|Or*|OR*)
- { echo "$as_me:$LINENO: result: oracle" >&5
-echo "${ECHO_T}oracle" >&6; }
+ { $as_echo "$as_me:$LINENO: result: oracle" >&5
+$as_echo "oracle" >&6; }
USE_CDB=0
USE_SQL=1
USE_ORACLE=1
@@ -7504,8 +7883,8 @@
;;
sy*|Sy*|SY*)
- { echo "$as_me:$LINENO: result: sybase" >&5
-echo "${ECHO_T}sybase" >&6; }
+ { $as_echo "$as_me:$LINENO: result: sybase" >&5
+$as_echo "sybase" >&6; }
USE_CDB=0
USE_SQL=1
USE_SYBASE=1
@@ -7528,10 +7907,10 @@
;;
*)
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- { { echo "$as_me:$LINENO: error: A valid auth-module was not selected. Please specify using --enable-auth-module=cdb|mysql|pgsql|ldap|oracle|sybase" >&5
-echo "$as_me: error: A valid auth-module was not selected. Please specify using --enable-auth-module=cdb|mysql|pgsql|ldap|oracle|sybase" >&2;}
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:$LINENO: error: A valid auth-module was not selected. Please specify using --enable-auth-module=cdb|mysql|pgsql|ldap|oracle|sybase" >&5
+$as_echo "$as_me: error: A valid auth-module was not selected. Please specify using --enable-auth-module=cdb|mysql|pgsql|ldap|oracle|sybase" >&2;}
{ (exit 1); exit 1; }; }
;;
@@ -7540,8 +7919,8 @@
#----------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking whether system accounts have been enabled" >&5
-echo $ECHO_N "checking whether system accounts have been enabled... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether system accounts have been enabled" >&5
+$as_echo_n "checking whether system accounts have been enabled... " >&6; }
# Check whether --enable-passwd was given.
if test "${enable_passwd+set}" = set; then
enableval=$enable_passwd; ENABLE_PASSWD=$enableval
@@ -7555,27 +7934,28 @@
case $ENABLE_PASSWD in
1*|y*|Y*)
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
ENABLE_PASSWD=1
for ac_header in shadow.h
do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
else
# Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -7591,32 +7971,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -7630,69 +8011,73 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
;;
esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
eval "$as_ac_Header=\$ac_header_preproc"
fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
@@ -7701,17 +8086,17 @@
HAS_SHADOW_H=0
if test "${ac_cv_header_shadow_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for shadow.h" >&5
-echo $ECHO_N "checking for shadow.h... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for shadow.h" >&5
+$as_echo_n "checking for shadow.h... " >&6; }
if test "${ac_cv_header_shadow_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_shadow_h" >&5
-echo "${ECHO_T}$ac_cv_header_shadow_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_shadow_h" >&5
+$as_echo "$ac_cv_header_shadow_h" >&6; }
else
# Is the header compilable?
-{ echo "$as_me:$LINENO: checking shadow.h usability" >&5
-echo $ECHO_N "checking shadow.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking shadow.h usability" >&5
+$as_echo_n "checking shadow.h usability... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -7727,32 +8112,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
# Is the header present?
-{ echo "$as_me:$LINENO: checking shadow.h presence" >&5
-echo $ECHO_N "checking shadow.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking shadow.h presence" >&5
+$as_echo_n "checking shadow.h presence... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -7766,66 +8152,67 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
- { echo "$as_me:$LINENO: WARNING: shadow.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: shadow.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: shadow.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: shadow.h: proceeding with the compiler's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: shadow.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: shadow.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: shadow.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: shadow.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: shadow.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: shadow.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: shadow.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: shadow.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: shadow.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: shadow.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: shadow.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: shadow.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: shadow.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: shadow.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: shadow.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: shadow.h: in the future, the compiler will take precedence" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: shadow.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: shadow.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: shadow.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: shadow.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: shadow.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: shadow.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: shadow.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: shadow.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: shadow.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: shadow.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: shadow.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: shadow.h: in the future, the compiler will take precedence" >&2;}
;;
esac
-{ echo "$as_me:$LINENO: checking for shadow.h" >&5
-echo $ECHO_N "checking for shadow.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for shadow.h" >&5
+$as_echo_n "checking for shadow.h... " >&6; }
if test "${ac_cv_header_shadow_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_cv_header_shadow_h=$ac_header_preproc
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_shadow_h" >&5
-echo "${ECHO_T}$ac_cv_header_shadow_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_shadow_h" >&5
+$as_echo "$ac_cv_header_shadow_h" >&6; }
fi
-if test $ac_cv_header_shadow_h = yes; then
+if test "x$ac_cv_header_shadow_h" = x""yes; then
HAS_SHADOW_H=1;
@@ -7843,20 +8230,20 @@
;;
*)
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
ENABLE_PASSWD=0
;;
esac
#----------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking whether /etc/shadow exists" >&5
-echo $ECHO_N "checking whether /etc/shadow exists... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether /etc/shadow exists" >&5
+$as_echo_n "checking whether /etc/shadow exists... " >&6; }
if test -f /etc/shadow
then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
HAS_SHADOW=1
cat >>confdefs.h <<_ACEOF
@@ -7864,14 +8251,14 @@
_ACEOF
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
#----------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking whether logging is enabled" >&5
-echo $ECHO_N "checking whether logging is enabled... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether logging is enabled" >&5
+$as_echo_n "checking whether logging is enabled... " >&6; }
# Check whether --enable-logging was given.
if test "${enable_logging+set}" = set; then
enableval=$enable_logging; ENABLE_LOGGING=$enableval
@@ -7885,8 +8272,8 @@
case $ENABLE_LOGGING in
1*|y*|Y*)
- { echo "$as_me:$LINENO: result: all attempts" >&5
-echo "${ECHO_T}all attempts" >&6; }
+ { $as_echo "$as_me:$LINENO: result: all attempts" >&5
+$as_echo "all attempts" >&6; }
ENABLE_LOGGING=1
cat >>confdefs.h <<_ACEOF
@@ -7895,8 +8282,8 @@
;;
e*|E*)
- { echo "$as_me:$LINENO: result: errors only" >&5
-echo "${ECHO_T}errors only" >&6; }
+ { $as_echo "$as_me:$LINENO: result: errors only" >&5
+$as_echo "errors only" >&6; }
ENABLE_LOGGING=2
cat >>confdefs.h <<_ACEOF
@@ -7905,8 +8292,8 @@
;;
p*|P*)
- { echo "$as_me:$LINENO: result: errors, with password" >&5
-echo "${ECHO_T}errors, with password" >&6; }
+ { $as_echo "$as_me:$LINENO: result: errors, with password" >&5
+$as_echo "errors, with password" >&6; }
ENABLE_LOGGING=3
cat >>confdefs.h <<_ACEOF
@@ -7915,8 +8302,8 @@
;;
v*|V*)
- { echo "$as_me:$LINENO: result: verbose, all with password" >&5
-echo "${ECHO_T}verbose, all with password" >&6; }
+ { $as_echo "$as_me:$LINENO: result: verbose, all with password" >&5
+$as_echo "verbose, all with password" >&6; }
ENABLE_LOGGING=4
cat >>confdefs.h <<_ACEOF
@@ -7925,8 +8312,8 @@
;;
*)
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
ENABLE_LOGGING=0
cat >>confdefs.h <<_ACEOF
@@ -7953,8 +8340,8 @@
#----------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking whether auth-logging is enabled" >&5
-echo $ECHO_N "checking whether auth-logging is enabled... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether auth-logging is enabled" >&5
+$as_echo_n "checking whether auth-logging is enabled... " >&6; }
# Check whether --enable-auth-logging was given.
if test "${enable_auth_logging+set}" = set; then
enableval=$enable_auth_logging; ENABLE_AUTH_LOGGING=$enableval
@@ -7968,8 +8355,8 @@
case $ENABLE_AUTH_LOGGING in
1*|y*|Y*)
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
ENABLE_AUTH_LOGGING=1
cat >>confdefs.h <<_ACEOF
@@ -7978,15 +8365,15 @@
;;
*)
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
;;
esac
#----------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking whether sql-logging is enabled" >&5
-echo $ECHO_N "checking whether sql-logging is enabled... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether sql-logging is enabled" >&5
+$as_echo_n "checking whether sql-logging is enabled... " >&6; }
# Check whether --enable-sql-logging was given.
if test "${enable_sql_logging+set}" = set; then
enableval=$enable_sql_logging; ENABLE_SQL_LOGGING=$enableval
@@ -8000,12 +8387,12 @@
case $ENABLE_SQL_LOGGING in
1*|y*|Y*)
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
if test "$USE_SQL" != 1
then
- { { echo "$as_me:$LINENO: error: sql-logging is only supported in the MySQL/Postgres authentication modules" >&5
-echo "$as_me: error: sql-logging is only supported in the MySQL/Postgres authentication modules" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: sql-logging is only supported in the MySQL/Postgres authentication modules" >&5
+$as_echo "$as_me: error: sql-logging is only supported in the MySQL/Postgres authentication modules" >&2;}
{ (exit 1); exit 1; }; }
else
ENABLE_SQL_LOGGING=1
@@ -8017,15 +8404,15 @@
fi
;;
*)
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
;;
esac
#----------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking whether mysql-limits is enabled" >&5
-echo $ECHO_N "checking whether mysql-limits is enabled... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether mysql-limits is enabled" >&5
+$as_echo_n "checking whether mysql-limits is enabled... " >&6; }
# Check whether --enable-mysql-limits was given.
if test "${enable_mysql_limits+set}" = set; then
enableval=$enable_mysql_limits; ENABLE_MYSQL_LIMITS=$enableval
@@ -8039,12 +8426,12 @@
case $ENABLE_MYSQL_LIMITS in
1*|y*|Y*)
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
if test "$USE_MYSQL" != 1
then
- { { echo "$as_me:$LINENO: error: mysql-limits is only supported in the MySQL authentication module" >&5
-echo "$as_me: error: mysql-limits is only supported in the MySQL authentication module" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: mysql-limits is only supported in the MySQL authentication module" >&5
+$as_echo "$as_me: error: mysql-limits is only supported in the MySQL authentication module" >&2;}
{ (exit 1); exit 1; }; }
else
ENABLE_MYSQL_LIMITS=1
@@ -8056,15 +8443,15 @@
fi
;;
*)
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
;;
esac
#----------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking whether mysql-replication is enabled" >&5
-echo $ECHO_N "checking whether mysql-replication is enabled... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether mysql-replication is enabled" >&5
+$as_echo_n "checking whether mysql-replication is enabled... " >&6; }
# Check whether --enable-mysql-replication was given.
if test "${enable_mysql_replication+set}" = set; then
enableval=$enable_mysql_replication; MYSQL_REPLICATION=$enableval
@@ -8078,12 +8465,12 @@
case $MYSQL_REPLICATION in
1*|y*|Y*)
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
if test "$USE_MYSQL" != 1
then
- { { echo "$as_me:$LINENO: error: mysql-replication is only supported in the MySQL authentication module" >&5
-echo "$as_me: error: mysql-replication is only supported in the MySQL authentication module" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: mysql-replication is only supported in the MySQL authentication module" >&5
+$as_echo "$as_me: error: mysql-replication is only supported in the MySQL authentication module" >&2;}
{ (exit 1); exit 1; }; }
else
MYSQL_REPLICATION=1
@@ -8095,15 +8482,15 @@
fi
;;
*)
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
;;
esac
#----------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking whether valias is enabled" >&5
-echo $ECHO_N "checking whether valias is enabled... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether valias is enabled" >&5
+$as_echo_n "checking whether valias is enabled... " >&6; }
# Check whether --enable-valias was given.
if test "${enable_valias+set}" = set; then
enableval=$enable_valias; VALIAS=$enableval
@@ -8117,14 +8504,14 @@
case $VALIAS in
1*|y*|Y*)
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
if test "$USE_SQL" != 1
then
if test "$USE_LDAP" != 1
then
- { { echo "$as_me:$LINENO: error: valias option is only supported in the SQL and LDAP authentication modules" >&5
-echo "$as_me: error: valias option is only supported in the SQL and LDAP authentication modules" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: valias option is only supported in the SQL and LDAP authentication modules" >&5
+$as_echo "$as_me: error: valias option is only supported in the SQL and LDAP authentication modules" >&2;}
{ (exit 1); exit 1; }; }
fi
fi
@@ -8137,15 +8524,15 @@
;;
*)
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
;;
esac
#----------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking whether many-domains is enabled" >&5
-echo $ECHO_N "checking whether many-domains is enabled... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether many-domains is enabled" >&5
+$as_echo_n "checking whether many-domains is enabled... " >&6; }
# Check whether --enable-many-domains was given.
if test "${enable_many_domains+set}" = set; then
enableval=$enable_many_domains; MANY_DOMAINS=$enableval
@@ -8159,8 +8546,8 @@
case $MANY_DOMAINS in
1*|y*|Y*)
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
#if test $USE_SQL != 1
#then
# AC_MSG_ERROR(many-domains is only supported in the SQL authentication modules)
@@ -8174,24 +8561,24 @@
#fi
;;
*)
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
MANY_DOMAINS=0
;;
esac
#----------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking whether any discontinued --enable commands have been used" >&5
-echo $ECHO_N "checking whether any discontinued --enable commands have been used... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether any discontinued --enable commands have been used" >&5
+$as_echo_n "checking whether any discontinued --enable commands have been used... " >&6; }
# Check whether --enable-mysql-logging was given.
if test "${enable_mysql_logging+set}" = set; then
enableval=$enable_mysql_logging;
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- { { echo "$as_me:$LINENO: error: --enable-mysql-logging has been superceded. Please use --enable-sql-logging instead" >&5
-echo "$as_me: error: --enable-mysql-logging has been superceded. Please use --enable-sql-logging instead" >&2;}
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+ { { $as_echo "$as_me:$LINENO: error: --enable-mysql-logging has been superceded. Please use --enable-sql-logging instead" >&5
+$as_echo "$as_me: error: --enable-mysql-logging has been superceded. Please use --enable-sql-logging instead" >&2;}
{ (exit 1); exit 1; }; }
@@ -8201,10 +8588,10 @@
# Check whether --enable-pgsql-logging was given.
if test "${enable_pgsql_logging+set}" = set; then
enableval=$enable_pgsql_logging;
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- { { echo "$as_me:$LINENO: error: --enable-pgsql-logging has been superceded. Please use --enable-sql-logging instead" >&5
-echo "$as_me: error: --enable-pgsql-logging has been superceded. Please use --enable-sql-logging instead" >&2;}
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+ { { $as_echo "$as_me:$LINENO: error: --enable-pgsql-logging has been superceded. Please use --enable-sql-logging instead" >&5
+$as_echo "$as_me: error: --enable-pgsql-logging has been superceded. Please use --enable-sql-logging instead" >&2;}
{ (exit 1); exit 1; }; }
@@ -8214,10 +8601,10 @@
# Check whether --enable-mysql was given.
if test "${enable_mysql+set}" = set; then
enableval=$enable_mysql;
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- { { echo "$as_me:$LINENO: error: --enable-mysql has been superceded. Please use --enable-auth-module=mysql instead" >&5
-echo "$as_me: error: --enable-mysql has been superceded. Please use --enable-auth-module=mysql instead" >&2;}
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+ { { $as_echo "$as_me:$LINENO: error: --enable-mysql has been superceded. Please use --enable-auth-module=mysql instead" >&5
+$as_echo "$as_me: error: --enable-mysql has been superceded. Please use --enable-auth-module=mysql instead" >&2;}
{ (exit 1); exit 1; }; }
@@ -8227,10 +8614,10 @@
# Check whether --enable-pgsql was given.
if test "${enable_pgsql+set}" = set; then
enableval=$enable_pgsql;
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- { { echo "$as_me:$LINENO: error: --enable-pgsql has been superceded. Please use --enable-auth-module=pgsql instead" >&5
-echo "$as_me: error: --enable-pgsql has been superceded. Please use --enable-auth-module=pgsql instead" >&2;}
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+ { { $as_echo "$as_me:$LINENO: error: --enable-pgsql has been superceded. Please use --enable-auth-module=pgsql instead" >&5
+$as_echo "$as_me: error: --enable-pgsql has been superceded. Please use --enable-auth-module=pgsql instead" >&2;}
{ (exit 1); exit 1; }; }
@@ -8240,10 +8627,10 @@
# Check whether --enable-ldap was given.
if test "${enable_ldap+set}" = set; then
enableval=$enable_ldap;
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- { { echo "$as_me:$LINENO: error: --enable-ldap has been superceded. Please use --enable-auth-module=ldap instead" >&5
-echo "$as_me: error: --enable-ldap has been superceded. Please use --enable-auth-module=ldap instead" >&2;}
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+ { { $as_echo "$as_me:$LINENO: error: --enable-ldap has been superceded. Please use --enable-auth-module=ldap instead" >&5
+$as_echo "$as_me: error: --enable-ldap has been superceded. Please use --enable-auth-module=ldap instead" >&2;}
{ (exit 1); exit 1; }; }
@@ -8253,10 +8640,10 @@
# Check whether --enable-oracle was given.
if test "${enable_oracle+set}" = set; then
enableval=$enable_oracle;
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- { { echo "$as_me:$LINENO: error: --enable-oracle has been superceded. Please use --enable-auth-module=oracle instead" >&5
-echo "$as_me: error: --enable-oracle has been superceded. Please use --enable-auth-module=oracle instead" >&2;}
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+ { { $as_echo "$as_me:$LINENO: error: --enable-oracle has been superceded. Please use --enable-auth-module=oracle instead" >&5
+$as_echo "$as_me: error: --enable-oracle has been superceded. Please use --enable-auth-module=oracle instead" >&2;}
{ (exit 1); exit 1; }; }
@@ -8266,10 +8653,10 @@
# Check whether --enable-sybase was given.
if test "${enable_sybase+set}" = set; then
enableval=$enable_sybase;
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- { { echo "$as_me:$LINENO: error: --enable-sybase has been superceded. Please use --enable-auth-module=sybase instead" >&5
-echo "$as_me: error: --enable-sybase has been superceded. Please use --enable-auth-module=sybase instead" >&2;}
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+ { { $as_echo "$as_me:$LINENO: error: --enable-sybase has been superceded. Please use --enable-auth-module=sybase instead" >&5
+$as_echo "$as_me: error: --enable-sybase has been superceded. Please use --enable-auth-module=sybase instead" >&2;}
{ (exit 1); exit 1; }; }
@@ -8286,10 +8673,10 @@
# Check whether --enable-hardquota was given.
if test "${enable_hardquota+set}" = set; then
enableval=$enable_hardquota;
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- { { echo "$as_me:$LINENO: error: --enable-hardquota has been superceded. Please use the ~vpopmail/etc/vlimits.default file instead." >&5
-echo "$as_me: error: --enable-hardquota has been superceded. Please use the ~vpopmail/etc/vlimits.default file instead." >&2;}
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+ { { $as_echo "$as_me:$LINENO: error: --enable-hardquota has been superceded. Please use the ~vpopmail/etc/vlimits.default file instead." >&5
+$as_echo "$as_me: error: --enable-hardquota has been superceded. Please use the ~vpopmail/etc/vlimits.default file instead." >&2;}
{ (exit 1); exit 1; }; }
@@ -8299,10 +8686,10 @@
# Check whether --enable-defaultquota was given.
if test "${enable_defaultquota+set}" = set; then
enableval=$enable_defaultquota;
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- { { echo "$as_me:$LINENO: error: --enable-defaultquota has been superceded. Please use the ~vpopmail/etc/vlimits.default file instead." >&5
-echo "$as_me: error: --enable-defaultquota has been superceded. Please use the ~vpopmail/etc/vlimits.default file instead." >&2;}
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+ { { $as_echo "$as_me:$LINENO: error: --enable-defaultquota has been superceded. Please use the ~vpopmail/etc/vlimits.default file instead." >&5
+$as_echo "$as_me: error: --enable-defaultquota has been superceded. Please use the ~vpopmail/etc/vlimits.default file instead." >&2;}
{ (exit 1); exit 1; }; }
@@ -8312,18 +8699,18 @@
# Check whether --enable-default-domain was given.
if test "${enable_default_domain+set}" = set; then
enableval=$enable_default_domain;
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- { { echo "$as_me:$LINENO: error: --enable-default-domain has been superceded. The default domain should be put into the file ~vpopmail/etc/defaultdomain instead" >&5
-echo "$as_me: error: --enable-default-domain has been superceded. The default domain should be put into the file ~vpopmail/etc/defaultdomain instead" >&2;}
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+ { { $as_echo "$as_me:$LINENO: error: --enable-default-domain has been superceded. The default domain should be put into the file ~vpopmail/etc/defaultdomain instead" >&5
+$as_echo "$as_me: error: --enable-default-domain has been superceded. The default domain should be put into the file ~vpopmail/etc/defaultdomain instead" >&2;}
{ (exit 1); exit 1; }; }
fi
-{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
#----------------------------------------------------------------------
@@ -8356,11 +8743,12 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
*) $as_unset $ac_var ;;
esac ;;
esac
@@ -8393,12 +8781,12 @@
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
- { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+ { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
cat confcache >$cache_file
else
- { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+ { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
rm -f confcache
@@ -8414,7 +8802,7 @@
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
- ac_i=`echo "$ac_i" | sed "$ac_script"`
+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -8426,26 +8814,27 @@
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
+$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
: ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
@@ -8458,7 +8847,7 @@
SHELL=\${CONFIG_SHELL-$SHELL}
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
## --------------------- ##
## M4sh Initialization. ##
## --------------------- ##
@@ -8468,7 +8857,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@ -8490,17 +8879,45 @@
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
+else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
else
- PATH_SEPARATOR=:
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+ as_echo_n_body='eval
+ arg=$1;
+ case $arg in
+ *"$as_nl"*)
+ expr "X$arg" : "X\\(.*\\)$as_nl";
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+ esac;
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+ '
+ export as_echo_n_body
+ as_echo_n='sh -c $as_echo_n_body as_echo'
fi
- rm -f conf$$.sh
+ export as_echo_body
+ as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
fi
# Support unset when possible.
@@ -8516,8 +8933,6 @@
# there to prevent editors from complaining about space-tab.
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
# splitting by setting IFS to empty value.)
-as_nl='
-'
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -8540,7 +8955,7 @@
as_myself=$0
fi
if test ! -f "$as_myself"; then
- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
{ (exit 1); exit 1; }
fi
@@ -8553,17 +8968,10 @@
PS4='+ '
# NLS nuisances.
-for as_var in \
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
- LC_TELEPHONE LC_TIME
-do
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
# Required to use basename.
if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -8585,7 +8993,7 @@
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
@@ -8636,7 +9044,7 @@
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
@@ -8664,7 +9072,6 @@
*)
ECHO_N='-n';;
esac
-
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
@@ -8677,19 +9084,22 @@
rm -f conf$$.dir/conf$$.file
else
rm -f conf$$.dir
- mkdir conf$$.dir
+ mkdir conf$$.dir 2>/dev/null
fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+if (echo >conf$$.file) 2>/dev/null; then
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -p'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
+ fi
else
as_ln_s='cp -p'
fi
@@ -8714,10 +9124,10 @@
as_test_x='
eval sh -c '\''
if test -d "$1"; then
- test -d "$1/.";
+ test -d "$1/.";
else
case $1 in
- -*)set "./$1";;
+ -*)set "./$1";;
esac;
case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
???[sx]*):;;*)false;;esac;fi
@@ -8739,8 +9149,8 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by vpopmail $as_me 5.4.27, which was
-generated by GNU Autoconf 2.61. Invocation command line was
+This file was extended by vpopmail $as_me 5.4.28, which was
+generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -8753,7 +9163,16 @@
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# Files that config.status was made for.
config_files="$ac_config_files"
config_headers="$ac_config_headers"
@@ -8761,22 +9180,23 @@
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [FILE]...
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
- -q, --quiet do not print progress messages
+ -q, --quiet, --silent
+ do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
- --file=FILE[:TEMPLATE]
- instantiate the configuration file FILE
- --header=FILE[:TEMPLATE]
- instantiate the configuration header FILE
+ --file=FILE[:TEMPLATE]
+ instantiate the configuration file FILE
+ --header=FILE[:TEMPLATE]
+ instantiate the configuration header FILE
Configuration files:
$config_files
@@ -8790,13 +9210,13 @@
Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-vpopmail config.status 5.4.27
-configured by $0, generated by GNU Autoconf 2.61,
- with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+vpopmail config.status 5.4.28
+configured by $0, generated by GNU Autoconf 2.63,
+ with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -8804,11 +9224,12 @@
srcdir='$srcdir'
INSTALL='$INSTALL'
MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value. By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
ac_need_defaults=:
while test $# != 0
do
@@ -8830,30 +9251,36 @@
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
- echo "$ac_cs_version"; exit ;;
+ $as_echo "$ac_cs_version"; exit ;;
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
- CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+ case $ac_optarg in
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ esac
+ CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
ac_need_defaults=false;;
--header | --heade | --head | --hea )
$ac_shift
- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+ case $ac_optarg in
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ esac
+ CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
- { echo "$as_me: error: ambiguous option: $1
+ { $as_echo "$as_me: error: ambiguous option: $1
Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; };;
--help | --hel | -h )
- echo "$ac_cs_usage"; exit ;;
+ $as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil | --si | --s)
ac_cs_silent=: ;;
# This is an error.
- -*) { echo "$as_me: error: unrecognized option: $1
+ -*) { $as_echo "$as_me: error: unrecognized option: $1
Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; } ;;
@@ -8872,27 +9299,29 @@
fi
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
- CONFIG_SHELL=$SHELL
+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ shift
+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+ CONFIG_SHELL='$SHELL'
export CONFIG_SHELL
- exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ exec "\$@"
fi
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
exec 5>>config.log
{
echo
sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
## Running $as_me. ##
_ASBOX
- echo "$ac_log"
+ $as_echo "$ac_log"
} >&5
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
#
# INIT-COMMANDS
#
@@ -8900,7 +9329,7 @@
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# Handling of arguments.
for ac_config_target in $ac_config_targets
@@ -8910,8 +9339,8 @@
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
esac
done
@@ -8952,160 +9381,144 @@
(umask 077 && mkdir "$tmp")
} ||
{
- echo "$me: cannot create a temporary directory in ." >&2
+ $as_echo "$as_me: cannot create a temporary directory in ." >&2
{ (exit 1); exit 1; }
}
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
if test -n "$CONFIG_FILES"; then
-_ACEOF
+ac_cr='
'
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+ ac_cs_awk_cr='\\r'
+else
+ ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
+_ACEOF
+{
+ echo "cat >conf$$subs.awk <<_ACEOF" &&
+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+ echo "_ACEOF"
+} >conf$$subs.sh ||
+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-am__isrc!$am__isrc$ac_delim
-CYGPATH_W!$CYGPATH_W$ac_delim
-PACKAGE!$PACKAGE$ac_delim
-VERSION!$VERSION$ac_delim
-ACLOCAL!$ACLOCAL$ac_delim
-AUTOCONF!$AUTOCONF$ac_delim
-AUTOMAKE!$AUTOMAKE$ac_delim
-AUTOHEADER!$AUTOHEADER$ac_delim
-MAKEINFO!$MAKEINFO$ac_delim
-install_sh!$install_sh$ac_delim
-STRIP!$STRIP$ac_delim
-INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-mkdir_p!$mkdir_p$ac_delim
-AWK!$AWK$ac_delim
-SET_MAKE!$SET_MAKE$ac_delim
-am__leading_dot!$am__leading_dot$ac_delim
-AMTAR!$AMTAR$ac_delim
-am__tar!$am__tar$ac_delim
-am__untar!$am__untar$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-host!$host$ac_delim
-host_cpu!$host_cpu$ac_delim
-host_vendor!$host_vendor$ac_delim
-host_os!$host_os$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-DEPDIR!$DEPDIR$ac_delim
-am__include!$am__include$ac_delim
-am__quote!$am__quote$ac_delim
-AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-CCDEPMODE!$CCDEPMODE$ac_delim
-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-RANLIB!$RANLIB$ac_delim
-CPP!$CPP$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-vpopuser!$vpopuser$ac_delim
-vpopgroup!$vpopgroup$ac_delim
-vpopmaildir!$vpopmaildir$ac_delim
-domains_dir!$domains_dir$ac_delim
-authlib!$authlib$ac_delim
-auth_inc!$auth_inc$ac_delim
-USE_MYSQL!$USE_MYSQL$ac_delim
-auth_libs!$auth_libs$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
+ . ./conf$$subs.sh ||
+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+ if test $ac_delim_n = $ac_delim_num; then
break
elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
{ (exit 1); exit 1; }; }
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
done
+rm -f conf$$subs.sh
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
- ac_eof=`expr $ac_eof + 1`
-fi
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+ N
+ s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+ for (key in S) S_is_set[key] = 1
+ FS = ""
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+}
+{
+ line = $ 0
+ nfields = split(line, field, "@")
+ substed = 0
+ len = length(field[1])
+ for (i = 2; i < nfields; i++) {
+ key = field[i]
+ keylen = length(key)
+ if (S_is_set[key]) {
+ value = S[key]
+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+ len += length(value) + length(field[++i])
+ substed = 1
+ } else
+ len += 1 + keylen
+ }
+
+ print line
+}
+
+_ACAWK
_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+ cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+ || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+ { (exit 1); exit 1; }; }
_ACEOF
-
# VPATH may cause trouble with some makes, so we remove $(srcdir),
# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
@@ -9121,19 +9534,133 @@
}'
fi
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
fi # test -n "$CONFIG_FILES"
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+ ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+ if test -z "$ac_t"; then
+ break
+ elif $ac_last_try; then
+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any. Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[ ]*#[ ]*define[ ][ ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ for (key in D) D_is_set[key] = 1
+ FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+ line = \$ 0
+ split(line, arg, " ")
+ if (arg[1] == "#") {
+ defundef = arg[2]
+ mac1 = arg[3]
+ } else {
+ defundef = substr(arg[1], 2)
+ mac1 = arg[2]
+ }
+ split(mac1, mac2, "(") #)
+ macro = mac2[1]
+ prefix = substr(line, 1, index(line, defundef) - 1)
+ if (D_is_set[macro]) {
+ # Preserve the white space surrounding the "#".
+ print prefix "define", macro P[macro] D[macro]
+ next
+ } else {
+ # Replace #undef with comments. This is necessary, for example,
+ # in the case of _POSIX_SOURCE, which is predefined and required
+ # on some systems where configure will not decide to define it.
+ if (defundef == "undef") {
+ print "/*", prefix defundef, macro, "*/"
+ next
+ }
+ }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
+$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
+ { (exit 1); exit 1; }; }
+fi # test -n "$CONFIG_HEADERS"
-for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS
+
+eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"
+shift
+for ac_tag
do
case $ac_tag in
:[FHLC]) ac_mode=$ac_tag; continue;;
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+ :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
{ (exit 1); exit 1; }; };;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -9162,26 +9689,38 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
{ (exit 1); exit 1; }; };;
esac
- ac_file_inputs="$ac_file_inputs $ac_f"
+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+ ac_file_inputs="$ac_file_inputs '$ac_f'"
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
- configure_input="Generated from "`IFS=:
- echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+ configure_input='Generated from '`
+ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+ `' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
- { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
+ { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
fi
+ # Neutralize special characters interpreted by sed in replacement strings.
+ case $configure_input in #(
+ *\&* | *\|* | *\\* )
+ ac_sed_conf_input=`$as_echo "$configure_input" |
+ sed 's/[\\\\&|]/\\\\&/g'`;; #(
+ *) ac_sed_conf_input=$configure_input;;
+ esac
case $ac_tag in
- *:-:* | *:-) cat >"$tmp/stdin";;
+ *:-:* | *:-) cat >"$tmp/stdin" \
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
;;
esac
@@ -9191,7 +9730,7 @@
X"$ac_file" : 'X\(//\)[^/]' \| \
X"$ac_file" : 'X\(//\)$' \| \
X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -9217,7 +9756,7 @@
as_dirs=
while :; do
case $as_dir in #(
- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
*) as_qdir=$as_dir;;
esac
as_dirs="'$as_qdir' $as_dirs"
@@ -9226,7 +9765,7 @@
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -9247,17 +9786,17 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
{ (exit 1); exit 1; }; }; }
ac_builddir=.
case "$ac_dir" in
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
# A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -9302,12 +9841,13 @@
esac
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
p
q
}
@@ -9316,13 +9856,14 @@
/@infodir@/p
/@localedir@/p
/@mandir@/p
-' $ac_file_inputs` in
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
*datarootdir*) ac_datarootdir_seen=yes;;
*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
- { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_datarootdir_hack='
s&@datadir@&$datadir&g
s&@docdir@&$docdir&g
@@ -9336,15 +9877,16 @@
# Neutralize VPATH when `$srcdir' = `.'.
# Shell code in configure.ac might set extrasub.
# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
- sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
$extrasub
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
s&@srcdir@&$ac_srcdir&;t t
s&@abs_srcdir@&$ac_abs_srcdir&;t t
s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -9355,121 +9897,60 @@
s&@INSTALL@&$ac_INSTALL&;t t
s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed 's/|#_!!_#|//g' >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+ { (exit 1); exit 1; }; }
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
- { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&2;}
rm -f "$tmp/stdin"
case $ac_file in
- -) cat "$tmp/out"; rm -f "$tmp/out";;
- *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
- esac
+ -) cat "$tmp/out" && rm -f "$tmp/out";;
+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+ esac \
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+ { (exit 1); exit 1; }; }
;;
:H)
#
# CONFIG_HEADER
#
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status. If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless. But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
-ac_dB='\\)[ (].*,\\1define\\2'
-ac_dC=' '
-ac_dD=' ,'
-
-uniq confdefs.h |
- sed -n '
- t rset
- :rset
- s/^[ ]*#[ ]*define[ ][ ]*//
- t ok
- d
- :ok
- s/[\\&,]/\\&/g
- s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
- s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
- ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments. This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[ #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
-do
- # Write a here document:
- cat >>$CONFIG_STATUS <<_ACEOF
- # First, check the format of the line:
- cat >"\$tmp/defines.sed" <<\\CEOF
-/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
-/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
-b
-:def
-_ACEOF
- sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
- echo 'CEOF
- sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
- ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
- sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
- grep . conftest.tail >/dev/null || break
- rm -f conftest.defines
- mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
if test x"$ac_file" != x-; then
- echo "/* $configure_input */" >"$tmp/config.h"
- cat "$ac_result" >>"$tmp/config.h"
- if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
- { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
+ {
+ $as_echo "/* $configure_input */" \
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+ } >"$tmp/config.h" \
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+ { (exit 1); exit 1; }; }
+ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+ { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
- rm -f $ac_file
- mv "$tmp/config.h" $ac_file
+ rm -f "$ac_file"
+ mv "$tmp/config.h" "$ac_file" \
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+ { (exit 1); exit 1; }; }
fi
else
- echo "/* $configure_input */"
- cat "$ac_result"
+ $as_echo "/* $configure_input */" \
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+ || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+$as_echo "$as_me: error: could not create -" >&2;}
+ { (exit 1); exit 1; }; }
fi
- rm -f "$tmp/out12"
-# Compute $ac_file's index in $config_headers.
-_am_arg=$ac_file
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
@@ -9484,7 +9965,7 @@
X"$_am_arg" : 'X\(//\)[^/]' \| \
X"$_am_arg" : 'X\(//\)$' \| \
X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$_am_arg" |
+$as_echo X"$_am_arg" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -9504,30 +9985,40 @@
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
- :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
+ :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
case $ac_file$ac_mode in
- "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`$as_dirname -- "$mf" ||
+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # are listed without --file. Let's play safe and only enable the eval
+ # if we detect the quoting.
+ case $CONFIG_FILES in
+ *\'*) eval set x "$CONFIG_FILES" ;;
+ *) set x $CONFIG_FILES ;;
+ esac
+ shift
+ for mf
+ do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+ # We used to match only the files named `Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
X"$mf" : 'X\(//\)$' \| \
X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$mf" |
+$as_echo X"$mf" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -9545,33 +10036,33 @@
q
}
s/.*/./; q'`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`$as_dirname -- "$file" ||
+ else
+ continue
+ fi
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running `make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # When using ansi2knr, U may be empty or an underscore; expand it
+ U=`sed -n 's/^U = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`$as_dirname -- "$file" ||
$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$file" : 'X\(//\)[^/]' \| \
X"$file" : 'X\(//\)$' \| \
X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$file" |
+$as_echo X"$file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -9589,7 +10080,7 @@
q
}
s/.*/./; q'`
- { as_dir=$dirpart/$fdir
+ { as_dir=$dirpart/$fdir
case $as_dir in #(
-*) as_dir=./$as_dir;;
esac
@@ -9597,7 +10088,7 @@
as_dirs=
while :; do
case $as_dir in #(
- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
*) as_qdir=$as_dir;;
esac
as_dirs="'$as_qdir' $as_dirs"
@@ -9606,7 +10097,7 @@
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -9627,13 +10118,14 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
{ (exit 1); exit 1; }; }; }
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
done
-done
+}
;;
esac
@@ -9645,6 +10137,11 @@
chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
+test $ac_write_fail = 0 ||
+ { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
+
# configure is writing to config.log, and then calls config.status.
# config.status does its own redirection, appending to config.log.
@@ -9666,6 +10163,10 @@
# would make configure fail if this is the last instruction.
$ac_cs_success || { (exit 1); exit 1; }
fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+ { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
#----------------------------------------------------------------------
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/dotqmail2valias.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: dotqmail2valias.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: dotqmail2valias.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2004-2009 Inter7 Internet Technologies, Inc.
*
* Copyright (C) 2003-2004 Tom Collins
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/file_lock.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: file_lock.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: file_lock.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/file_lock.h
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: file_lock.h 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: file_lock.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2000-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/hmac_md5.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: hmac_md5.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: hmac_md5.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*/
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/ippp.c
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: ippp.c 705 2009-03-10 17:43:50Z volz0r $
+ $Id: ippp.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/ippp.h
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: ippp.h 705 2009-03-10 17:43:50Z volz0r $
+ $Id: ippp.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/ldap/qmailUser.schema
^
|
| @@ -37,6 +37,5 @@
objectclass ( 1.3.6.1.4.1.8868.3.1 NAME 'qmailUser'
DESC 'qmail local mail recipient'
SUP ( top $ person $ organizationalPerson )
- MUST ( sn $ cn )
- MAY ( qmailGID $ qmailUID $ qmaildomain $ mailQuota $ mailMessageStore $ clearPassword $ uid $ name ))
+ MAY ( sn $ cn $ qmailGID $ qmailUID $ qmaildomain $ mailQuota $ mailMessageStore $ clearPassword $ uid $ name ))
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/ldap/valias.schema
^
|
| @@ -1,5 +1,5 @@
#
-# $Id: valias.schema 710 2009-03-10 19:30:25Z volz0r $
+# $Id: valias.schema 924 2009-08-24 15:01:12Z volz0r $
#
# vpopmail LDAP valias schema
# <matt.at,inter7.com>
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/maildirquota.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: maildirquota.c 717 2009-03-10 20:42:39Z volz0r $
+ * $Id: maildirquota.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
@@ -494,7 +494,6 @@
ret = client_query_quick(email, &uusage, &dusage);
if (ret) {
if (uusage != -1) {
-
/*
Convert quota string to integers
*/
@@ -505,8 +504,7 @@
Return percentage
*/
- fd = (int)((uusage/usquota) * 100);
-
+ fd = (int)((long double)((long double)uusage/(long double)usquota) * (long double)100.0);
if (fd > 100)
fd = 100;
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/maildirquota.h
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: maildirquota.h 706 2009-03-10 17:56:19Z volz0r $
+ $Id: maildirquota.h 924 2009-08-24 15:01:12Z volz0r $
Copyright (C) 2009 Inter7 Internet Technologies, Inc.
This is a composite of deliverquota's maildirquota.h, maildirmisc.h, and
@@ -48,7 +48,7 @@
extern "C" {
#endif
-static const char maildirquota_h_rcsid[]="$Id: maildirquota.h 706 2009-03-10 17:56:19Z volz0r $";
+static const char maildirquota_h_rcsid[]="$Id: maildirquota.h 924 2009-08-24 15:01:12Z volz0r $";
int maildir_checkquota(const char *, /* Pointer to directory */
int *, /* Initialized to -1, or opened descriptor for maildirsize */
@@ -87,7 +87,7 @@
extern "C" {
#endif
-static const char maildirmisc_h_rcsid[]="$Id: maildirquota.h 706 2009-03-10 17:56:19Z volz0r $";
+static const char maildirmisc_h_rcsid[]="$Id: maildirquota.h 924 2009-08-24 15:01:12Z volz0r $";
/*
**
@@ -238,7 +238,7 @@
extern "C" {
#endif
-static const char numlib_h_rcsid[]="$Id: maildirquota.h 706 2009-03-10 17:56:19Z volz0r $";
+static const char numlib_h_rcsid[]="$Id: maildirquota.h 924 2009-08-24 15:01:12Z volz0r $";
#define NUMBUFSIZE 60
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/md5.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: md5.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: md5.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/md5.h
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: md5.h 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: md5.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2000-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/seek.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: seek.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: seek.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
* Copyright (c) 1987 University of Maryland Computer Science Department.
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/seek.h
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: seek.h 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: seek.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
* Copyright (c) 1987 University of Maryland Computer Science Department.
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/storage.h
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: storage.h 705 2009-03-10 17:43:50Z volz0r $
+ $Id: storage.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vaddaliasdomain.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vaddaliasdomain.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vaddaliasdomain.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vadddomain.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vadddomain.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vadddomain.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vadduser.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vadduser.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vadduser.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/valias.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: valias.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: valias.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vauth.h
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vauth.h 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vauth.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vcdb.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vcdb.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vcdb.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,7 @@
*/
/******************************************************************************
**
-** $Id: vcdb.c 706 2009-03-10 17:56:19Z volz0r $
+** $Id: vcdb.c 924 2009-08-24 15:01:12Z volz0r $
** Change a domain's password file to a CDB database
**
** Chris Johnson, July 1998
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vcdb.h
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vcdb.h 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vcdb.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vchangepw.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vchangepw.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vchangepw.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* Modified version of vpasswd created by Rolf Eike Beer, November 2003
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vchkpw.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vchkpw.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vchkpw.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vconvert.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vconvert.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vconvert.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vdeldomain.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vdeldomain.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vdeldomain.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vdelivermail.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vdelivermail.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vdelivermail.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
@@ -821,6 +821,8 @@
chdir(dir);
#ifdef QMAIL_EXT
+ fs = NULL;
+
/* format the file name */
if (strlen(TheExt)) {
strcpy(tmpbuf,".qmail-");
@@ -837,9 +839,10 @@
}
}
}
- } else {
- fs = fopen(".qmail","r");
}
+
+ if (fs == NULL)
+ fs = fopen(".qmail","r");
#else
fs = fopen(".qmail","r");
#endif
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vdelivermail.h
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vdelivermail.h 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vdelivermail.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vdeloldusers.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vdeloldusers.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vdeloldusers.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vdeluser.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vdeluser.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vdeluser.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vdominfo.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vdominfo.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vdominfo.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2001-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vipmap.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vipmap.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vipmap.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vkill.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vkill.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vkill.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vldap.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vldap.c 711 2009-03-10 19:30:41Z volz0r $
+ * $Id: vldap.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vldap.h
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id$
+ * $Id: vldap.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2000-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vlimits.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vlimits.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vlimits.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* handle domain limits in both file format
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vlimits.h
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vlimits.h 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vlimits.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
* handle domain limits in both file and mysql tables
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vlist.c
^
|
| @@ -1,4 +1,4 @@
-/* $Id: vlist.c 706 2009-03-10 17:56:19Z volz0r $
+/* $Id: vlist.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vlistlib.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vlistlib.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vlistlib.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vlog.h
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vlog.h 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vlog.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vmkpasswd.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vmkpasswd.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vmkpasswd.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vmoddomlimits.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vmoddomlimits.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vmoddomlimits.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vmoduser.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vmoduser.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vmoduser.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vmysql.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vmysql.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vmysql.c 933 2009-09-02 17:51:25Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
@@ -31,6 +31,7 @@
#include <string.h>
#include <time.h>
#include <mysql.h>
+#include <mysqld_error.h>
#include "config.h"
#include "vpopmail.h"
#include "vauth.h"
@@ -591,7 +592,9 @@
qnprintf( SqlBufUpdate, SQL_BUF_SIZE,
"delete from lastauth where domain = '%s'", domain );
if (mysql_query(&mysql_update,SqlBufUpdate)) {
- return(-1);
+ err = mysql_errno(&mysql_update);
+ if (err != ER_NO_SUCH_TABLE)
+ fprintf(stderr, "vauth_deldomain: warning: mysql_query(%s) failed: %s\n", SqlBufUpdate, mysql_error(&mysql_update));
}
#endif
@@ -599,7 +602,9 @@
qnprintf( SqlBufUpdate, SQL_BUF_SIZE,
"delete from vlog where domain = '%s'", domain );
if (mysql_query(&mysql_update,SqlBufUpdate)) {
- return(-1);
+ err = mysql_errno(&mysql_update);
+ if (err != ER_NO_SUCH_TABLE)
+ fprintf(stderr, "vauth_deldomain: warning: mysql_query(%s) failed: %s\n", SqlBufUpdate, mysql_error(&mysql_update));
}
#endif
@@ -642,7 +647,11 @@
"delete from lastauth where user = '%s' and domain = '%s'",
user, domain );
if (mysql_query(&mysql_update,SqlBufUpdate)) {
- err = -1;
+ err = mysql_errno(&mysql_update);
+ if (err != ER_NO_SUCH_TABLE)
+ err = -1;
+ else
+ err = 0;
}
#endif
@@ -651,7 +660,11 @@
"delete from vlog where domain = '%s' and user = '%s'",
domain, user );
if (mysql_query(&mysql_update,SqlBufUpdate)) {
- err = -1;
+ err = mysql_errno(&mysql_update);
+ if (err != ER_NO_SUCH_TABLE)
+ err = -1;
+ else
+ err = 0;
}
#endif
return(err);
@@ -792,11 +805,11 @@
char *vauth_munch_domain( char *domain )
{
int i;
- static char tmpbuf[50];
+ static char tmpbuf[512];
if ( domain == NULL || domain[0] == 0 ) return(domain);
- for(i=0;domain[i]!=0;++i){
+ for(i=0; ((domain[i]!=0) && (i < (sizeof(tmpbuf) - 1)));++i){
tmpbuf[i] = domain[i];
if ( domain[i] == '.' || domain[i] == '-' ) {
tmpbuf[i] = MYSQL_DOT_CHAR;
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vmysql.h
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vmysql.h 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vmysql.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/voracle.h
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: voracle.h 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: voracle.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vpalias.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vpalias.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vpalias.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2000-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vpasswd.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vpasswd.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vpasswd.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vpgsql.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vpgsql.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vpgsql.c 934 2009-09-02 17:53:21Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
@@ -226,19 +226,21 @@
domstr = PGSQL_LARGE_USERS_TABLE;
}
+ *dirbuf = '\0';
+
if ( strlen(domain) <= 0 ) {
if ( strlen(dir) > 0 ) {
- snprintf(dirbuf, SQL_BUF_SIZE,
+ snprintf(dirbuf, sizeof(dirbuf),
"%s/users/%s/%s", VPOPMAILDIR, dir, user);
} else {
- snprintf(dirbuf, SQL_BUF_SIZE, "%s/users/%s", VPOPMAILDIR, user);
+ snprintf(dirbuf, sizeof(dirbuf), "%s/users/%s", VPOPMAILDIR, user);
}
} else {
vget_assign(domain, dom_dir, 156, &uid, &gid );
if ( strlen(dir) > 0 ) {
- snprintf(dirbuf,SQL_BUF_SIZE, "%s/%s/%s", dom_dir, dir, user);
+ snprintf(dirbuf,sizeof(dirbuf), "%s/%s/%s", dom_dir, dir, user);
} else {
- snprintf(dirbuf,SQL_BUF_SIZE, "%s/%s", dom_dir, user);
+ snprintf(dirbuf,sizeof(dirbuf), "%s/%s", dom_dir, user);
}
}
@@ -248,7 +250,7 @@
Crypted[0] = 0;
}
- qnprintf( SqlBufUpdate, SQL_BUF_SIZE, INSERT,
+ qnprintf( SqlBufUpdate, sizeof(SqlBufUpdate), INSERT,
domstr, user,
#ifdef MANY_DOMAINS
domain,
@@ -587,11 +589,11 @@
char *vauth_munch_domain( char *domain )
{
int i;
- static char tmpbuf[50];
+ static char tmpbuf[512];
if ( domain == NULL || domain[0] == 0 ) return(domain);
- for(i=0;domain[i]!=0;++i){
+ for(i=0;domain[i]!=0 && i < (sizeof(tmpbuf) - 1);++i){
tmpbuf[i] = tolower(domain[i]);
if ( domain[i] == '.' || domain[i] == '-' ) {
tmpbuf[i] = SQL_DOT_CHAR;
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vpgsql.h
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vpgsql.h 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vpgsql.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vpopbull.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vpopbull.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vpopbull.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vpopmail.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vpopmail.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vpopmail.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2000-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vpopmail.h
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vpopmail.h 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vpopmail.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vpopmaild.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vpopmaild.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vpopmaild.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2004-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vqmaillocal.c
^
|
| @@ -4,7 +4,7 @@
*/
/*
- * $Id: vqmaillocal.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vqmaillocal.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2002-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vsetuserquota.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vsetuserquota.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vsetuserquota.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vsybase.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vsybase.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vsybase.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vsybase.h
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vsybase.h 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vsybase.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vusagec.c
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: vusagec.c 714 2009-03-10 20:41:15Z volz0r $
+ $Id: vusagec.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
@@ -47,7 +47,7 @@
if (uusage == -1)
printf("%s: No data available\n", argv[i]);
else
- printf("%s: %llu byte(s) in %llu message(s)\n", *(argv[i]) == '@' ? (argv[i] + 1) : argv[i], uusage, musage);
+ printf("%s: %llu byte(s) in %llu file(s)\n", *(argv[i]) == '@' ? (argv[i] + 1) : argv[i], uusage, musage);
}
}
#else
@@ -67,7 +67,7 @@
if (uusage == -1)
printf("%s: No data available\n", argv[i]);
else
- printf("%s: %llu byte(s) in %llu message(s)\n", *(argv[i]) == '@' ? (argv[i] + 1) : argv[i], uusage, musage);
+ printf("%s: %llu byte(s) in %llu file(s)\n", *(argv[i]) == '@' ? (argv[i] + 1) : argv[i], uusage, musage);
}
client_close(handle);
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vusaged/configure.ac
^
|
| @@ -1,5 +1,5 @@
#
-# $Id: configure.ac 705 2009-03-10 17:43:50Z volz0r $
+# $Id: configure.ac 924 2009-08-24 15:01:12Z volz0r $
#
# * Copyright (C) 2009 Inter7 Internet Technologies, Inc.
# *
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vusaged/directory.c
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: directory.c 705 2009-03-10 17:43:50Z volz0r $
+ $Id: directory.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
@@ -329,6 +329,8 @@
count = 0;
dir = opendir(d->directory);
+
+#if 0
if (dir == NULL) {
fprintf(stderr, "directory: %s: opendir failed\n", d->directory);
@@ -340,44 +342,48 @@
return 1;
}
+#endif
- for (e = readdir(dir); e; e = readdir(dir)) {
- /*
- Hidden files, current directory, and parent directory are not calculated
- */
-
- if (*(e->d_name) == '.') {
- if (!directory_count_entry_size)
- continue;
-
- else if (*((e->d_name) + 1) != '\0')
+ if (dir) {
+ for (e = readdir(dir); e; e = readdir(dir)) {
+ /*
+ Hidden files, current directory, and parent directory are not calculated
+ */
+
+ if (*(e->d_name) == '.') {
+ if (!directory_count_entry_size)
+ continue;
+
+ else if (*((e->d_name) + 1) != '\0')
+ continue;
+ }
+
+ /*
+ Form temporary path and determine it's size
+ */
+
+ memset(b, 0, sizeof(b));
+ ret = snprintf(b, sizeof(b), "%s/%s", d->directory, e->d_name);
+
+ size = directory_filesize(b, ret);
+ if (size == -1) {
+ fprintf(stderr, "directory: %s: directory_filesize failed\n", b);
continue;
- }
-
- /*
- Form temporary path and determine it's size
- */
+ }
- memset(b, 0, sizeof(b));
- ret = snprintf(b, sizeof(b), "%s/%s", d->directory, e->d_name);
-
- size = directory_filesize(b, ret);
- if (size == -1) {
- fprintf(stderr, "directory: %s: directory_filesize failed\n", b);
- continue;
+ storage += size;
+ count++;
}
- storage += size;
- count++;
+ closedir(dir);
}
- closedir(dir);
-
/*
Update directory
*/
memcpy(&d->st, &st, sizeof(struct stat));
+
d->usage = storage;
d->count = count;
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vusaged/directory.h
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: directory.h 705 2009-03-10 17:43:50Z volz0r $
+ $Id: directory.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vusaged/domain.c
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: domain.c 705 2009-03-10 17:43:50Z volz0r $
+ $Id: domain.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
@@ -24,6 +24,7 @@
#ifdef ASSERT_DEBUG
#include <assert.h>
#endif
+#include <pthread.h>
#include "storage.h"
#include "cache.h"
#include "domain.h"
@@ -73,6 +74,7 @@
return NULL;
}
+ pthread_mutex_init(&d->m_usage, NULL);
return d;
}
@@ -86,6 +88,8 @@
assert(d != NULL);
#endif
+ pthread_mutex_destroy(&d->m_usage);
+
if (d->domain)
free(d->domain);
@@ -117,11 +121,17 @@
storage_t domain_usage(domain_t *d)
{
+ storage_t usage;
+
#ifdef ASSERT_DEBUG
assert(d != NULL);
#endif
- return d->usage;
+ pthread_mutex_lock(&d->m_usage);
+ usage = d->usage;
+ pthread_mutex_unlock(&d->m_usage);
+
+ return usage;
}
/*
@@ -144,17 +154,50 @@
}
/*
+ Return usage and count
+*/
+
+int domain_get_use(const char *domain, storage_t *usage, storage_t *count)
+{
+ domain_t *d = NULL;
+
+#ifdef ASSERT_DEBUG
+ assert(domain != NULL);
+ assert(usage != NULL);
+ assert(count != NULL);
+#endif
+
+ d = domain_get(domain);
+ if (d == NULL)
+ return 0;
+
+ pthread_mutex_lock(&d->m_usage);
+
+ *usage = d->usage;
+ *count = d->count;
+
+ pthread_mutex_unlock(&d->m_usage);
+ return 1;
+}
+
+/*
Express a change in estimated storage under a domain
*/
-int domain_update(domain_t *d, storage_t before, storage_t after)
+int domain_update(domain_t *d, storage_t before, storage_t after, storage_t cbefore, storage_t cafter)
{
#ifdef ASSERT_DEBUG
assert(d != NULL);
#endif
+ pthread_mutex_lock(&d->m_usage);
+
d->usage -= before;
d->usage += after;
+ d->count -= cbefore;
+ d->count += cafter;
+
+ pthread_mutex_unlock(&d->m_usage);
return 1;
}
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vusaged/domain.h
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: domain.h 705 2009-03-10 17:43:50Z volz0r $
+ $Id: domain.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
@@ -21,6 +21,7 @@
#ifndef __DOMAIN_H_
#define __DOMAIN_H_
+#include <pthread.h>
#include "storage.h"
/*
@@ -35,7 +36,10 @@
typedef struct __domain_ {
char *domain;
- storage_t usage;
+
+ storage_t usage,
+ count;
+ pthread_mutex_t m_usage;
} domain_t;
domain_t *domain_load(const char *);
@@ -43,6 +47,7 @@
domain_t *domain_get(const char *);
storage_t domain_usage(domain_t *);
storage_t domain_get_usage(const char *);
-int domain_update(domain_t *, storage_t, storage_t);
+int domain_get_use(const char *, storage_t *, storage_t *);
+int domain_update(domain_t *, storage_t, storage_t, storage_t, storage_t);
#endif
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vusaged/etc/vusaged.conf
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: vusaged.conf 705 2009-03-10 17:43:50Z volz0r $
+ $Id: vusaged.conf 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vusaged/grow.c
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: grow.c 705 2009-03-10 17:43:50Z volz0r $
+ $Id: grow.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vusaged/grow.h
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: grow.h 705 2009-03-10 17:43:50Z volz0r $
+ $Id: grow.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vusaged/list.c
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: list.c 705 2009-03-10 17:43:50Z volz0r $
+ $Id: list.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vusaged/list.h
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: list.h 705 2009-03-10 17:43:50Z volz0r $
+ $Id: list.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vusaged/packet.c
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: packet.c 705 2009-03-10 17:43:50Z volz0r $
+ $Id: packet.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vusaged/packet.h
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: packet.h 705 2009-03-10 17:43:50Z volz0r $
+ $Id: packet.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vusaged/path.h
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: path.h 705 2009-03-10 17:43:50Z volz0r $
+ $Id: path.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vusaged/query.c
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: query.c 715 2009-03-10 20:41:48Z volz0r $
+ $Id: query.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
@@ -56,14 +56,8 @@
Domain counts
*/
- if (*data == '@') {
- /*
- Currently we don't track domain message counts
- */
-
- cusage = 0;
- susage = domain_get_usage(data + 1);
- }
+ if (*data == '@')
+ domain_get_use(data + 1, &susage, &cusage);
/*
User counts
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vusaged/query.h
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: query.h 705 2009-03-10 17:43:50Z volz0r $
+ $Id: query.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vusaged/queue.c
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: queue.c 705 2009-03-10 17:43:50Z volz0r $
+ $Id: queue.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vusaged/queue.h
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: queue.h 705 2009-03-10 17:43:50Z volz0r $
+ $Id: queue.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vusaged/quota.h
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: quota.h 705 2009-03-10 17:43:50Z volz0r $
+ $Id: quota.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vusaged/shutdown.c
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: shutdown.c 705 2009-03-10 17:43:50Z volz0r $
+ $Id: shutdown.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vusaged/shutdown.h
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: shutdown.h 705 2009-03-10 17:43:50Z volz0r $
+ $Id: shutdown.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vusaged/signal.c
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: signal.c 705 2009-03-10 17:43:50Z volz0r $
+ $Id: signal.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vusaged/signal.h
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: signal.h 705 2009-03-10 17:43:50Z volz0r $
+ $Id: signal.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vusaged/socket.c
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: socket.c 705 2009-03-10 17:43:50Z volz0r $
+ $Id: socket.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vusaged/socket.h
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: socket.h 705 2009-03-10 17:43:50Z volz0r $
+ $Id: socket.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vusaged/storage.h
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: storage.h 705 2009-03-10 17:43:50Z volz0r $
+ $Id: storage.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vusaged/user.c
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: user.c 716 2009-03-10 20:42:10Z volz0r $
+ $Id: user.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
@@ -374,7 +374,7 @@
int user_poll(user_t *u)
{
int ret = 0;
- storage_t before = 0, after = 0;
+ storage_t before = 0, cbefore = 0, after = 0, cafter = 0;
#ifdef ASSERT_DEBUG
assert(u != NULL);
@@ -397,7 +397,7 @@
*/
else {
- before = userstore_usage(u->userstore);
+ userstore_use(u->userstore, &before, &cbefore);
ret = userstore_poll(u->userstore);
}
@@ -406,9 +406,9 @@
*/
if (u->userstore) {
- after = userstore_usage(u->userstore);
+ userstore_use(u->userstore, &after, &cafter);
- ret = domain_update(u->domain, before, after);
+ ret = domain_update(u->domain, before, after, cbefore, cafter);
if (!ret)
fprintf(stderr, "user_poll: domain_update failed\n");
}
@@ -434,7 +434,7 @@
int user_verify(user_t *u)
{
int ret = 0;
- storage_t usage = 0;
+ storage_t usage = 0, count = 0;
char b[USER_MAX_USERNAME + DOMAIN_MAX_DOMAIN] = { 0 };
#ifdef ASSERT_DEBUG
@@ -457,8 +457,8 @@
*/
if (u->userstore) {
- usage = userstore_usage(u->userstore);
- domain_update(u->domain, usage, 0);
+ userstore_use(u->userstore, &usage, &count);
+ domain_update(u->domain, usage, 0, count, 0);
}
/*
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vusaged/user.h
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: user.h 716 2009-03-10 20:42:10Z volz0r $
+ $Id: user.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vusaged/userstore.c
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: userstore.c 720 2009-03-10 20:44:19Z volz0r $
+ $Id: userstore.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
@@ -547,5 +547,6 @@
pthread_mutex_lock(&u->m_usage);
u->usage = 0;
+ u->count = 0;
pthread_mutex_unlock(&u->m_usage);
}
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vusaged/userstore.h
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: userstore.h 705 2009-03-10 17:43:50Z volz0r $
+ $Id: userstore.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vusaged/vusaged.c
^
|
| @@ -1,5 +1,5 @@
/*
- $Id: vusaged.c 705 2009-03-10 17:43:50Z volz0r $
+ $Id: vusaged.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2009 Inter7 Internet Technologies, Inc.
*
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vuserinfo.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vuserinfo.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vuserinfo.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 2000-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vutil.c
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vutil.c 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vutil.c 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
[-]
[+]
|
Changed |
vpopmail-5.4.28.tar.bz2/vutil.h
^
|
| @@ -1,5 +1,5 @@
/*
- * $Id: vutil.h 706 2009-03-10 17:56:19Z volz0r $
+ * $Id: vutil.h 924 2009-08-24 15:01:12Z volz0r $
* Copyright (C) 1999-2009 Inter7 Internet Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify
|
|
|
Added |
vpopmail-5.4.29.tar.bz2
^
|
|
|
Added |
vpopmail-5.4.30.tar.bz2
^
|
