Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changes to autotools files to enable VPATH builds #66

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Changes to autotools files to enable VPATH builds #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,15 +128,17 @@ AC_ARG_WITH([uriparser-dir],
]
)

SAFEC_STUB_DIR='$(abs_top_builddir)/safe_c_stub'
AC_SUBST(SAFEC_STUB_DIR)
safecdir="$SAFEC_STUB_DIR"
AC_SUBST([SAFEC_DIR], "$safecdir")
AC_SUBST([SAFEC_CFLAGS], "$safecdir/include")
AC_SUBST([SAFEC_LDFLAGS], "$safecdir/lib")

CFLAGS="$CFLAGS -Wall -I$safecdir/include"
LDFLAGS="$LDFLAGS -L$safecdir/lib"
SAFEC_STUB_SRCDIR='$(abs_top_srcdir)/safe_c_stub'
SAFEC_STUB_BLDDIR='$(abs_top_builddir)/safe_c_stub'
AC_SUBST(SAFEC_STUB_SRCDIR)
safecsrcdir="$SAFEC_STUB_SRCDIR"
safecblddir="$SAFEC_STUB_BLDDIR"
AC_SUBST([SAFEC_DIR], "$safecsrcdir")
AC_SUBST([SAFEC_CFLAGS], "$safecsrcdir/include")
AC_SUBST([SAFEC_LDFLAGS], "$safecblddir/lib")

CFLAGS="$CFLAGS -Wall -I$safecsrcdir/include"
LDFLAGS="$LDFLAGS -L$safecblddir/lib"
LIBS="$LIBS -lsafe_lib"

AC_PREFIX_DEFAULT([/usr/local/est])
Expand Down
2 changes: 1 addition & 1 deletion example/client-simple/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ DL=
else
DL=-ldl
endif
estclient_simple_LDFLAGS = -L../../src/est/.libs $(DL) -lest -lssl -lcrypto
estclient_simple_LDFLAGS = -L$(abs_top_builddir)/src/est/.libs $(DL) -lest -lssl -lcrypto
2 changes: 1 addition & 1 deletion example/client/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ else
PTHREAD=-lpthread
endif

estclient_LDFLAGS = -L../../src/est/.libs $(DL) $(PTHREAD) -lest -lssl -lcrypto
estclient_LDFLAGS = -L$(abs_top_builddir)/src/est/.libs $(DL) $(PTHREAD) -lest -lssl -lcrypto
2 changes: 1 addition & 1 deletion example/proxy/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ else
PTHREAD=-lpthread
endif

estproxy_LDFLAGS = -L../../src/est/.libs $(DL) $(PTHREAD) -lest -lssl -lcrypto
estproxy_LDFLAGS = -L$(abs_top_builddir)/src/est/.libs $(DL) $(PTHREAD) -lest -lssl -lcrypto

EXTRA_DIST = createRA.sh runproxy.sh estExampleCA.cnf
2 changes: 1 addition & 1 deletion example/server/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ else
PTHREAD=-lpthread
endif

estserver_LDFLAGS = -L../../src/est/.libs $(DL) $(PTHREAD) -lest -lssl -lcrypto
estserver_LDFLAGS = -L$(abs_top_builddir)/src/est/.libs $(DL) $(PTHREAD) -lest -lssl -lcrypto

EXTRA_DIST = ossl_srv.h apps.h createCA.sh ext.cnf ESTcommon.sh runserver.sh estExampleCA.cnf extExampleCA.cnf