1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-05 22:43:24 +00:00
freebsd-ports/misc/gnomeutils/files/patch-aa
1998-10-10 15:59:18 +00:00

261 lines
7.1 KiB
Plaintext

--- configure.orig Wed Sep 23 00:11:28 1998
+++ configure Fri Oct 2 22:58:32 1998
@@ -940,12 +940,12 @@
if test "$no_gnome_config" = "yes"; then
- echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
-echo "configure:945: checking for gnomeConf.sh file in $gnome_prefix" >&5
- if test -f $gnome_prefix/gnomeConf.sh; then
+ echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6
+echo "configure:945: checking for gnomeConf.sh file in $prefix/share/gnome" >&5
+ if test -f $prefix/share/gnome/gnomeConf.sh; then
echo "$ac_t""found" 1>&6
- echo "loading gnome configuration from $gnome_prefix/gnomeConf.sh"
- . $gnome_prefix/gnomeConf.sh
+ echo "loading gnome configuration from $prefix/share/gnome/gnomeConf.sh"
+ . $prefix/share/gnome/gnomeConf.sh
else
echo "$ac_t""not found" 1>&6
@@ -2745,239 +2745,6 @@
PROGRAMS_GNCAL="gncal"
-
-
- for ac_prog in $OBJC egcs
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2756: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_OBJC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- if test -n "$OBJC"; then
- ac_cv_prog_OBJC="$OBJC" # Let the user override the test.
-else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_OBJC="$ac_prog"
- break
- fi
- done
- IFS="$ac_save_ifs"
-fi
-fi
-OBJC="$ac_cv_prog_OBJC"
-if test -n "$OBJC"; then
- echo "$ac_t""$OBJC" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
-
-test -n "$OBJC" && break
-done
-test -n "$OBJC" || OBJC=""""
-
- if test "x$OBJC" = "x" ; then
- for ac_prog in $OBJC gcc
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2791: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_OBJC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- if test -n "$OBJC"; then
- ac_cv_prog_OBJC="$OBJC" # Let the user override the test.
-else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_OBJC="$ac_prog"
- break
- fi
- done
- IFS="$ac_save_ifs"
-fi
-fi
-OBJC="$ac_cv_prog_OBJC"
-if test -n "$OBJC"; then
- echo "$ac_t""$OBJC" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
-
-test -n "$OBJC" && break
-done
-test -n "$OBJC" || OBJC=""""
-
- fi
-
-
-
- OBJC_LIBS="-lobjc $PTHREAD_LIB"
- echo $ac_n "checking for sched_yield""... $ac_c" 1>&6
-echo "configure:2826: checking for sched_yield" >&5
-if eval "test \"`echo '$''{'ac_cv_func_sched_yield'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2831 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char sched_yield(); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char sched_yield();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_sched_yield) || defined (__stub___sched_yield)
-choke me
-#else
-sched_yield();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:2854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
- rm -rf conftest*
- eval "ac_cv_func_sched_yield=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_func_sched_yield=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'sched_yield`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- :
-else
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6
-echo "configure:2873: checking for sched_yield in -lposix4" >&5
-ac_lib_var=`echo posix4'_'sched_yield | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-lposix4 $OBJC_LIBS $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2881 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char sched_yield();
-
-int main() {
-sched_yield()
-; return 0; }
-EOF
-if { (eval echo configure:2892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- OBJC_LIBS="$OBJC_LIBS -lposix4"
-else
- echo "$ac_t""no" 1>&6
-fi
-
-fi
-
-
-
- echo $ac_n "checking if Objective C compiler ($OBJC) works""... $ac_c" 1>&6
-echo "configure:2917: checking if Objective C compiler ($OBJC) works" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_objc_works'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
-
- if test -n "$OBJC"; then
- cat > conftest.m <<EOF
-#include <objc/Object.h>
-@interface myRandomObj : Object
-{
-}
-@end
-@implementation myRandomObj
-@end
-int main () {
- /* No, you are not seeing double. Remember that square brackets
- are the autoconf m4 quotes. */
- id myid = [myRandomObj alloc];
- [myid free];
- return 0;
-}
-EOF
-
- $OBJC -o conftest $LDFLAGS conftest.m $OBJC_LIBS 1>&5 2>&1
- result=$?
- rm -f conftest*
-
- if test $result -eq 0; then
- ac_cv_prog_objc_works=yes
- fi
- else
- ac_cv_prog_objc_works=no
- fi
-
-fi
-
-echo "$ac_t""$ac_cv_prog_objc_works" 1>&6
-
-
-
-if test x$ac_cv_prog_objc_works = xyes; then
- OBJECTIVE_C_TRUE=
- OBJECTIVE_C_FALSE='#'
-else
- OBJECTIVE_C_TRUE='#'
- OBJECTIVE_C_FALSE=
-fi
- OBJECTIVE_C=$ac_cv_prog_objc_works
-
-if test $OBJECTIVE_C = yes; then
-
- echo $ac_n "checking for obGnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
-echo "configure:2969: checking for obGnomeConf.sh file in $gnome_prefix" >&5
- if test -f $gnome_prefix/obGnomeConf.sh; then
- . $gnome_prefix/obGnomeConf.sh
- echo "$ac_t""found" 1>&6
- else
- echo "$ac_t""not found" 1>&6
- echo "configure: warning: Could not find the obGnomeConf.sh file that is generated by gnome-objc install" 1>&2
- fi
-
-
-
-
-fi
echo $ac_n "checking for working const""... $ac_c" 1>&6
echo "configure:2984: checking for working const" >&5