Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gmsh
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Larry Price
gmsh
Commits
a346e50b
Commit
a346e50b
authored
19 years ago
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
*** empty log message ***
parent
c2458c58
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
Makefile
+5
-2
5 additions, 2 deletions
Makefile
configure
+20
-20
20 additions, 20 deletions
configure
configure.in
+16
-16
16 additions, 16 deletions
configure.in
with
41 additions
and
38 deletions
Makefile
+
5
−
2
View file @
a346e50b
# $Id: Makefile,v 1.39
7
2005-09-2
1
1
9
:5
8:33
geuzaine Exp $
# $Id: Makefile,v 1.39
8
2005-09-2
5
1
5
:5
2:17
geuzaine Exp $
#
# Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
#
...
...
@@ -135,7 +135,10 @@ source-tree: purge
rm
-rf
gmsh-
${
GMSH_VERSION
}
tar
zcvf gmsh.tgz
--exclude
"*.o"
--exclude
"*.a"
--exclude
"gmsh"
\
--exclude
"variables"
--exclude
"config.log"
--exclude
"config.status"
\
--exclude
"autom4*"
--exclude
"benchmarks"
--exclude
"zzz_*"
*
--exclude
"autom4*"
--exclude
"benchmarks"
--exclude
"Makefile.distrib"
\
--exclude
"zzz_*"
--exclude
"HTML"
\
--exclude
"*TAGS*"
--exclude
"GSYMS"
--exclude
"GPATH"
\
*
mkdir
gmsh-
${
GMSH_VERSION
}
cd
gmsh-
${
GMSH_VERSION
}
&&
tar
zxvf ../gmsh.tgz
rm
-f
gmsh.tgz
...
...
This diff is collapsed.
Click to expand it.
configure
+
20
−
20
View file @
a346e50b
...
...
@@ -853,7 +853,7 @@ Optional Features:
--enable-cygwin use the Cygwin library on Windows (default=yes)
--enable-parallel enable parallel version (default=no)
--enable-jpeg enable JPEG support (default=yes)
--enable-z
enable ZLIB support (default=yes)
--enable-z
lib
enable ZLIB support (default=yes)
--enable-png enable PNG support (default=yes)
--enable-contrib enable contrib packages (default=yes)
--enable-triangle compile Triangle if available (default=yes)
...
...
@@ -872,7 +872,7 @@ Optional Packages:
installed
--with-png-prefix=PFX prefix where the PNG library and includes are
installed
--with-z-prefix=PFX
prefix where the ZLIB library and includes are
--with-z
lib
-prefix=PFX prefix where the ZLIB library and includes are
installed
Some influential environment variables:
...
...
@@ -1350,10 +1350,10 @@ if test "${with_png_prefix+set}" = set; then
PNG_PREFIX
=
$withval
fi
;
# Check whether --with-z-prefix or --without-z-prefix was given.
if
test
"
${
with_z_prefix
+set
}
"
=
set
;
then
withval
=
"
$with_z_prefix
"
Z_PREFIX
=
$withval
# Check whether --with-z
lib
-prefix or --without-z
lib
-prefix was given.
if
test
"
${
with_z
lib
_prefix
+set
}
"
=
set
;
then
withval
=
"
$with_z
lib
_prefix
"
Z
LIB
_PREFIX
=
$withval
fi
;
# Check whether --enable-gsl or --disable-gsl was given.
...
...
@@ -1381,9 +1381,9 @@ if test "${enable_jpeg+set}" = set; then
enableval
=
"
$enable_jpeg
"
fi
;
# Check whether --enable-z or --disable-z was given.
if
test
"
${
enable_z
+set
}
"
=
set
;
then
enableval
=
"
$enable_z
"
# Check whether --enable-z
lib
or --disable-z
lib
was given.
if
test
"
${
enable_z
lib
+set
}
"
=
set
;
then
enableval
=
"
$enable_z
lib
"
fi
;
# Check whether --enable-png or --disable-png was given.
...
...
@@ -3580,10 +3580,10 @@ fi
fi
fi
Z
=
""
if
test
"x
$enable_z
"
!=
"xno"
;
then
if
test
"x
${
Z_PREFIX
}
"
!=
"x"
;
then
LDFLAGS
=
"-L
${
Z_PREFIX
}
-L
${
Z_PREFIX
}
/lib
${
LDFLAGS
}
"
Z
LIB
=
""
if
test
"x
$enable_z
lib
"
!=
"xno"
;
then
if
test
"x
${
Z
LIB
_PREFIX
}
"
!=
"x"
;
then
LDFLAGS
=
"-L
${
Z
LIB
_PREFIX
}
-L
${
Z
LIB
_PREFIX
}
/lib
${
LDFLAGS
}
"
fi
echo
"
$as_me
:
$LINENO
: checking for main in -lz"
>
&5
echo
$ECHO_N
"checking for main in -lz...
$ECHO_C
"
>
&6
...
...
@@ -3644,14 +3644,14 @@ fi
echo
"
$as_me
:
$LINENO
: result:
$ac_cv_lib_z_main
"
>
&5
echo
"
${
ECHO_T
}
$ac_cv_lib_z_main
"
>
&6
if
test
$ac_cv_lib_z_main
=
yes
;
then
Z
=
"yes"
Z
LIB
=
"yes"
else
Z
=
"no"
Z
LIB
=
"no"
fi
fi
if
test
"x
$enable_png
"
!=
"xno"
-a
"x
${
Z
}
"
=
"xyes"
;
then
if
test
"x
$enable_png
"
!=
"xno"
-a
"x
${
Z
LIB
}
"
=
"xyes"
;
then
if
test
"x
${
PNG_PREFIX
}
"
!=
"x"
;
then
LDFLAGS
=
"-L
${
PNG_PREFIX
}
-L
${
PNG_PREFIX
}
/lib
${
LDFLAGS
}
"
fi
...
...
@@ -3730,13 +3730,13 @@ fi
fi
fi
if
test
"x
${
Z
}
"
=
"xyes"
;
then
if
test
"x
${
Z
LIB
}
"
=
"xyes"
;
then
FLAGS
=
"-DHAVE_LIBZ
${
FLAGS
}
"
if
test
"x
${
Z_PREFIX
}
"
=
"x"
;
then
if
test
"x
${
Z
LIB
_PREFIX
}
"
=
"x"
;
then
GMSH_LIBS
=
"
${
GMSH_LIBS
}
-lz"
else
GMSH_LIBS
=
"
${
GMSH_LIBS
}
-L
${
Z_PREFIX
}
-L
${
Z_PREFIX
}
/lib -lz"
INCLS
=
"
${
INCLS
}
-I
${
Z_PREFIX
}
-I
${
Z_PREFIX
}
/include"
GMSH_LIBS
=
"
${
GMSH_LIBS
}
-L
${
Z
LIB
_PREFIX
}
-L
${
Z
LIB
_PREFIX
}
/lib -lz"
INCLS
=
"
${
INCLS
}
-I
${
Z
LIB
_PREFIX
}
-I
${
Z
LIB
_PREFIX
}
/include"
fi
fi
...
...
This diff is collapsed.
Click to expand it.
configure.in
+
16
−
16
View file @
a346e50b
dnl $Id: configure.in,v 1.8
1
2005-09-2
3 21:10:30
geuzaine Exp $
dnl $Id: configure.in,v 1.8
2
2005-09-2
5 15:52:17
geuzaine Exp $
dnl
dnl Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
dnl
...
...
@@ -45,10 +45,10 @@ AC_ARG_WITH(png-prefix,
AC_HELP_STRING([--with-png-prefix=PFX],
[prefix where the PNG library and includes are installed]),
[PNG_PREFIX=$withval])
AC_ARG_WITH(z-prefix,
AC_HELP_STRING([--with-z-prefix=PFX],
AC_ARG_WITH(z
lib
-prefix,
AC_HELP_STRING([--with-z
lib
-prefix=PFX],
[prefix where the ZLIB library and includes are installed]),
[Z_PREFIX=$withval])
[Z
LIB
_PREFIX=$withval])
dnl Parse '--enable' command line options
AC_ARG_ENABLE(gsl,
...
...
@@ -66,8 +66,8 @@ AC_ARG_ENABLE(parallel,
AC_ARG_ENABLE(jpeg,
AC_HELP_STRING([--enable-jpeg],
[enable JPEG support (default=yes)]))
AC_ARG_ENABLE(z,
AC_HELP_STRING([--enable-z],
AC_ARG_ENABLE(z
lib
,
AC_HELP_STRING([--enable-z
lib
],
[enable ZLIB support (default=yes)]))
AC_ARG_ENABLE(png,
AC_HELP_STRING([--enable-png],
...
...
@@ -182,16 +182,16 @@ if test "x$enable_gui" != "xno"; then
fi
dnl Check for libz
Z=""
if test "x$enable_z" != "xno"; then
if test "x${Z_PREFIX}" != "x"; then
LDFLAGS="-L${Z_PREFIX} -L${Z_PREFIX}/lib ${LDFLAGS}"
Z
LIB
=""
if test "x$enable_z
lib
" != "xno"; then
if test "x${Z
LIB
_PREFIX}" != "x"; then
LDFLAGS="-L${Z
LIB
_PREFIX} -L${Z
LIB
_PREFIX}/lib ${LDFLAGS}"
fi
AC_CHECK_LIB(z,main,Z="yes",Z="no")
AC_CHECK_LIB(z,main,Z
LIB
="yes",Z
LIB
="no")
fi
dnl Check for libpng (only if libz is available)
if test "x$enable_png" != "xno" -a "x${Z}" = "xyes"; then
if test "x$enable_png" != "xno" -a "x${Z
LIB
}" = "xyes"; then
if test "x${PNG_PREFIX}" != "x"; then
LDFLAGS="-L${PNG_PREFIX} -L${PNG_PREFIX}/lib ${LDFLAGS}"
fi
...
...
@@ -209,14 +209,14 @@ if test "x$enable_gui" != "xno"; then
fi
dnl Complete zlib link line (zlib must be linked in after libpng)
if test "x${Z}" = "xyes"; then
if test "x${Z
LIB
}" = "xyes"; then
FLAGS="-DHAVE_LIBZ ${FLAGS}"
if test "x${Z_PREFIX}" = "x"; then
if test "x${Z
LIB
_PREFIX}" = "x"; then
GMSH_LIBS="${GMSH_LIBS} -lz"
else
dnl Find the libs/includes even if libjpeg is _not_ properly installed (ugly hack!)
GMSH_LIBS="${GMSH_LIBS} -L${Z_PREFIX} -L${Z_PREFIX}/lib -lz"
INCLS="${INCLS} -I${Z_PREFIX} -I${Z_PREFIX}/include"
GMSH_LIBS="${GMSH_LIBS} -L${Z
LIB
_PREFIX} -L${Z
LIB
_PREFIX}/lib -lz"
INCLS="${INCLS} -I${Z
LIB
_PREFIX} -I${Z
LIB
_PREFIX}/include"
fi
fi
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment