diff options
| author | DRC <dcommander@users.sourceforge.net> | 2009-04-04 15:27:57 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2009-04-04 15:27:57 +0000 |
| commit | 3c186e9a7277eda7b3eae59da6c9155831c2f145 (patch) | |
| tree | f94466c7eeb617c107e85458d9468cdd5d96150b /unix | |
| parent | a4d983a2b086960c5f299cdb41b76a2c8466e8e1 (diff) | |
| download | tigervnc-3c186e9a7277eda7b3eae59da6c9155831c2f145.tar.gz tigervnc-3c186e9a7277eda7b3eae59da6c9155831c2f145.zip | |
Properly handle spaces in configure flags
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3754 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'unix')
| -rwxr-xr-x | unix/build-xorg-7.4 | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/unix/build-xorg-7.4 b/unix/build-xorg-7.4 index 5c6f3f35..66f10137 100755 --- a/unix/build-xorg-7.4 +++ b/unix/build-xorg-7.4 @@ -59,13 +59,6 @@ modules="dri2proto \ pixman" -setcfgflags() -{ - shift - CFGFLAGS=${1+"$@"} -} - - init() { mkdir -p xorg @@ -75,7 +68,7 @@ init() tar jxf util-macros.tar.bz2 pushd util-macros-* echo "Building macros" - ./configure --prefix=${PREFIX} + ./configure ${1+"$@"} --prefix=${PREFIX} ($MAKE); make install popd @@ -110,7 +103,7 @@ build () # Build VNC echo "*** Building VNC ***" make distclean || true - ./configure ${CFGFLAGS} --prefix=${PREFIX} + ./configure ${1+"$@"} --prefix=${PREFIX} make # Build Xorg @@ -125,7 +118,10 @@ build () if [ "${module}" = "libX11" ]; then extraoptions="${extraoptions} --without-xcb" fi - ./configure ${CFGFLAGS} --prefix="${PREFIX}" ${extraoptions} + if [ "${module}" = "libSM" ]; then + extraoptions="${extraoptions} --with-uuid=no" + fi + ./configure ${1+"$@"} --prefix="${PREFIX}" ${extraoptions} echo ====================== echo building ${module} echo ====================== @@ -141,7 +137,7 @@ build () # build mesa echo "*** Building Mesa ***" pushd Mesa-* - ./configure ${CFGFLAGS} --prefix=${PREFIX} --with-driver=dri --disable-glut --without-demos + ./configure ${1+"$@"} --prefix=${PREFIX} --with-driver=dri --disable-glut --without-demos if [ $? -ne 0 ]; then echo "Failed to configure Mesa." exit @@ -155,7 +151,7 @@ build () # build xserver echo "*** Building xserver ***" cd xserver - ./configure ${CFGFLAGS} --prefix=${PREFIX} --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg + ./configure ${1+"$@"} --prefix=${PREFIX} --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg if [ $? -ne 0 ]; then echo "Failed to configure X server." exit @@ -165,16 +161,14 @@ build () cd .. } -if [ ! "$2" = "" ]; then - setcfgflags ${1+"$@"} -fi - case "$1" in init) - init + shift + init ${1+"$@"} ;; build) - build + shift + build ${1+"$@"} ;; update) update_modules |