From: Enlightenment S. <no-...@en...> - 2008-11-01 18:11:30
|
Log: formatting, disable openssl by default on Windows XP Author: caro Date: 2008-11-01 11:11:27 -0700 (Sat, 01 Nov 2008) New Revision: 37379 Modified: trunk/eet/configure.ac Modified: trunk/eet/configure.ac =================================================================== --- trunk/eet/configure.ac 2008-11-01 18:11:10 UTC (rev 37378) +++ trunk/eet/configure.ac 2008-11-01 18:11:27 UTC (rev 37379) @@ -28,7 +28,7 @@ ### Default options with respect to host case "$host_os" in - mingw32ce* | cegcc*) + mingw* | cegcc*) want_openssl="no" want_cypher="no" want_signature="no" @@ -110,23 +110,43 @@ AC_SUBST(DEBUG_CFLAGS) -### Checks for libraries +### Checks for programs +AC_PROG_CC -PKG_PROG_PKG_CONFIG +# doxygen program for documentation building +EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"]) + + +### Checks for libraries + # Evil library for compilation on Windows EFL_EET_BUILD="" case "$host_os" in mingw* | cegcc*) - PKG_CHECK_MODULES([EVIL], [evil]) - AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if Evil library is installed]) - requirement_eet="evil ${requirement_eet}" - EFL_EET_BUILD="-DEFL_EET_BUILD" + PKG_CHECK_MODULES([EVIL], [evil]) + AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if Evil library is installed]) + requirement_eet="evil ${requirement_eet}" + EFL_EET_BUILD="-DEFL_EET_BUILD" ;; esac AC_SUBST(EFL_EET_BUILD) +EET_LIBS="" +case "$host_os" in + mingw32ce*) + EET_LIBS="-lws2" + ;; + cegcc*) + EET_LIBS="-lws2" + ;; + mingw*) + EET_LIBS="-lws2_32" + ;; +esac +AC_SUBST(EET_LIBS) + # Eina library PKG_CHECK_MODULES(EINA, [eina-0]) @@ -140,7 +160,8 @@ have_openssl="yes" AC_DEFINE(HAVE_OPENSSL, 1, [Have Openssl support]) requirement_eet="openssl ${requirement_eet}" - ], [have_openssl="no"]) + ], + [have_openssl="no"]) fi have_cypher="no" @@ -179,14 +200,6 @@ [AC_MSG_ERROR([Cannot find fnmatch.h. Make sure your CFLAGS environment variable contains include lines for the location of this file. MinGW users: see the INSTALL file])]) -### Checks for programs -AC_PROG_CC - -# doxygen program for documentation building - -EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"]) - - ### Checks for types @@ -243,20 +256,6 @@ ### Checks for linker characteristics -EET_LIBS="" -case "$host_os" in - mingw32ce*) - EET_LIBS="-lws2" - ;; - cegcc*) - EET_LIBS="-lws2" - ;; - mingw*) - EET_LIBS="-lws2_32" - ;; -esac -AC_SUBST(EET_LIBS) - lt_enable_auto_import="" case "$host_os" in mingw* | cegcc*) |