File xbase-2.0.0-makefiles.patch of Package xbase
--- Makefile.am
+++ Makefile.am
@@ -53,4 +53,4 @@ rpm : dist
docs :
(cd docs ; make docs)
-.PHONY : docs
\ No newline at end of file
+.PHONY : docs
--- acinclude.m4
+++ acinclude.m4
@@ -21,7 +21,7 @@
## Find a file (or one of more files in a list of dirs)
## ------------------------------------------------------------------------
##
-AC_DEFUN(AC_FIND_FILE,
+AC_DEFUN([AC_FIND_FILE],
[
$3=NO
for i in $2;
@@ -47,7 +47,7 @@ done
## macro AC_PATH_X
## ------------------------------------------------------------------------
##
-AC_DEFUN(K_PATH_X,
+AC_DEFUN([K_PATH_X],
[
AC_MSG_CHECKING(for X)
AC_CACHE_VAL(ac_cv_have_x,
@@ -101,43 +101,7 @@ AC_SUBST(x_includes)
all_includes=$X_INCLUDES
])
-dnl slightly changed version of AC_CHECK_FUNC(setenv)
-AC_DEFUN(AC_CHECK_SETENV,
-[AC_MSG_CHECKING([for setenv])
-AC_CACHE_VAL(ac_cv_func_setenv,
-[AC_LANG_C
-AC_TRY_LINK(
-dnl Don't include <ctype.h> because on OSF/1 3.0 it includes <sys/types.h>
-dnl which includes <sys/select.h> which contains a prototype for
-dnl select. Similarly for bzero.
-[#include <assert.h>
-]ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
-extern "C"
-#endif
-])dnl
-[/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-#include <stdlib.h>
-], [
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$1) || defined (__stub___$1)
-choke me
-#else
-setenv("TEST", "alle", 1);
-#endif
-], eval "ac_cv_func_setenv=yes", eval "ac_cv_func_setenv=no")])
-
-if test "$ac_cv_func_setenv" = "yes"; then
- AC_MSG_RESULT(yes)
- AC_DEFINE_UNQUOTED(HAVE_FUNC_SETENV)
-else
- AC_MSG_RESULT(no)
-fi
-])
-
-AC_DEFUN(AC_CHECK_GETDOMAINNAME,
+AC_DEFUN([AC_CHECK_GETDOMAINNAME],
[
AC_LANG_CPLUSPLUS
save_CXXFLAGS=$CXXFLAGS
@@ -165,7 +129,7 @@ fi
CXXFLAGS=$save_CXXFLAGS
])
-AC_DEFUN(AC_CHECK_GETHOSTNAME,
+AC_DEFUN([AC_CHECK_GETHOSTNAME],
[
AC_LANG_CPLUSPLUS
save_CXXFLAGS=$CXXFLAGS
@@ -194,7 +158,7 @@ fi
CXXFLAGS=$save_CXXFLAGS
])
-AC_DEFUN(AC_CHECK_USLEEP,
+AC_DEFUN([AC_CHECK_USLEEP],
[
AC_LANG_CPLUSPLUS
@@ -220,7 +184,7 @@ fi
LIBS=$ac_libs_safe
])
-AC_DEFUN(AC_FIND_GIF,
+AC_DEFUN([AC_FIND_GIF],
[AC_MSG_CHECKING([for giflib])
AC_CACHE_VAL(ac_cv_lib_gif,
[ac_save_LIBS="$LIBS"
@@ -250,7 +214,7 @@ else
fi
])
-AC_DEFUN(AC_FIND_JPEG,
+AC_DEFUN([AC_FIND_JPEG],
[AC_MSG_CHECKING([for jpeglib])
AC_CACHE_VAL(ac_cv_lib_jpeg,
[ac_save_LIBS="$LIBS"
@@ -304,7 +268,7 @@ if eval "test ! \"`echo $ac_cv_lib_jpeg`
fi
])
-AC_DEFUN(AC_CHECK_BOOL,
+AC_DEFUN([AC_CHECK_BOOL],
[
AC_MSG_CHECKING([for bool])
AC_CACHE_VAL(ac_cv_have_bool,
@@ -321,7 +285,7 @@ AC_DEFUN(AC_CHECK_BOOL,
fi
])
-AC_DEFUN(AC_CHECK_GNU_EXTENSIONS,
+AC_DEFUN([AC_CHECK_GNU_EXTENSIONS],
[
AC_MSG_CHECKING(if you need GNU extensions)
AC_CACHE_VAL(ac_cv_gnu_extensions,
@@ -349,7 +313,7 @@ if test "$ac_cv_gnu_extensions" = "yes";
fi
])
-AC_DEFUN(AC_CHECK_COMPILERS,
+AC_DEFUN([AC_CHECK_COMPILERS],
[
dnl this is somehow a fat lie, but prevents other macros from double checking
AC_PROVIDE([AC_PROG_CC])
@@ -372,9 +336,6 @@ dnl this was AC_PROG_CC. I had to includ
if test -z "$CC"; then AC_CHECK_PROG(CC, xlc, xlc) fi
test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
- AC_PROG_CC_WORKS
- AC_PROG_CC_GNU
-
if test $ac_cv_prog_gcc = yes; then
GCC=yes
else
@@ -383,7 +344,6 @@ dnl this was AC_PROG_CC. I had to includ
if test -z "$CFLAGS"; then
if test "$ac_use_debug_code" = "yes"; then
- AC_PROG_CC_G
if test $ac_cv_prog_cc_g = yes; then
CFLAGS="-g"
fi
@@ -447,9 +407,6 @@ dnl dependecies between AC_PROG_CPP and
if test -z "$CXX"; then AC_CHECK_PROG(CXX, DCC, DCC) fi
test -z "$CXX" && AC_MSG_ERROR([no acceptable C++-compiler found in \$PATH])
- AC_PROG_CXX_WORKS
- AC_PROG_CXX_GNU
-
if test $ac_cv_prog_gxx = yes; then
GXX=yes
else
@@ -472,10 +429,6 @@ EOF
if test -z "$CXXFLAGS"; then
if test "$ac_use_debug_code" = "yes"; then
- AC_PROG_CXX_G
- if test $ac_cv_prog_cxx_g = yes; then
- CXXFLAGS="-g"
- fi
if test "$ac_cv_prog_CC" = "yes"; then
CXXFLAGS="$CXXFLAGS -pto"
fi
@@ -499,7 +452,7 @@ EOF
])
dnl just a wrapper to clean up configure.in
-AC_DEFUN(KDE_PROG_LIBTOOL,
+AC_DEFUN([KDE_PROG_LIBTOOL],
[
dnl libtool is only for C, so I must force him
dnl to find the correct flags for C++
@@ -515,7 +468,7 @@ CFLAGS=$ac_save_cflags
])
dnl Check for the type of the third argument of getsockname
-AC_DEFUN(AC_CHECK_KSIZE_T,
+AC_DEFUN([AC_CHECK_KSIZE_T],
[AC_MSG_CHECKING(for the third argument of getsockname)
AC_LANG_CPLUSPLUS
AC_CACHE_VAL(ac_cv_ksize_t_int,
@@ -536,21 +489,10 @@ fi
dnl From Jim Meyering. Use this if you use the GNU error.[ch].
dnl FIXME: Migrate into libit
-AC_DEFUN(AM_FUNC_ERROR_AT_LINE,
-[AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line,
- [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");],
- am_cv_lib_error_at_line=yes,
- am_cv_lib_error_at_line=no)])
- if test $am_cv_lib_error_at_line = no; then
- LIBOBJS="$LIBOBJS error.o"
- fi
- AC_SUBST(LIBOBJS)dnl
-])
-
# Macro to add for using GNU gettext.
# Ulrich Drepper <drepper@cygnus.com>, 1995.
-AC_DEFUN(AC_HAVE_XPM,
+AC_DEFUN([AC_HAVE_XPM],
[AC_REQUIRE_CPP()dnl
test -z "$XPM_LDFLAGS" && XPM_LDFLAGS=
@@ -601,7 +543,7 @@ AC_DEFUN(AC_HAVE_XPM,
AC_SUBST(XPMLIB)
])
-AC_DEFUN(AC_HAVE_GL,
+AC_DEFUN([AC_HAVE_GL],
[AC_REQUIRE_CPP()dnl
test -z "$GL_LDFLAGS" && GL_LDFLAGS=
@@ -655,7 +597,7 @@ AC_DEFUN(AC_HAVE_GL,
dnl PAM pam
dnl Should test for PAM (Pluggable Authentication Modules)
- AC_DEFUN(AC_PATH_PAM_DIRECT,
+ AC_DEFUN([AC_PATH_PAM_DIRECT],
[test -z "$pam_direct_test_library" && pam_direct_test_library=pam
test -z "$pam_direct_test_library" && pam_direct_test_library=pam_misc
test -z "$pam_direct_test_library" && pam_direct_test_library=dl
@@ -709,7 +651,7 @@ AC_DEFUN(AC_HAVE_GL,
LIBS="$ac_save_LIBS"
])
-AC_DEFUN(AC_PATH_PAM,
+AC_DEFUN([AC_PATH_PAM],
[AC_REQUIRE_CPP()dnl
pam_includes=NONE
@@ -763,7 +705,7 @@ AC_DEFUN(AC_PATH_PAM,
])
-AC_DEFUN(XB_CHECK_DLOPEN,
+AC_DEFUN([XB_CHECK_DLOPEN],
[
AC_CHECK_LIB(dl, dlopen, [
LIBDL="-ldl"
@@ -815,7 +757,7 @@ fi
])
-AC_DEFUN(KDE_CHECK_DYNAMIC_LOADING,
+AC_DEFUN([KDE_CHECK_DYNAMIC_LOADING],
[
KDE_CHECK_DLOPEN(libtool_enable_shared=no, libtool_enable_static=no)
KDE_PROG_LIBTOOL
@@ -834,237 +776,3 @@ else
$2
fi
])
-
-## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*-
-## Copyright (C) 1996-1998 Free Software Foundation, Inc.
-## Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-##
-## As a special exception to the GNU General Public License, if you
-## distribute this file as part of a program that contains a
-## configuration script generated by Autoconf, you may include it under
-## the same distribution terms that you use for the rest of that program.
-
-# serial 20 AM_PROG_LIBTOOL
-AC_DEFUN(AM_PROG_LIBTOOL,
-[AC_REQUIRE([AM_ENABLE_SHARED])dnl
-AC_REQUIRE([AM_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_PROG_RANLIB])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AM_PROG_LD])dnl
-AC_REQUIRE([AM_PROG_NM])dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-dnl
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
-AC_SUBST(LIBTOOL)dnl
-
-# Check for any special flags to pass to ltconfig.
-libtool_flags=
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$silent" = yes && libtool_flags="$libtool_flags --silent"
-test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case "$host" in
-*-*-irix*)
- # Find out which ABI we are using.
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- case "`/usr/bin/file conftest.o`" in
- *32-bit*)
- LD="${LD-ld} -32"
- ;;
- *N32*)
- LD="${LD-ld} -n32"
- ;;
- *64-bit*)
- LD="${LD-ld} -64"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
-
-*-*-sco3.2v5*)
- # On SCO OpenServer 5, we need -belf to get full-featured binaries.
- CFLAGS="$CFLAGS -belf"
- ;;
-esac
-
-# Actually configure libtool. ac_aux_dir is where install-sh is found.
-CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
-|| AC_MSG_ERROR([libtool configure failed])
-])
-
-# AM_ENABLE_SHARED - implement the --enable-shared flag
-# Usage: AM_ENABLE_SHARED[(DEFAULT)]
-# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
-# `yes'.
-AC_DEFUN(AM_ENABLE_SHARED,
-[define([AM_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(shared,
-changequote(<<, >>)dnl
-<< --enable-shared build shared libraries [default=>>AM_ENABLE_SHARED_DEFAULT],
-changequote([, ])dnl
-[if test "$enableval" = no; then
- enable_shared=no
-else
- enable_shared=yes
-fi],
-enable_shared=AM_ENABLE_SHARED_DEFAULT)dnl
-])
-
-# AM_DISABLE_SHARED - set the default shared flag to --disable-static
-AC_DEFUN(AM_DISABLE_SHARED,
-[AM_ENABLE_SHARED(no)])
-
-# AM_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN(AM_DISABLE_STATIC,
-[AM_ENABLE_STATIC(no)])
-
-# AM_ENABLE_STATIC - implement the --enable-static flag
-# Usage: AM_ENABLE_STATIC[(DEFAULT)]
-# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
-# `yes'.
-AC_DEFUN(AM_ENABLE_STATIC,
-[define([AM_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(static,
-changequote(<<, >>)dnl
-<< --enable-static build static libraries [default=>>AM_ENABLE_STATIC_DEFAULT],
-changequote([, ])dnl
-[if test "$enableval" = no; then
- enable_static=no
-else
- enable_static=yes
-fi],
-enable_static=AM_ENABLE_STATIC_DEFAULT)dnl
-])
-
-
-# AM_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN(AM_PROG_LD,
-[AC_ARG_WITH(gnu-ld,
-[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])
-ac_prog=ld
-if test "$ac_cv_prog_gcc" = yes; then
- # Check if gcc -print-prog-name=ld gives a path.
- AC_MSG_CHECKING([for ld used by GCC])
- ac_prog=`($CC -print-prog-name=ld) 2>&5`
- case "$ac_prog" in
- # Accept absolute paths.
- /*)
- test -z "$LD" && LD="$ac_prog"
- ;;
- "")
- # If it fails, then pretend we aren't using GCC.
- ac_prog=ld
- ;;
- *)
- # If it is relative, then search for the first ld in PATH.
- with_gnu_ld=unknown
- ;;
- esac
-elif test "$with_gnu_ld" = yes; then
- AC_MSG_CHECKING([for GNU ld])
-else
- AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(ac_cv_path_LD,
-[if test -z "$LD"; then
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f "$ac_dir/$ac_prog"; then
- ac_cv_path_LD="$ac_dir/$ac_prog"
- # Check to see if the program is GNU ld. I'd rather use --version,
- # but apparently some GNU ld's only accept -v.
- # Break only if it was the GNU/non-GNU ld that we prefer.
- if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
- test "$with_gnu_ld" != no && break
- else
- test "$with_gnu_ld" != yes && break
- fi
- fi
- done
- IFS="$ac_save_ifs"
-else
- ac_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$ac_cv_path_LD"
-if test -n "$LD"; then
- AC_MSG_RESULT($LD)
-else
- AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_SUBST(LD)
-AM_PROG_LD_GNU
-])
-
-AC_DEFUN(AM_PROG_LD_GNU,
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
- ac_cv_prog_gnu_ld=yes
-else
- ac_cv_prog_gnu_ld=no
-fi])
-])
-
-# AM_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN(AM_PROG_NM,
-[AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(ac_cv_path_NM,
-[case "$NM" in
-/*)
- ac_cv_path_NM="$NM" # Let the user override the test with a path.
- ;;
-*)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do
- test -z "$ac_dir" && dir=.
- if test -f $ac_dir/nm; then
- # Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1!d' prevents false positives on HP-UX, which says:
- # nm: unknown option "B" ignored
- if ($ac_dir/nm -B /dev/null 2>&1 | sed '1!d'; exit 0) | egrep /dev/null >/dev/null; then
- ac_cv_path_NM="$ac_dir/nm -B"
- elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1!d'; exit 0) | egrep /dev/null >/dev/null; then
- ac_cv_path_NM="$ac_dir/nm -p"
- else
- ac_cv_path_NM="$ac_dir/nm"
- fi
- break
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
- ;;
-esac])
-NM="$ac_cv_path_NM"
-AC_MSG_RESULT([$NM])
-AC_SUBST(NM)
-])
--- bin/Makefile.am
+++ bin/Makefile.am
@@ -1,6 +1,6 @@
INCLUDES= -I$(topdir) $(all_includes)
-LDADD = -L$(topdir)/xbase/.libs -lxbase
+LDADD = $(topdir)/xbase/libxbase.la
INSTALL_PROGRAM = @INSTALL@
--- configure.in
+++ configure.in
@@ -15,18 +15,20 @@ dnl generate the config header
AM_CONFIG_HEADER(xbase/xbconfig.h) dnl at the distribution this done
dnl Checks for programs.
-AC_CHECK_COMPILERS
-KDE_PROG_LIBTOOL
+AC_PROG_CC
+AC_PROG_CXX
+
+dnl find out some variables
+AC_USE_SYSTEM_EXTENSIONS
+
+AC_ENABLE_SHARED(yes)
+AC_PROG_LIBTOOL
AC_CHECK_PROG(doxygen, doxygen, yes, no)
if test "$doxygen" = "yes"; then
XSUBDIRS="$XSUBDIRS docs"
fi
-dnl find out some variables
-AC_AIX
-AC_MINIX
-
dnl for NLS support. Call them in this order!
AC_LANG_CPLUSPLUS dnl switch to C++
@@ -52,7 +54,6 @@ AC_CHECK_FUNCS(flock) dnl
AC_CHECK_FUNCS(fcntl)
AC_CHECK_FUNCS(snprintf) dnl
AC_CHECK_FUNCS(socket vsnprintf vsprintf)
-AC_CHECK_SETENV
AC_LANG_CPLUSPLUS
AC_CHECK_FUNCS(getdomainname)
AC_CHECK_FUNCS(strcasecmp)
@@ -62,9 +63,6 @@ AC_CHECK_LIB(nsl, gethostbyname, [LIBNSL
AC_SUBST(LIBSOCKET)
AC_SUBST(LIBNSL)
-dnl Perform program name transformation
-AC_ARG_PROGRAM
-
AC_ARG_WITH(index-ndx, [ --without-index-ndx do not compile .ndx index support ], enable_index_ndx="$withval", enable_index_ndx="yes")
if test "$enable_index_ndx" = "yes"; then
AC_DEFINE(XB_INDEX_NDX,1)
@@ -72,7 +70,7 @@ fi
AC_ARG_WITH(index-ntx, [ --without-index-ntx do not compile .ntx index support ], enable_index_ntx="$withval", enable_index_ntx="yes")
if test "$enable_index_ntx" = "yes"; then
- AC_DEFINE(XB_INDEX_NTX,1)~
+ AC_DEFINE(XB_INDEX_NTX,1)
fi
AC_ARG_WITH(memo-fields, [ --without-memo-fields do not compile memo fields support ], enable_memo_fields="$withval", enable_memo_fields="yes")
@@ -133,23 +131,18 @@ fi
AC_SUBST(TVPROGS)
dnl add here all your Makefiles
-AC_OUTPUT([
- Makefile
- xbase/Makefile
- xbase/xbase.h
- examples/Makefile
- bin/Makefile
- html/Makefile
- tv/Makefile
- libtest/Makefile
-dnl ybase/Makefile
- xbase-config
- xbase.spec
- docs/doxygen.cfg
- docs/Makefile
- ],
- [
- chmod +x xbase-config
- ]
-)
+AC_CONFIG_FILES([ Makefile ])
+AC_CONFIG_FILES([ xbase/Makefile ])
+AC_CONFIG_FILES([ xbase/xbase.h ])
+AC_CONFIG_FILES([ examples/Makefile ])
+AC_CONFIG_FILES([ bin/Makefile ])
+AC_CONFIG_FILES([ html/Makefile ])
+AC_CONFIG_FILES([ tv/Makefile ])
+AC_CONFIG_FILES([ libtest/Makefile ])
+AC_CONFIG_FILES([ xbase-config ])
+AC_CONFIG_FILES([ xbase.spec ])
+AC_CONFIG_FILES([ docs/doxygen.cfg ])
+AC_CONFIG_FILES([ docs/Makefile ])
+AC_OUTPUT
+chmod +x xbase-config
--- examples/Makefile.am
+++ examples/Makefile.am
@@ -1,6 +1,6 @@
INCLUDES= -I$(topdir) $(all_includes)
-LDADD = -L$(topdir)/xbase/.libs -lxbase
+LDADD = $(topdir)/xbase/libxbase.la
# for shadow passwords override the value
INSTALL_PROGRAM = @INSTALL@
--- libtest/Makefile.am
+++ libtest/Makefile.am
@@ -1,6 +1,6 @@
INCLUDES= -I$(topdir) $(all_includes)
-LDADD = -L$(topdir)/xbase/.libs -lxbase
+LDADD = $(topdir)/xbase/libxbase.la
INSTALL_PROGRAM = @INSTALL@
--- tv/Makefile.am
+++ tv/Makefile.am
@@ -24,6 +24,6 @@ noinst_PROGRAMS = @TVPROGS@
EXTRA_PROGRAMS = tvxbase
tvxbase_SOURCES = tvxbase.cpp tvbrowse.cpp tvbrowse.h
-tvxbase_LDADD = -L$(topdir)/xdb/.libs -lxdb -ltvision -lgpm
+tvxbase_LDADD = $(topdir)/xdb/libxdb.la -ltvision -lgpm
MAINTAINERCLEANFILES = Makefile.in
