--- parser3/Attic/configure.in 2012/06/15 12:13:56 1.169 +++ parser3/Attic/configure.in 2012/07/18 21:40:02 1.178 @@ -73,11 +73,6 @@ AC_ARG_WITH(assertions, [ --with-assert AC_DEFINE(NDEBUG,,assertions disabled) ) -AC_ARG_WITH(pathlink,[ --with-pathlink=LKEY put dynamic libraries paths to binary - using linker key (-R, -rpath-link)], - LD_PATHLINK=$withval -) - AC_ARG_WITH(sjlj-exceptions,[ --with-sjlj-exceptions enable simple 'throw' from dynamic library], AC_DEFINE(PA_WITH_SJLJ_EXCEPTIONS,,one can throw from dynamic library) ) @@ -134,6 +129,12 @@ AC_ARG_WITH(gc,[ --with-gc[=D] else GC_LIBS="-L$GC -lgc" fi + + if test "$GC" = "yes"; then + GC="" + GC_LIBS="-lgc" + AC_MSG_WARN([--with-gc value was not specified, hoping linker would find it]) + fi ],[ GC_LIBS="-lgc" AC_MSG_WARN([--with-gc was not specified, hoping linker would find it]) @@ -148,7 +149,7 @@ if test -z "$GC_OK"; then , AC_MSG_RESULT(no) if test -z "$GC"; then - AC_MSG_ERROR(please specify path to libgc: --with-gc) + AC_MSG_ERROR(please specify path to libgc: --with-gc=D) else AC_MSG_ERROR($GC does not seem to be valid libgc installation directory) fi @@ -172,8 +173,15 @@ AC_ARG_WITH(pcre,[ --with-pcre=D PCRE_LIBS="-L$PCRE -lpcre" fi + if test "$PCRE" = "yes"; then + PCRE="" + PCRE_LIBS="-lpcre" + PCRE_INCLUDES="" + AC_MSG_WARN([--with-pcre value was not specified, hoping linker would find it]) + fi ],[ PCRE_LIBS="-lpcre" + PCRE_INCLUDES="" AC_MSG_WARN([--with-pcre was not specified, hoping linker would find it]) ]) @@ -186,7 +194,7 @@ if test -z "$PCRE_OK"; then , AC_MSG_RESULT(no) if test -z "$PCRE"; then - AC_MSG_ERROR(please specify path to PCRE: --with-pcre) + AC_MSG_ERROR(please specify path to PCRE: --with-pcre=D) else AC_MSG_ERROR($PCRE does not seem to be valid PCRE installation directory) fi @@ -228,7 +236,7 @@ AC_ARG_WITH(xml,[ --with-xml=D , AC_MSG_RESULT(no) if test -z "$XML"; then - AC_MSG_ERROR(please specify path to Gnome XML libraries: --with-xml) + AC_MSG_ERROR(please specify path to Gnome XML libraries: --with-xml=D) else AC_MSG_ERROR($XML does not seem to be valid Gnome XML installation directory) fi @@ -241,77 +249,53 @@ AC_ARG_WITH(xml,[ --with-xml=D AC_SUBST(XML_INCLUDES) AC_SUBST(XML_LIBS) -dnl Mail receive argument -AC_ARG_WITH(glib-config,[ --with-glib-config=FILE FILE is glib library - configuration file (search for glib*-config)], - GLIB_CONFIG=$withval -) - -AC_ARG_WITH(shared-mailreceive,[ --with-shared-mailreceive=D is the directory where - Gnome MIME library is installed (shared lib)],[ - GNOME_MIME=$withval - MIMEBIN="$GNOME_MIME/bin" - MIMEINC="$GNOME_MIME/include" - MIMELIB="$GNOME_MIME/lib" - if test \! -d $MIMEBIN -o \! -d $MIMEINC -o \! -d $MIMELIB; then - AC_MSG_ERROR($GNOME_MIME does not seem to be valid Gnome installation directory) - fi - - AC_DEFINE(WITH_MAILRECEIVE,,has \$mail:received (uses shared library)) - - LIBMIME_SO_NAME=`cd $MIMELIB ; ls libgmime.?? libgmime.??? 2>/dev/null | grep -v \.la$ | sed 's/lib//' | sed 's/\..*//'` - - if test -z "$GLIB_CONFIG"; then - GLIB_CONFIG=$XMLBIN/glib-config - if test \! -x $GLIB_CONFIG; then - GLIB_CONFIG=$XMLBIN/glib2-config - if test \! -x $GLIB_CONFIG; then - GLIB_CONFIG=glib-config +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 + MIME="" + MIME_INCLUDES=`pkg-config --cflags $GMIME 2>/dev/null` + 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" + 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 - GLIB_CFLAGS=`$GLIB_CONFIG --cflags` - GLIB_LIBS=`$GLIB_CONFIG --libs` - - MIME_INCLUDES="$GLIB_CFLAGS -I$MIMEINC/gmime" - MIME_LIBS="$GLIB_LIBS -L$MIMELIB -l$LIBMIME_SO_NAME" - if test \! -z "$LD_PATHLINK"; then - MIME_LIBS="$MIME_LIBS -Wl,$LD_PATHLINK -Wl,$MIMELIB" - fi -]) -AC_ARG_WITH(static-mailreceive,[ --with-static-mailreceive=D is the directory where - Gnome MIME library is installed (static lib)],[ - GNOME_MIME=$withval - MIMEBIN="$GNOME_MIME/bin" - MIMEINC="$GNOME_MIME/include" - MIMELIB="$GNOME_MIME/lib" - if test \! -d $MIMEBIN -o \! -d $MIMEINC -o \! -d $MIMELIB; then - AC_MSG_ERROR($GNOME_MIME does not seem to be valid Gnome installation directory) - fi - - AC_DEFINE(WITH_MAILRECEIVE,,has \$mail:received (uses static library)) - - if test -z "$GLIB_CONFIG"; then - GLIB_CONFIG=$XMLBIN/glib-config - if test \! -x $GLIB_CONFIG; then - GLIB_CONFIG=$XMLBIN/glib2-config - if test \! -x $GLIB_CONFIG; then - GLIB_CONFIG=glib-config + if test -z "$MIME_OK"; then + AC_MSG_CHECKING(for mime) + SAVE_LIBS=$LIBS + LIBS="$LIBS $MIME_LIBS $MIME_INCLUDES" + AC_TRY_LINK([ #include ],[ guint v=gmime_major_version; ], + AC_MSG_RESULT(yes) + , + AC_MSG_RESULT(no) + if test -z "$MIME"; then + AC_MSG_ERROR(please specify path to Gnome MIME library: --with-mailreceive=D) + else + AC_MSG_ERROR($MIME does not seem to be valid Gnome MIME installation directory) fi - fi + ) + LIBS=$SAVE_LIBS fi - GLIB_CFLAGS=`$GLIB_CONFIG --cflags` - -dnl '-L/usr/local/lib -lglib' -> /usr/local/lib -changequote(, )dnl - GLIB_DIR=`$GLIB_CONFIG --libs | sed 's/.*-L\([^ ]*\).*/\1/'` - GLIB_NAME=`$GLIB_CONFIG --libs | sed 's/.*-l\([^ ]*\).*/\1/'` -changequote([, ])dnl - MIME_INCLUDES="$GLIB_CFLAGS -I$MIMEINC/gmime" - MIME_LIBS="$MIMELIB/libgmime.la $GLIB_DIR/lib$GLIB_NAME.la" + AC_DEFINE(WITH_MAILRECEIVE,,has \$mail:received) ]) + AC_SUBST(MIME_INCLUDES) AC_SUBST(MIME_LIBS) @@ -371,11 +355,6 @@ AC_C_BIGENDIAN( AC_TYPE_SIZE_T -dnl gmime -AC_CHECK_TYPE(off_t, long) -AC_CHECK_TYPE(ssize_t, int) - - dnl Checks for C header files. AC_HEADER_TIME @@ -476,8 +455,7 @@ AC_CHECK_FUNCS(qsort, , AC_MSG_ERROR([No 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 -dnl or it can be tm.tm_tzadj +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 ],