patch for motif-config and autotools
Patrice Dumas <[email protected]>
| Newsgroups | gmane.comp.graphics.lesstif |
|---|---|
| Message-ID | <[email protected]> |
Hello,
Here is a patch:
* allow for autoreconf to work
* remove XRENDER_LIBS from scripts/motif-config.in since it is not used
in the build, instead create and add FREETYPE_LIBS, use all the X_*
flags
* use the includedir and libdir from autoconf in scripts/motif-config.in
* use ${datadir}/aclocal for ACLOCALDIR to have make distcheck work
--
Pat
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Lesstif-discuss mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/lesstif-discuss
lesstif-build.diff
(text/plain, 3 KB)
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/lesstif/lesstif/acinclude.m4,v
retrieving revision 1.48
diff -u -3 -p -r1.48 acinclude.m4
--- acinclude.m4 1 Nov 2005 08:14:56 -0000 1.48
+++ acinclude.m4 21 Oct 2007 17:27:40 -0000
@@ -553,6 +553,8 @@ yes)
yes)
LT_HAVE_FREETYPE="yes"
AC_DEFINE(HAVE_FREETYPE, 1, Means we have discovered the FreeType library)
+ FREETYPE_LIBS=$freetype_lib
+ AC_SUBST(FREETYPE_LIBS)
AC_SUBST(FREETYPE_CFLAGS)
;;
esac
Index: configure.in
===================================================================
RCS file: /cvsroot/lesstif/lesstif/configure.in,v
retrieving revision 1.424
diff -u -3 -p -r1.424 configure.in
--- configure.in 10 Jun 2006 09:22:48 -0000 1.424
+++ configure.in 21 Oct 2007 17:27:40 -0000
@@ -78,8 +78,9 @@ AH_TEMPLATE([XTHREADS], [Define if libXt
AH_TEMPLATE([HAVE_LIB_XP], [Define if libXp is available])
AH_TEMPLATE([HAVE_GETHOSTNAME], [Define if gethostname() is available (may be in non-standard libs])
-AC_MSG_CHECKING(where to store autoconf macro files)
-ACLOCALDIR=`aclocal --print-ac-dir`
+dnl AC_MSG_CHECKING(where to store autoconf macro files)
+dnl ACLOCALDIR=`aclocal --print-ac-dir`
+ACLOCALDIR="${datadir}/aclocal"
AM_CONDITIONAL(Aclocal, test x$ACLOCALDIR != x )
AC_MSG_RESULT($ACLOCALDIR)
Index: scripts/motif-config.in
===================================================================
RCS file: /cvsroot/lesstif/lesstif/scripts/motif-config.in,v
retrieving revision 1.2
diff -u -3 -p -r1.2 motif-config.in
--- scripts/motif-config.in 14 Jan 2005 19:36:00 -0000 1.2
+++ scripts/motif-config.in 21 Oct 2007 17:27:40 -0000
@@ -2,14 +2,17 @@
#
# $Header: /cvsroot/lesstif/lesstif/scripts/motif-config.in,v 1.2 2005/01/14 19:36:00 dannybackx Exp $
#
-L="@prefix@"
XC="@X_CFLAGS@"
-XL="@X_LIBS@"
-XR="@XRENDER_LIBS@"
+X_PRE_LIBS="@X_PRE_LIBS@"
+X_LIBS="@X_LIBS@"
+X_EXTRA_LIBS="@X_EXTRA_LIBS@"
+FREETYPE_LIBS="@FREETYPE_LIBS@"
V="@PACKAGE_NAME@ @PACKAGE_VERSION@"
-prefix=$L
-exec_prefix=$L
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+libdir="@libdir@"
+includedir="@includedir@"
exec_prefix_set=no
usage()
@@ -80,10 +83,10 @@ if test "$echo_exec_prefix" = "yes"; the
fi
if test "$echo_cflags" = "yes"; then
- echo "-I$L/include $XC"
+ echo "-I$includedir $XC"
fi
if test "$echo_libs" = "yes"; then
- echo "-L$L/lib -L/usr/X11R6/lib -lXm -lXt $my_glib_libs $XR -lXext -lX11"
+ echo "-L$libdir ${X_LIBS} ${FREETYPE_LIBS} -lXm -lXt ${X_PRE_LIBS} -lX11 ${X_EXTRA_LIBS}"
fi
Index: test/Makefile.am
===================================================================
RCS file: /cvsroot/lesstif/lesstif/test/Makefile.am,v
retrieving revision 1.24
diff -u -3 -p -r1.24 Makefile.am
--- test/Makefile.am 18 May 2002 14:28:47 -0000 1.24
+++ test/Makefile.am 21 Oct 2007 17:27:40 -0000
@@ -2,6 +2,9 @@
# $Header: /cvsroot/lesstif/lesstif/test/Makefile.am,v 1.24 2002/05/18 14:28:47 dannybackx Exp $
#
+ACLOCAL_AMFLAGS = -I ../
+AUTOMAKE_OPTIONS = foreign
+
MAINTAINERCLEANFILES=Makefile.in
bin_SCRIPTS = testall