Permalink
Browse files

Libnl's path used to be hardcoded in the userspace app's makefile. =_=

Fixed.
  • Loading branch information...
ydahhrk committed Jul 14, 2014
1 parent 54fc02d commit 6455ffd898bae996ce3cab37b2fb6a3459ae096b
Showing with 8 additions and 9 deletions.
  1. +4 −6 usr/configure.ac
  2. +4 −3 usr/src/Makefile.am
View
@@ -9,11 +9,6 @@ AM_INIT_AUTOMAKE
# Checks for programs.
AC_PROG_CC
# Checks for libraries.
AC_CHECK_LIB([nl-3], [nl_send_simple], [],[
echo "Could not find the Netlink library. Please install libnl-3-dev."
exit -1])
# Checks for header files.
AC_CHECK_HEADERS([arpa/inet.h stdlib.h string.h unistd.h])
@@ -23,5 +18,8 @@ AC_CHECK_HEADER_STDBOOL
# Checks for library functions.
AC_CHECK_FUNCS([inet_ntoa memset strcasecmp strtol])
AC_OUTPUT(Makefile src/Makefile man/Makefile)
# Checks for dependencies.
PKG_CHECK_MODULES(LIBNL3, libnl-3.0 >= 3.1)
# Spit out the makefiles.
AC_OUTPUT(Makefile src/Makefile man/Makefile)
View
@@ -1,7 +1,8 @@
AM_CFLAGS = -Wall -O2 -I${srcdir}/../../include -I/usr/include/libnl3
AM_LDFLAGS = -lnl-3
AM_CFLAGS = -Wall -O2 -I${srcdir}/../../include ${LIBNL3_CFLAGS}
# Note to myself: documentation tends to call these "PROGRAMS" "targets". "jool" is a "target".
bin_PROGRAMS = jool
jool_SOURCES = bib.c fragmentation.c pool4.c session.c translate.c \
filtering.c jool.c netlink.c pool6.c str_utils.c dns.c
jool_LDADD = ${LIBNL3_LIBS}

0 comments on commit 6455ffd

Please sign in to comment.