--- parser3/Attic/configure.in 2012/07/17 08:13:48 1.176 +++ parser3/Attic/configure.in 2013/10/15 22:32:17 1.198 @@ -1,6 +1,6 @@ dnl Autoconf initialisation AC_PREREQ(2.59) -AC_INIT(parser, 3.4.2) +AC_INIT(parser, 3.4.3rc) AC_CONFIG_SRCDIR(README) @@ -51,11 +51,8 @@ AC_LANG_C dnl Dll extension AC_MSG_CHECKING(for dynamic-link library extension) case "$host_os" in -cygwin) - dll_extension=dll - ;; -*) - dll_extension=so + *cygwin* ) dll_extension=dll;; + * ) dll_extension=so esac AC_MSG_RESULT($dll_extension) AC_SUBST(dll_extension) @@ -254,6 +251,7 @@ dnl Mail receive argument AC_ARG_WITH(mailreceive,[ --with-mailreceive=D is the directory where Gnome MIME library is installed],[ MIME=$withval + GLIB="glib-2.0" GMIME="gmime-2.4" if test -z "$MIME" -o "$MIME" = "yes"; then @@ -262,10 +260,16 @@ AC_ARG_WITH(mailreceive,[ --with-mailre MIME_LIBS=`pkg-config --libs $GMIME 2>/dev/null` AC_MSG_WARN([--with-mailreceive value was not specified, hoping linker would find Gnome MIME library]) else - MIME_INCLUDES="-I$MIME/include/$GMIME -I$MIME/include/glib-2.0" + MIME_INCLUDES="-I$MIME/include/$GMIME" MIME_LIBS="-l$GMIME" if test -f $MIME/include/$GMIME/gmime/gmime.h -a -f $MIME/lib/lib$GMIME.la; then MIME_LIBS="$MIME/lib/lib$GMIME.la" + if test -f $MIME/lib/lib$GLIB.la; then + MIME_INCLUDES="$MIME_INCLUDES -I$MIME/include/$GLIB -I$MIME/lib/$GLIB/include" + else + GLIB_INCLUDES=`pkg-config --cflags $GLIB 2>/dev/null` + MIME_INCLUDES="$MIME_INCLUDES $GLIB_INCLUDES" + fi MIME_OK="yes" fi fi @@ -336,7 +340,7 @@ LT_INIT(dlopen win32-dll no-pic) LTDL_INIT -dnl Checks for typedefs, structures, and compiler characteristics. +dnl Checks for typedefs, structures, and compiler characteristics AC_C_BIGENDIAN( AC_DEFINE(PA_BIG_ENDIAN,,compile for sparc processor) , @@ -346,49 +350,25 @@ AC_C_BIGENDIAN( ) AC_TYPE_SIZE_T +AC_TYPE_SSIZE_T +AC_TYPE_UINT8_T +AC_TYPE_UINT16_T +AC_TYPE_UINT32_T +AC_TYPE_UINT64_T +AC_STRUCT_DIRENT_D_TYPE -dnl Checks for C header files. +dnl Checks for C header files +AC_HEADER_STDC AC_HEADER_TIME -AC_CHECK_HEADERS( -assert.h \ -signal.h \ -unistd.h \ -process.h \ -stddef.h \ -stdarg.h \ -fcntl.h \ -sys/stat.h \ -io.h \ -stdio.h \ -errno.h \ -ctype.h \ -math.h \ -crypt.h \ -time.h sys/time.h \ -string.h \ -direct.h \ -setjmp.h \ -memory.h \ -limits.h \ -sys/file.h \ -sys/locking.h \ -sys/types.h \ -sys/select.h \ -sys/resource.h \ -winsock.h \ -sys/socket.h \ -netinet/in.h \ -arpa/inet.h \ -netdb.h -) +AC_CHECK_HEADERS(stdio.h sys/types.h sys/stat.h stdlib.h stddef.h memory.h string.h strings.h inttypes.h stdint.h unistd.h) +AC_CHECK_HEADERS(assert.h limits.h ctype.h math.h process.h stdarg.h setjmp.h signal.h) +AC_CHECK_HEADERS(errno.h dirent.h fcntl.h io.h sys/file.h sys/locking.h sys/select.h sys/resource.h sys/wait.h) +AC_CHECK_HEADERS(sys/socket.h netinet/in.h arpa/inet.h netdb.h) dnl Checks for libraries - - -dnl Some systems (Solaris 2.x) require libnsl (Network Services Library) case "$host" in *-freebsd4*) AC_DEFINE(FREEBSD4,,FreeBSD4X target platform) @@ -406,115 +386,54 @@ case "$host" in ;; *-cygwin*) AC_DEFINE(WIN32,,Windows32 target platform) - AC_CHECK_LIB(wsock32, socket) ;; esac AC_CHECK_LIB(m, sin) AC_CHECK_LIB(crypt, crypt) -dnl Checks for functions. -AC_CHECK_FUNCS( -flock \ -_locking \ -fcntl \ -lockf \ -ftruncate \ -fchmod \ -getrusage \ -gettimeofday \ -crypt \ -sigsetjmp \ -siglongjmp \ -unsetenv -) +dnl Checks for functions +AC_CHECK_FUNCS(flock _locking fcntl lockf ftruncate fchmod) +AC_CHECK_FUNCS(getrusage gettimeofday crypt sigsetjmp siglongjmp unsetenv) + dnl on some linux[seen on 2.4] it's a macro PA_CHECK_SIGSETJMP + dnl see comment above AC_LANG_PUSH(C++) -PA_CHECK_MATH_FUNCS_ONE_ARG( -trunc \ -round \ -sign -) +PA_CHECK_MATH_FUNCS_ONE_ARG(trunc round sign) AC_LANG_POP -dnl We require qsort(3) +dnl We require qsort(3) AC_CHECK_FUNCS(qsort, , AC_MSG_ERROR([No qsort library function.])) + dnl For correct mail receiving we need to know local offset from GMT dnl it be timezone+(daylight?60*60*sign(timezone):0) dnl or it can be tm.tm_gmtoff or it can be tm.tm_tzadj AC_MSG_CHECKING(for timezone variable) -AC_TRY_COMPILE([#include ], -[ -time_t test=timezone; -], -AC_DEFINE(HAVE_TIMEZONE) -AC_MSG_RESULT(yes), -AC_MSG_RESULT(no)) +AC_TRY_COMPILE([#include ], [time_t test=timezone;], AC_DEFINE(HAVE_TIMEZONE) AC_MSG_RESULT(yes), AC_MSG_RESULT(no)) AC_MSG_CHECKING(for daylight variable) -AC_TRY_COMPILE([#include ], -[ -int test=daylight; -], -AC_DEFINE(HAVE_DAYLIGHT) -AC_MSG_RESULT(yes), -AC_MSG_RESULT(no)) +AC_TRY_COMPILE([#include ], [int test=daylight;], AC_DEFINE(HAVE_DAYLIGHT) AC_MSG_RESULT(yes), AC_MSG_RESULT(no)) AC_MSG_CHECKING(for tm_gmtoff in struct tm) -AC_TRY_COMPILE([#include ], -[struct tm tm; -tm.tm_gmtoff=0; -], -AC_DEFINE(HAVE_TM_GMTOFF) -AC_MSG_RESULT(yes), -AC_MSG_RESULT(no)) +AC_TRY_COMPILE([#include ], [struct tm tm; tm.tm_gmtoff=0;], AC_DEFINE(HAVE_TM_GMTOFF) AC_MSG_RESULT(yes), AC_MSG_RESULT(no)) AC_MSG_CHECKING(for tm_tzadj in struct tm) -AC_TRY_COMPILE([#include ], -[struct tm tm; -tm.tm_tzadj=0; -], -AC_DEFINE(HAVE_TM_TZADJ) -AC_MSG_RESULT(yes), -AC_MSG_RESULT(no)) +AC_TRY_COMPILE([#include ], [struct tm tm; tm.tm_tzadj=0;], AC_DEFINE(HAVE_TM_TZADJ) AC_MSG_RESULT(yes), AC_MSG_RESULT(no)) dnl Output header and makefiles -AH_TEMPLATE([HAVE_DLD],[Define if you have the GNU dld library]) - -AH_TEMPLATE([HAVE_LIBDL], - [Define if you have the libdl library or equivalent.]) - -AH_TEMPLATE([HAVE_SHL_LOAD], - [Define if you have the shl_load function. ]) - - -AH_TEMPLATE([size_t], - [Define to `unsigned int' if does not define.]) - -AH_TEMPLATE([ssize_t], - [Define to `int' if does not define.]) - -AH_TEMPLATE([HAVE_DAYLIGHT], - [Define if you have daylight external variable in ]) - -AH_TEMPLATE([HAVE_TIMEZONE], - [Define if you have timezone external variable in ]) - -AH_TEMPLATE([HAVE_TM_GMTOFF], - [Define if you have tm_gmtoff member of tm structure in ]) - -AH_TEMPLATE([HAVE_TM_TZADJ], - [Define if you have tm_tzadj member of tm structure in ]) - +AH_TEMPLATE([HAVE_DAYLIGHT],[Define if you have daylight external variable in ]) +AH_TEMPLATE([HAVE_TIMEZONE],[Define if you have timezone external variable in ]) +AH_TEMPLATE([HAVE_TM_GMTOFF],[Define if you have tm_gmtoff member of tm structure in ]) +AH_TEMPLATE([HAVE_TM_TZADJ],[Define if you have tm_tzadj member of tm structure in ]) AM_CONFIG_HEADER(src/include/pa_config_auto.h)