64 lines
1.7 KiB
Text
64 lines
1.7 KiB
Text
--- cliplibs/clip-gtk/configure.orig Fri Mar 12 14:34:16 2004
|
|
+++ cliplibs/clip-gtk/configure Tue Jun 29 11:28:13 2004
|
|
@@ -3,6 +3,8 @@
|
|
uname=`uname -s`
|
|
uver=`uname -r`
|
|
hname=`hostname -f 2>/dev/null`
|
|
+gtkconfig=gtk-config
|
|
+gtkpath=
|
|
oldpwd=`pwd`
|
|
|
|
[ -z "$CLIPROOT" ] && CLIPROOT=$(cd ../../../; pwd)/cliproot
|
|
@@ -35,6 +37,8 @@
|
|
;;
|
|
FreeBSD*)
|
|
osname=FREEBSD
|
|
+ gtkconfig=gtk12-config
|
|
+ gtkpath=/gtk12
|
|
STATICLINK=-static
|
|
;;
|
|
NetBSD*)
|
|
@@ -82,7 +86,7 @@
|
|
PIXBUFOBJ='gdkpixbuf.o gdkrgb.o'
|
|
fi
|
|
|
|
-gtkprefix=`gtk-config --prefix 2>/dev/null`
|
|
+gtkprefix=`${gtkconfig} --prefix 2>/dev/null`
|
|
|
|
if [ $? -ne 0 ]
|
|
then
|
|
@@ -97,7 +101,7 @@
|
|
# cd $gtkincpath/..
|
|
# gtkincpath=`pwd`
|
|
# cd $oldpwd
|
|
- LIBS=`gtk-config --libs`
|
|
+ LIBS=`${gtkconfig} --libs`
|
|
|
|
if [ "$osname" = "CYGWIN" ]
|
|
then
|
|
@@ -111,12 +115,14 @@
|
|
# echo
|
|
# echo 'Warning: system do not have installed GTK+ development'
|
|
# fi
|
|
- GTK_MAJOR=`gtk-config --version|cut -d. -f1`
|
|
- GTK_MINOR=`gtk-config --version|cut -d. -f2`
|
|
+ GTK_MAJOR=`${gtkconfig} --version|cut -d. -f1`
|
|
+ GTK_MINOR=`${gtkconfig} --version|cut -d. -f2`
|
|
if [ ! \( "$GTK_MAJOR" -ge 1 -o "$GTK_MINOR" -ge 2 -o "$GTK_MAJOR" -gt 1 \) ]
|
|
then
|
|
echo
|
|
echo 'Warning: system must have installed GTK+ version 1.2 or above'
|
|
+ else
|
|
+ USE_GTK=yes
|
|
fi
|
|
fi
|
|
|
|
@@ -164,7 +170,7 @@
|
|
echo "DLLSUFF='$DLLSUFF'" >&3
|
|
echo "DLLREALSUFF='$DLLREALSUFF'" >&3
|
|
echo "PIXBUFINCLUDEDIRS='$PIXBUFCFLAGS'" >&3
|
|
-echo 'INCLUDEDIRS=-I. -I$(CLIPROOT)/include $(PIXBUFINCLUDEDIRS) '$(gtk-config --cflags) >&3
|
|
+echo 'INCLUDEDIRS=-I. -I$(CLIPROOT)/include $(PIXBUFINCLUDEDIRS) -I'$gtkprefix'/include'${gtkpath} >&3
|
|
echo "XTARGETS='"'$(XLIB) $(XSLIB)'"'" >&3
|
|
echo "C_FLAGS=-Wall '"'$(INCLUDEDIRS)'"' '$EXTRACFLAGS'" >&3
|
|
echo "LIBS='$LIBS $PIXBUFLIBS' " >&3
|