mirror of
https://github.com/gryf/wmaker.git
synced 2026-01-03 20:34:14 +01:00
Small bug fixes over 0.20.2 -Dan
This commit is contained in:
dan
81
configure
vendored
81
configure
vendored
@@ -20,7 +20,7 @@ ac_help="$ac_help
|
||||
ac_help="$ac_help
|
||||
--disable-shape disable shaped window extension support"
|
||||
ac_help="$ac_help
|
||||
--disable-shm disable usage of MIT-SHM extension"
|
||||
--disable-shm disable usage of MIT-SHM extension"
|
||||
ac_help="$ac_help
|
||||
--with-gfx-libs pass compiler flags to look for gfx libraries"
|
||||
ac_help="$ac_help
|
||||
@@ -30,17 +30,17 @@ ac_help="$ac_help
|
||||
ac_help="$ac_help
|
||||
--disable-jpeg disable JPEG support through libjpeg"
|
||||
ac_help="$ac_help
|
||||
--disable-gif disable GIF support through libgif or libungif"
|
||||
--disable-gif disable GIF support through libgif or libungif"
|
||||
ac_help="$ac_help
|
||||
--disable-tiff disable use of TIFF images through libtiff"
|
||||
ac_help="$ac_help
|
||||
--enable-debug enable debugging "
|
||||
ac_help="$ac_help
|
||||
--enable-sound enable sound support "
|
||||
--disable-sound disable sound support "
|
||||
ac_help="$ac_help
|
||||
--with-pixmapdir=PATH specify where pixmaps are located [DATADIR/pixmaps]"
|
||||
ac_help="$ac_help
|
||||
--with-appspath=PATH specify the path of the GNUstep applications directory "
|
||||
--with-appspath=PATH specify the path of the GNUstep applications directory"
|
||||
ac_help="$ac_help
|
||||
--enable-single-icon use single application icon per WM_INSTANCE+WM_CLASS
|
||||
"
|
||||
@@ -4041,15 +4041,16 @@ fi
|
||||
|
||||
|
||||
|
||||
sound=yes
|
||||
# Check whether --enable-sound or --disable-sound was given.
|
||||
if test "${enable_sound+set}" = set; then
|
||||
enableval="$enable_sound"
|
||||
:
|
||||
sound=$enableval
|
||||
else
|
||||
enable_sound=no
|
||||
sound=yes
|
||||
fi
|
||||
|
||||
if test "$enable_sound" = yes; then
|
||||
if test "$sound" = yes; then
|
||||
SOUND="#define WMSOUND"
|
||||
else
|
||||
SOUND="#undef WMSOUND"
|
||||
@@ -4123,12 +4124,12 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
|
||||
echo "configure:4127: checking for sys/wait.h that is POSIX.1 compatible" >&5
|
||||
echo "configure:4128: checking for sys/wait.h that is POSIX.1 compatible" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4132 "configure"
|
||||
#line 4133 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#include <sys/wait.h>
|
||||
@@ -4144,7 +4145,7 @@ wait (&s);
|
||||
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4148: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:4149: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_header_sys_wait_h=yes
|
||||
else
|
||||
@@ -4168,17 +4169,17 @@ for ac_hdr in fcntl.h limits.h sys/ioctl.h sys/time.h sys/types.h libintl.h sys/
|
||||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:4172: checking for $ac_hdr" >&5
|
||||
echo "configure:4173: checking for $ac_hdr" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4177 "configure"
|
||||
#line 4178 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:4182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:4183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
@@ -4208,12 +4209,12 @@ done
|
||||
|
||||
|
||||
echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
|
||||
echo "configure:4212: checking for sys_siglist declaration in signal.h or unistd.h" >&5
|
||||
echo "configure:4213: checking for sys_siglist declaration in signal.h or unistd.h" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4217 "configure"
|
||||
#line 4218 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#include <signal.h>
|
||||
@@ -4225,7 +4226,7 @@ int main() {
|
||||
char *msg = *(sys_siglist + 1);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4229: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:4230: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_decl_sys_siglist=yes
|
||||
else
|
||||
@@ -4246,12 +4247,12 @@ EOF
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for working const""... $ac_c" 1>&6
|
||||
echo "configure:4250: checking for working const" >&5
|
||||
echo "configure:4251: checking for working const" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4255 "configure"
|
||||
#line 4256 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
@@ -4300,7 +4301,7 @@ ccp = (char const *const *) p;
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4304: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:4305: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_c_const=yes
|
||||
else
|
||||
@@ -4321,12 +4322,12 @@ EOF
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
|
||||
echo "configure:4325: checking for ANSI C header files" >&5
|
||||
echo "configure:4326: checking for ANSI C header files" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4330 "configure"
|
||||
#line 4331 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdlib.h>
|
||||
#include <stdarg.h>
|
||||
@@ -4334,7 +4335,7 @@ else
|
||||
#include <float.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:4338: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:4339: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
@@ -4351,7 +4352,7 @@ rm -f conftest*
|
||||
if test $ac_cv_header_stdc = yes; then
|
||||
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4355 "configure"
|
||||
#line 4356 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <string.h>
|
||||
EOF
|
||||
@@ -4369,7 +4370,7 @@ fi
|
||||
if test $ac_cv_header_stdc = yes; then
|
||||
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4373 "configure"
|
||||
#line 4374 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdlib.h>
|
||||
EOF
|
||||
@@ -4390,7 +4391,7 @@ if test "$cross_compiling" = yes; then
|
||||
:
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4394 "configure"
|
||||
#line 4395 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <ctype.h>
|
||||
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
|
||||
@@ -4401,7 +4402,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
|
||||
exit (0); }
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:4405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:4406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
@@ -4425,12 +4426,12 @@ EOF
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for size_t""... $ac_c" 1>&6
|
||||
echo "configure:4429: checking for size_t" >&5
|
||||
echo "configure:4430: checking for size_t" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4434 "configure"
|
||||
#line 4435 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#if STDC_HEADERS
|
||||
@@ -4458,12 +4459,12 @@ EOF
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
|
||||
echo "configure:4462: checking for pid_t" >&5
|
||||
echo "configure:4463: checking for pid_t" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4467 "configure"
|
||||
#line 4468 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#if STDC_HEADERS
|
||||
@@ -4491,12 +4492,12 @@ EOF
|
||||
fi
|
||||
|
||||
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
|
||||
echo "configure:4495: checking whether time.h and sys/time.h may both be included" >&5
|
||||
echo "configure:4496: checking whether time.h and sys/time.h may both be included" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4500 "configure"
|
||||
#line 4501 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#include <sys/time.h>
|
||||
@@ -4505,7 +4506,7 @@ int main() {
|
||||
struct tm *tp;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4509: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:4510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_header_time=yes
|
||||
else
|
||||
@@ -4575,7 +4576,7 @@ if test "$enable_shared" = yes; then
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for shared library support""... $ac_c" 1>&6
|
||||
echo "configure:4579: checking for shared library support" >&5
|
||||
echo "configure:4580: checking for shared library support" >&5
|
||||
|
||||
test=tmptest$$
|
||||
cat > $test.c <<EOF
|
||||
@@ -5134,6 +5135,12 @@ echo "WLIBS=\"-L$exec_prefix/lib -lWINGs -lwraster $LIBPL_LIBS $GFXLIBS -lm\""\
|
||||
|
||||
supported_gfx="$supported_gfx PPM (built-in)"
|
||||
|
||||
if test "x$MOFILES" = "x"; then
|
||||
mof=none
|
||||
else
|
||||
mof=$MOFILES
|
||||
fi
|
||||
|
||||
echo
|
||||
echo "Window Maker was configured as follows:"
|
||||
echo
|
||||
@@ -5141,11 +5148,7 @@ echo "Installation path prefix: $prefix"
|
||||
echo "Installation path prefix for binaries: $exec_prefix"
|
||||
echo "Installation path for WPrefs.app: $wprefsdir"
|
||||
echo "Graphic format libraries: $supported_gfx"
|
||||
if test "x$MOFILES" = "x"; then
|
||||
mof=none
|
||||
else
|
||||
mof=$MOFILES
|
||||
fi
|
||||
echo "Sound support: $sound"
|
||||
echo "Translated message files to install: $mof"
|
||||
if test "x$MOFILES" != "x"; then
|
||||
echo "Installation path of translated messages: $NLSDIR"
|
||||
|
||||
Reference in New Issue
Block a user