From 1fdee871b1e49a0cc5be1f4a00f72c6984a875c3 Mon Sep 17 00:00:00 2001 From: rlar Date: Thu, 29 Dec 2011 14:32:47 +0000 Subject: [PATCH] remove @libname@ --- ChangeLog | 5 +++++ configure.ac | 11 +---------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9fa36e27e..7820d4deb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-12-29 Robert Larice + * configure.ac : + remove @libname@ + has been replaced by $(pkglibdir) + 2011-12-29 Robert Larice * configure.ac , * src/Makefile.am , diff --git a/configure.ac b/configure.ac index 2b9f89ddb..3c194ac8c 100644 --- a/configure.ac +++ b/configure.ac @@ -807,7 +807,7 @@ AC_CHECK_PROGS(YACC, 'bison -y' byacc yacc) ################# XSPICE ################################################## dnl Add new code models to the build by pointing to them here. -libname="lib" + if test "$enable_xspice" = "yes"; then if test -z "${YACC}" ; then AC_MSG_ERROR([XSPICE build requires bison, byacc or yacc parser generator]) @@ -839,14 +839,6 @@ dnl Define variables for LEX XSPICEINIT="" AC_CHECK_FUNCS([modf]) AC_CHECK_HEADERS([libintl.h malloc.h]) -dnl Find the library directory (lib or lib64) for XSPICE libs - if test -n $libdir ; then - libtest=`expr $libdir : '.*\/lib64$'` - if test $libtest -gt 5 ; then - libname="lib64" - fi - echo XSPICE libraries in directory $libname - fi else XSPICEINIT="*" @@ -856,7 +848,6 @@ else fi AC_SUBST(XSPICEINIT) AC_SUBST(XSPICEDLLIBS) -AC_SUBST(libname) AM_CONDITIONAL([XSPICE_WANTED], [test "$enable_xspice" = "yes"])