osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

At last compiling on CygWin works again! Added the missing PCRE and GLIB 

libraries to libftypes.

Provide caching of computed configure tests.

svn path=/trunk/; revision=10600
This commit is contained in:
Olivier Biot 2004-04-14 18:42:19 +00:00
parent 27ca219d2b
commit af4a73a523
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure.in
View File

@ -1,4 +1,4 @@
# $Id: configure.in,v 1.254 2004/03/27 11:52:51 jmayer Exp $
# $Id: configure.in,v 1.255 2004/04/14 18:42:19 obiot Exp $
#
AC_INIT(etypes.h)
@ -133,6 +133,14 @@ else
CFLAGS="-no-cpp-precomp $CFLAGS"
AC_MSG_RESULT(Apple GCC - added -no-cpp-precomp)
;;
cygwin*)
#
# Shared libraries in cygwin/Win32 must never contain
# undefined symbols.
#
LDFLAGS="$LDFLAGS -no-undefined"
AC_MSG_RESULT(CygWin GCC - added -no-undefined to LDFLAGS)
;;
*)
AC_MSG_RESULT(none needed)
;;
@ -978,6 +986,9 @@ then
fi
AC_SUBST(ENABLE_STATIC)
dnl Save the cacheable configure results to config.cache before recursing
AC_CACHE_SAVE
AM_CONFIG_HEADER(config.h)
AC_CONFIG_SUBDIRS(wiretap)
AC_OUTPUT(

4
epan/ftypes/Makefile.am
View File

@ -1,6 +1,6 @@
# Makefile.am
#
# $Id: Makefile.am,v 1.7 2004/03/24 21:27:44 obiot Exp $
# $Id: Makefile.am,v 1.8 2004/04/14 18:42:19 obiot Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@zing.org>
@ -44,6 +44,8 @@ libftypes_la_SOURCES = \
ftype-time.c \
ftype-tvbuff.c
libftypes_la_LIBADD = @GLIB_LIBS@ @PCRE_LIBS@
EXTRA_DIST = \
Makefile.nmake

10
wiretap/configure.in
View File

@ -1,4 +1,4 @@
# $Id: configure.in,v 1.56 2004/03/04 06:30:14 guy Exp $
# $Id: configure.in,v 1.57 2004/04/14 18:42:19 obiot Exp $
#
AC_INIT(wtap.c)
@ -92,6 +92,14 @@ else
CFLAGS="-no-cpp-precomp $CFLAGS"
AC_MSG_RESULT(Apple GCC - added -no-cpp-precomp)
;;
cygwin*)
#
# Shared libraries in cygwin/Win32 must never contain
# undefined symbols.
#
LDFLAGS="$LDFLAGS -no-undefined"
AC_MSG_RESULT(CygWin GCC - added -no-undefined to LDFLAGS)
;;
*)
AC_MSG_RESULT(none needed)
;;