[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Patch to add libtool support
|
From: |
Johnny C. Lam |
|
Subject: |
Patch to add libtool support |
|
Date: |
Thu, 12 Oct 2000 02:58:52 -0400 |
Hi,
I've added support for building ncurses using libtool. The patches
below add the libtool logic into the current infrastructure. I've made the
changes as minimal as possible, and I've taken great pains to adhere to how
the library models are currently chosen.
I've also added two new options to configure: --with-manpage-tbl,
which causes the manpages to be preprocessed by tbl(1) prior to installation,
and --without-curses-h, which causes the installation process to install
curses.h as ncurses.h and make appropriate changes to headers and manpages.
I've found these to be useful options for building using NetBSD pkgsrc.
The patches below are relative to the 5.1 sources. I would like
very much to see them integrated into the main tree. I know how difficult
it is to figure out how shared libraries are built on different platforms.
My solution, to provide a way to do it with libtool, allows libtool to
encapsulate the knowledge on how to make the shared libraries.
I wasn't able to run autoconf, so the changes I made to
aclocal.m4 and configure.in are untested, but I made the appropriate
adjustments to configure directly, and the changes do work.
Please let me know if the patches aren't acceptable as they are.
I'd be happy to make changes to get them into the main tree.
Thanks,
-- Johnny C. Lam <address@hidden>
NetBSD Packages Collection developer
http://www.netbsd.org/
--- INSTALL.orig Sat Jul 8 18:46:08 2000
+++ INSTALL
@@ -101,6 +101,8 @@
libncurses_p.a (profile)
+ libncurses.la (libtool)
+
If you do not specify any models, the normal and debug libraries will be
configured. Typing `configure' with no arguments is equivalent to:
@@ -123,6 +125,13 @@
and SunOS with gcc, but more work needs to be done to make shared libraries
work on other systems.
+ If you have libtool installed, you can type
+
+ ./configure --with-libtool
+
+ to generate the appropriate static and/or shared libraries for your
+ platform using libtool.
+
You can make curses and terminfo fall back to an existing file of termcap
definitions by configuring with --enable-termcap. If you do this, the
library will search /etc/termcap before the terminfo database, and will
@@ -173,7 +182,8 @@
The terminfo(5) manual page must be preprocessed with tbl(1) before
being formatted by nroff(1). Modern man(1) implementations tend to do
this by default, but you may want to look at your version's manual page
- to be sure.
+ to be sure. You can also install the manual pages after preprocessing
+ with tbl(1) by specifying the configure option --with-manpage-tbl.
If the system already has a curses library that you need to keep using
for some bizarre binary-compatibility reason, you'll need to distinguish
@@ -484,6 +494,15 @@
this on systems that do not support symbolic links will result in
copying the man-page for each alias.
+ --with-manpage-tbl
+ Tell the configure script that you with to preprocess the manpages
+ by running them through tbl to generate tables understandable by
+ nroff.
+
+ --with-libtool
+ Generate libraries with libtool. If this option is selected, then
+ it overrides all other library model specifications.
+
--with-normal
Generate normal (i.e., static) libraries (default).
@@ -528,6 +547,11 @@
--without-ada
Suppress the configure script's check for Ada95, do not build the
Ada95 binding and related demo.
+
+ --without-curses-h
+ Don't install the ncurses header with the name "curses.h". Rather,
+ install as "ncurses.h" and modify the installed headers and manpages
+ accordingly.
--without-cxx
XSI curses declares "bool" as part of the interface. C++ also declares
--- aclocal.m4.orig Fri Jul 7 11:11:34 2000
+++ aclocal.m4
@@ -957,27 +957,61 @@
DST=\[$]1
REF=\[$]2
SRC=\[$]3
+TMPSRC=\${TMPDIR-/tmp}/\`basename \$SRC\`\$\$
+TMPSED=\${TMPDIR-/tmp}/headers.sed\$\$
echo installing \$SRC in \$DST
+CF_EOF
+if test $WITH_CURSES_H != yes; then
+ cat >>headers.sh <<CF_EOF
case \$DST in
/*/include/*)
- TMPSRC=\${TMPDIR-/tmp}/\`basename \$SRC\`\$\$
- TMPSED=\${TMPDIR-/tmp}/headers.sed\$\$
END=\`basename \$DST\`
for i in \`cat \$REF/../*/headers |fgrep -v "#"\`
do
NAME=\`basename \$i\`
+ if test "\$NAME" = "curses.h"
+ then
+ echo "s/<curses.h>/<ncurses.h>/" >> \$TMPSED
+ NAME=ncurses.h
+ fi
echo "s/<\$NAME>/<\$END\/\$NAME>/" >> \$TMPSED
done
- rm -f \$TMPSRC
- sed -f \$TMPSED \$SRC > \$TMPSRC
- eval \$PRG \$TMPSRC \$DST/\$SRC
- rm -f \$TMPSRC \$TMPSED
+ ;;
+*)
+ echo "s/<curses.h>/<ncurses.h>/" >> \$TMPSED
;;
+esac
+CF_EOF
+else
+ cat >>headers.sh <<CF_EOF
+case \$DST in
+/*/include/*)
+ END=\`basename \$DST\`
+ for i in \`cat \$REF/../*/headers |fgrep -v "#"\`
+ do
+ NAME=\`basename \$i\`
+ echo "s/<\$NAME>/<\$END\/\$NAME>/" >> \$TMPSED
+ done
+ ;;
*)
- eval \$PRG \$SRC \$DST
+ echo "" >> \$TMPSED
;;
esac
CF_EOF
+fi
+cat >>headers.sh <<CF_EOF
+rm -f \$TMPSRC
+sed -f \$TMPSED \$SRC > \$TMPSRC
+CF_EOF
+if test $WITH_CURSES_H != yes; then
+ cat >>headers.sh <<CF_EOF
+test "\$SRC" = "curses.h" && SRC=ncurses.h
+CF_EOF
+fi
+cat >>headers.sh <<CF_EOF
+eval \$PRG \$TMPSRC \$DST/\$SRC
+rm -f \$TMPSRC \$TMPSED
+CF_EOF
chmod 0755 headers.sh
@@ -1002,7 +1036,7 @@
for i in `cat $srcdir/$cf_dir/headers |fgrep -v "#"`
do
echo " @ (cd \$(INSTALL_PREFIX)\$(includedir) && rm -f
`basename $i`) ; ../headers.sh \$(INSTALL_DATA)
\$(INSTALL_PREFIX)\$(includedir) \$(srcdir) $i" >>$cf_dir/Makefile
- test $i = curses.h && echo " @ (cd
\$(INSTALL_PREFIX)\$(includedir) && rm -f ncurses.h && \$(LN_S) curses.h
ncurses.h)" >>$cf_dir/Makefile
+ test $i = curses.h && test $WITH_CURSES_H = yes && echo
" @ (cd \$(INSTALL_PREFIX)\$(includedir) && rm -f ncurses.h && \$(LN_S)
curses.h ncurses.h)" >>$cf_dir/Makefile
done
cat >>$cf_dir/Makefile <<CF_EOF
@@ -1030,6 +1064,7 @@
[
AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
case $1 in
+ libtool) $2='.la' ;;
normal) $2='.a' ;;
debug) $2='_g.a' ;;
profile) $2='_p.a' ;;
@@ -1049,6 +1084,7 @@
AC_DEFUN([CF_LIB_TYPE],
[
case $1 in
+ libtool) $2='' ;;
normal) $2='' ;;
debug) $2='_g' ;;
profile) $2='_p' ;;
@@ -1317,6 +1353,20 @@
AC_MSG_RESULT($cf_manpage_symlinks)
])dnl
dnl ---------------------------------------------------------------------------
+dnl This option causes manpages to be run through tbl to generate tables
+dnl correctly.
+AC_DEFUN([CF_MANPAGE_TBL],
+[
+AC_MSG_CHECKING(for manpage tbl)
+
+AC_ARG_WITH(manpage-tbl,
+ [ --with-manpage-tbl specify manpage processing with tbl],
+ [cf_manpage_tbl=$withval],
+ [cf_manpage_tbl=yes])
+
+AC_MSG_RESULT($cf_manpage_tbl)
+])dnl
+dnl ---------------------------------------------------------------------------
dnl Try to determine if the man-pages on the system are compressed, and if
dnl so, what format is used. Use this information to construct a script that
dnl will install man-pages.
@@ -1326,6 +1376,7 @@
CF_MANPAGE_FORMAT
CF_MANPAGE_RENAMES
CF_MANPAGE_SYMLINKS
+CF_MANPAGE_TBL
if test "$prefix" = "NONE" ; then
cf_prefix="$ac_default_prefix"
@@ -1401,6 +1452,18 @@
test \$verb = installing && sed -e "s,@DATADIR@,\$datadir," < \$i | sed
-f edit_man.sed >\$TMP
CF_EOF
fi
+if test $cf_manpage_tbl = yes ; then
+cat >>man/edit_man.sh <<CF_EOF
+ tbl \$TMP >\$TMP.out
+ mv \$TMP.out \$TMP
+CF_EOF
+fi
+if test $with_curses_h != yes ; then
+cat >>man/edit_man.sh <<CF_EOF
+ sed -e "/\#[ ]*include/s,curses.h,ncurses.h," < \$TMP >\$TMP.out
+ mv \$TMP.out \$TMP
+CF_EOF
+fi
if test $cf_format = yes ; then
cat >>man/edit_man.sh <<CF_EOF
nroff -man \$TMP >\$TMP.out
@@ -1512,6 +1575,7 @@
AC_DEFUN([CF_OBJ_SUBDIR],
[
case $1 in
+ libtool) $2='obj_lo' ;;
normal) $2='objects' ;;
debug) $2='obj_g' ;;
profile) $2='obj_p' ;;
@@ -1952,7 +2016,11 @@
# dependencies and linker-arguments for test-programs
TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${LIB_NAME}${DFT_DEP_SUFFIX} $TEST_DEPS"
-TEST_ARGS="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARGS"
+if test "$DFT_LWR_MODEL" = "libtool"; then
+ TEST_ARGS="${TEST_DEPS}"
+else
+ TEST_ARGS="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARGS"
+fi
# dependencies and linker-arguments for utility-programs
PROG_ARGS="$TEST_ARGS"
@@ -1987,7 +2055,11 @@
AC_DEFINE_UNQUOTED(HAVE_${cf_have_include}_H)
AC_DEFINE_UNQUOTED(HAVE_LIB${cf_have_include})
TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEPS"
- TEST_ARGS="-l${cf_dir}${DFT_ARG_SUFFIX} $TEST_ARGS"
+ if test "$DFT_LWR_MODEL" = "libtool"; then
+ TEST_ARGS="${TEST_DEPS}"
+ else
+ TEST_ARGS="-l${cf_dir}${DFT_ARG_SUFFIX}
$TEST_ARGS"
+ fi
fi
fi
done
--- c++/Makefile.in.orig Sat May 27 21:44:34 2000
+++ c++/Makefile.in
@@ -48,6 +48,8 @@
libdir = @libdir@
includedir = @includedir@
+LIBTOOL = @LIBTOOL@
+
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -64,6 +66,7 @@
CCFLAGS = $(CPPFLAGS) $(CXXFLAGS)
+CFLAGS_LIBTOOL = $(CCFLAGS)
CFLAGS_NORMAL = $(CCFLAGS)
CFLAGS_DEBUG = $(CCFLAGS) @CXX_G_OPT@ -DTRACE
CFLAGS_PROFILE = $(CCFLAGS) -pg
@@ -71,25 +74,38 @@
CFLAGS_DEFAULT = $(address@hidden@)
+NCURSES_MAJOR = @NCURSES_MAJOR@
+NCURSES_MINOR = @NCURSES_MINOR@
REL_VERSION = @cf_cv_rel_version@
ABI_VERSION = @cf_cv_abi_version@
-LINK = @LINK_PROGS@ $(CXX) @CXXLDFLAGS@
+LINK = @LINK_PROGS@ $(LIBTOOL) $(CXX) @CXXLDFLAGS@
+
+LIBROOT = ncurses++
+LIBNAME = @address@hidden(LIBROOT)@DFT_DEP_SUFFIX@
+
+LIBNAME_NORMAL = @address@hidden(LIBROOT)@address@hidden
+LIBNAME_LIBTOOL = @address@hidden(LIBROOT)@address@hidden
-LIBROOT = address@hidden@
-LIBNAME = @address@hidden(LIBROOT).a
+LINK_FLAGS = @EXTRA_LDFLAGS@ -L../lib -L$(libdir) -l$(LIBROOT)
-LDFLAGS = @EXTRA_LDFLAGS@ -L../lib -L$(libdir) \
- -l$(LIBROOT) \
+LINK_LIBTOOL = @EXTRA_LDFLAGS@ -L$(libdir) ../lib/$(LIBNAME)
+LINK_NORMAL = $(LINK_FLAGS)
+LINK_DEBUG = $(LINK_FLAGS)
+LINK_PROFILE = $(LINK_FLAGS)
+LINK_SHARED = $(LINK_FLAGS)
+
+LDFLAGS = \
@TEST_ARGS@ @LDFLAGS@ \
@LD_MODEL@ @LIBS@ @EXTRA_LIBS@ @LOCAL_LDFLAGS@ $(CXXLIBS)
+LDFLAGS_LIBTOOL = $(LDFLAGS)
LDFLAGS_NORMAL = $(LDFLAGS)
LDFLAGS_DEBUG = $(LDFLAGS) @CC_G_OPT@
LDFLAGS_PROFILE = $(LDFLAGS) -pg
LDFLAGS_SHARED = $(LDFLAGS) @LD_SHARED_OPTS@
-LDFLAGS_DEFAULT = $(address@hidden@)
+LDFLAGS_DEFAULT = $(address@hidden@) $(address@hidden@)
AUTO_SRC = \
etip.h
@@ -114,10 +130,15 @@
$(MODEL)/cursesapp.o \
$(MODEL)/cursesmain.o
-../lib/$(LIBNAME) : $(LIB_OBJS)
+../lib/$(LIBNAME_NORMAL) : $(LIB_OBJS)
$(AR) $(AR_OPTS) $@ $?
$(RANLIB) $@
+../lib/$(LIBNAME_LIBTOOL) : $(LIB_OBJS)
+ cd ../lib && $(LIBTOOL) $(CXX) -o $(LIBNAME) $(LIB_OBJS:.o=.lo) \
+ -rpath $(INSTALL_PREFIX)$(libdir) \
+ -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR)
+
OBJS_DEMO = $(MODEL)/demo.o
$(MODEL)/demo.o : $(srcdir)/demo.cc \
@@ -137,17 +158,17 @@
install \
install.libs:: ../lib/$(LIBNAME) $(INSTALL_PREFIX)$(libdir)
- $(INSTALL) ../lib/$(LIBNAME) $(INSTALL_PREFIX)$(libdir)/$(LIBNAME)
+ $(LIBTOOL) $(INSTALL) ../lib/$(LIBNAME)
$(INSTALL_PREFIX)$(libdir)/$(LIBNAME)
uninstall \
uninstall.libs::
- -rm -f $(INSTALL_PREFIX)$(libdir)/$(LIBNAME)
+ -$(LIBTOOL) rm -f $(INSTALL_PREFIX)$(libdir)/$(LIBNAME)
mostlyclean ::
-rm -f core tags TAGS *~ *.ln *.atac trace
clean :: mostlyclean
- -rm -f demo$x $(AUTO_SRC) ../lib/$(LIBNAME) $(LIB_OBJS) $(OBJS_DEMO)
+ -$(LIBTOOL) rm -f demo$x $(AUTO_SRC) ../lib/$(LIBNAME) $(LIB_OBJS)
$(LIB_OBJS:.o=.lo) $(OBJS_DEMO)
distclean :: clean
-rm -f Makefile
--- configure.in.orig Wed Jul 5 18:24:29 2000
+++ configure.in
@@ -146,6 +146,13 @@
[cf_with_progs=yes])
AC_MSG_RESULT($cf_with_progs)
+AC_MSG_CHECKING(if you wish to install curses.h)
+AC_ARG_WITH(curses-h,
+ [ --without-curses-h only install ncurses.h],
+ [with_curses_h=$withval],
+ [with_curses_h=yes])
+AC_MSG_RESULT($with_curses_h)
+
modules_to_build="ncurses"
if test "X$cf_with_progs" != Xno ; then
modules_to_build="$modules_to_build progs tack"
@@ -196,6 +203,20 @@
cf_list_models=""
AC_SUBST(cf_list_models)dnl the complete list of models ("normal debug")
+AC_MSG_CHECKING(if you want to build libraries with libtool)
+AC_ARG_WITH(libtool,
+ [ --with-libtool generate libraries with libtool],
+ [with_libtool=$withval],
+ [with_libtool=no])
+AC_MSG_RESULT($with_libtool)
+if test "$with_libtool" = "yes"; then
+ cf_list_models="$cf_list_models libtool"
+ test -z "$LIBTOOL" && LIBTOOL=libtool
+else
+ LIBTOOL=""
+fi
+AC_SUBST(LIBTOOL)
+
AC_MSG_CHECKING(if you want to build shared libraries)
AC_ARG_WITH(shared,
[ --with-shared generate shared-libraries],
@@ -232,6 +253,9 @@
AC_MSG_CHECKING(for specified models)
test -z "$cf_list_models" && cf_list_models=normal
+dnl If we use libtool to generate libraries, then it must be the only
+dnl specified model.
+test "$with_libtool" = "yes" && cf_list_models=libtool
AC_MSG_RESULT($cf_list_models)
### Use the first model as the default, and save its suffix for use in building
@@ -321,6 +345,7 @@
AC_MSG_CHECKING(for default loader flags)
case $DFT_LWR_MODEL in
+libtool) LD_MODEL='' ;;
normal) LD_MODEL='' ;;
debug) LD_MODEL=$CC_G_OPT ;;
profile) LD_MODEL='-pg';;
@@ -994,7 +1019,11 @@
### could override this.
if test "$with_termlib" = yes ; then
TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${TINFO_NAME}${DFT_DEP_SUFFIX}"
- TEST_ARGS="-l${TINFO_NAME}${DFT_ARG_SUFFIX}"
+ if test "$DFT_LWR_MODEL" = "libtool"; then
+ TEST_ARGS="${TEST_DEPS}"
+ else
+ TEST_ARGS="-l${TINFO_NAME}${DFT_ARG_SUFFIX}"
+ fi
fi
PROG_DEPS="$TEST_DEPS"
PROG_ARGS="$TEST_ARGS"
@@ -1033,6 +1062,7 @@
TINFO_NAME="$TINFO_NAME"
WITH_ECHO="$with_echo"
WITH_OVERWRITE="$with_overwrite"
+WITH_CURSES_H="$with_curses_h"
cf_cv_abi_version="$cf_cv_abi_version"
cf_cv_do_symlinks="$cf_cv_do_symlinks"
cf_cv_rel_version="$cf_cv_rel_version"
--- configure.orig Fri Jul 7 11:11:50 2000
+++ configure
@@ -193,13 +193,16 @@
--without-cxx-binding do not build C++ binding and demo
--without-ada suppress check for Ada95, don't build demo
--without-progs suppress build with programs (e.g., tic)
+ --without-curses-h only install ncurses.h
--with-install-prefix prefixes actual install-location
Options to Specify How Manpages are Installed:
--with-manpage-format specify manpage-format: gzip/compress/BSDI/normal and
optionally formatted, e.g., gzip,formatted
--with-manpage-renames specify manpage-renaming
--with-manpage-symlinks specify manpage-symlinks
+ --with-manpage-tbl specify manpage processing with tbl
Options to Specify the Libraries Built/Used:
+ --with-libtool generate libraries with libtool
--with-shared generate shared-libraries
EOF
cat <<EOF
@@ -1526,6 +1529,19 @@
echo "$ac_t""$cf_with_progs" 1>&6
+echo $ac_n "checking if you wish to install curses.h""... $ac_c" 1>&6
+echo "configure:1518: checking if you wish to install curses.h" >&5
+
+# Check whether --with-curses-h or --without-curses-h was given.
+if test "${with_curses_h+set}" = set; then
+ withval="$with_curses_h"
+ with_curses_h=$withval
+else
+ with_curses_h=yes
+fi
+
+echo "$ac_t""$with_curses_h" 1>&6
+
modules_to_build="ncurses"
if test "X$cf_with_progs" != Xno ; then
modules_to_build="$modules_to_build progs tack"
@@ -2043,6 +2059,22 @@
echo "$ac_t""$cf_manpage_symlinks" 1>&6
+echo $ac_n "checking for manpage tbl""... $ac_c" 1>&6
+echo "configure:2032: checking for manpage tbl" >&5
+
+
+# Check whether --with-manpage-tbl or --without-manpage-tbl was given.
+if test "${with_manpage_tbl+set}" = set; then
+ withval="$with_manpage_tbl"
+ cf_manpage_tbl=$withval
+else
+ cf_manpage_tbl=yes
+fi
+
+
+echo "$ac_t""$cf_manpage_tbl" 1>&6
+
+
if test "$prefix" = "NONE" ; then
cf_prefix="$ac_default_prefix"
else
@@ -2116,6 +2148,18 @@
test \$verb = installing && sed -e "s,@DATADIR@,\$datadir," < \$i | sed
-f edit_man.sed >\$TMP
CF_EOF
fi
+if test $cf_manpage_tbl = yes ; then
+cat >>man/edit_man.sh <<CF_EOF
+ tbl \$TMP >\$TMP.out
+ mv \$TMP.out \$TMP
+CF_EOF
+fi
+if test $with_curses_h != yes ; then
+cat >>man/edit_man.sh <<CF_EOF
+ sed -e "/\#[ ]*include/s,curses.h,ncurses.h," < \$TMP >\$TMP.out
+ mv \$TMP.out \$TMP
+CF_EOF
+fi
if test $cf_format = yes ; then
cat >>man/edit_man.sh <<CF_EOF
nroff -man \$TMP >\$TMP.out
@@ -2208,6 +2252,25 @@
### shared, for example.
cf_list_models=""
+echo $ac_n "checking if you want to build libraries with libtool""... $ac_c"
1>&6
+echo "configure:2213: checking if you want to build libraries with libtool" >&5
+
+# Check whether --with-libtool or --without-libtool was given.
+if test "${with_libtool+set}" = set; then
+ withval="$with_libtool"
+ with_libtool=$withval
+else
+ with_libtool=no
+fi
+
+echo "$ac_t""$with_libtool" 1>&6
+if test "$with_libtool" = "yes"; then
+ cf_list_models="$cf_list_models libtool"
+ test -z "$LIBTOOL" && LIBTOOL=libtool
+else
+ LIBTOOL=""
+fi
+
echo $ac_n "checking if you want to build shared libraries""... $ac_c" 1>&6
echo "configure:2213: checking if you want to build shared libraries" >&5
@@ -2269,6 +2332,9 @@
echo $ac_n "checking for specified models""... $ac_c" 1>&6
echo "configure:2271: checking for specified models" >&5
test -z "$cf_list_models" && cf_list_models=normal
+# If we use libtool to generate libraries, then it must be the only
+# specified model.
+test "$with_libtool" = "yes" && cf_list_models=libtool
echo "$ac_t""$cf_list_models" 1>&6
### Use the first model as the default, and save its suffix for use in building
@@ -2563,6 +2629,7 @@
echo $ac_n "checking for default loader flags""... $ac_c" 1>&6
echo "configure:2565: checking for default loader flags" >&5
case $DFT_LWR_MODEL in
+libtool) LD_MODEL='' ;;
normal) LD_MODEL='' ;;
debug) LD_MODEL=$CC_G_OPT ;;
profile) LD_MODEL='-pg';;
@@ -6540,6 +6607,7 @@
echo "configure:6541: checking default library suffix" >&5
case $DFT_LWR_MODEL in
+ libtool) DFT_ARG_SUFFIX='' ;;
normal) DFT_ARG_SUFFIX='' ;;
debug) DFT_ARG_SUFFIX='_g' ;;
profile) DFT_ARG_SUFFIX='_p' ;;
@@ -6553,6 +6621,7 @@
case $DFT_LWR_MODEL in
+ libtool) DFT_DEP_SUFFIX='.la' ;;
normal) DFT_DEP_SUFFIX='.a' ;;
debug) DFT_DEP_SUFFIX='_g.a' ;;
profile) DFT_DEP_SUFFIX='_p.a' ;;
@@ -6569,6 +6638,7 @@
echo "configure:6570: checking default object directory" >&5
case $DFT_LWR_MODEL in
+ libtool) DFT_OBJ_SUBDIR='obj_lo' ;;
normal) DFT_OBJ_SUBDIR='objects' ;;
debug) DFT_OBJ_SUBDIR='obj_g' ;;
profile) DFT_OBJ_SUBDIR='obj_p' ;;
@@ -6594,7 +6664,11 @@
### could override this.
if test "$with_termlib" = yes ; then
TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${TINFO_NAME}${DFT_DEP_SUFFIX}"
- TEST_ARGS="-l${TINFO_NAME}${DFT_ARG_SUFFIX}"
+ if test "$DFT_LWR_MODEL" = "libtool"; then
+ TEST_ARGS="${TEST_DEPS}"
+ else
+ TEST_ARGS="-l${TINFO_NAME}${DFT_ARG_SUFFIX}"
+ fi
fi
PROG_DEPS="$TEST_DEPS"
PROG_ARGS="$TEST_ARGS"
@@ -6608,7 +6682,11 @@
# dependencies and linker-arguments for test-programs
TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${LIB_NAME}${DFT_DEP_SUFFIX} $TEST_DEPS"
-TEST_ARGS="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARGS"
+if test "$DFT_LWR_MODEL" = "libtool"; then
+ TEST_ARGS="${TEST_DEPS}"
+else
+ TEST_ARGS="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARGS"
+fi
# dependencies and linker-arguments for utility-programs
PROG_ARGS="$TEST_ARGS"
@@ -6651,7 +6729,11 @@
EOF
TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEPS"
- TEST_ARGS="-l${cf_dir}${DFT_ARG_SUFFIX} $TEST_ARGS"
+ if test "$DFT_LWR_MODEL" = "libtool"; then
+ TEST_ARGS="${TEST_DEPS}"
+ else
+ TEST_ARGS="-l${cf_dir}${DFT_ARG_SUFFIX}
$TEST_ARGS"
+ fi
fi
fi
done
@@ -6697,6 +6779,7 @@
do
case $cf_item in
+ libtool) cf_subdir='obj_lo' ;;
normal) cf_subdir='objects' ;;
debug) cf_subdir='obj_g' ;;
profile) cf_subdir='obj_p' ;;
@@ -6832,6 +6915,7 @@
s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
$ac_vpsub
$extrasub
address@hidden@%$LIBTOOL%g
address@hidden@%$SHELL%g
address@hidden@%$CFLAGS%g
address@hidden@%$CPPFLAGS%g
@@ -7172,6 +7256,7 @@
TINFO_NAME="$TINFO_NAME"
WITH_ECHO="$with_echo"
WITH_OVERWRITE="$with_overwrite"
+WITH_CURSES_H="$with_curses_h"
cf_cv_abi_version="$cf_cv_abi_version"
cf_cv_do_symlinks="$cf_cv_do_symlinks"
cf_cv_rel_version="$cf_cv_rel_version"
@@ -7206,6 +7291,7 @@
case $cf_item in
+ libtool) cf_suffix='.la' ;;
normal) cf_suffix='.a' ;;
debug) cf_suffix='_g.a' ;;
profile) cf_suffix='_p.a' ;;
@@ -7256,6 +7342,7 @@
case $cf_item in
+ libtool) cf_suffix='.la' ;;
normal) cf_suffix='.a' ;;
debug) cf_suffix='_g.a' ;;
profile) cf_suffix='_p.a' ;;
@@ -7269,6 +7356,7 @@
case $cf_item in
+ libtool) cf_subdir='obj_lo' ;;
normal) cf_subdir='objects' ;;
debug) cf_subdir='obj_g' ;;
profile) cf_subdir='obj_p' ;;
@@ -7406,27 +7494,61 @@
DST=\$1
REF=\$2
SRC=\$3
+TMPSRC=\${TMPDIR-/tmp}/\`basename \$SRC\`\$\$
+TMPSED=\${TMPDIR-/tmp}/headers.sed\$\$
echo installing \$SRC in \$DST
+CF_EOF
+if test $WITH_CURSES_H != yes; then
+ cat >>headers.sh <<CF_EOF
case \$DST in
/*/include/*)
- TMPSRC=\${TMPDIR-/tmp}/\`basename \$SRC\`\$\$
- TMPSED=\${TMPDIR-/tmp}/headers.sed\$\$
END=\`basename \$DST\`
for i in \`cat \$REF/../*/headers |fgrep -v "#"\`
do
NAME=\`basename \$i\`
+ if test "\$NAME" = "curses.h"
+ then
+ echo "s/<curses.h>/<ncurses.h>/" >> \$TMPSED
+ NAME=ncurses.h
+ fi
echo "s/<\$NAME>/<\$END\/\$NAME>/" >> \$TMPSED
done
- rm -f \$TMPSRC
- sed -f \$TMPSED \$SRC > \$TMPSRC
- eval \$PRG \$TMPSRC \$DST/\$SRC
- rm -f \$TMPSRC \$TMPSED
+ ;;
+*)
+ echo "s/<curses.h>/<ncurses.h>/" >> \$TMPSED
;;
+esac
+CF_EOF
+else
+ cat >>headers.sh <<CF_EOF
+case \$DST in
+/*/include/*)
+ END=\`basename \$DST\`
+ for i in \`cat \$REF/../*/headers |fgrep -v "#"\`
+ do
+ NAME=\`basename \$i\`
+ echo "s/<\$NAME>/<\$END\/\$NAME>/" >> \$TMPSED
+ done
+ ;;
*)
- eval \$PRG \$SRC \$DST
+ echo "" >> \$TMPSED
;;
esac
CF_EOF
+fi
+cat >>headers.sh <<CF_EOF
+rm -f \$TMPSRC
+sed -f \$TMPSED \$SRC > \$TMPSRC
+CF_EOF
+if test $WITH_CURSES_H != yes; then
+ cat >>headers.sh <<CF_EOF
+test "\$SRC" = "curses.h" && SRC=ncurses.h
+CF_EOF
+fi
+cat >>headers.sh <<CF_EOF
+eval \$PRG \$TMPSRC \$DST/\$SRC
+rm -f \$TMPSRC \$TMPSED
+CF_EOF
chmod 0755 headers.sh
@@ -7451,7 +7573,7 @@
for i in `cat $srcdir/$cf_dir/headers |fgrep -v "#"`
do
echo " @ (cd \$(INSTALL_PREFIX)\$(includedir) && rm -f
`basename $i`) ; ../headers.sh \$(INSTALL_DATA)
\$(INSTALL_PREFIX)\$(includedir) \$(srcdir) $i" >>$cf_dir/Makefile
- test $i = curses.h && echo " @ (cd
\$(INSTALL_PREFIX)\$(includedir) && rm -f ncurses.h && \$(LN_S) curses.h
ncurses.h)" >>$cf_dir/Makefile
+ test $i = curses.h && test $WITH_CURSES_H = yes && echo
" @ (cd \$(INSTALL_PREFIX)\$(includedir) && rm -f ncurses.h && \$(LN_S)
curses.h ncurses.h)" >>$cf_dir/Makefile
done
cat >>$cf_dir/Makefile <<CF_EOF
--- form/Makefile.in.orig Sat May 27 21:40:18 2000
+++ form/Makefile.in
@@ -61,6 +61,7 @@
AR_OPTS = @AR_OPTS@
AWK = @AWK@
LD = @LD@
+LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
CC = @CC@
@@ -72,6 +73,7 @@
CCFLAGS = $(CPPFLAGS) $(CFLAGS)
+CFLAGS_LIBTOOL = $(CCFLAGS)
CFLAGS_NORMAL = $(CCFLAGS)
CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE
CFLAGS_PROFILE = $(CCFLAGS) -pg
@@ -87,6 +89,8 @@
MK_SHARED_LIB = @MK_SHARED_LIB@
+NCURSES_MAJOR = @NCURSES_MAJOR@
+NCURSES_MINOR = @NCURSES_MINOR@
REL_VERSION = @cf_cv_rel_version@
ABI_VERSION = @cf_cv_abi_version@
--- menu/Makefile.in.orig Sat May 27 21:40:08 2000
+++ menu/Makefile.in
@@ -61,6 +61,7 @@
AR_OPTS = @AR_OPTS@
AWK = @AWK@
LD = @LD@
+LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
CC = @CC@
@@ -72,10 +73,10 @@
CCFLAGS = $(CPPFLAGS) $(CFLAGS)
+CFLAGS_LIBTOOL = $(CCFLAGS)
CFLAGS_NORMAL = $(CCFLAGS)
CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE
CFLAGS_PROFILE = $(CCFLAGS) -pg
-
CFLAGS_SHARED = $(CCFLAGS) @CC_SHARED_OPTS@
CFLAGS_DEFAULT = $(address@hidden@)
@@ -88,6 +89,8 @@
MK_SHARED_LIB = @MK_SHARED_LIB@
+NCURSES_MAJOR = @NCURSES_MAJOR@
+NCURSES_MINOR = @NCURSES_MINOR@
REL_VERSION = @cf_cv_rel_version@
ABI_VERSION = @cf_cv_abi_version@
--- mk-1st.awk.orig Thu Jul 6 20:27:51 2000
+++ mk-1st.awk
@@ -215,6 +215,28 @@
printf "address@hidden -f
so_locations\n"
}
}
+ else if ( MODEL == "LIBTOOL" ) {
+ if ( $2 == "c++" ) {
+ compile="CXX"
+ } else {
+ compile="CC"
+ }
+ end_name = lib_name;
+ printf "../lib/%s : $(%s_OBJS)\n", lib_name,
OBJS
+ printf "\tcd ../lib && $(LIBTOOL) $(%s) -o %s
$(%s_OBJS:.o=.lo) -rpath $(INSTALL_PREFIX)$(libdir) -version-info
$(NCURSES_MAJOR):$(NCURSES_MINOR)\n", compile, lib_name, OBJS
+ print ""
+ print "install \\"
+ print "install.libs \\"
+ printf "install.%s ::
$(INSTALL_PREFIX)$(libdir) ../lib/%s\n", name, lib_name
+ printf "address@hidden installing ../lib/%s in
$(INSTALL_PREFIX)$(libdir)\n", lib_name
+ printf "\tcd ../lib && $(LIBTOOL)
$(INSTALL_DATA) %s $(INSTALL_PREFIX)$(libdir)\n", lib_name
+ print ""
+ print "uninstall \\"
+ print "uninstall.libs \\"
+ printf "uninstall.%s ::\n", name
+ printf "address@hidden uninstalling
$(INSTALL_PREFIX)$(libdir)/%s\n", lib_name
+ printf "address@hidden(LIBTOOL) rm -f
$(INSTALL_PREFIX)$(libdir)/%s\n", lib_name
+ }
else
{
end_name = lib_name;
@@ -266,14 +288,23 @@
print ""
print "mostlyclean::"
printf "\t-rm -f $(%s_OBJS)\n", OBJS
+ if ( MODEL == "LIBTOOL" ) {
+ printf "\t-rm -f $(%s_OBJS:.o=.lo)\n", OBJS
+ }
}
else if ( found == 2 )
{
print ""
print "mostlyclean::"
printf "\t-rm -f $(%s_OBJS)\n", OBJS
+ if ( MODEL == "LIBTOOL" ) {
+ printf "\t-rm -f $(%s_OBJS:.o=.lo)\n", OBJS
+ }
print ""
print "clean ::"
printf "\t-rm -f $(%s_OBJS)\n", OBJS
+ if ( MODEL == "LIBTOOL" ) {
+ printf "\t-rm -f $(%s_OBJS:.o=.lo)\n", OBJS
+ }
}
}
--- mk-2nd.awk.orig Sat Apr 1 15:50:36 2000
+++ mk-2nd.awk
@@ -96,13 +96,18 @@
atsign="@"
printf "address@hidden 'compiling %s
(%s)'\n", $1, model
}
+ if ( MODEL == "LIBTOOL" ) {
+ libtool="\$(LIBTOOL)"
+ } else {
+ libtool=""
+ }
if ( $3 == "." || srcdir == "." ) {
dir = $3 "/"
sub("^\\$\\(srcdir\\)/","",dir);
sub("^\\./","",dir);
- printf "\t%scd ../%s; $(%s)
$(CFLAGS_%s) -c ../%s/%s%s%s", atsign, model, compile, MODEL, name, dir, $1,
suffix
+ printf "\t%scd ../%s; %s $(%s)
$(CFLAGS_%s) -c ../%s/%s%s%s", atsign, model, libtool, compile, MODEL, name,
dir, $1, suffix
} else
- printf "\t%scd ../%s; $(%s)
$(CFLAGS_%s) -c %s/%s%s", atsign, model, compile, MODEL, $3, $1, suffix
+ printf "\t%scd ../%s; %s $(%s)
$(CFLAGS_%s) -c %s/%s%s", atsign, model, libtool compile, MODEL, $3, $1, suffix
} else {
printf "%s", $1
for (n = 2; n <= NF; n++) printf " %s", $n
--- ncurses/Makefile.in.orig Sat May 27 21:39:56 2000
+++ ncurses/Makefile.in
@@ -72,6 +72,7 @@
AR_OPTS = @AR_OPTS@
AWK = @AWK@
LD = @LD@
+LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
CC = @CC@
@@ -88,6 +89,7 @@
HOSTCCFLAGS = @CFLAGS@ $(CPPFLAGS)
HOSTLDFLAGS = @LDFLAGS@ @LIBS@
+CFLAGS_LIBTOOL = $(CCFLAGS)
CFLAGS_NORMAL = $(CCFLAGS)
CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE
CFLAGS_PROFILE = $(CCFLAGS) -pg
@@ -104,6 +106,8 @@
MK_SHARED_LIB = @MK_SHARED_LIB@
+NCURSES_MAJOR = @NCURSES_MAJOR@
+NCURSES_MINOR = @NCURSES_MINOR@
REL_VERSION = @cf_cv_rel_version@
ABI_VERSION = @cf_cv_abi_version@
--- panel/Makefile.in.orig Sat May 27 21:40:32 2000
+++ panel/Makefile.in
@@ -64,6 +64,7 @@
AR_OPTS = @AR_OPTS@
AWK = @AWK@
LD = @LD@
+LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
CC = @CC@
@@ -75,6 +76,7 @@
CCFLAGS = $(CPPFLAGS) $(CFLAGS)
+CFLAGS_LIBTOOL = $(CCFLAGS)
CFLAGS_NORMAL = $(CCFLAGS)
CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE
CFLAGS_PROFILE = $(CCFLAGS) -pg
@@ -90,6 +92,8 @@
MK_SHARED_LIB = @MK_SHARED_LIB@
+NCURSES_MAJOR = @NCURSES_MAJOR@
+NCURSES_MINOR = @NCURSES_MINOR@
REL_VERSION = @cf_cv_rel_version@
ABI_VERSION = @cf_cv_abi_version@
--- progs/Makefile.in.orig Fri Jul 7 21:56:25 2000
+++ progs/Makefile.in
@@ -65,6 +65,7 @@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
AWK = @AWK@
+LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
CC = @CC@
@@ -77,6 +78,7 @@
CCFLAGS = $(CPPFLAGS) $(CFLAGS)
+CFLAGS_LIBTOOL = $(CCFLAGS)
CFLAGS_NORMAL = $(CCFLAGS)
CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE
CFLAGS_PROFILE = $(CCFLAGS) -pg
@@ -85,10 +87,11 @@
CFLAGS_DEFAULT = $(address@hidden@)
LD = @LD@
-LINK = @LINK_PROGS@ $(CC)
+LINK = @LINK_PROGS@ $(LIBTOOL) $(CC)
LDFLAGS = @EXTRA_LDFLAGS@ \
@PROG_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@ @EXTRA_LIBS@
+LDFLAGS_LIBTOOL = $(LDFLAGS)
LDFLAGS_NORMAL = $(LDFLAGS)
LDFLAGS_DEBUG = $(LDFLAGS) @CC_G_OPT@
LDFLAGS_PROFILE = $(LDFLAGS) -pg
@@ -103,7 +106,7 @@
AUTO_SRC = \
termsort.c
-PROGS = tic$x toe$x infocmp$x clear$x tput$x tset$x
+PROGS = tic$x toe$x infocmp$x # clear$x tput$x tset$x
TESTPROGS = mvcur$x tctest$x hardscroll$x hashmap$x
@@ -124,12 +127,12 @@
uninstall.libs:
install.progs: $(PROGS) $(INSTALL_PREFIX)$(bindir)
- $(INSTALL_PROGRAM) tic$x $(INSTALL_PREFIX)$(bindir)/tic$x
- $(INSTALL_PROGRAM) toe$x $(INSTALL_PREFIX)$(bindir)/toe$x
- $(INSTALL_PROGRAM) infocmp$x $(INSTALL_PREFIX)$(bindir)/infocmp$x
- $(INSTALL_PROGRAM) clear$x $(INSTALL_PREFIX)$(bindir)/clear$x
- $(INSTALL_PROGRAM) tput$x $(INSTALL_PREFIX)$(bindir)/tput$x
- $(INSTALL_PROGRAM) tset$x $(INSTALL_PREFIX)$(bindir)/tset$x
+ $(LIBTOOL) $(INSTALL_PROGRAM) tic$x $(INSTALL_PREFIX)$(bindir)/tic$x
+ $(LIBTOOL) $(INSTALL_PROGRAM) toe$x $(INSTALL_PREFIX)$(bindir)/toe$x
+ $(LIBTOOL) $(INSTALL_PROGRAM) infocmp$x
$(INSTALL_PREFIX)$(bindir)/infocmp$x
+ $(LIBTOOL) $(INSTALL_PROGRAM) clear$x
$(INSTALL_PREFIX)$(bindir)/clear$x
+ $(LIBTOOL) $(INSTALL_PROGRAM) tput$x
$(INSTALL_PREFIX)$(bindir)/tput$x
+ $(LIBTOOL) $(INSTALL_PROGRAM) tset$x
$(INSTALL_PREFIX)$(bindir)/tset$x
@echo "linking captoinfo to tic"
address@hidden -f $(INSTALL_PREFIX)$(bindir)/captoinfo$x
(cd $(INSTALL_PREFIX)$(bindir) && $(LN_S) tic$x captoinfo$x)
@@ -141,12 +144,12 @@
(cd $(INSTALL_PREFIX)$(bindir) && $(LN_S) tset$x reset$x)
uninstall.progs:
- address@hidden -f $(INSTALL_PREFIX)$(bindir)/tic$x
- address@hidden -f $(INSTALL_PREFIX)$(bindir)/toe$x
- address@hidden -f $(INSTALL_PREFIX)$(bindir)/infocmp$x
- address@hidden -f $(INSTALL_PREFIX)$(bindir)/clear$x
- address@hidden -f $(INSTALL_PREFIX)$(bindir)/tput$x
- address@hidden -f $(INSTALL_PREFIX)$(bindir)/tset$x
+ address@hidden(LIBTOOL) rm -f $(INSTALL_PREFIX)$(bindir)/tic$x
+ address@hidden(LIBTOOL) rm -f $(INSTALL_PREFIX)$(bindir)/toe$x
+ address@hidden(LIBTOOL) rm -f $(INSTALL_PREFIX)$(bindir)/infocmp$x
+ address@hidden(LIBTOOL) rm -f $(INSTALL_PREFIX)$(bindir)/clear$x
+ address@hidden(LIBTOOL) rm -f $(INSTALL_PREFIX)$(bindir)/tput$x
+ address@hidden(LIBTOOL) rm -f $(INSTALL_PREFIX)$(bindir)/tset$x
address@hidden -f $(INSTALL_PREFIX)$(bindir)/captoinfo$x
address@hidden -f $(INSTALL_PREFIX)$(bindir)/infotocap$x
address@hidden -f $(INSTALL_PREFIX)$(bindir)/reset$x
--- tack/Makefile.in.orig Fri Jul 7 21:56:35 2000
+++ tack/Makefile.in
@@ -35,6 +35,7 @@
INSTALL_DATA = @INSTALL_DATA@
AWK = @AWK@
+LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
CC = @CC@
@@ -46,6 +47,7 @@
CCFLAGS = $(CPPFLAGS) $(CFLAGS)
+CFLAGS_LIBTOOL = $(CCFLAGS)
CFLAGS_NORMAL = $(CCFLAGS)
CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE
CFLAGS_PROFILE = $(CCFLAGS) -pg
@@ -54,10 +56,11 @@
CFLAGS_DEFAULT = $(address@hidden@)
LD = @LD@
-LINK = @LINK_PROGS@ $(CC)
+LINK = @LINK_PROGS@ $(LIBTOOL) $(CC)
LDFLAGS = @EXTRA_LDFLAGS@ \
@PROG_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@ @EXTRA_LIBS@
+LDFLAGS_LIBTOOL = $(LDFLAGS)
LDFLAGS_NORMAL = $(LDFLAGS)
LDFLAGS_DEBUG = $(LDFLAGS) @CC_G_OPT@
LDFLAGS_PROFILE = $(LDFLAGS) -pg
@@ -90,11 +93,11 @@
install.tack: $(PROGS) \
$(INSTALL_PREFIX)$(bindir) \
$(INSTALL_PREFIX)$(mandir)
- $(INSTALL_PROGRAM) tack$x $(INSTALL_PREFIX)$(bindir)/tack$x
+ $(LIBTOOL) $(INSTALL_PROGRAM) tack$x $(INSTALL_PREFIX)$(bindir)/tack$x
$(INSTALL_DATA) $(srcdir)/tack.1 $(INSTALL_PREFIX)$(mandir)/tack.1
uninstall.tack:
- address@hidden -f $(INSTALL_PREFIX)$(bindir)/tack$x
+ address@hidden(LIBTOOL) rm -f $(INSTALL_PREFIX)$(bindir)/tack$x
address@hidden -f $(INSTALL_PREFIX)$(mandir)/tack.1
$(INSTALL_PREFIX)$(bindir) \
--- test/Makefile.in.orig Sat May 27 21:28:39 2000
+++ test/Makefile.in
@@ -53,6 +53,7 @@
CCFLAGS = $(CPPFLAGS) $(CFLAGS)
+CFLAGS_LIBTOOL = $(CCFLAGS)
CFLAGS_NORMAL = $(CCFLAGS)
CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE
CFLAGS_PROFILE = $(CCFLAGS) -pg
@@ -66,10 +67,12 @@
MATH_LIB = @MATH_LIB@
LD = @LD@
-LINK = @LINK_TESTS@ $(CC)
+LIBTOOL = @LIBTOOL@
+LINK = @LINK_TESTS@ $(LIBTOOL) $(CC)
LDFLAGS = @LD_MODEL@ @TEST_ARGS@ @LIBS@ @EXTRA_LIBS@
@LOCAL_LDFLAGS@ @LDFLAGS@
+LDFLAGS_LIBTOOL = $(LDFLAGS)
LDFLAGS_NORMAL = $(LDFLAGS)
LDFLAGS_DEBUG = $(LDFLAGS) @CC_G_OPT@
LDFLAGS_PROFILE = $(LDFLAGS) -pg
- Patch to add libtool support,
Johnny C. Lam <=