Tatsuhiro Tsujikawa 14 лет назад
Родитель
Сommit
4fba271036
2 измененных файлов с 3 добавлено и 2 удалено
  1. 1 1
      deps/wslay/configure.ac
  2. 2 1
      deps/wslay/tests/Makefile.am

+ 1 - 1
deps/wslay/configure.ac

@@ -21,8 +21,8 @@ dnl LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 dnl OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 dnl OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 dnl WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 dnl WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 AC_PREREQ(2.61)
 AC_PREREQ(2.61)
-LT_PREREQ([2.2.6])
 AC_INIT([wslay], [0.1.1], [t-tujikawa@users.sourceforge.net])
 AC_INIT([wslay], [0.1.1], [t-tujikawa@users.sourceforge.net])
+LT_PREREQ([2.2.6])
 LT_INIT([disable-shared])
 LT_INIT([disable-shared])
 AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_AUX_DIR([.])
 dnl See versioning rule:
 dnl See versioning rule:

+ 2 - 1
deps/wslay/tests/Makefile.am

@@ -37,7 +37,8 @@ main_SOURCES = $(HFILES) $(OBJECTS)
 
 
 main_LDADD = ${top_builddir}/lib/libwslay.la -lcunit
 main_LDADD = ${top_builddir}/lib/libwslay.la -lcunit
 main_LDFLAGS = -static
 main_LDFLAGS = -static
-AM_CFLAGS = -Wall -g -O2 -I${top_srcdir}/lib -I${top_srcdir}/lib/includes
+AM_CFLAGS = -Wall -g -O2 -I${top_srcdir}/lib -I${top_srcdir}/lib/includes\
+	@DEFS@
 # DEFS += -D_ISOC99_SOURCE -D_GNU_SOURCE
 # DEFS += -D_ISOC99_SOURCE -D_GNU_SOURCE
 TESTS = main
 TESTS = main