]> pilppa.org Git - familiar-h63xx-build.git/blob - org.handhelds.familiar/packages/db/db3-3.2.9/autofoo.patch
OE tree imported from monotone branch org.openembedded.oz354fam083 at revision 8b12e3...
[familiar-h63xx-build.git] / org.handhelds.familiar / packages / db / db3-3.2.9 / autofoo.patch
1 --- dist/Makefile.in    2000-11-30 17:07:33.000000000 -0600
2 +++ dist/Makefile.in    2004-09-01 19:47:37.000000000 -0500
3 @@ -2,6 +2,7 @@
4  
5  srcdir=        @srcdir@/..
6  builddir=.
7 +top_builddir=.
8  
9  ##################################################
10  # C, C++
11 --- dist/configure.in   2001-01-19 11:36:43.000000000 -0600
12 +++ dist/configure.in   2004-09-01 19:45:35.000000000 -0500
13 @@ -38,7 +38,6 @@
14  AC_SUBST(LIBJSO_LIBS)
15  AC_SUBST(LIBS)
16  AC_SUBST(LIBSO_LIBS)
17 -AC_SUBST(LIBTOOL)
18  AC_SUBST(LIBTSO_LIBS)
19  AC_SUBST(LIBXSO_LIBS)
20  AC_SUBST(MAKEFILE_CC)
21 @@ -48,7 +47,6 @@
22  AC_SUBST(RPC_OBJS)
23  AC_SUBST(SOFLAGS)
24  AC_SUBST(SOLINK)
25 -AC_SUBST(SOSUFFIX)
26  
27  dnl $o is set to ".o" or ".lo", and is the file suffix used in the
28  dnl Makefile instead of .o
29 @@ -205,27 +203,15 @@
30  dnl Dynamic library and libtool configuration; optional, but required for
31  dnl Tcl or Java support.
32  LIBDB_ARGS="libdb.a"
33 -LIBTOOL="nolibtool"
34  POSTLINK="@true"
35 -SOSUFFIX="so"
36  if test "$db_cv_dynamic" = "yes"; then
37 +       AM_PROG_LIBTOOL
38         SAVE_CC="${MAKEFILE_CC}"
39         SAVE_CXX="${MAKEFILE_CXX}"
40  
41 -       # Configure libtool.
42 -       AC_MSG_CHECKING(libtool configuration)
43 -       AC_MSG_RESULT([])
44 -       ${CONFIG_SHELL-/bin/sh} $srcdir/ltconfig \
45 -               --no-verify $srcdir/ltmain.sh \
46 -               --output=./libtool $host_os \
47 -               --disable-static \
48 -       || AC_MSG_ERROR([libtool configure failed])
49 -
50 -       SOSUFFIX=`sed -e '/^library_names_spec=/!d' -e 's/.*\.\([[a-zA-Z0-9_]]*\).*/\1/' ./libtool`
51         DEFAULT_LIB="\$(libso_target)"
52         DEFAULT_INSTALL="install_dynamic"
53         LIBDB_ARGS="\$(libso_linkname)"
54 -       LIBTOOL="\$(SHELL) ./libtool"
55  
56         MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${SAVE_CC}"
57         MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${SAVE_CXX}"
58 @@ -373,13 +359,6 @@
59  AC_REPLACE_FUNCS(getcwd getopt memcmp memcpy memmove)
60  AC_REPLACE_FUNCS(raise snprintf strcasecmp strerror vsnprintf)
61  
62 -dnl XXX
63 -dnl Nasty hack.  AC_REPLACE_FUNCS added entries of the form xxx.o to the
64 -dnl LIBOBJS variable.  They have to be xxx.lo if we are building shared
65 -dnl libraries.  Use sed, configure already requires it.
66 -tmp="`echo \"$LIBOBJS\" | sed \"s/\.o/${o}/g\"`"
67 -LIBOBJS="$tmp"
68 -
69  dnl Check for system functions we optionally use.
70  AC_CHECK_FUNCS(getuid pstat_getdynamic sysconf sched_yield strtoul yield)
71