42 lines
1.5 KiB
Plaintext
42 lines
1.5 KiB
Plaintext
$OpenBSD: patch-configure,v 1.2 2010/03/23 19:42:57 jasper Exp $
|
|
--- configure.orig Wed Jul 11 22:58:54 2001
|
|
+++ configure Tue Mar 23 16:25:08 2010
|
|
@@ -1659,7 +1659,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
ac_save_LIBS="$LIBS"
|
|
-LIBS="-ltk -ltcl -ldl -L$x_libraries -lX11 $LIBS"
|
|
+LIBS="-ltk83 -ltcl83 -L$x_libraries -lX11 $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
#line 1665 "configure"
|
|
#include "confdefs.h"
|
|
@@ -1690,7 +1690,7 @@ LIBS="$ac_save_LIBS"
|
|
fi
|
|
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
|
echo "$ac_t""yes" 1>&6
|
|
- REMOTE_OBJS='xqcctl-tk.o' ; REMOTE_LIBS='-ltk -ltcl -lXext -lX11 -ldl -lm' ; REMOTE_CFLAGS='-DREMOTE'
|
|
+ REMOTE_OBJS='xqcctl-tk.o' ; REMOTE_LIBS='-ltk83 -ltcl83 -lXext -lX11 -lm' ; REMOTE_CFLAGS='-DREMOTE'
|
|
else
|
|
echo "$ac_t""no" 1>&6
|
|
echo "configure: warning: *** xcqcam will be built without the control panel ***" 1>&2 ;
|
|
@@ -1746,7 +1746,7 @@ fi
|
|
|
|
echo $ac_n "checking GTK+ version""... $ac_c" 1>&6
|
|
echo "configure:1749: checking GTK+ version" >&5
|
|
- GTKV=`$gtkbin""gtk-config --version`
|
|
+ GTKV=`false`
|
|
echo "$ac_t""$GTKV" 1>&6
|
|
case "$GTKV" in
|
|
1.0.*)
|
|
@@ -1952,8 +1952,8 @@ case "$host_os" in
|
|
OS_LIBCQCAM_OBJS=''
|
|
;;
|
|
openbsd*)
|
|
- OS_CFLAGS='-O2 -DOPENBSD'
|
|
- OS_LDFLAGS='-L/usr/local/lib'
|
|
+ OS_CFLAGS="${CFLAGS}"' -DOPENBSD -I${LOCALBASE}/include'
|
|
+ OS_LDFLAGS='-L${LOCALBASE}/lib'
|
|
OS_LIBCQCAM_OBJS=''
|
|
OS_LIBS='-li386'
|
|
;;
|