Fix bootstrap parameters for cmake

Conditionally display build instructions for the cmake case

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40528 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/macosx-setup.sh b/macosx-setup.sh
index cd7915e6b0ad55e27964b8ba432ddc8d9f5473c8..819eab74dbfb0010d927c4f3d395465d56355681 100755 (executable)
--- a/macosx-setup.sh
+++ b/macosx-setup.sh
@@ -139,7 +139,7 @@ if [ -n "$CMAKE" ]; then
   curl -O http://www.cmake.org/files/v$cmake_dir/cmake-$CMAKE_VERSION.tar.gz || exit 1
   gzcat cmake-$CMAKE_VERSION.tar.gz | tar xf - || exit 1
   cd cmake-$CMAKE_VERSION
-  ./bootstrap --system-libs || exit 1
+  ./bootstrap || exit 1
   make -j 3 || exit 1
   $DO_MAKE_INSTALL || exit 1
   cd ..
@@ -420,8 +420,19 @@ fi
 echo ""
 
 echo "You are now prepared to build Wireshark. To do so do:"
+echo "export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/X11/lib/pkgconfig"
+echo ""
+if [ -n "$CMAKE" ]; then
+  echo "mkdir build; cd build"
+  echo "cmake .."
+  echo
+  echo "or"
+  echo
+fi
 echo "./autogen.sh"
-echo "./configure"
+echo "mkdir build; cd build"
+echo "../configure"
+echo ""
 echo "make -j 3"
 echo "make install"