Commit 4f4122b1 by devttys0

Added cygwin specific build patches

parent 12fe62d5
...@@ -6,6 +6,7 @@ export prefix=@prefix@ ...@@ -6,6 +6,7 @@ export prefix=@prefix@
export exec_prefix=@exec_prefix@ export exec_prefix=@exec_prefix@
export LIBDIR=@libdir@ export LIBDIR=@libdir@
export INSTALL_OPTIONS=@INSTALL_OPTIONS@ export INSTALL_OPTIONS=@INSTALL_OPTIONS@
export PLATFORM=@PLATFORM@
BUILD_C_LIBS=@BUILD_C_LIBS@ BUILD_C_LIBS=@BUILD_C_LIBS@
PYTHON=@PYTHON@ PYTHON=@PYTHON@
...@@ -18,7 +19,7 @@ all: build ...@@ -18,7 +19,7 @@ all: build
install: build install: build
if [ "$(BUILD_C_LIBS)" -eq "1" ]; then make -C $(SRC_C_DIR) install; fi if [ "$(BUILD_C_LIBS)" -eq "1" ]; then make -C $(SRC_C_DIR) install; fi
$(PYTHON) ./setup.py install $(PYTHON) ./setup.py install
if [ "$(BUILD_C_LIBS)" -eq "1" ]; then ldconfig || true; fi if [ "$(BUILD_C_LIBS)" -eq "1" ] && [ "$(PLATFORM)" != "Cygwin" ]; then ldconfig || true; fi
deps: deps:
./deps.sh ./deps.sh
......
...@@ -600,6 +600,7 @@ ac_includes_default="\ ...@@ -600,6 +600,7 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS ac_subst_vars='LTLIBOBJS
INSTALL_OPTIONS INSTALL_OPTIONS
PLATFORM
SOEXT SOEXT
SONAME SONAME
PYTHON PYTHON
...@@ -3334,6 +3335,8 @@ SONAME=$SONAME ...@@ -3334,6 +3335,8 @@ SONAME=$SONAME
SOEXT=$SOEXT SOEXT=$SOEXT
PLATFORM=$(uname -o)
INSTALL_OPTIONS=$INSTALL_OPTIONS INSTALL_OPTIONS=$INSTALL_OPTIONS
ac_config_files="$ac_config_files Makefile" ac_config_files="$ac_config_files Makefile"
......
...@@ -41,6 +41,7 @@ AC_SUBST(BUILD_C_LIBS, $BUILD_C_LIBS) ...@@ -41,6 +41,7 @@ AC_SUBST(BUILD_C_LIBS, $BUILD_C_LIBS)
AC_SUBST(PYTHON, $PYTHON) AC_SUBST(PYTHON, $PYTHON)
AC_SUBST(SONAME, $SONAME) AC_SUBST(SONAME, $SONAME)
AC_SUBST(SOEXT, $SOEXT) AC_SUBST(SOEXT, $SOEXT)
AC_SUBST(PLATFORM, $(uname -o))
AC_SUBST(INSTALL_OPTIONS, $INSTALL_OPTIONS) AC_SUBST(INSTALL_OPTIONS, $INSTALL_OPTIONS)
AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([Makefile])
AC_OUTPUT AC_OUTPUT
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment