Patches for Afterstep 1.5beta3 configure script

Jacques Caron (jcaron@planete.net)
Fri, 4 Sep 1998 12:14:39 +0200 

Hi,

I noticed a few problems in the AfterStep 1.5beta3 configure scripts...

1. If there's not JPEG LIbrary, the configure script doesn't define
HAVEJPEG, and the configure.h file can't compile (Line 20).

The following should fix that in the autoconf config file (not tested, I
don't have autoconf):

*** configure.in.orig   Fri Sep  4 11:13:47 1998
--- configure.in        Fri Sep  4 11:14:44 1998
***************
*** 36,42 ****
  AC_CHECK_FUNCS(uname gethostname)
  VT_FIND_LIBXPM
  AC_CHECK_LIB(Xext, XShapeCombineMask, [XEXT_LIB="-lX11 -lXext"
HAVESHAPE="SHAP
E"],,$XLFLAGS $X_LIBS)
! AC_CHECK_LIB(jpeg, jpeg_destroy_compress, [JPEG_LIB="-ljpeg"
HAVEJPEG="JPEG"],
,)

  dnl# Variable strings declaration

--- 36,42 ----
  AC_CHECK_FUNCS(uname gethostname)
  VT_FIND_LIBXPM
  AC_CHECK_LIB(Xext, XShapeCombineMask, [XEXT_LIB="-lX11 -lXext"
HAVESHAPE="SHAP
E"],,$XLFLAGS $X_LIBS)
! AC_CHECK_LIB(jpeg, jpeg_destroy_compress, [JPEG_LIB="-ljpeg"
HAVEJPEG="JPEG"],
HAVEJPEG="NOJPEG",)

  dnl# Variable strings declaration

This patches the resulting file for people like me who don't have autoconf:

nt12# diff -c configure.orig configure
*** configure.orig      Fri Sep  4 11:10:50 1998
--- configure   Fri Sep  4 10:41:59 1998
***************
*** 2645,2650 ****
--- 2645,2651 ----
    echo "$ac_t""yes" 1>&6
    JPEG_LIB="-ljpeg" HAVEJPEG="JPEG"
  else
+   HAVEJPEG="NOJPEG"
    echo "$ac_t""no" 1>&6
  fi

2. The Makefile in /lib should use the INCS_X macro...

nt12# diff -c Makefile.common.lib.in.orig Makefile.common.lib.in
*** Makefile.common.lib.in.orig Fri Sep  4 11:11:12 1998
--- Makefile.common.lib.in      Fri Sep  4 10:51:19 1998
***************
*** 14,19 ****
--- 14,23 ----
  RMF           = @RM@ -f
  MKDIR         = @MKDIR@

+ INCS_X                = @X_CFLAGS@
+ INCS_XPM      = @XPM_CFLAGS@
+ INCLUDES      = $(INCS_X) $(INCS_XPM)
+
  YACC          = @YACC@
  LEX           = @LEX@
  YACCFLAGS     = -d

3. The configure.h file should always include limits.h, even on FreeBSD
machines. We need LONG_INT from limits.h in src/afterstep/events.c, and
limits.h includes <sys/syslimits.h> anyway:

*** configure.h.in.orig Fri Sep  4 12:11:54 1998
--- configure.h.in      Fri Sep  4 12:13:02 1998
***************
*** 1,10 ****
  #include "config.h"

- #ifdef __FreeBSD__
- #include <sys/syslimits.h>
- #else
  #include <limits.h>
- #endif


  /* Maximal lenght of config. file lines ; attention : the more you define
--- 1,6 ----

Jacques.

--- Jacques Caron - Planete.net - jcaron@planete.net
    Mail:   5/7 rue Raspail - 93100 Montreuil - France
    Phone:  +33 (0)1 49 88 65 00 - Fax: +33 (0)1 49 88 75 15
    Planete.net: 28 points d'acces en France, tous services Internet
    pour particuliers et professionnels - http://www.planete.net