Changeset 4238

Show
Ignore:
Timestamp:
07/31/08 13:16:14 (4 months ago)
Author:
martin
Message:

reimplemented dbus plugin for NetworkManager 0.7, renamed to nm

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/configure.in

    r4221 r4238  
    561561    [if test x$enableval = xyes; then 
    562562        uci=true 
     563    fi] 
     564) 
     565 
     566AC_ARG_ENABLE( 
     567    [nm], 
     568    AS_HELP_STRING([--enable-nm],[enable NetworkManager plugin (default is NO).]), 
     569    [if test x$enableval = xyes; then 
     570        nm=true 
    563571    fi] 
    564572) 
    …… 
    704712    AC_HAVE_LIBRARY([uci],[LIBS="$LIBS"],[AC_MSG_ERROR([UCI library libuci not found])]) 
    705713    AC_CHECK_HEADER([uci.h],,[AC_MSG_ERROR([UCI header uci.h not found!])]) 
     714fi 
     715 
     716if test x$nm = xtrue; then 
     717    PKG_CHECK_MODULES(nm, [NetworkManager libnm_glib_vpn gthread-2.0]) 
     718    AC_SUBST(nm_CFLAGS) 
     719    AC_SUBST(nm_LIBS) 
    706720fi 
    707721 
    …… 
    799813AM_CONDITIONAL(USE_MEDSRV, test x$medsrv = xtrue) 
    800814AM_CONDITIONAL(USE_MEDCLI, test x$medcli = xtrue) 
     815AM_CONDITIONAL(USE_NM, test x$nm = xtrue) 
    801816AM_CONDITIONAL(USE_UCI, test x$uci = xtrue) 
    802817AM_CONDITIONAL(USE_SMP, test x$smp = xtrue) 
    …… 
    877892    src/charon/plugins/medsrv/Makefile 
    878893    src/charon/plugins/medcli/Makefile 
     894    src/charon/plugins/nm/Makefile 
    879895    src/charon/plugins/uci/Makefile 
    880896    src/charon/plugins/stroke/Makefile 

  • trunk/src/charon/Makefile.am

    r4195 r4238  
    181181endif 
    182182 
     183if USE_NM 
     184  SUBDIRS += plugins/nm 
     185  PLUGINS += nm 
     186endif 
     187 
    183188if USE_UCI 
    184189  SUBDIRS += plugins/uci