Changeset 3464

Show
Ignore:
Timestamp:
03/04/08 23:59:06
Author:
pvanhoof
Message:

Fixing linking and building

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/libtinymail-camel/camel-lite/camel/Makefile.am

    r3458 r3464  
    2626camel_litelibexecdir = $(libexecdir) 
    2727 
    28 noinst_LTLIBRARIES = libcamel-lite-1.2.la 
    29 # lib_LTLIBRARIES = libcamel-lite-1.2.la 
     28# noinst_LTLIBRARIES = libcamel-lite-1.2.la 
     29lib_LTLIBRARIES = libcamel-lite-1.2.la 
    3030 
    3131INCLUDES = -I.. -I$(srcdir)/.. \ 

  • trunk/m4/gtk-doc.m4

    r2911 r3464  
    1010  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first 
    1111  dnl for overriding the documentation installation directory 
    12   AC_ARG_WITH([html-dir], 
    13     AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, 
     12  AC_ARG_WITH(html-dir, 
     13    AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, 
    1414    [with_html_dir='${datadir}/gtk-doc/html']) 
    1515  HTML_DIR="$with_html_dir" 
    16   AC_SUBST([HTML_DIR]) 
     16  AC_SUBST(HTML_DIR) 
    1717 
    1818  dnl enable/disable documentation building 
    19   AC_ARG_ENABLE([gtk-doc], 
    20     AS_HELP_STRING([--enable-gtk-doc], 
    21                    [use gtk-doc to build documentation [[default=no]]]),, 
    22     [enable_gtk_doc=no]) 
     19  AC_ARG_ENABLE(gtk-doc, 
     20    AC_HELP_STRING([--enable-gtk-doc], 
     21                   [use gtk-doc to build documentation [default=no]]),, 
     22    enable_gtk_doc=no) 
    2323 
    2424  have_gtk_doc=no 
    2525  if test x$enable_gtk_doc = xyes; then 
    2626    if test -z "$PKG_CONFIG"; then 
    27       AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no]) 
     27      AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 
    2828    fi 
    2929    if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then 
    …… 
    3737      AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version]) 
    3838      if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then 
    39         AC_MSG_RESULT([yes]) 
     39        AC_MSG_RESULT(yes) 
    4040      else 
    41         AC_MSG_RESULT([no]) 
     41        AC_MSG_RESULT(no) 
    4242        have_gtk_doc=no 
    4343      fi 
    …… 
    4949  fi 
    5050 
    51   AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) 
    52   AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) 
     51  AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) 
     52  AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL") 
    5353])