Package: aalib Version: 1.4p5 This has a few misc changes to the build system that have accumulated in the package, including:
- Document --static-libs in aalib-config usage - Make --static-libs link with -lgpm - Don't directly link with -lgpm otherwise (see large comment in configure) - Update aalib.m4 to remove warning from some versions of automake. - Don't use rpath. -- see shy jo
--- aalib-1.4p5.orig/aalib-config.in
+++ aalib-1.4p5/aalib-config.in
@@ -5,7 +5,7 @@
exec_prefix_set=no
usage="\
-Usage: aalib-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
+Usage: aalib-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--static-libs] [--cflags]"
if test $# -eq 0; then
echo "${usage}" 1>&2
@@ -49,11 +49,14 @@
;;
@ENABLE_SHARED_TRUE@ --libs)
@ENABLE_SHARED_TRUE@ libdirs="[EMAIL PROTECTED]@ @AALIB_RLD_FLAGS@"
[EMAIL PROTECTED]@ echo $libdirs @AALIB_LIBS@
[EMAIL PROTECTED]@ echo $libdirs -laa
@ENABLE_SHARED_TRUE@ ;;
@ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs)
@ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs)
@ENABLE_STATIC_TRUE@ libdirs="[EMAIL PROTECTED]@ @AALIB_RLD_FLAGS@"
[EMAIL PROTECTED]@ if [ "`uname -s`" = Linux ]; then
[EMAIL PROTECTED]@ printf "%s" "-lgpm "
[EMAIL PROTECTED]@ fi
@ENABLE_STATIC_TRUE@ echo $libdirs @AALIB_LIBS@
@ENABLE_STATIC_TRUE@ ;;
*)
--- aalib-1.4p5.orig/aalib.m4
+++ aalib-1.4p5/aalib.m4
@@ -9,7 +9,7 @@
dnl AM_PATH_AALIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for AALIB, and define AALIB_CFLAGS and AALIB_LIBS
dnl
-AC_DEFUN(AM_PATH_AALIB,
+AC_DEFUN([AM_PATH_AALIB],
[dnl
dnl Get the cflags and libraries from the aalib-config script
dnl
--- aalib-1.4p5.orig/configure.in
+++ aalib-1.4p5/configure.in
@@ -1,8 +1,7 @@
-include(aclocal.m4)
AC_INIT(src/aalib.c)
-AM_INIT_AUTOMAKE(aalib,1.4.0)
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
+AM_INIT_AUTOMAKE(aalib,1.4.0)
AM_CONFIG_HEADER(src/config.h)
@@ -92,7 +91,8 @@
AC_DEFINE(GPM_MOUSEDRIVER)
gpm_mousedriver=true
CFLAGS="$CFLAGS -I$withval/include"
- AALIB_LIBS="$AALIB_LIBS -L$withval/lib -lgpm"
+dnl See Debian hack below for explination.
+dnl AALIB_LIBS="$AALIB_LIBS -L$withval/lib -lgpm"
AC_MSG_RESULT(defining use_gpm)
fi
)
@@ -113,7 +113,13 @@
AC_CHECK_LIB(gpm, Gpm_Repeat,[
AC_DEFINE(GPM_MOUSEDRIVER)
gpm_mousedriver=true
- AALIB_LIBS="$AALIB_LIBS -lgpm"
+dnl Debian hack: Don't bother putting gpm on the libs list, so aalib-config
+dnl will not require programs link with gpm. Since aalib itself links to
+dnl gpm, gpm support is still pulled in for client programs, but they need
+dnl not build-depend on it. This means that the -dev package need not
+dnl depend on libgpm1g-dev, which is a good thing since gpm support is not
+dnl available at all on some platforms like the hurd.
+dnl AALIB_LIBS="$AALIB_LIBS -lgpm"
LIBS="$LIBS -lgpm"])
fi
@@ -373,9 +379,9 @@
# Set runtime shared library paths as needed
-if test $ARCH = linux -o $ARCH = freebsd -o $ARCH = bsdi; then
- AALIB_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib"
-fi
+#if test $ARCH = linux -o $ARCH = freebsd -o $ARCH = bsdi; then
+# AALIB_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib"
+#fi
if test $ARCH = solaris; then
AALIB_RLD_FLAGS="-R\${exec_prefix}/lib"
signature.asc
Description: Digital signature
