freebsd-ports/x11/gnome-libs/files/patch-aa

101 lines
3.2 KiB
Text
Raw Normal View History

1999-01-14 17:59:34 +01:00
--- configure.orig Wed Jan 13 09:30:53 1999
+++ configure Fri Jan 15 00:03:57 1999
1999-01-01 03:47:12 +01:00
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
1999-01-01 03:47:12 +01:00
# Guess values for system-dependent variables and create Makefiles.
# Generated automatically using autoconf version 2.12
1999-01-14 17:59:34 +01:00
@@ -4727,7 +4727,9 @@
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- cat > conftest.$ac_ext <<EOF
+ ac_save_LIBS="$LIBS"
+LIBS="-lintl $LIBS"
+cat > conftest.$ac_ext <<EOF
1999-01-14 17:59:34 +01:00
#line 4732 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
1999-01-14 17:59:34 +01:00
@@ -5905,7 +5907,9 @@
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- cat > conftest.$ac_ext <<EOF
+ ac_save_LIBS="$LIBS"
+LIBS="-lutil $LIBS"
+cat > conftest.$ac_ext <<EOF
1999-01-14 17:59:34 +01:00
#line 5910 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
1999-01-14 17:59:34 +01:00
@@ -5960,8 +5964,8 @@
1999-01-01 03:47:12 +01:00
#include "confdefs.h"
#include <stdio.h>
-#include <sys/socket.h>
#include <sys/types.h>
+#include <sys/socket.h>
int main() {
1999-01-14 17:59:34 +01:00
@@ -6407,7 +6411,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-ltiff -lm $LIBS"
+LIBS="-ltiff -ljpeg -lz -lm $LIBS"
cat > conftest.$ac_ext <<EOF
1999-01-14 17:59:34 +01:00
#line 6413 "configure"
#include "confdefs.h"
1999-01-14 17:59:34 +01:00
@@ -6661,16 +6665,16 @@
1998-09-18 04:38:56 +02:00
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
1999-01-14 17:59:34 +01:00
-echo "configure:6667: checking for gif_lib.h" >&5
1998-09-18 04:38:56 +02:00
+ ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6
1999-01-14 17:59:34 +01:00
+echo "configure:6667: checking for giflib/gif_lib.h" >&5
1998-09-18 04:38:56 +02:00
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
1999-01-14 17:59:34 +01:00
#line 6672 "configure"
#include "confdefs.h"
-#include <gif_lib.h>
+#include <giflib/gif_lib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1999-01-14 17:59:34 +01:00
{ (eval echo configure:6677: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
@@ -6737,16 +6741,16 @@
fi
1999-01-01 03:47:12 +01:00
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
1999-01-14 17:59:34 +01:00
-echo "configure:6743: checking for gif_lib.h" >&5
1999-01-01 03:47:12 +01:00
+ ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6
1999-01-14 17:59:34 +01:00
+echo "configure:6743: checking for giflib/gif_lib.h" >&5
1999-01-01 03:47:12 +01:00
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
1999-01-14 17:59:34 +01:00
#line 6748 "configure"
1999-01-01 03:47:12 +01:00
#include "confdefs.h"
-#include <gif_lib.h>
+#include <giflib/gif_lib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1999-01-14 17:59:34 +01:00
{ (eval echo configure:6753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
@@ -9674,7 +9678,7 @@
1999-01-01 03:47:12 +01:00
ZVT_LIBS="-lzvt $GTK_LIBS"
GNOME_LIBDIR='-L${libdir}'
-GNOME_INCLUDEDIR='-I${includedir} -DNEED_GNOMESUPPORT_H -I${pkglibdir}/include'
+GNOME_INCLUDEDIR='-I${includedir} -DNEED_GNOMESUPPORT_H'
GNOME_IDLDIR='-I${datadir}/idl'