Reorder setup script

Build and install pixman before configuring cairo.
ssvb · Mar 27, 2014 · f904e5b · f904e5b
1 parent 86014d9
commit f904e5b
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/setup.sh b/setup.sh
@@ -29,22 +29,15 @@ if [ ! -d "cairo" ]; then
     popd
 fi
 
-# first time configure for pixman and cairo
+# configure and build pixman and cairo
 
 if [ ! -f "pixman/configure" ]; then
+    echo "Configuring pixman..."
     pushd pixman
     ./autogen.sh --prefix=$PREFIX/pixman --disable-gtk || exit 1
     popd
 fi
 
-if [ ! -f "cairo/configure" ]; then
-    pushd cairo
-    ./autogen.sh --prefix=$PREFIX/cairo || exit 1
-    popd
-fi
-
-# first time compile and install for pixman and cairo
-
 if [ ! -d "tmp/pixman" ]; then
     echo "Compiling pixman..."
     pushd pixman
@@ -57,6 +50,13 @@ if [ ! -d "tmp/pixman" ]; then
     popd
 fi
 
+if [ ! -f "cairo/configure" ]; then
+    echo "Configuring cairo..."
+    pushd cairo
+    ./autogen.sh --prefix=$PREFIX/cairo || exit 1
+    popd
+fi
+
 if [ ! -d "tmp/cairo" ]; then
     echo "Compiling cairo..."
     pushd cairo