summaryrefslogtreecommitdiff
path: root/x11/kdelibs3/patches/patch-ae
blob: f897d0018b530d82b5d4bce953152cf86b894771 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
$NetBSD: patch-ae,v 1.12 2011/08/22 17:16:24 adam Exp $

--- configure.orig	2008-08-20 16:06:05.000000000 +0000
+++ configure
@@ -8315,7 +8315,7 @@ darwin* | rhapsody*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu)
+freebsd* | kfreebsd*-gnu | dragonfly*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
@@ -11114,7 +11114,7 @@ if test -z "$aix_libpath"; then aix_libp
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
+    freebsd* | kfreebsd*-gnu | dragonfly*)
       archive_cmds='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
@@ -11679,7 +11679,7 @@ kfreebsd*-gnu*)
   dynamic_linker='GNU ld.so'
   ;;
 
-freebsd*)
+freebsd* | dragonfly*)
   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
   version_type=freebsd-$objformat
   case $version_type in
@@ -13995,7 +13995,7 @@ if test -z "$aix_libpath"; then aix_libp
   freebsd-elf*)
     archive_cmds_need_lc_CXX=no
     ;;
-  freebsd* | kfreebsd*-gnu)
+  freebsd* | kfreebsd*-gnu | dragonfly*)
     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
     # conventions
     ld_shlibs_CXX=yes
@@ -14706,7 +14706,7 @@ echo $ECHO_N "checking for $compiler opt
 	    ;;
 	esac
 	;;
-      freebsd* | kfreebsd*-gnu)
+      freebsd* | kfreebsd*-gnu | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
@@ -15308,7 +15308,7 @@ kfreebsd*-gnu*)
   dynamic_linker='GNU ld.so'
   ;;
 
-freebsd*)
+freebsd* | dragonfly*)
   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
   version_type=freebsd-$objformat
   case $version_type in
@@ -17797,7 +17797,7 @@ if test -z "$aix_libpath"; then aix_libp
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
+    freebsd* | kfreebsd*-gnu | dragonfly*)
       archive_cmds_F77='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
       hardcode_libdir_flag_spec_F77='-R$libdir'
       hardcode_direct_F77=yes
@@ -18362,7 +18362,7 @@ kfreebsd*-gnu*)
   dynamic_linker='GNU ld.so'
   ;;
 
-freebsd*)
+freebsd* | dragonfly*)
   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
   version_type=freebsd-$objformat
   case $version_type in
@@ -20085,7 +20085,7 @@ if test -z "$aix_libpath"; then aix_libp
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
+    freebsd* | kfreebsd*-gnu | dragonfly*)
       archive_cmds_GCJ='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
       hardcode_libdir_flag_spec_GCJ='-R$libdir'
       hardcode_direct_GCJ=yes
@@ -20650,7 +20650,7 @@ kfreebsd*-gnu*)
   dynamic_linker='GNU ld.so'
   ;;
 
-freebsd*)
+freebsd* | dragonfly*)
   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
   version_type=freebsd-$objformat
   case $version_type in
@@ -45355,7 +45355,7 @@ echo "$as_me: error: Fast malloc is not 
     esac
     case $target_os in
         linux*) ;;
-        freebsd*) ;;
+        freebsd*|dragonfly*) ;;
         *)
             if test "$kde_fast_malloc" = "notgiven"; then
                 kde_fast_malloc=no
@@ -49056,6 +49056,7 @@ ac_link='rm -rf SunWS_cache; ${CXX-g++} 
            kde_save_CXXFLAGS="$CXXFLAGS"
            EXR_FLAGS=`$PKG_CONFIG --cflags OpenEXR`
            CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES $EXR_FLAGS"
+           CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
 
            cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -51215,7 +51216,7 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
       gssapi_flavor=HEIMDAL
     fi
   else
-    search_incs="$kde_includes /usr/include /usr/local/include"
+    search_incs="$kde_includes /usr/include/gssapi /usr/include /usr/local/include"
 
 gssapi_incdir=NO
 for i in $search_incs;
@@ -51258,7 +51259,7 @@ done
             GSSAPI_LIBS="-L$gssapi_libdir "
             test "$USE_RPATH" = yes && GSSAPI_RPATH="-R $gssapi_libdir"
           fi
-          GSSAPI_LIBS="${GSSAPI_LIBS}-lgssapi -lkrb5 -lasn1 -lcrypto -lroken -lcrypt ${LIBRESOLV}"
+          GSSAPI_LIBS="${GSSAPI_LIBS}-lgssapi -lkrb5 -lasn1 -lcrypto -lroken -lcom_err -lcrypt ${LIBRESOLV}"
           with_gssapi=FOUND
           gssapi_flavor=HEIMDAL
           break
@@ -51302,7 +51303,7 @@ echo "${ECHO_T}searched but not found" >
       GSSAPI_LIBS="${GSSAPI_LIBS}-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${LIBRESOLV}"
     else
       gssapi_flavor=HEIMDAL
-      GSSAPI_LIBS="${GSSAPI_LIBS}-lgssapi -lkrb5 -lasn1 -lcrypto -lroken -lcrypt ${LIBRESOLV}"
+      GSSAPI_LIBS="${GSSAPI_LIBS}-lgssapi -lkrb5 -lasn1 -lcrypto -lroken -lcom_err -lcrypt ${LIBRESOLV}"
     fi
   fi
   if test "x$gssapi_flavor" = "xMIT" ; then