175 lines
5.7 KiB
Text
175 lines
5.7 KiB
Text
$NetBSD: patch-aa,v 1.3 2005/11/07 17:58:00 joerg Exp $
|
|
|
|
--- configure.orig 2003-09-21 13:31:30.000000000 +0200
|
|
+++ configure
|
|
@@ -1247,7 +1247,7 @@ EOF
|
|
|
|
DEFAULT_DEFAULT_wxUSE_MOTIF=1
|
|
;;
|
|
- *-*-freebsd*)
|
|
+ *-*-freebsd*|*-*-dragonfly*)
|
|
USE_BSD=1
|
|
USE_FREEBSD=1
|
|
cat >> confdefs.h <<\EOF
|
|
@@ -11498,9 +11498,10 @@ SEARCH_INCLUDE="\
|
|
/usr/local/x11r5/include \
|
|
/usr/lpp/Xamples/include \
|
|
\
|
|
- /usr/openwin/share/include"
|
|
+ /usr/openwin/share/include\
|
|
+ ${BUILDLINK_DIR}/include"
|
|
|
|
-SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` "
|
|
+SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g`"
|
|
|
|
|
|
cat > confcache <<\EOF
|
|
@@ -13381,6 +13382,101 @@ echo "configure:13351: checking PANGOFT2
|
|
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 +16200,8 @@ esac
|
|
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 +16427,7 @@ fi
|
|
*-*-sunos4* | \
|
|
*-*-osf* | \
|
|
*-*-dgux5* | \
|
|
- *-*-sysv5* )
|
|
+ *-*-sysv5* | *-*-dragonfly*)
|
|
;;
|
|
|
|
*)
|
|
@@ -18668,6 +18764,9 @@ if test "$TOOLKIT" != "MSW" -a "$TOOLKIT
|
|
THREAD_OPTS="-mt $THREAD_OPTS"
|
|
fi
|
|
;;
|
|
+ *-*-dragonfly*)
|
|
+ THREAD_OPTS="-pthread $THREAD_OPTS"
|
|
+ ;;
|
|
*-*-freebsd*)
|
|
THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
|
|
;;
|
|
@@ -18751,7 +18850,7 @@ echo "configure:18748: checking if more
|
|
LDFLAGS="-L/usr/lib/threads $LDFLAGS"
|
|
flag="-D_THREAD_SAFE"
|
|
;;
|
|
- *-freebsd*)
|
|
+ *-freebsd* | *-*-dragonfly*)
|
|
flag="-D_THREAD_SAFE"
|
|
;;
|
|
*-hp-hpux* )
|
|
@@ -22777,6 +22876,7 @@ s%@WX_RELEASE_NUMBER@%$WX_RELEASE_NUMBER
|
|
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
|