NSIS-ka
A free C++ implementation of NSIS protocols

Changeset 6762


Ignore:
Timestamp:
Mar 4, 2014, 3:00:56 PM (4 years ago)
Author:
bless@…
Message:
  • new option --disable-rao, that allows to build protlib w/o tp_queryencap
Location:
protlib/branches/2013-01-18-RELOAD-goltsman
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • protlib/branches/2013-01-18-RELOAD-goltsman/configure.ac

    r6746 r6762  
    5555AM_CONDITIONAL(PROTLIB_DISABLE_LOGGING, test "$protlib_logging" = no)
    5656
     57AC_ARG_ENABLE([rao],
     58        [AS_HELP_STRING([--enable-rao], [compile with rout alert option support (default: disabled)])],
     59        [protlib_with_rao=$enableval],
     60        [protlib_with_rao=no])
     61
     62AM_CONDITIONAL(PROTLIB_WITH_RAO, test "$protlib_with_rao" = yes)
     63
    5764## libnetfilter_queue or obsolete libipq
    5865AC_ARG_ENABLE([nfq],
     
    6370#LIB NETFILTER_QUEUE
    6471AM_CONDITIONAL(PROTLIB_WITH_NFQ, test "$protlib_with_nfq" = yes)
     72
     73if test $protlib_with_rao = yes; then
     74AC_MSG_NOTICE([protlib will be built with router alert option support (query encapsulation), requires netfilterqueue or libipq])
    6575if test $protlib_with_nfq = yes; then
    6676        AC_CHECK_HEADERS([libnetfilter_queue/libnetfilter_queue.h], [], [AC_MSG_ERROR([cannot find libnetfilter_queue/libnetfilter_queue.h in include path, probably you need to install libnetfilter-queue-dev first])],
     
    7484fi
    7585
     86else
     87AC_MSG_NOTICE([NOTE: protlib will be built without router alert option support (query encapsulation)])
     88fi #end if $protlib_with_rao
    7689
    7790AC_SUBST([NETFILTER_QUEUE_INCLUDE])
     
    130143
    131144
    132 
    133 #AC_CHECK_HEADER([libipq.h], [],)
    134 
    135145AC_LANG_CPLUSPLUS
    136146
  • protlib/branches/2013-01-18-RELOAD-goltsman/src/Makefile.am

    r6407 r6762  
    1414libprot_a_DEPENDENCIES = $(FQUEUE_LIB)
    1515
     16if PROTLIB_WITH_RAO
     17
    1618if PROTLIB_WITH_NFQ
    1719libprot_a_SOURCES += tp_queryencap_nfq.cpp
     
    1921libprot_a_SOURCES += tp_queryencap.cpp
    2022endif
     23
     24endif #PROTLIB_WITH_RAO
    2125
    2226nobase_include_HEADERS=$(top_srcdir)/include/address.h                  \
  • protlib/branches/2013-01-18-RELOAD-goltsman/test/Makefile.am

    r6412 r6762  
    55test_runner_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/fastqueue $(CPPUNIT_CFLAGS)
    66test_runner_LDADD = $(top_builddir)/fastqueue/libfastqueue.a $(top_builddir)/src/libprot.a \
    7                 $(CPPUNIT_LIBS) -ldl -lpthread -lipq -lssl -lcrypto
     7                $(CPPUNIT_LIBS) -ldl -lpthread  -lssl -lcrypto $(LIBS)
    88#  -lpthread -lipq -lssl -lcrypto
    99TESTS = $(check_PROGRAMS)
Note: See TracChangeset for help on using the changeset viewer.