Bryan Drewery пре 11 година
родитељ
комит
78c66e0e14
3 измењених фајлова са 15 додато и 15 уклоњено
  1. 7 7
      build/autotools/configure.ac
  2. 7 7
      configure
  3. 1 1
      src/generate_defs.sh

+ 7 - 7
build/autotools/configure.ac

@@ -254,13 +254,6 @@ if test -d .git; then
 fi
 fi
 ]
 ]
 
 
-CXX="$CXX" TCL_INCLUDES="$TCL_INCLUDES" SSL_INCLUDES="$SSL_INCLUDES" SED="$SED" src/generate_defs.sh
-[
-if [ $? -ne 0 ]; then
-  exit 1
-fi
-]
-
 echo
 echo
 echo
 echo
 echo "------------ Configuring BDLIB ------------"
 echo "------------ Configuring BDLIB ------------"
@@ -272,3 +265,10 @@ if [[ -n "${LIBELF_BUNDLED}" ]] && [[ -f lib/libelf/configure ]]; then
   echo "------------ Configuring LIBELF ------------"
   echo "------------ Configuring LIBELF ------------"
   ( cd lib/libelf && CC="$CC" CXX="$CXX" ./configure )
   ( cd lib/libelf && CC="$CC" CXX="$CXX" ./configure )
 fi
 fi
+
+CXX="$CXX" TCL_INCLUDES="$TCL_INCLUDES" SSL_INCLUDES="$SSL_INCLUDES" SED="$SED" src/generate_defs.sh
+[
+if [ $? -ne 0 ]; then
+  exit 1
+fi
+]

+ 7 - 7
configure

@@ -10122,13 +10122,6 @@ if test -d .git; then
 fi
 fi
 
 
 
 
-CXX="$CXX" TCL_INCLUDES="$TCL_INCLUDES" SSL_INCLUDES="$SSL_INCLUDES" SED="$SED" src/generate_defs.sh
-
-if [ $? -ne 0 ]; then
-  exit 1
-fi
-
-
 echo
 echo
 echo
 echo
 echo "------------ Configuring BDLIB ------------"
 echo "------------ Configuring BDLIB ------------"
@@ -10140,3 +10133,10 @@ if [ -n "${LIBELF_BUNDLED}" ] && [ -f lib/libelf/configure ]; then
   echo "------------ Configuring LIBELF ------------"
   echo "------------ Configuring LIBELF ------------"
   ( cd lib/libelf && CC="$CC" CXX="$CXX" ./configure )
   ( cd lib/libelf && CC="$CC" CXX="$CXX" ./configure )
 fi
 fi
+
+CXX="$CXX" TCL_INCLUDES="$TCL_INCLUDES" SSL_INCLUDES="$SSL_INCLUDES" SED="$SED" src/generate_defs.sh
+
+if [ $? -ne 0 ]; then
+  exit 1
+fi
+

+ 1 - 1
src/generate_defs.sh

@@ -7,7 +7,7 @@ if [ -z "$SED" -o -z "$CXX" ]; then
   echo "This must be ran by configure" >&2
   echo "This must be ran by configure" >&2
   exit 1
   exit 1
 fi
 fi
-echo "Generating lib symbols"
+echo "==== Generating lib symbols ===="
 INCLUDES="${TCL_INCLUDES} ${SSL_INCLUDES}"
 INCLUDES="${TCL_INCLUDES} ${SSL_INCLUDES}"
 
 
 mkdir -p src/.defs > /dev/null 2>&1
 mkdir -p src/.defs > /dev/null 2>&1