Modified: trunk/compile-xserver.sh (372 => 373)
--- trunk/compile-xserver.sh 2009-09-30 19:31:21 UTC (rev 372)
+++ trunk/compile-xserver.sh 2009-10-18 23:43:49 UTC (rev 373)
@@ -1,9 +1,8 @@
#!/bin/bash
-#CONFIGURE="./autogen.sh"
-CONFIGURE="./configure"
#CONFOPT="--disable-xquartz --disable-launchd --enable-kdrive --disable-xsdl --enable-xnest --enable-xvfb"
#CONFOPT="--disable-glx"
+#CONFOPT="--disable-shave"
#MESA="$(pwd)/../Mesa-6.5.2"
#MESA="$(pwd)/../Mesa-7.0.4"
@@ -15,28 +14,35 @@
. ~/src/strip.sh
-ACLOCAL="aclocal -I /usr/X11/share/aclocal"
+ACLOCAL="aclocal -I /opt/X11/share/aclocal -I /usr/local/share/aclocal"
+#ACLOCAL="aclocal -I /usr/X11/share/aclocal"
CFLAGS="-Wall -pipe -DNO_ALLOCA"
CFLAGS="$CFLAGS -O0 -ggdb3"
#CFLAGS="$CFLAGS -O2"
-CFLAGS="$CFLAGS -arch i386 -arch ppc"
+CFLAGS="$CFLAGS -arch i386 -arch x86_64 -arch ppc"
LDFLAGS="$CFLAGS"
-CPPFLAGS="$CPPFLAGS -F/Applications/Utilities/X11.app/Contents/Frameworks"
-LDFLAGS="$LDFLAGS -F/Applications/Utilities/X11.app/Contents/Frameworks"
+#CPPFLAGS="$CPPFLAGS -F/Applications/Utilities/XQuartz.app/Contents/Frameworks"
+#LDFLAGS="$LDFLAGS -F/Applications/Utilities/XQuartz.app/Contents/Frameworks"
export ACLOCAL CPPFLAGS CFLAGS LDFLAGS
+PKG_CONFIG_PATH=/opt/X11/lib/pkgconfig:$PKG_CONFIG_PATH
+PATH=/opt/X11/bin:$PATH
+#PKG_CONFIG_PATH=/usr/X11/lib/pkgconfig:$PKG_CONFIG_PATH
+#PATH=/usr/X11/bin:$PATH
+
die() {
echo "${@}" >&2
exit 1
}
docomp() {
- ${CONFIGURE} --prefix=/usr/X11 --with-mesa-source="${MESA}" ${CONFOPT} --disable-dependency-tracking --enable-maintainer-mode --enable-xcsecurity --enable-record --enable-sparkle "${@}" || die "Could not configure xserver"
+ autoreconf -fvi || die
+ ./configure --prefix=/opt/X11 --with-mesa-source="${MESA}" ${CONFOPT} --disable-dependency-tracking --enable-maintainer-mode --enable-xcsecurity --enable-record --with-apple-application-name=XQuartz --with-launchd-id-prefix=org.macosforge.xquartz "${@}" || die "Could not configure xserver"
${MAKE} clean || die "Unable to make clean"
${MAKE} ${MAKE_OPTS} || die "Could not make xserver"
}
@@ -48,18 +54,16 @@
dosign() {
/opt/local/bin/gmd5sum $1 > $1.md5sum
/opt/local/bin/gsha1sum $1 > $1.sha1sum
- /opt/local/bin/gpg -b $1
+ /opt/local/bin/gpg2 -b $1
}
dodist() {
${MAKE} dist
+ dosign xorg-server-$1.tar.bz2
+
cp hw/xquartz/mach-startup/X11.bin X11.bin-$1
- cp hw/xquartz/mach-startup/Xquartz Xquartz-$1
bzip2 X11.bin-$1
- bzip2 Xquartz-$1
dosign X11.bin-$1.bz2
- dosign Xquartz-$1.bz2
- dosign xorg-server-$1.tar.bz2
}
docomp `[ -f conf_flags ] && cat conf_flags`