1
0
Эх сурвалжийг харах

* Checkout submodules before generating symbols as they may depend on the libs

Bryan Drewery 14 жил өмнө
parent
commit
554aa037cd
2 өөрчлөгдсөн 15 нэмэгдсэн , 13 устгасан
  1. 7 6
      autotools/configure.ac
  2. 8 7
      configure

+ 7 - 6
autotools/configure.ac

@@ -278,6 +278,13 @@ if [ "$GIT_REQUIRED" = "1" ]; then
 fi
 ]
 
+[
+if test -d .git; then
+  git submodule init
+  git submodule update
+fi
+]
+
 CXX="$CXX" TCLINC="$TCLINC" SSL_INCLUDES="$SSL_INCLUDES" SED="$SED" src/generate_defs.sh
 [
 if [ $? -ne 0 ]; then
@@ -288,10 +295,4 @@ fi
 echo ""
 echo ""
 echo "------------ Configuring BDLIB ------------"
-[
-if test -d .git; then
-  git submodule init
-  git submodule update
-fi
-]
 test -f lib/bdlib/configure && cd lib/bdlib && MAKEJOBS="$MAKEJOBS" ./configure

+ 8 - 7
configure

@@ -9874,13 +9874,6 @@ if [ "$GIT_REQUIRED" = "1" ]; then
 fi
 
 
-CXX="$CXX" TCLINC="$TCLINC" SSL_INCLUDES="$SSL_INCLUDES" SED="$SED" src/generate_defs.sh
-
-if [ $? -ne 0 ]; then
-  exit 1
-fi
-
-
 echo ""
 echo ""
 echo "------------ Configuring BDLIB ------------"
@@ -9890,4 +9883,12 @@ if test -d .git; then
   git submodule update
 fi
 
+
+CXX="$CXX" TCLINC="$TCLINC" SSL_INCLUDES="$SSL_INCLUDES" SED="$SED" src/generate_defs.sh
+
+if [ $? -ne 0 ]; then
+  exit 1
+fi
+
+
 test -f lib/bdlib/configure && cd lib/bdlib && MAKEJOBS="$MAKEJOBS" ./configure