Commit 6797ac43 authored by Niels Möller's avatar Niels Möller
Browse files

* configure.ac: New command line option --disable-pic. Use

LSH_CCPIC.

* Makefile.am (libnettle_a_CFLAGS): Added $(CCPIC), to attempt to
build also the static library as position independent code.

Rev: src/nettle/ChangeLog:1.274
Rev: src/nettle/Makefile.am:1.78
Rev: src/nettle/configure.ac:1.41
parent 68368ae5
2004-08-31 Niels Mller <nisse@lysator.liu.se>
* configure.ac: New command line option --disable-pic. Use
LSH_CCPIC.
* Makefile.am (libnettle_a_CFLAGS): Added $(CCPIC), to attempt to
build also the static library as position independent code.
2004-08-24 Niels Mller <nisse@lysator.liu.se> 2004-08-24 Niels Mller <nisse@lysator.liu.se>
* des-compat.c (des_cbc_cksum): Pad input with NUL:s, if it's not * des-compat.c (des_cbc_cksum): Pad input with NUL:s, if it's not
......
...@@ -61,6 +61,8 @@ libnettle_a_SOURCES = aes.c aes.h aes-internal.h \ ...@@ -61,6 +61,8 @@ libnettle_a_SOURCES = aes.c aes.h aes-internal.h \
nettle-meta.h \ nettle-meta.h \
nettle-internal.c nettle-internal.h nettle-internal.c nettle-internal.h
libnettle_a_CFLAGS = $(CCPIC)
LIBOBJS = @LIBOBJS@ LIBOBJS = @LIBOBJS@
libnettle_a_LIBADD = $(LIBOBJS) libnettle_a_LIBADD = $(LIBOBJS)
......
...@@ -45,6 +45,11 @@ AC_ARG_ENABLE(shared, ...@@ -45,6 +45,11 @@ AC_ARG_ENABLE(shared,
AC_HELP_STRING([--enable-shared], [Build a shared library]),, AC_HELP_STRING([--enable-shared], [Build a shared library]),,
[enable_shared=no]) [enable_shared=no])
AC_ARG_ENABLE(pic,
AC_HELP_STRING([--disable-pic],
[Do not try to compile library files as position independent code]),,
[enable_pic=yes])
LSH_RPATH_INIT([`echo $with_lib_path | sed 's/:/ /g'` \ LSH_RPATH_INIT([`echo $with_lib_path | sed 's/:/ /g'` \
`echo $exec_prefix | sed "s@^NONE@$prefix/lib@g" | sed "s@^NONE@$ac_default_prefix/lib@g"` \ `echo $exec_prefix | sed "s@^NONE@$prefix/lib@g" | sed "s@^NONE@$ac_default_prefix/lib@g"` \
/usr/local/lib /sw/local/lib /sw/lib \ /usr/local/lib /sw/local/lib /sw/lib \
...@@ -111,14 +116,14 @@ if test "x$enable_assembler" = xyes ; then ...@@ -111,14 +116,14 @@ if test "x$enable_assembler" = xyes ; then
fi fi
fi fi
SHLIBCFLAGS="-fpic" LSH_CCPIC
SHLIBCFLAGS="$CCPIC"
SHLIBFORLINK=libnettle.so SHLIBFORLINK=libnettle.so
SHLIBSONAME='$(SHLIBFORLINK).$(SHLIBMAJOR)' SHLIBSONAME='$(SHLIBFORLINK).$(SHLIBMAJOR)'
SHLIBFILE='$(SHLIBSONAME).$(SHLIBMINOR)' SHLIBFILE='$(SHLIBSONAME).$(SHLIBMINOR)'
SHLIBLINK='$(CC) $(LDFLAGS) -shared -Wl,-soname=$(SHLIBSONAME)' SHLIBLINK='$(CC) $(LDFLAGS) -shared -Wl,-soname=$(SHLIBSONAME)'
echo "enable_shared: $enable_shared"
if test "x$enable_shared" = xyes ; then if test "x$enable_shared" = xyes ; then
SHLIBTARGET='$(SHLIBFORLINK)' SHLIBTARGET='$(SHLIBFORLINK)'
SHLIBINSTALL=install-shared SHLIBINSTALL=install-shared
...@@ -127,6 +132,10 @@ else ...@@ -127,6 +132,10 @@ else
SHLIBINSTALL='' SHLIBINSTALL=''
fi fi
if test "x$enable_pic" = xyes; then : ; else
CCPIC=''
fi
AM_CONDITIONAL([ENABLE_ASSEMBLER], [test x$enable_assembler = xyes]) AM_CONDITIONAL([ENABLE_ASSEMBLER], [test x$enable_assembler = xyes])
AM_CONDITIONAL([ENABLE_SHARED], [test x$enable_shared = xyes]) AM_CONDITIONAL([ENABLE_SHARED], [test x$enable_shared = xyes])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment