Skip to content

Commit

Permalink
Use / as path separator when configuring with --enable-ansi-c
Browse files Browse the repository at this point in the history
  • Loading branch information
@feeley
feeley committed Jun 23, 2015
1 parent 6b353f5 commit f4c4ca3
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 24 deletions.
23 changes: 12 additions & 11 deletions configure
View file
Expand Up @@ -5872,6 +5872,9 @@ fi
done
# Default path separator
PATH_SEP="/"
if test "$ANSI_C" = yes; then
# Check if linking to the math library needs some special linker flags.
Expand Down Expand Up @@ -6622,7 +6625,7 @@ $as_echo "#define socklen_t int" >>confdefs.h
if test "$C_COMP_VISUALC" = yes; then
PATH_SEPARATOR="\\\\\\\\\\\\\\\\"
PATH_SEP="\\\\\\\\\\\\\\\\"
LIBS="$LIBS Kernel32.Lib User32.Lib Gdi32.Lib WS2_32.Lib"
Expand All @@ -6641,7 +6644,7 @@ $as_echo "#define socklen_t int" >>confdefs.h
mingw*) # add Windows libraries needed by MinGW
PATH_SEPARATOR="\\\\\\\\\\\\\\\\"
PATH_SEP="\\\\\\\\\\\\\\\\"
LIBS="$LIBS -lws2_32"
Expand All @@ -6654,8 +6657,6 @@ $as_echo "#define socklen_t int" >>confdefs.h
*) # check libraries for other systems
PATH_SEPARATOR="/"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing asin" >&5
$as_echo_n "checking for library containing asin... " >&6; }
if ${ac_cv_search_asin+:} false; then :
Expand Down Expand Up @@ -13314,32 +13315,32 @@ if test "$datadir" = "\${datarootdir}"; then
datadir="\${prefix}/share"
fi
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR=\"\\\"`echo \"$prefix\" | sed -e \"s|/|$PATH_SEPARATOR|g\"`\\\"\""
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR=\"\\\"`echo \"$prefix\" | sed -e \"s|/|$PATH_SEP|g\"`\\\"\""
if test "$ENABLE_SYMLINKS" != yes; then
if test "$bindir" != "\${prefix}/bin"; then
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_BIN=\"\\\"`echo \"$bindir\" | sed -e \"s|/|$PATH_SEPARATOR|g\"`\\\"\""
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_BIN=\"\\\"`echo \"$bindir\" | sed -e \"s|/|$PATH_SEP|g\"`\\\"\""
fi
if test "$includedir" != "\${prefix}/include"; then
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_INCLUDE=\"\\\"`echo \"$includedir\" | sed -e \"s|/|$PATH_SEPARATOR|g\"`\\\"\""
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_INCLUDE=\"\\\"`echo \"$includedir\" | sed -e \"s|/|$PATH_SEP|g\"`\\\"\""
fi
if test "$libdir" != "\${prefix}/lib"; then
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_LIB=\"\\\"`echo \"$libdir\" | sed -e \"s|/|$PATH_SEPARATOR|g\"`\\\"\""
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_LIB=\"\\\"`echo \"$libdir\" | sed -e \"s|/|$PATH_SEP|g\"`\\\"\""
fi
if test "$docdir" != "\${prefix}/doc"; then
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_DOC=\"\\\"`echo \"$docdir\" | sed -e \"s|/|$PATH_SEPARATOR|g\"`\\\"\""
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_DOC=\"\\\"`echo \"$docdir\" | sed -e \"s|/|$PATH_SEP|g\"`\\\"\""
fi
if test "$infodir" != "\${prefix}/info"; then
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_INFO=\"\\\"`echo \"$infodir\" | sed -e \"s|/|$PATH_SEPARATOR|g\"`\\\"\""
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_INFO=\"\\\"`echo \"$infodir\" | sed -e \"s|/|$PATH_SEP|g\"`\\\"\""
fi
if test "$datadir" != "\${prefix}/share"; then
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_SHARE=\"\\\"`echo \"$datadir\" | sed -e \"s|/|$PATH_SEPARATOR|g\"`\\\"\""
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_SHARE=\"\\\"`echo \"$datadir\" | sed -e \"s|/|$PATH_SEP|g\"`\\\"\""
fi
fi
Expand Down
23 changes: 12 additions & 11 deletions configure.ac
View file
Expand Up @@ -896,6 +896,9 @@ AC_CHECK_HEADERS(stdlib.h)
AC_CHECK_HEADERS(string.h)
AC_CHECK_HEADERS(time.h)

# Default path separator
PATH_SEP="/"

if test "$ANSI_C" = yes; then

# Check if linking to the math library needs some special linker flags.
Expand Down Expand Up @@ -1024,7 +1027,7 @@ else

if test "$C_COMP_VISUALC" = yes; then

PATH_SEPARATOR="\\\\\\\\\\\\\\\\"
PATH_SEP="\\\\\\\\\\\\\\\\"

LIBS="$LIBS Kernel32.Lib User32.Lib Gdi32.Lib WS2_32.Lib"

Expand All @@ -1043,7 +1046,7 @@ else

mingw*) # add Windows libraries needed by MinGW

PATH_SEPARATOR="\\\\\\\\\\\\\\\\"
PATH_SEP="\\\\\\\\\\\\\\\\"

LIBS="$LIBS -lws2_32"

Expand All @@ -1056,8 +1059,6 @@ else

*) # check libraries for other systems

PATH_SEPARATOR="/"

AC_SEARCH_LIBS(asin,m)

AC_SEARCH_LIBS(dlopen,dl)
Expand Down Expand Up @@ -2365,32 +2366,32 @@ if test "$datadir" = "\${datarootdir}"; then
datadir="\${prefix}/share"
fi

GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR=\"\\\"`echo \"$prefix\" | sed -e \"s|/|$PATH_SEPARATOR|g\"`\\\"\""
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR=\"\\\"`echo \"$prefix\" | sed -e \"s|/|$PATH_SEP|g\"`\\\"\""

if test "$ENABLE_SYMLINKS" != yes; then

if test "$bindir" != "\${prefix}/bin"; then
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_BIN=\"\\\"`echo \"$bindir\" | sed -e \"s|/|$PATH_SEPARATOR|g\"`\\\"\""
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_BIN=\"\\\"`echo \"$bindir\" | sed -e \"s|/|$PATH_SEP|g\"`\\\"\""
fi

if test "$includedir" != "\${prefix}/include"; then
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_INCLUDE=\"\\\"`echo \"$includedir\" | sed -e \"s|/|$PATH_SEPARATOR|g\"`\\\"\""
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_INCLUDE=\"\\\"`echo \"$includedir\" | sed -e \"s|/|$PATH_SEP|g\"`\\\"\""
fi

if test "$libdir" != "\${prefix}/lib"; then
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_LIB=\"\\\"`echo \"$libdir\" | sed -e \"s|/|$PATH_SEPARATOR|g\"`\\\"\""
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_LIB=\"\\\"`echo \"$libdir\" | sed -e \"s|/|$PATH_SEP|g\"`\\\"\""
fi

if test "$docdir" != "\${prefix}/doc"; then
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_DOC=\"\\\"`echo \"$docdir\" | sed -e \"s|/|$PATH_SEPARATOR|g\"`\\\"\""
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_DOC=\"\\\"`echo \"$docdir\" | sed -e \"s|/|$PATH_SEP|g\"`\\\"\""
fi

if test "$infodir" != "\${prefix}/info"; then
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_INFO=\"\\\"`echo \"$infodir\" | sed -e \"s|/|$PATH_SEPARATOR|g\"`\\\"\""
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_INFO=\"\\\"`echo \"$infodir\" | sed -e \"s|/|$PATH_SEP|g\"`\\\"\""
fi

if test "$datadir" != "\${prefix}/share"; then
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_SHARE=\"\\\"`echo \"$datadir\" | sed -e \"s|/|$PATH_SEPARATOR|g\"`\\\"\""
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___GAMBCDIR_SHARE=\"\\\"`echo \"$datadir\" | sed -e \"s|/|$PATH_SEP|g\"`\\\"\""
fi

fi
Expand Down
4 changes: 2 additions & 2 deletions include/stamp.h
View file
Expand Up @@ -2,5 +2,5 @@
* Time stamp of last source code repository commit.
*/

#define ___STAMP_YMD 20150605
#define ___STAMP_HMS 173849
#define ___STAMP_YMD 20150623
#define ___STAMP_HMS 133757

0 comments on commit f4c4ca3

Please sign in to comment.