X-Git-Url: http://git.jankratochvil.net/?p=captive.git;a=blobdiff_plain;f=build-static;h=3e362bba36082407d048eded812038bbfcca523e;hp=b241868a69f3850e4877103a5f01e97fb441f7dc;hb=HEAD;hpb=6c31c2cd57925ffb8b5e74aec58a632be3f1072c

diff --git a/build-static b/build-static
index b241868..3e362bb 100755
--- a/build-static
+++ b/build-static
@@ -25,17 +25,20 @@
 # definitely need to be changed for other distributions.
 
 # Required precompiled static libraries .a and some .c stubs:
-STATIC_PATH=/usr/local/devel-static
+STATIC_PATH=/usr/local/staticbuild
 
 
-set -e
-if test "$1" = link;then
+set -e -o pipefail
+if test "$1" != link;then
 	set -x
 	./autogen.pl --dist
-	(set -x;CFLAGS="-O2" ./configure --enable-maintainer-mode --disable-shared --enable-static --enable-install-pkg \
+	(set -x;CFLAGS="-O2" CPPFLAGS="-I$STATIC_PATH/include/gnome-vfs-module-2.0" \
+			./configure --enable-maintainer-mode --disable-shared --enable-static --enable-install-pkg \
 			--enable-standalone \
 			--enable-standalone-fonts=/usr/local/share/captive/fonts \
+			--disable-standalone-yum \
 		) 2>&1|tee errs1
+#			--enable-standalone-yum=/etc/yum.repos.d
 	make clean
 	make 2>&1|tee errs2
 	set +x
@@ -43,6 +46,7 @@ if test "$1" = link;then
 
 targets="
 		src/client/fuse/mount.captive
+		src/client/fuse/captive-fusermount
 		src/client/sandbox-server/captive-sandbox-server
 		src/client/cmdline/captive-cmdline
 		src/install/acquire/captive-install-acquire
@@ -67,7 +71,7 @@ print_objects:
 HERE
 )"
 #	set -x
-	gcc -O2 -static -Wall -Wstrict-prototypes -Wsign-compare -o $target $objects `pkg-config --cflags gmodule-2.0 gthread-2.0` $STATIC_PATH/src/*.c -L$STATIC_PATH/lib/ -L./src/install/libcaptive-install/ -lcaptive-install -L./src/libcaptive/.libs/ -lcaptive -L/usr/X11R6/lib -lgnomevfs-2 -lreadline -ltermcap -lcrypto -lntfs -lfuse -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lart_lgpl_2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangoxft-1.0 -lpangoft2-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lxml2 -lbonobo-2 -lgconf-2 -lbonobo-activation -lORBitCosNaming-2 -lORBit-2 -lm -lgthread-2.0 -lXft -lfontconfig -lfreetype -lexpat -lXrandr -lXinerama -lXfixes -lXcursor -lXext -lXrender -lX11 -lpng -lz -lglib-2.0 -lc -lnss_files -lnss_dns -lresolv
+	gcc -O2 -static -Wall -Wstrict-prototypes -Wsign-compare -o $target $objects `pkg-config --cflags gmodule-2.0 gthread-2.0` $STATIC_PATH/src/*.c -L$STATIC_PATH/lib/ -L./src/install/libcaptive-install/ -lcaptive-install -L./src/libcaptive/.libs/ -lcaptive -L/usr/X11R6/lib -L/usr/lib/gnome-vfs-2.0/modules -lgnomevfs-2 -lreadline -ltermcap -lcrypto -lntfs-gnomevfs -lntfs -lfuse -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lart_lgpl_2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangoxft-1.0 -lpangoft2-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lxml2 -lbonobo-2 -lgconf-2 -lbonobo-activation -lORBitCosNaming-2 -lORBit-2 -lm -lgthread-2.0 -lXft -lfontconfig -lfreetype -lexpat -lXrandr -lXinerama -lXfixes -lXcursor -lXext -lXrender -lX11 -lpng -lz -lglib-2.0 -lc -lnss_files -lnss_dns -lresolv
 	set +x
 	done) 2>&1|tee errs2
 echo OK