kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
pkgsrc/x11/wxGTK24/patches/patch-aa

227 lines
7.1 KiB
Text
Raw Blame History

$NetBSD: patch-aa,v 1.7 2010/12/22 19:44:24 chuck Exp $
--- configure.orig 2003-09-21 07:31:30.000000000 -0400
+++ configure 2010-12-22 13:41:03.000000000 -0500
@@ -1247,7 +1247,7 @@
DEFAULT_DEFAULT_wxUSE_MOTIF=1
;;
- *-*-freebsd*)
+ *-*-freebsd*|*-*-dragonfly*)
USE_BSD=1
USE_FREEBSD=1
cat >> confdefs.h <<\EOF
@@ -1396,6 +1396,21 @@
DEFAULT_DEFAULT_wxUSE_MAC=1
;;
+ i386-*-darwin* )
+ USE_BSD=1
+ USE_DARWIN=1
+ SO_SUFFIX=dylib
+ cat >> confdefs.h <<\EOF
+#define __BSD__ 1
+EOF
+
+ cat >> confdefs.h <<\EOF
+#define __DARWIN__ 1
+EOF
+
+ DEFAULT_DEFAULT_wxUSE_MAC=1
+ ;;
+
*-*-beos* )
USE_BEOS=1
cat >> confdefs.h <<\EOF
@@ -11436,6 +11451,7 @@
SEARCH_INCLUDE="\
+ ${BUILDLINK_DIR}/include \
/usr/local/include \
\
/usr/Motif-1.2/include \
@@ -11500,7 +11516,7 @@
\
/usr/openwin/share/include"
-SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` "
+SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g`"
cat > confcache <<\EOF
@@ -11972,9 +11988,9 @@
echo "$ac_t""$ac_cv_header_png_h" 1>&6
if test "$ac_cv_header_png_h" = "yes"; then
- echo $ac_n "checking for png_check_sig in -lpng""... $ac_c" 1>&6
-echo "configure:11977: checking for png_check_sig in -lpng" >&5
-ac_lib_var=`echo png'_'png_check_sig | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for png_sig_cmp in -lpng""... $ac_c" 1>&6
+echo "configure:11977: checking for png_sig_cmp in -lpng" >&5
+ac_lib_var=`echo png'_'png_sig_cmp | 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
@@ -11986,10 +12002,10 @@
/* 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 png_check_sig();
+char png_sig_cmp();
int main() {
-png_check_sig()
+png_sig_cmp()
; return 0; }
EOF
if { (eval echo configure:11996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -13381,6 +13397,101 @@
fi
fi
+
+ succeeded=no
+
+ if test -z "$PKG_CONFIG"; then
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:14533: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ case "$PKG_CONFIG" in
+ /*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ ?:/*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
+ ;;
+ *)
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+ ;;
+esac
+fi
+PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+if test -n "$PKG_CONFIG"; then
+ echo "$ac_t""$PKG_CONFIG" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ fi
+
+ if test "$PKG_CONFIG" = "no" ; then
+ echo "*** The pkg-config script could not be found. Make sure it is"
+ echo "*** in your path, or set the PKG_CONFIG environment variable"
+ echo "*** to the full path to pkg-config."
+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+ else
+ PKG_CONFIG_MIN_VERSION=0.9.0
+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+ echo $ac_n "checking for pangox""... $ac_c" 1>&6
+echo "configure:14577: checking for pangox" >&5
+
+ if $PKG_CONFIG --exists "pangox" ; then
+ echo "$ac_t""yes" 1>&6
+ succeeded=yes
+
+ echo $ac_n "checking PANGOX_CFLAGS""... $ac_c" 1>&6
+echo "configure:14584: checking PANGOX_CFLAGS" >&5
+ PANGOX_CFLAGS=`$PKG_CONFIG --cflags "pangox"`
+ echo "$ac_t""$PANGOX_CFLAGS" 1>&6
+
+ echo $ac_n "checking PANGOX_LIBS""... $ac_c" 1>&6
+echo "configure:14589: checking PANGOX_LIBS" >&5
+ PANGOX_LIBS=`$PKG_CONFIG --libs "pangox"`
+ echo "$ac_t""$PANGOX_LIBS" 1>&6
+ else
+ PANGOX_CFLAGS=""
+ PANGOX_LIBS=""
+ ## If we have a custom action on failure, don't print errors, but
+ ## do set a variable so people can do so.
+ PANGOX_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangox"`
+
+ fi
+
+
+
+ else
+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+ echo "*** See http://www.freedesktop.org/software/pkgconfig"
+ fi
+ fi
+
+ if test $succeeded = yes; then
+
+ CXXFLAGS="$CXXFLAGS $PANGOX_CFLAGS"
+ LIBS="$LIBS $PANGOX_LIBS"
+
+ else
+
+ { echo "configure: error: pangox library not found, library cannot be compiled in Unicode mode" 1>&2; exit 1; }
+
+
+ fi
+
else
if test "$wxUSE_UNICODE" = "yes"; then
echo "configure: warning: Unicode configuration not supported with GTK+ 1.x" 1>&2
@@ -16104,8 +16215,8 @@
WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY_GL}.a"
-WXCONFIG_LIBS="-l${WX_LIBRARY}"
-WXCONFIG_LIBS_STATIC="lib${WX_LIBRARY}.a"
+WXCONFIG_LIBS="-l${WX_LIBRARY_BASENAME}"
+WXCONFIG_LIBS_STATIC="lib${WX_LIBRARY_BASENAME}.a"
if test "$wxUSE_OPENGL" = "yes"; then
WXCONFIG_LIBS_GL="-l${WX_LIBRARY_GL} ${OPENGL_LIBS}"
@@ -16331,7 +16442,7 @@
*-*-sunos4* | \
*-*-osf* | \
*-*-dgux5* | \
- *-*-sysv5* )
+ *-*-sysv5* | *-*-dragonfly*)
;;
*)
@@ -18668,6 +18779,9 @@
THREAD_OPTS="-mt $THREAD_OPTS"
fi
;;
+ *-*-dragonfly*)
+ THREAD_OPTS="-pthread $THREAD_OPTS"
+ ;;
*-*-freebsd*)
THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
;;
@@ -18751,7 +18865,7 @@
LDFLAGS="-L/usr/lib/threads $LDFLAGS"
flag="-D_THREAD_SAFE"
;;
- *-freebsd*)
+ *-freebsd* | *-*-dragonfly*)
flag="-D_THREAD_SAFE"
;;
*-hp-hpux* )
@@ -22777,6 +22891,7 @@
s%@WX_LIBRARY_NAME_STATIC@%$WX_LIBRARY_NAME_STATIC%g
s%@WX_LIBRARY_NAME_SHARED@%$WX_LIBRARY_NAME_SHARED%g
s%@WX_LIBRARY_BASENAME@%$WX_LIBRARY_BASENAME%g
+s%@WX_LIBRARY_GL@%$WX_LIBRARY_GL%g
s%@WX_LIBRARY_IMPORTLIB@%$WX_LIBRARY_IMPORTLIB%g
s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g
s%@WX_LIBRARY_LINK1@%$WX_LIBRARY_LINK1%g
Reference in a new issue View git blame Copy permalink